diff options
Diffstat (limited to 'core')
26 files changed, 213 insertions, 173 deletions
diff --git a/core/controllers/admin_graphics.php b/core/controllers/admin_graphics.php index e6e42672..babad3d4 100644 --- a/core/controllers/admin_graphics.php +++ b/core/controllers/admin_graphics.php @@ -38,8 +38,8 @@ class Admin_Graphics_Controller extends Admin_Controller { } site_status::clear("missing_graphics_toolkit"); - message::success(_("Updated Graphics Toolkit")); - log::success("graphics", sprintf(_("Changed graphics toolkit to %s"), $toolkit)); + message::success(t("Updated Graphics Toolkit")); + log::success("graphics", t("Changed graphics toolkit to: {{toolkit}}", array("toolkit" => $toolkit))); } url::redirect("admin/graphics"); diff --git a/core/controllers/admin_maintenance.php b/core/controllers/admin_maintenance.php index ea844a1f..3eec16fc 100644 --- a/core/controllers/admin_maintenance.php +++ b/core/controllers/admin_maintenance.php @@ -26,13 +26,14 @@ class Admin_Maintenance_Controller extends Admin_Controller { $dirty_count = graphics::find_dirty_images_query()->count(); return array( "graphics::rebuild_dirty_images" => new ArrayObject( - array("name" => _("Rebuild Images"), + array("name" => t("Rebuild Images"), "callback" => "graphics::rebuild_dirty_images", "description" => ( $dirty_count ? - sprintf( - _("You have %d out-of-date images"), $dirty_count) - : _("All your images are up to date")), + t(array("one" => "You have one image which is out of date", + "other" => "You have {{count}} out-of-date images"), + array("count" => $dirty_count)) + : t("All your images are up to date")), "severity" => $dirty_count ? log::WARNING : log::SUCCESS), ArrayObject::ARRAY_AS_PROPS)); } @@ -49,10 +50,12 @@ class Admin_Maintenance_Controller extends Admin_Controller { $stalled_count = $query->count(); if ($stalled_count) { log::warning("tasks", - sprintf(_("%d tasks are stalled"), $stalled_count), - sprintf(_("%sview%s"), - "<a href=\"" . url::site("admin/maintenance") . "\">", - "</a>")); + t(array("one" => "One task is stalled", + "other" => "{{count}} tasks are stalled"), + array("count" => $stalled_count)), + t("{{link_start}}view{{link_end}}", + array("link_start" => "<a href=\"" . url::site("admin/maintenance") . "\">", + "link_start" => "</a>"))); } $view = new Admin_View("admin.html"); @@ -86,8 +89,9 @@ class Admin_Maintenance_Controller extends Admin_Controller { $view->csrf = access::csrf_token(); $view->task = $task; - log::info("tasks", sprintf(_("Task %s started (task id %d)"), $task->name, $task->id), - html::anchor(url::site("admin/maintenance"), _("maintenance"))); + log::info("tasks", t("Task {{task_name}} started (task id {{task_id}})", + array("task_name" => $task->name, "task_id" => $task->id)), + html::anchor(url::site("admin/maintenance"), t("maintenance"))); print $view; } @@ -106,8 +110,9 @@ class Admin_Maintenance_Controller extends Admin_Controller { $view->csrf = access::csrf_token(); $view->task = $task; - log::info("tasks", sprintf(_("Task %s resumed (task id %d)"), $task->name, $task->id), - html::anchor(url::site("admin/maintenance"), _("maintenance"))); + log::info("tasks", t("Task {{task_name}} resumed (task id {{task_id}})", + array("task_name" => $task->name, "task_id" => $task->id)), + html::anchor(url::site("admin/maintenance"), t("maintenance"))); print $view; } @@ -126,7 +131,7 @@ class Admin_Maintenance_Controller extends Admin_Controller { $task->state = "cancelled"; $task->save(); - message::success(_("Task cancelled")); + message::success(t("Task cancelled")); url::redirect("admin/maintenance"); } @@ -142,7 +147,7 @@ class Admin_Maintenance_Controller extends Admin_Controller { throw new Exception("@todo MISSING_TASK"); } $task->delete(); - message::success(_("Task removed")); + message::success(t("Task removed")); url::redirect("admin/maintenance"); } @@ -166,15 +171,17 @@ class Admin_Maintenance_Controller extends Admin_Controller { if ($task->done) { switch ($task->state) { case "success": - log::success("tasks", sprintf(_("Task %s completed (task id %d)"), $task->name, $task->id), - html::anchor(url::site("admin/maintenance"), _("maintenance"))); - message::success(_("Task completed successfully")); + log::success("tasks", t("Task {{task_name}} completed (task id {{task_id}})", + array("task_name" => $task->name, "task_id" => $task->id)), + html::anchor(url::site("admin/maintenance"), t("maintenance"))); + message::success(t("Task completed successfully")); break; case "error": - log::error("tasks", sprintf(_("Task %s failed (task id %d)"), $task->name, $task->id), - html::anchor(url::site("admin/maintenance"), _("maintenance"))); - message::success(_("Task failed")); + log::error("tasks", t("Task {{task_name}} failed (task id {{task_id}})", + array("task_name" => $task->name, "task_id" => $task->id)), + html::anchor(url::site("admin/maintenance"), t("maintenance"))); + message::success(t("Task failed")); break; } print json_encode( diff --git a/core/controllers/admin_modules.php b/core/controllers/admin_modules.php index c416a699..e345f8c6 100644 --- a/core/controllers/admin_modules.php +++ b/core/controllers/admin_modules.php @@ -34,10 +34,10 @@ class Admin_Modules_Controller extends Admin_Controller { $desired = $this->input->post($module_name) == 1; if ($info->installed && !$desired) { module::uninstall($module_name); - message::success(sprintf(_("Uninstalled %s module"), $info->name)); + message::success(t("Uninstalled {{module_name}} module", array("module_name" => $info->name))); } else if (!$info->installed && $desired) { module::install($module_name); - message::success(sprintf(_("Installed %s module"), $info->name)); + message::success(t("Installed {{module_name}} module", array("module_name" => $info->name))); } } url::redirect("admin/modules"); diff --git a/core/controllers/admin_themes.php b/core/controllers/admin_themes.php index 5c9a2ad1..6641221f 100644 --- a/core/controllers/admin_themes.php +++ b/core/controllers/admin_themes.php @@ -26,14 +26,14 @@ class Admin_Themes_Controller extends Admin_Controller { $view->content->active = module::get_var("core", "active_theme"); print $view; } - + public function save() { access::verify_csrf(); $theme = $this->input->post("theme"); if ($theme != module::get_var("core", "active_theme")) { module::set_var("core", "active_theme", $theme); - message::success(_("Updated Theme")); - log::success("graphics", sprintf(_("Changed theme to %s"), $theme)); + message::success(t("Updated Theme")); + log::success("graphics", t("Changed theme to {{theme_name}}", array("theme_name" => $theme))); } url::redirect("admin/themes"); } diff --git a/core/controllers/albums.php b/core/controllers/albums.php index 20291315..d87bd640 100644 --- a/core/controllers/albums.php +++ b/core/controllers/albums.php @@ -93,7 +93,7 @@ class Albums_Controller extends Items_Controller { log::success("content", "Created an album", html::anchor("albums/$new_album->id", "view album")); - message::success(sprintf(_("Created album %s"), $new_album->title)); + message::success(t("Created album {{album_title}}", array("album_title" => $new_album->title))); print json_encode( array("result" => "success", @@ -123,7 +123,7 @@ class Albums_Controller extends Items_Controller { user::active()->id); log::success("content", "Added a photo", html::anchor("photos/$photo->id", "view photo")); - message::success(sprintf(_("Added photo %s"), $photo->title)); + message::success(t("Added photo {{photo_title}}", array("photo_title" => $photo->title))); print json_encode( array("result" => "success", @@ -155,7 +155,7 @@ class Albums_Controller extends Items_Controller { module::event("album_changed", $orig, $album); log::success("content", "Updated album", "<a href=\"albums/$album->id\">view</a>"); - message::success(sprintf(_("Saved album %s"), $album->title)); + message::success(t("Saved album {{album_title}}", array("album_title" => $album->title))); print json_encode( array("result" => "success", diff --git a/core/controllers/photos.php b/core/controllers/photos.php index 6b5e84ba..b177b205 100644 --- a/core/controllers/photos.php +++ b/core/controllers/photos.php @@ -81,7 +81,7 @@ class Photos_Controller extends Items_Controller { module::event("photo_changed", $orig, $photo); log::success("content", "Updated photo", "<a href=\"photos/$photo->id\">view</a>"); - message::success(sprintf(_("Saved photo %s"), $photo->title)); + message::success(t("Saved photo {{photo_title}}", array("photo_title" => $photo->title))); print json_encode( array("result" => "success", diff --git a/core/helpers/album.php b/core/helpers/album.php index 82697254..8998c8d0 100644 --- a/core/helpers/album.php +++ b/core/helpers/album.php @@ -65,12 +65,12 @@ class album_Core { static function get_add_form($parent) { $form = new Forge("albums/{$parent->id}", "", "post", array("id" => "gAddAlbumForm")); - $group = $form->group("add_album")->label(sprintf(_("Add Album to %s"), $parent->title)); - $group->input("name")->label(_("Name")); - $group->input("title")->label(_("Title")); - $group->textarea("description")->label(_("Description")); + $group = $form->group("add_album")->label(t("Add Album to {{album_title}}", array("album_title" => $parent->title))); + $group->input("name")->label(t("Name")); + $group->input("title")->label(t("Title")); + $group->textarea("description")->label(t("Description")); $group->hidden("type")->value("album"); - $group->submit(_("Create")); + $group->submit(t("Create")); $form->add_rules_from(ORM::factory("item")); return $form; } @@ -78,14 +78,14 @@ class album_Core { static function get_edit_form($parent) { $form = new Forge("albums/{$parent->id}", "", "post", array("id" => "gEditAlbumForm")); $form->hidden("_method")->value("put"); - $group = $form->group("edit_album")->label(_("Edit Album")); + $group = $form->group("edit_album")->label(t("Edit Album")); if ($parent->id != 1) { - $group->input("name")->label(_("Name"))->value($parent->name); + $group->input("name")->label(t("Name"))->value($parent->name); } - $group->input("title")->label(_("Title"))->value($parent->title); - $group->textarea("description")->label(_("Description"))->value($parent->description); + $group->input("title")->label(t("Title"))->value($parent->title); + $group->textarea("description")->label(t("Description"))->value($parent->description); $group->hidden("type")->value("album"); - $group->submit(_("Modify")); + $group->submit(t("Modify")); $form->add_rules_from(ORM::factory("item")); return $form; } diff --git a/core/helpers/core_block.php b/core/helpers/core_block.php index f4224190..8c65b1ad 100644 --- a/core/helpers/core_block.php +++ b/core/helpers/core_block.php @@ -70,13 +70,13 @@ class core_block_Core { public static function admin_dashboard_blocks($theme) { $block = new Block(); $block->id = "gWelcome"; - $block->title = _("Welcome to Gallery3"); + $block->title = t("Welcome to Gallery3"); $block->content = new View("admin_block_welcome.html"); $blocks[] = $block; $block = new Block(); $block->id = "gPhotoStream"; - $block->title = _("Photo Stream"); + $block->title = t("Photo Stream"); $block->content = new View("admin_block_photo_stream.html"); $block->content->photos = ORM::factory("item")->where("type", "photo")->orderby("created", "desc")->find_all(10); @@ -84,7 +84,7 @@ class core_block_Core { $block = new Block(); $block->id = "gLogEntries"; - $block->title = _("Log Entries"); + $block->title = t("Log Entries"); $block->content = new View("admin_block_log_entries.html"); $block->content->entries = ORM::factory("log")->orderby("timestamp", "DESC")->find_all(5); $blocks[] = $block; @@ -95,7 +95,7 @@ class core_block_Core { public static function admin_sidebar_blocks($theme) { $block = new Block(); $block->id = "gStats"; - $block->title = _("Gallery Stats"); + $block->title = t("Gallery Stats"); $block->content = new View("admin_block_stats.html"); $block->content->album_count = ORM::factory("item")->where("type", "album")->count_all(); $block->content->photo_count = ORM::factory("item")->where("type", "photo")->count_all(); @@ -103,13 +103,13 @@ class core_block_Core { $block = new Block(); $block->id = "gPlatform"; - $block->title = _("Platform Information"); + $block->title = t("Platform Information"); $block->content = new View("admin_block_platform.html"); $blocks[] = $block; $block = new Block(); $block->id = "gProjectNews"; - $block->title = _("Gallery Project News"); + $block->title = t("Gallery Project News"); $block->content = new View("admin_block_news.html"); $block->content->feed = feed::parse("http://gallery.menalto.com/node/feed", 3); $blocks[] = $block; diff --git a/core/helpers/core_installer.php b/core/helpers/core_installer.php index 15b97809..043af641 100644 --- a/core/helpers/core_installer.php +++ b/core/helpers/core_installer.php @@ -122,7 +122,7 @@ class core_installer { $db->query("CREATE TABLE `translations_incomings` ( `id` int(9) NOT NULL auto_increment, - `key` char(32) NOT NULL, + `key` binary(16) NOT NULL, `locale` char(10) NOT NULL, `message` text NOT NULL, `translation` text, @@ -211,8 +211,8 @@ class core_installer { } if (!module::get_var("core", "graphics_toolkit")) { site_status::warning( - sprintf(_("Graphics toolkit missing! Please %schoose a toolkit%s."), - "<a href=\"" . url::site("admin/graphics") . "\">", "</a>"), + t("Graphics toolkit missing! Please {{link_start}}choose a toolkit{{link_start}}.", + array("link_start" => "<a href=\"" . url::site("admin/graphics") . "\">", "link_end" => "</a>")), "missing_graphics_toolkit"); } diff --git a/core/helpers/core_menu.php b/core/helpers/core_menu.php index ef866c1a..9a35e244 100644 --- a/core/helpers/core_menu.php +++ b/core/helpers/core_menu.php @@ -22,11 +22,11 @@ class core_menu_Core { $menu ->append(Menu::factory("link") ->id("home") - ->label(_("Home")) + ->label(t("Home")) ->url(url::base())) ->append(Menu::factory("link") ->id("browse") - ->label(_("Browse")) + ->label(t("Browse")) ->url(url::site("albums/1"))); $item = $theme->item(); @@ -34,31 +34,31 @@ class core_menu_Core { if (!user::active()->guest) { $menu->append($admin_menu = Menu::factory("submenu") ->id("admin_menu") - ->label(_("Admin"))); + ->label(t("Admin"))); } if ($item && access::can("edit", $item)) { $menu->append($options_menu = Menu::factory("submenu") ->id("options_menu") - ->label(_("Options")) + ->label(t("Options")) ->append(Menu::factory("dialog") ->id("edit_item") - ->label($item->type == "album" ? _("Edit album") : _("Edit photo")) + ->label($item->type == "album" ? t("Edit album") : t("Edit photo")) ->url(url::site("form/edit/{$item->type}s/$item->id")))); if ($item->type == "album") { $options_menu ->append(Menu::factory("dialog") ->id("add_item") - ->label(_("Add a photo")) + ->label(t("Add a photo")) ->url(url::site("form/add/albums/$item->id?type=photo"))) ->append(Menu::factory("dialog") ->id("add_album") - ->label(_("Add an album")) + ->label(t("Add an album")) ->url(url::site("form/add/albums/$item->id?type=album"))) ->append(Menu::factory("dialog") ->id("edit_permissions") - ->label(_("Edit permissions")) + ->label(t("Edit permissions")) ->url(url::site("permissions/browse/$item->id"))); } } @@ -66,7 +66,7 @@ class core_menu_Core { if (user::active()->admin) { $admin_menu->append(Menu::factory("link") ->id("site_admin") - ->label(_("Site Admin")) + ->label(t("Site Admin")) ->url(url::site("admin"))); } } @@ -75,7 +75,7 @@ class core_menu_Core { $menu ->append(Menu::factory("link") ->id("hybrid") - ->label(_("View album hybrid mode")) + ->label(t("View album hybrid mode")) ->url("#") ->css_id("gHybridLink")); } @@ -84,12 +84,12 @@ class core_menu_Core { $menu ->append(Menu::factory("link") ->id("fullsize") - ->label(_("View full size")) + ->label(t("View full size")) ->url("#") ->css_id("gFullsizeLink")) ->append(Menu::factory("link") ->id("album") - ->label(_("Return to album")) + ->label(t("Return to album")) ->url($theme->item()->parent()->url("show={$theme->item->id}")) ->css_id("gAlbumLink")); } @@ -98,43 +98,43 @@ class core_menu_Core { $menu ->append(Menu::factory("link") ->id("dashboard") - ->label(_("Dashboard")) + ->label(t("Dashboard")) ->url(url::site("admin"))) ->append(Menu::factory("submenu") ->id("settings_menu") - ->label(_("Settings")) + ->label(t("Settings")) ->append(Menu::factory("link") ->id("graphics_toolkits") - ->label(_("Graphics")) + ->label(t("Graphics")) ->url(url::site("admin/graphics")))) ->append(Menu::factory("link") ->id("modules") - ->label(_("Modules")) + ->label(t("Modules")) ->url(url::site("admin/modules"))) ->append(Menu::factory("submenu") ->id("content_menu") - ->label(_("Content"))) + ->label(t("Content"))) ->append(Menu::factory("submenu") ->id("presentation_menu") - ->label(_("Presentation")) + ->label(t("Presentation")) ->append(Menu::factory("link") ->id("themes") - ->label(_("Themes")) + ->label(t("Themes")) ->url(url::site("admin/themes"))) ->append(Menu::factory("link") ->id("image_sizes") - ->label(_("Image Sizes")) + ->label(t("Image Sizes")) ->url("#"))) ->append(Menu::factory("submenu") ->id("users_groups_menu") - ->label(_("Users/Groups"))) + ->label(t("Users/Groups"))) ->append(Menu::factory("link") ->id("maintenance") - ->label(_("Maintenance")) + ->label(t("Maintenance")) ->url(url::site("admin/maintenance"))) ->append(Menu::factory("submenu") ->id("statistics_menu") - ->label(_("Statistics")) + ->label(t("Statistics")) ->url("#")); } } diff --git a/core/helpers/graphics.php b/core/helpers/graphics.php index 83a08004..847de665 100644 --- a/core/helpers/graphics.php +++ b/core/helpers/graphics.php @@ -217,10 +217,13 @@ class graphics_Core { $count = self::find_dirty_images_query()->count(); if ($count) { site_status::warning( - sprintf(_("%d of your photos are out of date. %sClick here to fix them%s"), - $count, "<a href=\"" . - url::site("admin/maintenance/start/graphics::rebuild_dirty_images?csrf=__CSRF__") . - "\" class=\"gDialogLink\">", "</a>"), + t(array("one" => "One of your photos is out of date. {{link_start}}Click here to fix it{{link_end}}", + "other" => "{{count}} of your photos are out of date. {{link_start}}Click here to fix them{{link_end}}"), + array("count" => $count, + "link_start" => "<a href=\"" . + url::site("admin/maintenance/start/graphics::rebuild_dirty_images?csrf=__CSRF__") . + "\" class=\"gDialogLink\">", + "link_end" => "</a>")), "graphics_dirty"); } } @@ -251,8 +254,10 @@ class graphics_Core { } } - $task->status = sprintf( - _("Updated %d out of %d images"), $completed, $remaining + $completed); + $task->status = t(array("one" => "Updated: 1 image. Total: {{total_count}}.", + "other" => "Updated: {{count}} images. Total: {{total_count}}."), + array("count" => $completed, + "total_count" => ($remaining + $completed))); if ($completed + $remaining > 0) { $task->percent_complete = (int)(100 * $completed / ($completed + $remaining)); diff --git a/core/helpers/module.php b/core/helpers/module.php index 9bce7a44..4b98674e 100644 --- a/core/helpers/module.php +++ b/core/helpers/module.php @@ -127,7 +127,7 @@ class module_Core { } self::load_modules(); - log::success("module", sprintf(_("Installed module %s"), $module_name)); + log::success("module", t("Installed module {{module_name}}", array("module_name" => $module_name))); } /** @@ -137,7 +137,7 @@ class module_Core { $installer_class = "{$module_name}_installer"; Kohana::log("debug", "$installer_class uninstall"); call_user_func(array($installer_class, "uninstall")); - log::success("module", sprintf(_("Uninstalled module %s"), $module_name)); + log::success("module", t("Uninstalled module {{module_name}}", array("module_name" => $module_name))); } /** diff --git a/core/helpers/photo.php b/core/helpers/photo.php index 29f2ac6f..749efb87 100644 --- a/core/helpers/photo.php +++ b/core/helpers/photo.php @@ -96,13 +96,13 @@ class photo_Core { static function get_add_form($parent) { $form = new Forge("albums/{$parent->id}", "", "post", array("id" => "gAddPhotoForm")); - $group = $form->group("add_photo")->label(sprintf(_("Add Photo to %s"), $parent->title)); - $group->input("name")->label(_("Name")); - $group->input("title")->label(_("Title")); - $group->textarea("description")->label(_("Description")); - $group->upload("file")->label(_("File"))->rules("required|allow[jpg,png,gif]"); + $group = $form->group("add_photo")->label(t("Add Photo to {{album_title}}", array("album_title" =>$parent->title))); + $group->input("name")->label(t("Name")); + $group->input("title")->label(t("Title")); + $group->textarea("description")->label(t("Description")); + $group->upload("file")->label(t("File"))->rules("required|allow[jpg,png,gif]"); $group->hidden("type")->value("photo"); - $group->submit(_("Upload")); + $group->submit(t("Upload")); $form->add_rules_from(ORM::factory("item")); return $form; } @@ -110,11 +110,11 @@ class photo_Core { static function get_edit_form($photo) { $form = new Forge("photos/$photo->id", "", "post", array("id" => "gEditPhotoForm")); $form->hidden("_method")->value("put"); - $group = $form->group("edit_photo")->label(_("Edit Photo")); - $group->input("name")->label(_("Name"))->value($photo->name); - $group->input("title")->label(_("Title"))->value($photo->title); - $group->textarea("description")->label(_("Description"))->value($photo->description); - $group->submit(_("Modify")); + $group = $form->group("edit_photo")->label(t("Edit Photo")); + $group->input("name")->label(t("Name"))->value($photo->name); + $group->input("title")->label(t("Title"))->value($photo->title); + $group->textarea("description")->label(t("Description"))->value($photo->description); + $group->submit(t("Modify")); $form->add_rules_from(ORM::factory("item")); return $form; } diff --git a/core/hooks/register_i18n.php b/core/hooks/register_i18n.php new file mode 100644 index 00000000..2a8c8019 --- /dev/null +++ b/core/hooks/register_i18n.php @@ -0,0 +1,21 @@ +<?php defined("SYSPATH") or die("No direct script access."); +/** + * Gallery - a web based photo album viewer and editor + * Copyright (C) 2000-2008 Bharat Mediratta + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or (at + * your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. + */ + +Event::add("system.ready", array("I18n", "instance")); diff --git a/core/libraries/I18n.php b/core/libraries/I18n.php index 786274dd..6a8bf3ed 100644 --- a/core/libraries/I18n.php +++ b/core/libraries/I18n.php @@ -81,7 +81,7 @@ class I18n_Core { $entry = Database::instance() ->select("translation") ->from("translations_incomings") - ->where(array("key" => md5($key), + ->where(array("key" => md5($key, true), "locale" => $locale)) ->limit(1) ->get() diff --git a/core/tests/I18n_Test.php b/core/tests/I18n_Test.php index 2a13189a..5d505eb1 100644 --- a/core/tests/I18n_Test.php +++ b/core/tests/I18n_Test.php @@ -44,7 +44,7 @@ class I18n_Test extends Unit_Test_Case { $key = $message; $key = is_array($key) ? array_shift($key) : $key; $entry = ORM::factory("translations_incoming"); - $entry->key = md5($key); + $entry->key = md5($key, true); $entry->message = serialize($message); $entry->translation = serialize($translation); $entry->locale = 'te_ST'; diff --git a/core/views/admin_block_platform.html.php b/core/views/admin_block_platform.html.php index 958097a1..2f13d5d9 100644 --- a/core/views/admin_block_platform.html.php +++ b/core/views/admin_block_platform.html.php @@ -1,15 +1,15 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> <ul> <li> - <? printf(_("Operating System: %s"), PHP_OS) ?> + <?= t("Operating System: {{operating_system}}", array("operating_system" => PHP_OS)) ?> </li> <li> - <? printf(_("Apache: %s"), function_exists("apache_get_version") ? apache_get_version() : _("Unknown")) ?> + <?= t("Apache: {{apache_version}}", array("apache_version" => function_exists("apache_get_version") ? apache_get_version() : t("Unknown"))) ?> </li> <li> - <? printf(_("PHP: %s"), phpversion()) ?> + <?= t("PHP: {{php_version}}", array("php_version" => phpversion())) ?> </li> <li> - <? printf(_("MySQL: %s"), mysql_get_server_info()) ?> + <?= t("MySQL: {{mysql_version}}", array("mysql_version" => mysql_get_server_info())) ?> </li> </ul> diff --git a/core/views/admin_block_stats.html.php b/core/views/admin_block_stats.html.php index b83add10..c3b9ee98 100644 --- a/core/views/admin_block_stats.html.php +++ b/core/views/admin_block_stats.html.php @@ -1,12 +1,12 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> <ul> <li> - <? printf(_("Version: %s"), "3.0") ?> + <?= t("Version: {{version}}", array("version" => "3.0")) ?> </li> <li> - <? printf(_("Albums: %d"), $album_count) ?> + <?= t("Albums: {{count}}", array("count" => $album_count)) ?> </li> <li> - <? printf(_("Photos: %d"), $photo_count) ?> + <?= t("Photos: {{count}}", array("count" => $photo_count)) ?> </li> </ul> diff --git a/core/views/admin_block_welcome.html.php b/core/views/admin_block_welcome.html.php index a221c9bd..35501ffc 100644 --- a/core/views/admin_block_welcome.html.php +++ b/core/views/admin_block_welcome.html.php @@ -1,15 +1,18 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> <p> - <?= _("This is your administration dashboard and it provides a quick overview of status messages, recent updates, and frequently used options. Add or remove blocks and rearrange them to tailor to your needs. The admin menu provides quick access to all of Gallery 3's options and settings. Here are a few of the most used options to get you started.") ?> + <?= t("This is your administration dashboard and it provides a quick overview of status messages, recent updates, and frequently used options. Add or remove blocks and rearrange them to tailor to your needs. The admin menu provides quick access to all of Gallery 3's options and settings. Here are a few of the most used options to get you started.") ?> </p> <ul> <li> - <?= sprintf(_("%sGeneral Settings%s - General configuation options for your Gallery."), "<a href=\"#\">", "</a>") ?> + <?= t("{{link_start}}General Settings{{link_end}} - General configuation options for your Gallery.", + array("link_start" => "<a href=\"#\">", "link_end" => "</a>")) ?> </li> <li> - <?= sprintf(_("%sModules%s - Manage available and installed modules."), "<a href=\"" . url::site("admin/modules") . "\">", "</a>") ?> + <?= t("{{link_start}}Modules{{link_end}} - Manage available and installed modules.", + array("link_start" => "<a href=\"" . url::site("admin/modules") . "\">", "link_end" => "</a>")) ?> </li> <li> - <?= sprintf(_("%sPresentation%s - Choose a theme, set image sizes."), "<a href=\"#\">", "</a>") ?> + <?= t("{{link_start}}Presentation{{link_end}} - Choose a theme, set image sizes.", + array("link_start" => "<a href=\"#\">", "link_end" => "</a>")) ?> </li> </ul> diff --git a/core/views/admin_graphics.html.php b/core/views/admin_graphics.html.php index 19f80cba..7d57ec6f 100644 --- a/core/views/admin_graphics.html.php +++ b/core/views/admin_graphics.html.php @@ -1,13 +1,13 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> <div id="gGraphics"> - <h1> <?= _("Graphics Settings") ?> </h1> + <h1> <?= t("Graphics Settings") ?> </h1> <p> - <?= _("Gallery needs a graphics toolkit in order to manipulate your photos. Please choose one from the list below.") ?> + <?= t("Gallery needs a graphics toolkit in order to manipulate your photos. Please choose one from the list below.") ?> </p> <form method="post" action="<?= url::site("admin/graphics/save") ?>"> <?= access::csrf_form_field() ?> - <h2> <?= _("Graphics Toolkits") ?> </h2> + <h2> <?= t("Graphics Toolkits") ?> </h2> <table> <tr> <td valign="top" style="width: 100px"> @@ -19,21 +19,23 @@ </center> </td> <td> - <h3> <?= _("GD") ?> </h3> + <h3> <?= t("GD") ?> </h3> <p> - <? printf(_("The GD graphics library is an extension to PHP commonly installed most webservers. Please refer to the %sGD website%s for more information."), "<a href=\"http://www.boutell.com/gd/\">", "</a>") ?> + <?= t("The GD graphics library is an extension to PHP commonly installed most webservers. Please refer to the {{link_start}}GD website{{link_end}} for more information.", + array("link_start" => "<a href=\"http://www.boutell.com/gd/\">", "link_end" => "</a>")) ?> </p> <? if ($tk->gd["GD Version"] && function_exists('imagerotate')): ?> <p class="gSuccess"> - <? printf(_("You have GD version %s."), $tk->gd["GD Version"]) ?> + <?= t("You have GD version {{version}}.", array("version" => $tk->gd["GD Version"])) ?> </p> <? elseif ($tk->gd["GD Version"]): ?> <p class="gWarning"> - <? printf(_("You have GD version %s, but it lacks image rotation."), $tk->gd["GD Version"]) ?> + <?= t("You have GD version {{version}}, but it lacks image rotation.", + array("version" => $tk->gd["GD Version"])) ?> </p> <? else: ?> <p class="gInfo"> - <?= _("You do not have GD installed.") ?> + <?= t("You do not have GD installed.") ?> </p> <? endif ?> </td> @@ -49,17 +51,18 @@ </center> </td> <td> - <h3> <?= _("ImageMagick") ?> </h3> + <h3> <?= t("ImageMagick") ?> </h3> <p> - <? printf(_("ImageMagick is a standalone graphics program available on most Linux systems. Please refer to the %sImageMagick website%s for more information."), "<a href=\"http://www.imagemagick.org/\">", "</a>") ?> + <?= t("ImageMagick is a standalone graphics program available on most Linux systems. Please refer to the {{link_start}}ImageMagick website{{link_end}} for more information.", + array("link_start" => "<a href=\"http://www.imagemagick.org/\">", "link_end" => "</a>")) ?> </p> <? if ($tk->imagemagick): ?> <p class="gSuccess"> - <? printf(_("You have ImageMagick installed in %s"), $tk->imagemagick) ?> + <?= t("You have ImageMagick installed in {{path}}", array("path" => $tk->imagemagick)) ?> </p> <? else: ?> <p class="gInfo"> - <?= _("ImageMagick is not available on your system.") ?> + <?= t("ImageMagick is not available on your system.") ?> </p> <? endif ?> </td> @@ -75,22 +78,23 @@ </center> </td> <td> - <h3> <?= _("GraphicsMagick") ?> </h3> + <h3> <?= t("GraphicsMagick") ?> </h3> <p> - <? printf(_("GraphicsMagick is a standalone graphics program available on most Linux systems. Please refer to the %sGraphicsMagick website%s for more information."), "<a href=\"http://www.graphicsmagick.org/\">", "</a>") ?> + <?= t("GraphicsMagick is a standalone graphics program available on most Linux systems. Please refer to the {{link_start}}GraphicsMagick website{{link_end}} for more information.", + array("link_start" => "<a href=\"http://www.graphicsmagick.org/\">", "link_end" => "</a>")) ?> </p> <? if ($tk->graphicsmagick): ?> <p class="gSuccess"> - <? printf(_("You have GraphicsMagick installed in %s"), $tk->graphicsmagick) ?> + <?= t("You have GraphicsMagick installed in {{path}}", array("path" => $tk->graphicsmagick)) ?> </p> <? else: ?> <p class="gInfo"> - <?= _("GraphicsMagick is not available on your system.") ?> + <?= t("GraphicsMagick is not available on your system.") ?> </p> <? endif ?> </td> </tr> </table> - <input type="submit" value="<?= _("Save") ?>"/> + <input type="submit" value="<?= t("Save") ?>"/> </form> </div> diff --git a/core/views/admin_maintenance.html.php b/core/views/admin_maintenance.html.php index 1f9809ac..49a2f364 100644 --- a/core/views/admin_maintenance.html.php +++ b/core/views/admin_maintenance.html.php @@ -1,22 +1,22 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> <div id="gMaintenance"> - <h1> <?= _("Maintenance Tasks") ?> </h1> + <h1> <?= t("Maintenance Tasks") ?> </h1> <p> - <?= _("Occasionally your Gallery will require some maintenance. Here are some tasks you can use to keep it running smoothly.") ?> + <?= t("Occasionally your Gallery will require some maintenance. Here are some tasks you can use to keep it running smoothly.") ?> </p> <div id="gAvailableTasks"> - <h2> <?= _("Available Tasks") ?> </h2> + <h2> <?= t("Available Tasks") ?> </h2> <table style="width: 680px" border="1"> <tr> <th> - <?= _("Name") ?> + <?= t("Name") ?> </th> <th> - <?= _("Description") ?> + <?= t("Description") ?> </th> <th> - <?= _("Action") ?> + <?= t("Action") ?> </th> </tr> <? foreach ($task_definitions as $task) ?> @@ -30,7 +30,7 @@ <td> <a href="<?= url::site("admin/maintenance/start/$task->callback?csrf=$csrf") ?>" class="gDialogLink"> - <?= _("run") ?> + <?= t("run") ?> </a> </td> </tr> @@ -38,24 +38,24 @@ </div> <div id="gRunningTasks"> - <h2> <?= _("Running Tasks") ?> </h2> + <h2> <?= t("Running Tasks") ?> </h2> <table style="width: 680px" border="1"> <tr> <th> - <?= _("Last Updated") ?> + <?= t("Last Updated") ?> </th> <th> - <?= _("Name") ?> + <?= t("Name") ?> </th> <th> - <?= _("Status") ?> + <?= t("Status") ?> </th> <th> - <?= _("Info") ?> + <?= t("Info") ?> </th> <th> - <?= _("Action") ?> + <?= t("Action") ?> </th> </tr> <? foreach ($running_tasks as $task): ?> @@ -69,13 +69,13 @@ <td> <? if ($task->done): ?> <? if ($task->state == "cancelled"): ?> - <?= _("Cancelled") ?> + <?= t("Cancelled") ?> <? endif ?> - <?= _("Done") ?> + <?= t("Done") ?> <? elseif ($task->state == "stalled"): ?> - <?= _("Stalled") ?> + <?= t("Stalled") ?> <? else: ?> - <?= sprintf(_("%d%% Complete"), $task->percent_complete) ?> + <?= t("{{percent_complete}}% Complete", array("percent_complete" => $task->percent_complete)) ?> <? endif ?> </td> <td> @@ -84,11 +84,11 @@ <td> <? if ($task->state == "stalled"): ?> <a href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>" class="gDialogLink"> - <?= _("resume") ?> + <?= t("resume") ?> </a> <? endif ?> <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>"> - <?= _("cancel") ?> + <?= t("cancel") ?> </a> </td> </tr> @@ -97,24 +97,24 @@ </div> <div id="gFinishedTasks"> - <h2> <?= _("Finished Tasks") ?> </h2> + <h2> <?= t("Finished Tasks") ?> </h2> <table style="width: 680px" border="1"> <tr> <th> - <?= _("Last Updated") ?> + <?= t("Last Updated") ?> </th> <th> - <?= _("Name") ?> + <?= t("Name") ?> </th> <th> - <?= _("Status") ?> + <?= t("Status") ?> </th> <th> - <?= _("Info") ?> + <?= t("Info") ?> </th> <th> - <?= _("Action") ?> + <?= t("Action") ?> </th> </tr> <? foreach ($finished_tasks as $task): ?> @@ -127,11 +127,11 @@ </td> <td> <? if ($task->state == "success"): ?> - <?= _("Success") ?> + <?= t("Success") ?> <? elseif ($task->state == "error"): ?> - <?= _("Failed") ?> + <?= t("Failed") ?> <? elseif ($task->state == "cancelled"): ?> - <?= _("Cancelled") ?> + <?= t("Cancelled") ?> <? endif ?> </td> <td> @@ -140,14 +140,14 @@ <td> <? if ($task->done): ?> <a href="<?= url::site("admin/maintenance/remove/$task->id?csrf=$csrf") ?>"> - <?= _("remove") ?> + <?= t("remove") ?> </a> <? else: ?> <a href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>"> - <?= _("resume") ?> + <?= t("resume") ?> </a> <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>"> - <?= _("cancel") ?> + <?= t("cancel") ?> </a> <? endif ?> </td> diff --git a/core/views/admin_maintenance_task.html.php b/core/views/admin_maintenance_task.html.php index bcbdba0d..52e1f00d 100644 --- a/core/views/admin_maintenance_task.html.php +++ b/core/views/admin_maintenance_task.html.php @@ -26,7 +26,7 @@ <br/> percent_complete: <span id="gPercentComplete"></span> <div> - <button id="gPauseButton" onclick="dismiss()"><?= _("Pause") ?></button> - <button id="gDoneButton" style="display: none" onclick="dismiss()"><?= _("Done") ?></button> + <button id="gPauseButton" onclick="dismiss()"><?= t("Pause") ?></button> + <button id="gDoneButton" style="display: none" onclick="dismiss()"><?= t("Done") ?></button> </div> </div> diff --git a/core/views/admin_modules.html.php b/core/views/admin_modules.html.php index 4aa36a96..67fdfa32 100644 --- a/core/views/admin_modules.html.php +++ b/core/views/admin_modules.html.php @@ -1,30 +1,30 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> <div id="gModules"> - <h1> <?= _("Gallery Modules") ?> </h1> + <h1> <?= t("Gallery Modules") ?> </h1> <p> - <?= _("Power up your Gallery by adding more modules! Each module provides new cool features.") ?> + <?= t("Power up your Gallery by adding more modules! Each module provides new cool features.") ?> </p> <form method="post" action="<?= url::site("admin/modules/save") ?>"> <?= access::csrf_form_field() ?> <table> <tr> - <th> <?= _("Installed") ?> </th> - <th> <?= _("Name") ?> </th> - <th> <?= _("Version") ?> </th> - <th> <?= _("Description") ?> </th> + <th> <?= t("Installed") ?> </th> + <th> <?= t("Name") ?> </th> + <th> <?= t("Version") ?> </th> + <th> <?= t("Description") ?> </th> </tr> <? foreach ($available as $module_name => $module_info): ?> <tr> <? $data = array("name" => $module_name); ?> <? if ($module_info->locked) $data["disabled"] = 1; ?> <td> <?= form::checkbox($data, '1', module::is_installed($module_name)) ?> </td> - <td> <?= _($module_info->name) ?> </td> + <td> <?= t($module_info->name) ?> </td> <td> <?= $module_info->version ?> </td> - <td> <?= _($module_info->description) ?> </td> + <td> <?= t($module_info->description) ?> </td> </tr> <? endforeach ?> </table> - <input type="submit" value="<?= _("Update") ?>"/> + <input type="submit" value="<?= t("Update") ?>"/> </form> </div> diff --git a/core/views/admin_themes.html.php b/core/views/admin_themes.html.php index cff6de7d..1064ae5e 100644 --- a/core/views/admin_themes.html.php +++ b/core/views/admin_themes.html.php @@ -1,8 +1,8 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> <div id="gThemes"> - <h1><?= _("Theme Administration") ?></h1> + <h1><?= t("Theme Administration") ?></h1> <p> - <?= _("These are the themes in your system") ?> + <?= t("These are the themes in your system") ?> </p> <form method="post" action="<?= url::site("admin/themes/save") ?>"> <?= access::csrf_form_field() ?> @@ -12,6 +12,6 @@ /> <?= $theme ?> <? endforeach ?> - <input type="submit" value="<?= _("Save") ?>"/> + <input type="submit" value="<?= t("Save") ?>"/> </form> </div> diff --git a/core/views/permissions_form.html.php b/core/views/permissions_form.html.php index 94a3bead..ba3191e1 100644 --- a/core/views/permissions_form.html.php +++ b/core/views/permissions_form.html.php @@ -2,7 +2,7 @@ <form method="post" action="<?= url::site("permissions/edit/$item->id") ?>"> <?= access::csrf_form_field() ?> <fieldset> - <legend><?= _("Edit Permissions") ?> </legend> + <legend><?= t("Edit Permissions") ?> </legend> <table> <tr> @@ -14,7 +14,7 @@ <? foreach ($permissions as $permission): ?> <tr> - <td> <?= _($permission->display_name) ?> </td> + <td> <?= t($permission->display_name) ?> </td> <? foreach ($groups as $group): ?> <td> <? $intent = access::group_intent($group, $permission->name, $item) ?> @@ -22,7 +22,7 @@ <? $lock = access::locked_by($group, $permission->name, $item) ?> <? if ($lock): ?> - <?= _("denied and locked by") ?> <a href="javascript:show(<?= $lock->id ?>)"><?= _("parent") ?></a> + <?= t("denied and locked by") ?> <a href="javascript:show(<?= $lock->id ?>)"><?= t("parent") ?></a> <? else: ?> <? if ($intent === null): ?> <? if ($allowed): ?> diff --git a/core/views/quick_pane.html.php b/core/views/quick_pane.html.php index 7ae0a856..9a0e56d5 100644 --- a/core/views/quick_pane.html.php +++ b/core/views/quick_pane.html.php @@ -4,7 +4,7 @@ <div class="rotate-counter-clockwise" href="<?= url::site("quick/rotate/$item->id/ccw?csrf=" . access::csrf_token()) ?>"> <span> - <?= _("Rotate CCW") ?> + <?= t("Rotate CCW") ?> </span> </div> <? endif ?> @@ -12,7 +12,7 @@ <div class="edit gDialogLink" href="<?= url::site("quick/form_edit/$item->id") ?>"> <span> - <?= _("Edit") ?> + <?= t("Edit") ?> </span> </div> @@ -20,7 +20,7 @@ <div class="rotate-clockwise" href="<?= url::site("quick/rotate/$item->id/cw?csrf=" . access::csrf_token()) ?>"> <span> - <?= _("Rotate CCW") ?> + <?= t("Rotate CCW") ?> </span> </div> <? endif ?> |