From a631fe29f3950f8db1f7fb4ce1f47261a9b0feff Mon Sep 17 00:00:00 2001 From: Andy Staudacher Date: Thu, 8 Jan 2009 17:13:06 +0000 Subject: i18n refactoring: Rename all _() (reserved by gettext) calls to t(). - And refactor printf to our string interpolation / pluralization syntax - Also, a slight change to the translations_incomings table, using binary(16) instead of char(32) as message key. --- core/controllers/admin_graphics.php | 4 +- core/controllers/admin_maintenance.php | 47 ++++++++++++---------- core/controllers/admin_modules.php | 4 +- core/controllers/admin_themes.php | 6 +-- core/controllers/albums.php | 6 +-- core/controllers/photos.php | 2 +- core/helpers/album.php | 20 +++++----- core/helpers/core_block.php | 12 +++--- core/helpers/core_installer.php | 6 +-- core/helpers/core_menu.php | 46 +++++++++++----------- core/helpers/graphics.php | 17 +++++--- core/helpers/module.php | 4 +- core/helpers/photo.php | 22 +++++------ core/hooks/register_i18n.php | 21 ++++++++++ core/libraries/I18n.php | 2 +- core/tests/I18n_Test.php | 2 +- core/views/admin_block_platform.html.php | 8 ++-- core/views/admin_block_stats.html.php | 6 +-- core/views/admin_block_welcome.html.php | 11 ++++-- core/views/admin_graphics.html.php | 38 ++++++++++-------- core/views/admin_maintenance.html.php | 62 +++++++++++++++--------------- core/views/admin_maintenance_task.html.php | 4 +- core/views/admin_modules.html.php | 18 ++++----- core/views/admin_themes.html.php | 6 +-- core/views/permissions_form.html.php | 6 +-- core/views/quick_pane.html.php | 6 +-- 26 files changed, 213 insertions(+), 173 deletions(-) create mode 100644 core/hooks/register_i18n.php (limited to 'core') 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"), - "", - "")); + 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" => "", + "link_start" => ""))); } $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", "id\">view"); - 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", "id\">view"); - 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."), - "", ""), + t("Graphics toolkit missing! Please {{link_start}}choose a toolkit{{link_start}}.", + array("link_start" => "", "link_end" => "")), "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, "", ""), + 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" => "", + "link_end" => "")), "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 @@ +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 @@ 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 @@ 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 @@

- +

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 @@
-

+

- +

"> -

+

@@ -49,17 +51,18 @@ @@ -75,22 +78,23 @@
@@ -19,21 +19,23 @@ -

+

- ", "") ?> + "", "link_end" => "")) ?>

gd["GD Version"] && function_exists('imagerotate')): ?>

- gd["GD Version"]) ?> + $tk->gd["GD Version"])) ?>

gd["GD Version"]): ?>

- gd["GD Version"]) ?> + $tk->gd["GD Version"])) ?>

- +

-

+

- ", "") ?> + "", "link_end" => "")) ?>

imagemagick): ?>

- imagemagick) ?> + $tk->imagemagick)) ?>

- +

-

+

- ", "") ?> + "", "link_end" => "")) ?>

graphicsmagick): ?>

- graphicsmagick) ?> + $tk->graphicsmagick)) ?>

- +

- "/> + "/>
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 @@
-

+

- +

-

+

@@ -30,7 +30,7 @@ @@ -38,24 +38,24 @@
-

+

- + - + - +
callback?csrf=$csrf") ?>" class="gDialogLink"> - +
@@ -69,13 +69,13 @@ @@ -97,24 +97,24 @@
-

+

- + - + - + - + - +
done): ?> state == "cancelled"): ?> - + - + state == "stalled"): ?> - + - percent_complete) ?> + $task->percent_complete)) ?> @@ -84,11 +84,11 @@ state == "stalled"): ?> id?csrf=$csrf") ?>" class="gDialogLink"> - + id?csrf=$csrf") ?>"> - +
@@ -127,11 +127,11 @@ 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 @@
percent_complete:
- - + +
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 @@
-

+

- +

">
- + - + - + - + - +
state == "success"): ?> - + state == "error"): ?> - + state == "cancelled"): ?> - + @@ -140,14 +140,14 @@ done): ?> id?csrf=$csrf") ?>"> - + id?csrf=$csrf") ?>"> - + id?csrf=$csrf") ?>"> - +
- - - - + + + + $module_info): ?> $module_name); ?> locked) $data["disabled"] = 1; ?> - + - +
name) ?> name) ?> version ?> description) ?> description) ?>
- "/> + "/>
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 @@
-

+

- +

"> @@ -12,6 +12,6 @@ /> - "/> + "/>
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 @@
id") ?>">
- + @@ -14,7 +14,7 @@ - +
display_name) ?> display_name) ?> name, $item) ?> @@ -22,7 +22,7 @@ name, $item) ?> - + 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 @@
id/ccw?csrf=" . access::csrf_token()) ?>"> - +
@@ -12,7 +12,7 @@
id") ?>"> - +
@@ -20,7 +20,7 @@
id/cw?csrf=" . access::csrf_token()) ?>"> - +
-- cgit v1.2.3