diff options
-rw-r--r-- | cron.php | 2 | ||||
-rw-r--r-- | modules/locale.module | 24 | ||||
-rw-r--r-- | modules/locale/locale.module | 24 | ||||
-rw-r--r-- | modules/node.module | 4 | ||||
-rw-r--r-- | modules/node/node.module | 4 |
5 files changed, 29 insertions, 29 deletions
@@ -6,7 +6,7 @@ include_once "includes/common.inc"; ** If not in 'safe mode', increase the maximum execution time: */ -if (!get_cfg_var("safe_mode")) { +if (!get_cfg_var("safe_mode")) { set_time_limit(180); } diff --git a/modules/locale.module b/modules/locale.module index 43a3abb65..f0a053bf6 100644 --- a/modules/locale.module +++ b/modules/locale.module @@ -89,10 +89,10 @@ function locale_links($translation) { foreach ($languages as $key=>$value) { if ($translation) { - $output .= "<a href=\"admin.php?mod=locale&op=translated&lang=$key\">translated '$key' strings</a> | "; + $output .= "<a href=\"admin.php?mod=locale&op=translated&language=$key\">translated '$key' strings</a> | "; } else { - $output .= "<a href=\"admin.php?mod=locale&op=untranslated&lang=$key\">untranslated '$key' strings</a> | "; + $output .= "<a href=\"admin.php?mod=locale&op=untranslated&language=$key\">untranslated '$key' strings</a> | "; } } @@ -112,21 +112,21 @@ function locale_overview() { return $output; } -function locale_translated($lang) { - $result = db_query("SELECT * FROM locales WHERE $lang != '' ORDER BY string"); +function locale_translated($language) { + $result = db_query("SELECT * FROM locales WHERE $language != '' ORDER BY string"); $output .= "<TABLE BORDER=\"1\" CELLPADDING=\"2\" CELLSPACING=\"2\">\n"; $output .= " <TR><TH>original string</TH><TH>translated string</TH><TH COLSPAN=\"2\">operations</TH><TR>\n"; while ($locale = db_fetch_object($result)) { - $output .= " <TR><TD>". check_output($locale->string) ."</TD><TD>". check_output($locale->$lang) ."</TD><TD NOWRAP><A HREF=\"admin.php?mod=locale&op=edit&id=$locale->id\"> edit locale</A></TD><TD NOWRAP><A HREF=\"admin.php?mod=locale&op=delete&id=$locale->id\">delete locale</A></TD></TR>"; + $output .= " <TR><TD>". check_output($locale->string) ."</TD><TD>". check_output($locale->$language) ."</TD><TD NOWRAP><A HREF=\"admin.php?mod=locale&op=edit&id=$locale->id\"> edit locale</A></TD><TD NOWRAP><A HREF=\"admin.php?mod=locale&op=delete&id=$locale->id\">delete locale</A></TD></TR>"; } $output .= "</TABLE>\n"; return $output; } -function locale_untranslated($lang) { - $result = db_query("SELECT * FROM locales WHERE $lang = '' ORDER BY string"); +function locale_untranslated($language) { + $result = db_query("SELECT * FROM locales WHERE $language = '' ORDER BY string"); $output .= "<TABLE BORDER=\"1\" CELLPADDING=\"2\" CELLSPACING=\"2\">\n"; $output .= " <TR><TH>string</TH><TH COLSPAN=\"2\">operations</TH><TR>\n"; @@ -139,7 +139,7 @@ function locale_untranslated($lang) { } function locale_admin() { - global $id, $edit, $op, $lang; + global $id, $edit, $op, $language; if (!variable_get("locale", 0)) { print status("locale disabled."); @@ -160,12 +160,12 @@ function locale_admin() { break; case "Save translations": print locale_save(check_input($id), $edit); - break; + break; case "translated": - print locale_translated($lang); - break; + print locale_translated($language); + break; case "untranslated": - print locale_untranslated($lang); + print locale_untranslated($language); break; default: print locale_overview(); diff --git a/modules/locale/locale.module b/modules/locale/locale.module index 43a3abb65..f0a053bf6 100644 --- a/modules/locale/locale.module +++ b/modules/locale/locale.module @@ -89,10 +89,10 @@ function locale_links($translation) { foreach ($languages as $key=>$value) { if ($translation) { - $output .= "<a href=\"admin.php?mod=locale&op=translated&lang=$key\">translated '$key' strings</a> | "; + $output .= "<a href=\"admin.php?mod=locale&op=translated&language=$key\">translated '$key' strings</a> | "; } else { - $output .= "<a href=\"admin.php?mod=locale&op=untranslated&lang=$key\">untranslated '$key' strings</a> | "; + $output .= "<a href=\"admin.php?mod=locale&op=untranslated&language=$key\">untranslated '$key' strings</a> | "; } } @@ -112,21 +112,21 @@ function locale_overview() { return $output; } -function locale_translated($lang) { - $result = db_query("SELECT * FROM locales WHERE $lang != '' ORDER BY string"); +function locale_translated($language) { + $result = db_query("SELECT * FROM locales WHERE $language != '' ORDER BY string"); $output .= "<TABLE BORDER=\"1\" CELLPADDING=\"2\" CELLSPACING=\"2\">\n"; $output .= " <TR><TH>original string</TH><TH>translated string</TH><TH COLSPAN=\"2\">operations</TH><TR>\n"; while ($locale = db_fetch_object($result)) { - $output .= " <TR><TD>". check_output($locale->string) ."</TD><TD>". check_output($locale->$lang) ."</TD><TD NOWRAP><A HREF=\"admin.php?mod=locale&op=edit&id=$locale->id\"> edit locale</A></TD><TD NOWRAP><A HREF=\"admin.php?mod=locale&op=delete&id=$locale->id\">delete locale</A></TD></TR>"; + $output .= " <TR><TD>". check_output($locale->string) ."</TD><TD>". check_output($locale->$language) ."</TD><TD NOWRAP><A HREF=\"admin.php?mod=locale&op=edit&id=$locale->id\"> edit locale</A></TD><TD NOWRAP><A HREF=\"admin.php?mod=locale&op=delete&id=$locale->id\">delete locale</A></TD></TR>"; } $output .= "</TABLE>\n"; return $output; } -function locale_untranslated($lang) { - $result = db_query("SELECT * FROM locales WHERE $lang = '' ORDER BY string"); +function locale_untranslated($language) { + $result = db_query("SELECT * FROM locales WHERE $language = '' ORDER BY string"); $output .= "<TABLE BORDER=\"1\" CELLPADDING=\"2\" CELLSPACING=\"2\">\n"; $output .= " <TR><TH>string</TH><TH COLSPAN=\"2\">operations</TH><TR>\n"; @@ -139,7 +139,7 @@ function locale_untranslated($lang) { } function locale_admin() { - global $id, $edit, $op, $lang; + global $id, $edit, $op, $language; if (!variable_get("locale", 0)) { print status("locale disabled."); @@ -160,12 +160,12 @@ function locale_admin() { break; case "Save translations": print locale_save(check_input($id), $edit); - break; + break; case "translated": - print locale_translated($lang); - break; + print locale_translated($language); + break; case "untranslated": - print locale_untranslated($lang); + print locale_untranslated($language); break; default: print locale_overview(); diff --git a/modules/node.module b/modules/node.module index ba12cc7c5..c1e2283d5 100644 --- a/modules/node.module +++ b/modules/node.module @@ -349,10 +349,10 @@ function node_admin() { case "view": print node_module_view(node_get_array(array("nid" => $id)), $type); break; - case "Preview": + case t("Preview"): print node_edit_content($edit, $type); break; - case "Submit": + case t("Submit"): print status(node_save_content($edit, $type)); // fall through: default: diff --git a/modules/node/node.module b/modules/node/node.module index ba12cc7c5..c1e2283d5 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -349,10 +349,10 @@ function node_admin() { case "view": print node_module_view(node_get_array(array("nid" => $id)), $type); break; - case "Preview": + case t("Preview"): print node_edit_content($edit, $type); break; - case "Submit": + case t("Submit"): print status(node_save_content($edit, $type)); // fall through: default: |