diff options
Diffstat (limited to 'core/controllers')
| -rw-r--r-- | core/controllers/admin_dashboard.php | 6 | ||||
| -rw-r--r-- | core/controllers/admin_graphics.php | 2 | ||||
| -rw-r--r-- | core/controllers/admin_maintenance.php | 14 | ||||
| -rw-r--r-- | core/controllers/admin_modules.php | 4 | ||||
| -rw-r--r-- | core/controllers/admin_themes.php | 6 | ||||
| -rw-r--r-- | core/controllers/albums.php | 6 | ||||
| -rw-r--r-- | core/controllers/photos.php | 2 |
7 files changed, 20 insertions, 20 deletions
diff --git a/core/controllers/admin_dashboard.php b/core/controllers/admin_dashboard.php index 43b61868..15701417 100644 --- a/core/controllers/admin_dashboard.php +++ b/core/controllers/admin_dashboard.php @@ -42,12 +42,12 @@ class Admin_Dashboard_Controller extends Admin_Controller { if ($form->add_block->center->value) { dashboard::add_block("main", $module_name, $block_id); message::success( - t("Added <b>{{title}}</b> block to the main dashboard area", + t("Added <b>%title</b> block to the main dashboard area", array("title" => $available["$module_name:$id"]))); } else { dashboard::add_block("sidebar", $module_name, $block_id); message::success( - t("Added <b>{{title}}</b> to the dashboard sidebar", + t("Added <b>%title</b> to the dashboard sidebar", array("title" => $available["$module_name:$id"]))); } } @@ -68,7 +68,7 @@ class Admin_Dashboard_Controller extends Admin_Controller { if (!empty($deleted)) { $available = dashboard::get_available(); $title = $available[join(":", $deleted)]; - message::success(t("Removed <b>{{title}}</b> block", array("title" => $title))); + message::success(t("Removed <b>%title</b> block", array("title" => $title))); } url::redirect("admin"); diff --git a/core/controllers/admin_graphics.php b/core/controllers/admin_graphics.php index 69a83575..fe71a222 100644 --- a/core/controllers/admin_graphics.php +++ b/core/controllers/admin_graphics.php @@ -50,7 +50,7 @@ class Admin_Graphics_Controller extends Admin_Controller { site_status::clear("missing_graphics_toolkit"); message::success(t("Updated Graphics Toolkit")); - log::success("graphics", t("Changed graphics toolkit to: {{toolkit}}", + log::success("graphics", t("Changed graphics toolkit to: %toolkit", array("toolkit" => $toolkit))); } diff --git a/core/controllers/admin_maintenance.php b/core/controllers/admin_maintenance.php index 1c9b4164..6b344243 100644 --- a/core/controllers/admin_maintenance.php +++ b/core/controllers/admin_maintenance.php @@ -31,7 +31,7 @@ class Admin_Maintenance_Controller extends Admin_Controller { "description" => ( $dirty_count ? t2("You have one image which is out of date", - "You have {{count}} out-of-date images", + "You have %count out-of-date images", $dirty_count) : t("All your images are up to date")), "severity" => $dirty_count ? log::WARNING : log::SUCCESS), @@ -51,9 +51,9 @@ class Admin_Maintenance_Controller extends Admin_Controller { if ($stalled_count) { log::warning("tasks", t2("One task is stalled", - "{{count}} tasks are stalled", + "%count tasks are stalled", $stalled_count), - t("{{link_start}}view{{link_end}}", + t("%link_startview%link_end", array("link_start" => "<a href=\"" . url::site("admin/maintenance") . "\">", "link_start" => "</a>"))); } @@ -89,7 +89,7 @@ class Admin_Maintenance_Controller extends Admin_Controller { $view->csrf = access::csrf_token(); $view->task = $task; - log::info("tasks", t("Task {{task_name}} started (task id {{task_id}})", + 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; @@ -110,7 +110,7 @@ class Admin_Maintenance_Controller extends Admin_Controller { $view->csrf = access::csrf_token(); $view->task = $task; - log::info("tasks", t("Task {{task_name}} resumed (task id {{task_id}})", + 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; @@ -171,14 +171,14 @@ class Admin_Maintenance_Controller extends Admin_Controller { if ($task->done) { switch ($task->state) { case "success": - log::success("tasks", t("Task {{task_name}} completed (task id {{task_id}})", + 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", t("Task {{task_name}} failed (task id {{task_id}})", + 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")); diff --git a/core/controllers/admin_modules.php b/core/controllers/admin_modules.php index e345f8c6..2cd56c85 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(t("Uninstalled {{module_name}} module", array("module_name" => $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(t("Installed {{module_name}} module", array("module_name" => $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 b2e0b0e2..194b9d17 100644 --- a/core/controllers/admin_themes.php +++ b/core/controllers/admin_themes.php @@ -63,11 +63,11 @@ class Admin_Themes_Controller extends Admin_Controller { if ($type == "admin" && $info->admin) { module::set_var("core", "active_admin_theme", $theme_name); - message::success(t("Successfully changed your admin theme to <b>{{theme_name}}</b>", + message::success(t("Successfully changed your admin theme to <b>%theme_name</b>", array("theme_name" => $info->name))); } else if ($type == "site" && $info->site) { module::set_var("core", "active_site_theme", $theme_name); - message::success(t("Successfully changed your Gallery theme to <b>{{theme_name}}</b>", + message::success(t("Successfully changed your Gallery theme to <b>%theme_name</b>", array("theme_name" => $info->name))); } @@ -109,7 +109,7 @@ class Admin_Themes_Controller extends Admin_Controller { if ($theme != module::get_var("core", "active_theme")) { module::set_var("core", "active_theme", $theme); message::success(t("Updated Theme")); - log::success("graphics", t("Changed theme to {{theme_name}}", array("theme_name" => $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 0150314c..39946e60 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(t("Created album {{album_title}}", array("album_title" => $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(t("Added photo {{photo_title}}", array("photo_title" => $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("item_updated", $orig, $album); log::success("content", "Updated album", "<a href=\"albums/$album->id\">view</a>"); - message::success(t("Saved album {{album_title}}", array("album_title" => $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 ae1c6a3b..829f391f 100644 --- a/core/controllers/photos.php +++ b/core/controllers/photos.php @@ -81,7 +81,7 @@ class Photos_Controller extends Items_Controller { module::event("item_updated", $orig, $photo); log::success("content", "Updated photo", "<a href=\"photos/$photo->id\">view</a>"); - message::success(t("Saved photo {{photo_title}}", array("photo_title" => $photo->title))); + message::success(t("Saved photo %photo_title", array("photo_title" => $photo->title))); print json_encode( array("result" => "success", |