From ed7175092c81dafa54be7fec2fa91d0ad88aa780 Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Sat, 21 Mar 2009 07:44:46 +0000
Subject: Refactor all translation strings that have  ambiguous placeholders.
 E.g. "%link_startClick here%link_end" is now '<a href="%url">Click here</a>'.

Note: This isn't always the best solution. E.g. consider "Foo <a href='%url' class='gDialogLink'>bar</a>." Now the translator has to deal with
preserving CSS classes too...
---
 core/controllers/admin_maintenance.php  |  5 ++---
 core/helpers/graphics.php               | 10 +++-------
 core/views/admin_block_welcome.html.php | 12 ++++++------
 3 files changed, 11 insertions(+), 16 deletions(-)

(limited to 'core')

diff --git a/core/controllers/admin_maintenance.php b/core/controllers/admin_maintenance.php
index 99d6f067..df912e29 100644
--- a/core/controllers/admin_maintenance.php
+++ b/core/controllers/admin_maintenance.php
@@ -33,9 +33,8 @@ class Admin_Maintenance_Controller extends Admin_Controller {
                    t2("One task is stalled",
                       "%count tasks are stalled",
                       $stalled_count),
-                   t("%link_startview%link_end",
-                     array("link_start" => "<a href=\"" . url::site("admin/maintenance") . "\">",
-                           "link_start" => "</a>")));
+                   t('<a href="%url">view</a>',
+                     array("url" => url::site("admin/maintenance"))));
     }
 
     $view = new Admin_View("admin.html");
diff --git a/core/helpers/graphics.php b/core/helpers/graphics.php
index e16b3086..290d2677 100644
--- a/core/helpers/graphics.php
+++ b/core/helpers/graphics.php
@@ -253,14 +253,10 @@ class graphics_Core {
     $count = self::find_dirty_images_query()->count();
     if ($count) {
       site_status::warning(
-          t2("One of your photos is out of date. %link_startClick here to fix it%link_end",
-             "%count of your photos are out of date. %link_startClick here to fix them%link_end",
+          t2('One of your photos is out of date. <a href="%url" class="gDialogLink">Click here to fix it</a>',
+             '%count of your photos are out of date. <a href="%url" class="gDialogLink">Click here to fix them</a>',
              $count,
-             array("link_start" => "<a href=\"" .
-                   url::site(
-                     "admin/maintenance/start/core_task::rebuild_dirty_images?csrf=__CSRF__") .
-                   "\" class=\"gDialogLink\">",
-                   "link_end" => "</a>")),
+             array("url" => url::site("admin/maintenance/start/core_task::rebuild_dirty_images?csrf=__CSRF__"))),
           "graphics_dirty");
     }
   }
diff --git a/core/views/admin_block_welcome.html.php b/core/views/admin_block_welcome.html.php
index 89914fb3..a11f2489 100644
--- a/core/views/admin_block_welcome.html.php
+++ b/core/views/admin_block_welcome.html.php
@@ -4,15 +4,15 @@
 </p>
 <ul>
   <li>
-    <?= t("%link_startGeneral Settings%link_end - General configuation options for your Gallery.",
-          array("link_start" => "<a href=\"#\">", "link_end" => "</a>")) ?>
+    <?= t('<a href="%url">General Settings</a> - General configuration options for your Gallery.',
+          array("url" => "#")) ?>
   </li>
   <li>
-    <?= t("%link_startModules%link_end - Manage available and installed modules.",
-          array("link_start" => "<a href=\"" . url::site("admin/modules") . "\">", "link_end" => "</a>")) ?>
+    <?= t('<a href="%url">Modules</a> - Manage available and installed modules.',
+          array("url" => url::site("admin/modules"))) ?>
   </li>
   <li>
-    <?= t("%link_startPresentation%link_end - Choose a theme, set image sizes.",
-          array("link_start" => "<a href=\"#\">", "link_end" => "</a>")) ?>
+    <?= t('<a href="">Presentation</a> - Choose a theme, set image sizes.',
+          array("url" => "#")) ?>
   </li>
 </ul>
-- 
cgit v1.2.3