diff options
| author | Dries Buytaert <dries@buytaert.net> | 2002-06-20 18:55:18 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2002-06-20 18:55:18 +0000 |
| commit | ccba91d66fb13434ca6f16e9c913f8b84dd2d629 (patch) | |
| tree | 6983d5612a65f3d9cc1f12f251a8f784fe1e9157 | |
| parent | 3dbccfa7cfcf5c84e002c886c005b1327a8a31af (diff) | |
| download | brdo-ccba91d66fb13434ca6f16e9c913f8b84dd2d629.tar.gz brdo-ccba91d66fb13434ca6f16e9c913f8b84dd2d629.tar.bz2 | |
- Fixed two small bugs in the locale module:
1. The locale admin menu items 'untranslated "langcode" strings'
'translated "langcode" strings' were not properly localized.
2. When inserting new locale strings the uri which generated the
new string was not properly set (the 'location' field in
locale table).
Patch by Ori.
| -rw-r--r-- | modules/locale.module | 6 | ||||
| -rw-r--r-- | modules/locale/locale.module | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/locale.module b/modules/locale.module index 9de8fca32..4134c5552 100644 --- a/modules/locale.module +++ b/modules/locale.module @@ -107,10 +107,10 @@ function locale_links($translation) { foreach ($languages as $key=>$value) { if ($translation) { - $output .= la(t("translated '$key' strings"), array("mod" => "locale", "op" => "translated", "language" => $key)) ." | "; + $output .= la(t("translated '%langcode' strings", array("%langcode" => $key)), array("mod" => "locale", "op" => "translated", "language" => $key)) ." | "; } else { - $output .= la(t("untranslated '$key' strings"), array("mod" => "locale", "op" => "untranslated", "language" => $key)) ." | "; + $output .= la(t("untranslated '%langcode' strings", array("%langcode" => $key)), array("mod" => "locale", "op" => "untranslated", "language" => $key)) ." | "; } } @@ -290,7 +290,7 @@ function locale($string) { else { $result = db_query("SELECT lid, $locale FROM locales WHERE string = '%s'", $string); if (!db_fetch_object($result)) { - db_query("INSERT INTO locales (string, location) VALUES ('%s', '%s')", $string, getenv("PATH_INFO")); + db_query("INSERT INTO locales (string, location) VALUES ('%s', '%s')", $string, request_uri()); } } diff --git a/modules/locale/locale.module b/modules/locale/locale.module index 9de8fca32..4134c5552 100644 --- a/modules/locale/locale.module +++ b/modules/locale/locale.module @@ -107,10 +107,10 @@ function locale_links($translation) { foreach ($languages as $key=>$value) { if ($translation) { - $output .= la(t("translated '$key' strings"), array("mod" => "locale", "op" => "translated", "language" => $key)) ." | "; + $output .= la(t("translated '%langcode' strings", array("%langcode" => $key)), array("mod" => "locale", "op" => "translated", "language" => $key)) ." | "; } else { - $output .= la(t("untranslated '$key' strings"), array("mod" => "locale", "op" => "untranslated", "language" => $key)) ." | "; + $output .= la(t("untranslated '%langcode' strings", array("%langcode" => $key)), array("mod" => "locale", "op" => "untranslated", "language" => $key)) ." | "; } } @@ -290,7 +290,7 @@ function locale($string) { else { $result = db_query("SELECT lid, $locale FROM locales WHERE string = '%s'", $string); if (!db_fetch_object($result)) { - db_query("INSERT INTO locales (string, location) VALUES ('%s', '%s')", $string, getenv("PATH_INFO")); + db_query("INSERT INTO locales (string, location) VALUES ('%s', '%s')", $string, request_uri()); } } |