- Applied Stefaan's locale patches. The statistics.module patch failed to
apply.4.1.x
Dries Buytaert
parent
38c6aeafad
commit
54aba8d561
|
|
@ -16,7 +16,7 @@ function admin_page($mod) {
|
|||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
|
||||
<html>
|
||||
<head>
|
||||
<title><?php echo variable_get("site_name", "drupal"); ?> administration pages</title>
|
||||
<title><?php echo variable_get("site_name", "drupal") . " " . t("administration pages"); ?></title>
|
||||
</head>
|
||||
<style>
|
||||
body { font-family: helvetica, arial; font-size: 12pt; }
|
||||
|
|
@ -27,10 +27,10 @@ function admin_page($mod) {
|
|||
td { font-family: helvetica, arial; font-size: 12pt; }
|
||||
</style>
|
||||
<body bgcolor="#FFFFFF" link="#005599" vlink="#004499" alink="#FF0000">
|
||||
<h1>Administration</h1>
|
||||
<h1><?php echo t("Administration"); ?></h1>
|
||||
<?php
|
||||
|
||||
$links[] = "<a href=\"index.php\">home</a>";
|
||||
$links[] = "<a href=\"index.php\">" . t("home") . "</a>";
|
||||
foreach (module_list() as $name) {
|
||||
if (module_hook($name, "link")) {
|
||||
$links = array_merge($links, module_invoke($name, "link", "admin"));
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ function locale_edit($lid) {
|
|||
if ($translation = db_fetch_object($result)) {
|
||||
$form .= form_item(t("Original text"), "<pre>". wordwrap(check_output($translation->string)) ."</pre>");
|
||||
foreach ($languages as $code=>$language) $form .= (strlen($translation->string) > 30) ? form_textarea($language, $code, $translation->$code, 50, 10) : form_textfield($language, $code, $translation->$code, 50, 128);
|
||||
$form .= form_submit("Save translations");
|
||||
$form .= form_submit(t("Save translations"));
|
||||
|
||||
return form($form);
|
||||
}
|
||||
|
|
@ -107,10 +107,10 @@ function locale_links($translation) {
|
|||
|
||||
foreach ($languages as $key=>$value) {
|
||||
if ($translation) {
|
||||
$output .= la(t("translated '%langcode' strings", array("%langcode" => $key)), 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 '%langcode' strings", array("%langcode" => $key)), array("mod" => "locale", "op" => "untranslated", "language" => $key)) ." | ";
|
||||
$output .= la(t("untranslated '%langcode' strings", array("%langcode" => $key)), array("mod" => "locale", "op" => "untranslated", "language" => $key)) ." · ";
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -199,11 +199,11 @@ function locale_seek() {
|
|||
|
||||
reset($languages);
|
||||
|
||||
$form .= form_textfield("String", "string", $edit["string"], 30, 30, "Leave blank to show all strings. This is treated as a regular expression.");
|
||||
$form .= form_select("Language", "language", ($edit["language"] ? $edit["language"] : key($languages)), array_merge(array("any" => "Any language", "all" => "All languages"), $languages), "In which language must the string be translated/untranslated (see status)?");
|
||||
$form .= form_select("Status", "status", $edit["status"], array(2 => "Untranslated", 1 => "Translated", 0 => "All"));
|
||||
$form .= form_select("Module", "module", $edit["module"], array_merge(array("0" => "All modules + pages", "all" => "All modules"), module_list()));
|
||||
$form .= form_submit("Search");
|
||||
$form .= form_textfield(t("String"), "string", $edit["string"], 30, 30, t("Leave blank to show all strings. This is treated as a regular expression."));
|
||||
$form .= form_select(t("Language"), "language", ($edit["language"] ? $edit["language"] : key($languages)), array_merge(array("any" => t("Any language"), "all" => t("All languages")), $languages), t("In which language must the string be translated/untranslated (see status)?"));
|
||||
$form .= form_select(t("Status"), "status", $edit["status"], array(2 => t("Untranslated"), 1 => t("Translated"), 0 => t("All")));
|
||||
$form .= form_select(t("Module"), "module", $edit["module"], array_merge(array("0" => t("All modules + pages"), "all" => t("All modules")), module_list()));
|
||||
$form .= form_submit(t("Search"));
|
||||
|
||||
$output .= form($form);
|
||||
|
||||
|
|
@ -216,7 +216,7 @@ function locale_admin() {
|
|||
if (user_access("administer locales")) {
|
||||
locale_admin_initialize();
|
||||
|
||||
print "<small>". locale_links(1) . locale_links(0) . la(t("search"), array("mod" => "locale", "op" => "search")) ." | ". la(t("overview"), array("mod" => "locale", "op" => "overview")) ." | ". la(t("help"), array("mod" => "locale", "op" => "help")) ."</small><hr />\n";
|
||||
print "<small>". locale_links(1) . locale_links(0) . la(t("search"), array("mod" => "locale", "op" => "search")) ." · ". la(t("overview"), array("mod" => "locale", "op" => "overview")) ." · ". la(t("help"), array("mod" => "locale", "op" => "help")) ."</small><hr />\n";
|
||||
|
||||
switch ($op) {
|
||||
case "delete":
|
||||
|
|
@ -230,7 +230,7 @@ function locale_admin() {
|
|||
print locale_edit(check_query($id));
|
||||
break;
|
||||
case "search":
|
||||
case "Search":
|
||||
case t("Search"):
|
||||
print locale_seek();
|
||||
break;
|
||||
case "translated":
|
||||
|
|
@ -243,7 +243,7 @@ function locale_admin() {
|
|||
$edit["language"] = $language;
|
||||
print locale_seek();
|
||||
break;
|
||||
case "Save translations":
|
||||
case t("Save translations"):
|
||||
print locale_save(check_query($id));
|
||||
default:
|
||||
print locale_seek();
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ function locale_edit($lid) {
|
|||
if ($translation = db_fetch_object($result)) {
|
||||
$form .= form_item(t("Original text"), "<pre>". wordwrap(check_output($translation->string)) ."</pre>");
|
||||
foreach ($languages as $code=>$language) $form .= (strlen($translation->string) > 30) ? form_textarea($language, $code, $translation->$code, 50, 10) : form_textfield($language, $code, $translation->$code, 50, 128);
|
||||
$form .= form_submit("Save translations");
|
||||
$form .= form_submit(t("Save translations"));
|
||||
|
||||
return form($form);
|
||||
}
|
||||
|
|
@ -107,10 +107,10 @@ function locale_links($translation) {
|
|||
|
||||
foreach ($languages as $key=>$value) {
|
||||
if ($translation) {
|
||||
$output .= la(t("translated '%langcode' strings", array("%langcode" => $key)), 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 '%langcode' strings", array("%langcode" => $key)), array("mod" => "locale", "op" => "untranslated", "language" => $key)) ." | ";
|
||||
$output .= la(t("untranslated '%langcode' strings", array("%langcode" => $key)), array("mod" => "locale", "op" => "untranslated", "language" => $key)) ." · ";
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -199,11 +199,11 @@ function locale_seek() {
|
|||
|
||||
reset($languages);
|
||||
|
||||
$form .= form_textfield("String", "string", $edit["string"], 30, 30, "Leave blank to show all strings. This is treated as a regular expression.");
|
||||
$form .= form_select("Language", "language", ($edit["language"] ? $edit["language"] : key($languages)), array_merge(array("any" => "Any language", "all" => "All languages"), $languages), "In which language must the string be translated/untranslated (see status)?");
|
||||
$form .= form_select("Status", "status", $edit["status"], array(2 => "Untranslated", 1 => "Translated", 0 => "All"));
|
||||
$form .= form_select("Module", "module", $edit["module"], array_merge(array("0" => "All modules + pages", "all" => "All modules"), module_list()));
|
||||
$form .= form_submit("Search");
|
||||
$form .= form_textfield(t("String"), "string", $edit["string"], 30, 30, t("Leave blank to show all strings. This is treated as a regular expression."));
|
||||
$form .= form_select(t("Language"), "language", ($edit["language"] ? $edit["language"] : key($languages)), array_merge(array("any" => t("Any language"), "all" => t("All languages")), $languages), t("In which language must the string be translated/untranslated (see status)?"));
|
||||
$form .= form_select(t("Status"), "status", $edit["status"], array(2 => t("Untranslated"), 1 => t("Translated"), 0 => t("All")));
|
||||
$form .= form_select(t("Module"), "module", $edit["module"], array_merge(array("0" => t("All modules + pages"), "all" => t("All modules")), module_list()));
|
||||
$form .= form_submit(t("Search"));
|
||||
|
||||
$output .= form($form);
|
||||
|
||||
|
|
@ -216,7 +216,7 @@ function locale_admin() {
|
|||
if (user_access("administer locales")) {
|
||||
locale_admin_initialize();
|
||||
|
||||
print "<small>". locale_links(1) . locale_links(0) . la(t("search"), array("mod" => "locale", "op" => "search")) ." | ". la(t("overview"), array("mod" => "locale", "op" => "overview")) ." | ". la(t("help"), array("mod" => "locale", "op" => "help")) ."</small><hr />\n";
|
||||
print "<small>". locale_links(1) . locale_links(0) . la(t("search"), array("mod" => "locale", "op" => "search")) ." · ". la(t("overview"), array("mod" => "locale", "op" => "overview")) ." · ". la(t("help"), array("mod" => "locale", "op" => "help")) ."</small><hr />\n";
|
||||
|
||||
switch ($op) {
|
||||
case "delete":
|
||||
|
|
@ -230,7 +230,7 @@ function locale_admin() {
|
|||
print locale_edit(check_query($id));
|
||||
break;
|
||||
case "search":
|
||||
case "Search":
|
||||
case t("Search"):
|
||||
print locale_seek();
|
||||
break;
|
||||
case "translated":
|
||||
|
|
@ -243,7 +243,7 @@ function locale_admin() {
|
|||
$edit["language"] = $language;
|
||||
print locale_seek();
|
||||
break;
|
||||
case "Save translations":
|
||||
case t("Save translations"):
|
||||
print locale_save(check_query($id));
|
||||
default:
|
||||
print locale_seek();
|
||||
|
|
|
|||
Loading…
Reference in New Issue