- Translation fix: the date in the calendar block could not be translated. Patch by Goba.

- Translation fix: made the word 'permission' translatable in the system module' help text.  Patch by Goba.

- Translation fix: the ping module's help text was translated twice.  Patch by Goba.

6 files changed, 6 insertions, 6 deletions

diff --git a/modules/archive.module b/modules/archive.module
index 49130bdbf..a8a5e0cb8 100644
--- a/modules/archive.module
+++ b/modules/archive.module
@@ -83,7 +83,7 @@ function archive_calendar($original = 0) {
   $output .= "\n<!-- calendar -->\n";
   $output .= "<div class=\"calendar\">";
   $output .= "<table>\n";
-  $output .= " <tr><td colspan=\"7\" class=\"header-month\">". l("&laquo;", "archive/". date("Y/m/d", $prev)) ." ". date("F Y", $requested) ." ". ($nextmonth <= time() ? l("&raquo;", "archive/". date("Y/m/d", $next)) : "&nbsp;") ."</td></tr>\n";
+  $output .= " <tr><td colspan=\"7\" class=\"header-month\">". l("&laquo;", "archive/". date("Y/m/d", $prev)) ." ". t(date("F", $requested)) . date(" Y", $requested) ." ". ($nextmonth <= time() ? l("&raquo;", "archive/". date("Y/m/d", $next)) : "&nbsp;") ."</td></tr>\n";
 
   // First day of week (0 => Sunday, 1 => Monday, ...)
   $weekstart = variable_get("default_firstday", 0);
diff --git a/modules/archive/archive.module b/modules/archive/archive.module
index 49130bdbf..a8a5e0cb8 100644
--- a/modules/archive/archive.module
+++ b/modules/archive/archive.module
@@ -83,7 +83,7 @@ function archive_calendar($original = 0) {
   $output .= "\n<!-- calendar -->\n";
   $output .= "<div class=\"calendar\">";
   $output .= "<table>\n";
-  $output .= " <tr><td colspan=\"7\" class=\"header-month\">". l("&laquo;", "archive/". date("Y/m/d", $prev)) ." ". date("F Y", $requested) ." ". ($nextmonth <= time() ? l("&raquo;", "archive/". date("Y/m/d", $next)) : "&nbsp;") ."</td></tr>\n";
+  $output .= " <tr><td colspan=\"7\" class=\"header-month\">". l("&laquo;", "archive/". date("Y/m/d", $prev)) ." ". t(date("F", $requested)) . date(" Y", $requested) ." ". ($nextmonth <= time() ? l("&raquo;", "archive/". date("Y/m/d", $next)) : "&nbsp;") ."</td></tr>\n";
 
   // First day of week (0 => Sunday, 1 => Monday, ...)
   $weekstart = variable_get("default_firstday", 0);
diff --git a/modules/ping.module b/modules/ping.module
index b8c710787..b2499e65b 100644
--- a/modules/ping.module
+++ b/modules/ping.module
@@ -21,7 +21,7 @@ function ping_help($section = "admin/help#ping") {
       break;
   }
 
-  return t($output);
+  return $output;
 }
 
 function ping_cron() {
diff --git a/modules/ping/ping.module b/modules/ping/ping.module
index b8c710787..b2499e65b 100644
--- a/modules/ping/ping.module
+++ b/modules/ping/ping.module
@@ -21,7 +21,7 @@ function ping_help($section = "admin/help#ping") {
       break;
   }
 
-  return t($output);
+  return $output;
 }
 
 function ping_cron() {
diff --git a/modules/system.module b/modules/system.module
index 706710231..2b920d501 100644
--- a/modules/system.module
+++ b/modules/system.module
@@ -13,7 +13,7 @@ function system_help($section = "admin/help#system") {
       $output = t("Select which themes are available to your users and specify the default theme.");
       break;
     case 'admin/system/modules':
-      $output = t("Modules are plugins for Drupal that extend its core functionality.  Here you can select which modules are enabled. On the left hand side click on the name of the module for their individual configurations.  Once a module is enabled, you will need to grant %permissions to users.", array("%permissions" => l("permissions", "admin/user/permission")));
+      $output = t("Modules are plugins for Drupal that extend its core functionality.  Here you can select which modules are enabled. On the left hand side click on the name of the module for their individual configurations.  Once a module is enabled, you will need to grant %permissions to users.", array("%permissions" => l(t("permissions"), "admin/user/permission")));
       break;
     case 'admin/system/filters':
       $output = t("Filters fit between the raw text in a node and the HTML output. They allow you to replace text selectively. Uses include automatic conversion of emoticons into graphics and filtering HTML content from users' submissions.");
diff --git a/modules/system/system.module b/modules/system/system.module
index 706710231..2b920d501 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -13,7 +13,7 @@ function system_help($section = "admin/help#system") {
       $output = t("Select which themes are available to your users and specify the default theme.");
       break;
     case 'admin/system/modules':
-      $output = t("Modules are plugins for Drupal that extend its core functionality.  Here you can select which modules are enabled. On the left hand side click on the name of the module for their individual configurations.  Once a module is enabled, you will need to grant %permissions to users.", array("%permissions" => l("permissions", "admin/user/permission")));
+      $output = t("Modules are plugins for Drupal that extend its core functionality.  Here you can select which modules are enabled. On the left hand side click on the name of the module for their individual configurations.  Once a module is enabled, you will need to grant %permissions to users.", array("%permissions" => l(t("permissions"), "admin/user/permission")));
       break;
     case 'admin/system/filters':
       $output = t("Filters fit between the raw text in a node and the HTML output. They allow you to replace text selectively. Uses include automatic conversion of emoticons into graphics and filtering HTML content from users' submissions.");