diff --git a/modules/book.module b/modules/book.module
index b8d3f9c81e06497ca8ee49f8bd70b718d865bf5d..fa9c80e01f8dcf020b7997795391765f56cb9b73 100644
--- a/modules/book.module
+++ b/modules/book.module
@@ -15,7 +15,7 @@ function book_perm() {
function book_link($type) {
if ($type == "admin" && user_access("administer book")) {
- $links[] = "<a href=\"admin.php?mod=book\">". t("collaborative book") ."</a>";
+ $links[] = "<a href=\"admin.php?mod=book\">collaborative book</a>";
}
if ($type == "page" && user_access("access content")) {
diff --git a/modules/book/book.module b/modules/book/book.module
index b8d3f9c81e06497ca8ee49f8bd70b718d865bf5d..fa9c80e01f8dcf020b7997795391765f56cb9b73 100644
--- a/modules/book/book.module
+++ b/modules/book/book.module
@@ -15,7 +15,7 @@ function book_perm() {
function book_link($type) {
if ($type == "admin" && user_access("administer book")) {
- $links[] = "<a href=\"admin.php?mod=book\">". t("collaborative book") ."</a>";
+ $links[] = "<a href=\"admin.php?mod=book\">collaborative book</a>";
}
if ($type == "page" && user_access("access content")) {
diff --git a/modules/cvs.module b/modules/cvs.module
index bc12068983bb6810ae73cf224b9019edb241d412..5097d4d458fbbe12c4a150bab1df7259bc2ea86f 100644
--- a/modules/cvs.module
+++ b/modules/cvs.module
@@ -28,8 +28,8 @@ function cvs_cron() {
function cvs_conf_options() {
$period = array(43200 => format_interval(43200), 86400 => format_interval(86400), 172800 => format_interval(172800), 259200 => format_interval(259200), 604800 => format_interval(604800), 1209600 => format_interval(1209600));
- $output .= form_textfield(t("Digest recepients"), "cvs_mail", variable_get("cvs_mail", "root@localhost"), 30, 55, t("The e-mail address to mail the CVS log messages to. Multiple recipients can be specified by putting a comma between each address."));
- $output .= form_select(t("Digest interval"), "cvs_cron_time" , variable_get("cvs_cron_time", 86400), $period, t("The time interval at which batched CVS digests are dispatched. Requires crontab."));
+ $output .= form_textfield("Digest recepients", "cvs_mail", variable_get("cvs_mail", "root@localhost"), 30, 55, "The e-mail address to mail the CVS log messages to. Multiple recipients can be specified by putting a comma between each address.");
+ $output .= form_select("Digest interval", "cvs_cron_time" , variable_get("cvs_cron_time", 86400), $period, "The time interval at which batched CVS digests are dispatched. Requires crontab.");
return $output;
}
diff --git a/modules/locale.module b/modules/locale.module
index 73d531c85d8dcb5f9cd5640ab0e46932d6c63bcc..221fca57c7b264cfdcdb1bc7d517e131853811fd 100644
--- a/modules/locale.module
+++ b/modules/locale.module
@@ -47,7 +47,7 @@ function locale_link($type) {
}
function locale_conf_options() {
- return form_select(t("Locale support"), "locale", variable_get("locale", 0), array("Disabled", "Enabled"), t("Disable locale support if your site does not require translation or internationalization support."));
+ return form_select("Locale support", "locale", variable_get("locale", 0), array("Disabled", "Enabled"), "Disable locale support if your site does not require translation or internationalization support.");
}
function locale_delete($id) {
@@ -75,40 +75,77 @@ function locale_edit($id) {
}
function locale_languages($translation) {
- global $languages, $na;
- if (count($languages)) {
- foreach ($languages as $key=>$value) {
- $output .= ($translation->$key) ? "$key " : "<STRIKE>$key</STRIKE> ";
+ global $languages;
+
+ foreach ($languages as $key=>$value) {
+ $output .= ($translation->$key) ? "$key " : "<STRIKE>$key</STRIKE> ";
+ }
+
+ return $output;
+}
+
+function locale_links($translation) {
+ global $languages;
+
+ foreach ($languages as $key=>$value) {
+ if ($translation) {
+ $output .= "<a href=\"admin.php?mod=locale&op=translated&lang=$key\">translated '$key' strings</a> | ";
+ }
+ else {
+ $output .= "<a href=\"admin.php?mod=locale&op=untranslated&lang=$key\">untranslated '$key' strings</a> | ";
}
- return $output;
}
- return $na;
+
+ return $output;
}
function locale_overview() {
- if (variable_get("locale", 0)) {
- $result = db_query("SELECT * FROM locales ORDER BY string");
+ $result = db_query("SELECT * FROM locales ORDER BY string");
- $output .= "<TABLE BORDER=\"1\" CELLPADDING=\"2\" CELLSPACING=\"2\">\n";
- $output .= " <TR><TH>string</TH><TH>languages</TH><TH COLSPAN=\"2\">operations</TH><TR>\n";
- while ($locale = db_fetch_object($result)) {
- $languages = locale_languages($locale);
- $output .= " <TR><TD>". check_output($locale->string) ."<BR><SMALL><I>$locale->location</I></SMALL></TD><TD ALIGN=\"center\">$languages</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";
+ $output .= "<TABLE BORDER=\"1\" CELLPADDING=\"2\" CELLSPACING=\"2\">\n";
+ $output .= " <TR><TH>string</TH><TH>languages</TH><TH COLSPAN=\"2\">operations</TH><TR>\n";
+ while ($locale = db_fetch_object($result)) {
+ $output .= " <TR><TD>". check_output($locale->string) ."<BR><SMALL><I>". check_output($locale->location) ."</I></SMALL></TD><TD ALIGN=\"center\">". check_output(locale_languages($locale)) ."</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_translated($lang) {
+ $result = db_query("SELECT * FROM locales WHERE $lang != '' ORDER BY string");
- return $output;
+ $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>";
}
- else {
- return status("locale disabled.");
+ $output .= "</TABLE>\n";
+
+ return $output;
+}
+
+function locale_untranslated($lang) {
+ $result = db_query("SELECT * FROM locales WHERE $lang = '' ORDER BY string");
+
+ $output .= "<TABLE BORDER=\"1\" CELLPADDING=\"2\" CELLSPACING=\"2\">\n";
+ $output .= " <TR><TH>string</TH><TH COLSPAN=\"2\">operations</TH><TR>\n";
+ while ($locale = db_fetch_object($result)) {
+ $output .= " <TR><TD>". check_output($locale->string) ."<BR><SMALL><I>$locale->location</I></SMALL></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_admin() {
- global $id, $edit, $op;
+ global $id, $edit, $op, $lang;
- if (user_access("administer locales")) {
- print "<SMALL><A HREF=\"admin.php?mod=locale\">overview</A> | <A HREF=\"admin.php?mod=locale&op=help\">help</A></SMALL><HR>\n";
+ if (!variable_get("locale", 0)) {
+ return status("locale disabled.");
+ }
+ else if (user_access("administer locales")) {
+ print "<SMALL>". locale_links(1) . locale_links(0) ."<A HREF=\"admin.php?mod=locale\">overview</A> | <A HREF=\"admin.php?mod=locale&op=help\">help</A></SMALL><HR>\n";
switch ($op) {
case "delete":
@@ -123,7 +160,13 @@ function locale_admin() {
break;
case "Save translations":
print locale_save(check_input($id), $edit);
- // fall through
+ break;
+ case "translated":
+ print locale_translated($lang);
+ break;
+ case "untranslated":
+ print locale_untranslated($lang);
+ break;
default:
print locale_overview();
}
diff --git a/modules/locale/locale.module b/modules/locale/locale.module
index 73d531c85d8dcb5f9cd5640ab0e46932d6c63bcc..221fca57c7b264cfdcdb1bc7d517e131853811fd 100644
--- a/modules/locale/locale.module
+++ b/modules/locale/locale.module
@@ -47,7 +47,7 @@ function locale_link($type) {
}
function locale_conf_options() {
- return form_select(t("Locale support"), "locale", variable_get("locale", 0), array("Disabled", "Enabled"), t("Disable locale support if your site does not require translation or internationalization support."));
+ return form_select("Locale support", "locale", variable_get("locale", 0), array("Disabled", "Enabled"), "Disable locale support if your site does not require translation or internationalization support.");
}
function locale_delete($id) {
@@ -75,40 +75,77 @@ function locale_edit($id) {
}
function locale_languages($translation) {
- global $languages, $na;
- if (count($languages)) {
- foreach ($languages as $key=>$value) {
- $output .= ($translation->$key) ? "$key " : "<STRIKE>$key</STRIKE> ";
+ global $languages;
+
+ foreach ($languages as $key=>$value) {
+ $output .= ($translation->$key) ? "$key " : "<STRIKE>$key</STRIKE> ";
+ }
+
+ return $output;
+}
+
+function locale_links($translation) {
+ global $languages;
+
+ foreach ($languages as $key=>$value) {
+ if ($translation) {
+ $output .= "<a href=\"admin.php?mod=locale&op=translated&lang=$key\">translated '$key' strings</a> | ";
+ }
+ else {
+ $output .= "<a href=\"admin.php?mod=locale&op=untranslated&lang=$key\">untranslated '$key' strings</a> | ";
}
- return $output;
}
- return $na;
+
+ return $output;
}
function locale_overview() {
- if (variable_get("locale", 0)) {
- $result = db_query("SELECT * FROM locales ORDER BY string");
+ $result = db_query("SELECT * FROM locales ORDER BY string");
- $output .= "<TABLE BORDER=\"1\" CELLPADDING=\"2\" CELLSPACING=\"2\">\n";
- $output .= " <TR><TH>string</TH><TH>languages</TH><TH COLSPAN=\"2\">operations</TH><TR>\n";
- while ($locale = db_fetch_object($result)) {
- $languages = locale_languages($locale);
- $output .= " <TR><TD>". check_output($locale->string) ."<BR><SMALL><I>$locale->location</I></SMALL></TD><TD ALIGN=\"center\">$languages</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";
+ $output .= "<TABLE BORDER=\"1\" CELLPADDING=\"2\" CELLSPACING=\"2\">\n";
+ $output .= " <TR><TH>string</TH><TH>languages</TH><TH COLSPAN=\"2\">operations</TH><TR>\n";
+ while ($locale = db_fetch_object($result)) {
+ $output .= " <TR><TD>". check_output($locale->string) ."<BR><SMALL><I>". check_output($locale->location) ."</I></SMALL></TD><TD ALIGN=\"center\">". check_output(locale_languages($locale)) ."</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_translated($lang) {
+ $result = db_query("SELECT * FROM locales WHERE $lang != '' ORDER BY string");
- return $output;
+ $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>";
}
- else {
- return status("locale disabled.");
+ $output .= "</TABLE>\n";
+
+ return $output;
+}
+
+function locale_untranslated($lang) {
+ $result = db_query("SELECT * FROM locales WHERE $lang = '' ORDER BY string");
+
+ $output .= "<TABLE BORDER=\"1\" CELLPADDING=\"2\" CELLSPACING=\"2\">\n";
+ $output .= " <TR><TH>string</TH><TH COLSPAN=\"2\">operations</TH><TR>\n";
+ while ($locale = db_fetch_object($result)) {
+ $output .= " <TR><TD>". check_output($locale->string) ."<BR><SMALL><I>$locale->location</I></SMALL></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_admin() {
- global $id, $edit, $op;
+ global $id, $edit, $op, $lang;
- if (user_access("administer locales")) {
- print "<SMALL><A HREF=\"admin.php?mod=locale\">overview</A> | <A HREF=\"admin.php?mod=locale&op=help\">help</A></SMALL><HR>\n";
+ if (!variable_get("locale", 0)) {
+ return status("locale disabled.");
+ }
+ else if (user_access("administer locales")) {
+ print "<SMALL>". locale_links(1) . locale_links(0) ."<A HREF=\"admin.php?mod=locale\">overview</A> | <A HREF=\"admin.php?mod=locale&op=help\">help</A></SMALL><HR>\n";
switch ($op) {
case "delete":
@@ -123,7 +160,13 @@ function locale_admin() {
break;
case "Save translations":
print locale_save(check_input($id), $edit);
- // fall through
+ break;
+ case "translated":
+ print locale_translated($lang);
+ break;
+ case "untranslated":
+ print locale_untranslated($lang);
+ break;
default:
print locale_overview();
}
diff --git a/modules/rating.module b/modules/rating.module
index 4b9daa1a70bead70ba45acb5346dd01f72f5a8bd..7580643782355d3ca6e8d24d0318d9b09b567e8c 100644
--- a/modules/rating.module
+++ b/modules/rating.module
@@ -13,13 +13,13 @@ function rating_link($type) {
}
function rating_conf_options() {
- $period = array(3600 => format_interval(3600), 10800 => format_interval(10800), 21600 => format_interval(21600), 32400 => format_interval(32400), 43200 => format_interval(43200), 86400 => format_interval(86400), 172800 => format_interval(172800), 259200 => format_interval(259200), 604800 => format_interval(604800), 1209600 => format_interval(1209600), 1000000000 => t("Never"));
- $output .= form_select(t("Update interval"), "rating_cron_time" , variable_get("rating_cron_time", 86400), $period, t("The update interval for the user ratings. Requires crontab."));
+ $period = array(3600 => format_interval(3600), 10800 => format_interval(10800), 21600 => format_interval(21600), 32400 => format_interval(32400), 43200 => format_interval(43200), 86400 => format_interval(86400), 172800 => format_interval(172800), 259200 => format_interval(259200), 604800 => format_interval(604800), 1209600 => format_interval(1209600), 1000000000 => "Never");
+ $output .= form_select("Update interval", "rating_cron_time" , variable_get("rating_cron_time", 86400), $period, "The update interval for the user ratings. Requires crontab.");
- $weight = array(t("Disabled"), 1, 2, 3, 4, 5, 6, 7, 9, 10);
+ $weight = array("Disabled", 1, 2, 3, 4, 5, 6, 7, 9, 10);
foreach (module_list() as $name) {
if (module_hook($name, "user")) {
- $output .= form_select(t("Weight of a $name"), "rating_weight_$name", variable_get("rating_weight_$name", 0), $weight, t("The weight of a $name."));
+ $output .= form_select("Weight of a $name", "rating_weight_$name", variable_get("rating_weight_$name", 0), $weight, "The weight of a $name.");
}
}
return $output;
diff --git a/modules/statistics.module b/modules/statistics.module
index e06bbba4d0d1fbdd0796f8972c04559ae9ca0ba2..d23e7b22cfdfb337c431443d9479ea32f98c949d 100644
--- a/modules/statistics.module
+++ b/modules/statistics.module
@@ -23,9 +23,10 @@ function statistics_link($type) {
}
function statistics_conf_options() {
- $period = array(3600 => format_interval(3600), 10800 => format_interval(10800), 21600 => format_interval(21600), 32400 => format_interval(32400), 43200 => format_interval(43200), 86400 => format_interval(86400), 172800 => format_interval(172800), 259200 => format_interval(259200), 604800 => format_interval(604800), 1209600 => format_interval(1209600), 2419200 => format_interval(2419200), 1000000000 => t("Never"));
- $output .= form_select(t("Track referers"), "referer", variable_get("referer", 0), array("Disabled", "Enabled"), "If enabled, Drupal will count how many times your website is referred to by other websites.");
- $output .= form_select(t("Discard referers older than"), "referer_clear", variable_get("referer_clear", 604800), $period, "The time referer entries should be kept. Older entries will be automatically discarded. Requires crontab."); return $output;
+ $period = array(3600 => format_interval(3600), 10800 => format_interval(10800), 21600 => format_interval(21600), 32400 => format_interval(32400), 43200 => format_interval(43200), 86400 => format_interval(86400), 172800 => format_interval(172800), 259200 => format_interval(259200), 604800 => format_interval(604800), 1209600 => format_interval(1209600), 2419200 => format_interval(2419200), 1000000000 => "Never");
+ $output .= form_select("Track referers", "referer", variable_get("referer", 0), array("Disabled", "Enabled"), "If enabled, Drupal will count how many times your website is referred to by other websites.");
+ $output .= form_select("Discard referers older than", "referer_clear", variable_get("referer_clear", 604800), $period, "The time referer entries should be kept. Older entries will be automatically discarded. Requires crontab.");
+ return $output;
}
function statistics_referer_internal() {
diff --git a/modules/statistics/statistics.module b/modules/statistics/statistics.module
index e06bbba4d0d1fbdd0796f8972c04559ae9ca0ba2..d23e7b22cfdfb337c431443d9479ea32f98c949d 100644
--- a/modules/statistics/statistics.module
+++ b/modules/statistics/statistics.module
@@ -23,9 +23,10 @@ function statistics_link($type) {
}
function statistics_conf_options() {
- $period = array(3600 => format_interval(3600), 10800 => format_interval(10800), 21600 => format_interval(21600), 32400 => format_interval(32400), 43200 => format_interval(43200), 86400 => format_interval(86400), 172800 => format_interval(172800), 259200 => format_interval(259200), 604800 => format_interval(604800), 1209600 => format_interval(1209600), 2419200 => format_interval(2419200), 1000000000 => t("Never"));
- $output .= form_select(t("Track referers"), "referer", variable_get("referer", 0), array("Disabled", "Enabled"), "If enabled, Drupal will count how many times your website is referred to by other websites.");
- $output .= form_select(t("Discard referers older than"), "referer_clear", variable_get("referer_clear", 604800), $period, "The time referer entries should be kept. Older entries will be automatically discarded. Requires crontab."); return $output;
+ $period = array(3600 => format_interval(3600), 10800 => format_interval(10800), 21600 => format_interval(21600), 32400 => format_interval(32400), 43200 => format_interval(43200), 86400 => format_interval(86400), 172800 => format_interval(172800), 259200 => format_interval(259200), 604800 => format_interval(604800), 1209600 => format_interval(1209600), 2419200 => format_interval(2419200), 1000000000 => "Never");
+ $output .= form_select("Track referers", "referer", variable_get("referer", 0), array("Disabled", "Enabled"), "If enabled, Drupal will count how many times your website is referred to by other websites.");
+ $output .= form_select("Discard referers older than", "referer_clear", variable_get("referer_clear", 604800), $period, "The time referer entries should be kept. Older entries will be automatically discarded. Requires crontab.");
+ return $output;
}
function statistics_referer_internal() {
diff --git a/modules/system.module b/modules/system.module
index a3d746705102cee0c400045671f0427b74d0b9b3..7f9981727e5700beab02a3a9c89626e8a5c70000 100644
--- a/modules/system.module
+++ b/modules/system.module
@@ -29,46 +29,46 @@ function system_view_options() {
// general settings:
$output .= "<H3>General settings</H3>\n";
- $output .= form_textfield(t("Name"), "site_name", variable_get("site_name", "drupal"), 30, 55, t("The name of this website."));
- $output .= form_textfield(t("Slogan"), "site_slogan", variable_get("site_slogan", ""), 30, 55, t("The slogan of this website"));
- $output .= form_textfield(t("E-mail address"), "site_mail", variable_get("site_mail", "root@localhost"), 30, 55, t("A valid e-mail address for this website, used by the auto-mailer to create new user accounts."));
- $output .= form_textarea(t("Footer message"), "site_footer", variable_get("site_footer", ""), 55, 3, t("This text will be displayed at the bottom of each page. Useful for adding a copyright notice to your pages."));
- $output .= form_textfield(t("Anonymous user"), "anonymous", variable_get("anonymous", "Anonymous"), 30, 55, t("The name used to indicate anonymous users."));
+ $output .= form_textfield("Name", "site_name", variable_get("site_name", "drupal"), 30, 55, "The name of this website.");
+ $output .= form_textfield("Slogan", "site_slogan", variable_get("site_slogan", ""), 30, 55, "The slogan of this website");
+ $output .= form_textfield("E-mail address", "site_mail", variable_get("site_mail", "root@localhost"), 30, 55, "A valid e-mail address for this website, used by the auto-mailer to create new user accounts.");
+ $output .= form_textarea("Footer message", "site_footer", variable_get("site_footer", ""), 55, 3, "This text will be displayed at the bottom of each page. Useful for adding a copyright notice to your pages.");
+ $output .= form_textfield("Anonymous user", "anonymous", variable_get("anonymous", "Anonymous"), 30, 55, "The name used to indicate anonymous users.");
$output .= "<HR>\n";
// caching:
$output .= "<H3>Cache settings</H3>\n";
$period = array(10 => format_interval(10), 20 => format_interval(20), 30 => format_interval(30), 40 => format_interval(40), 50 => format_interval(50), 50 => format_interval(50), 60 => format_interval(60), 90 => format_interval(90), 120 => format_interval(120), 150 => format_interval(150), 180 => format_interval(180), 210 => format_interval(210), 240 => format_interval(240), 270 => format_interval(270), 300 => format_interval(300), 360 => format_interval(360), 420 => format_interval(420), 480 => format_interval(480), 540 => format_interval(540), 600 => format_interval(600), 1800 => format_interval(1800), 3600 => format_interval(3600), 7200 => format_interval(7200));
- $output .= form_select(t("Cache support"), "cache", variable_get("cache", 0), array("Disabled", "Enabled"), t("Enable or disable the caching of pages."));
- $output .= form_select(t("Discard cached pages older than"), "cache_clear", variable_get("cache_clear", 30), $period, t("The time cached pages should be kept. Older pages are automatically refreshed."));
+ $output .= form_select("Cache support", "cache", variable_get("cache", 0), array("Disabled", "Enabled"), "Enable or disable the caching of pages.");
+ $output .= form_select("Discard cached pages older than", "cache_clear", variable_get("cache_clear", 30), $period, "The time cached pages should be kept. Older pages are automatically refreshed.");
$output .= "<HR>\n";
// submission settings:
$output .= "<H3>Submission settings</H3>\n";
$size = array(1000 => "1.000 characters", 5000 => "5.000 characters", 10000 => "10.000 characters", 15000 => "15.000 characters", 30.000 => "30.000 characters", 50000 => "50.000 characters", 100000 => "100.000 characters");
- $output .= form_select(t("Maximum submission size"), "max_input_size", variable_get("max_input_size", 10000), $size, t("The maximum number of characters someone can enter in a form."));
+ $output .= form_select("Maximum submission size", "max_input_size", variable_get("max_input_size", 10000), $size, "The maximum number of characters someone can enter in a form.");
$rate = array(1 => "Maximum 1 every second", 5 => "Maximum 1 every 5 seconds", 15 => "Maximum 1 every 15 seconds", 30 => "Maximum 1 every 30 seconds", 60 => "Maximum 1 every minute", 300 => "Maximum 1 every 5 minutes", 900 => "Maximum 1 every 15 minutes", 1800 => "Maximum 1 every 30 minutes", 3600 => "Maximum 1 every hour", 21600 => "Maximum 1 every 6 hour", 43200 => "Maximum 1 every 12 hour");
- $output .= form_select(t("Maximum node rate"), "max_node_rate", variable_get("max_node_rate", 900), $rate, t("The maximum submission rate for nodes. Its purpose is to stop potential abuse or denial of service attacks."));
- $output .= form_select(t("Maximum comment rate"), "max_comment_rate", variable_get("max_comment_rate", 120), $rate, t("The maximum submission rate for comments. Its purpose is to stop potential abuse or denial of service attacks."));
+ $output .= form_select("Maximum node rate", "max_node_rate", variable_get("max_node_rate", 900), $rate, "The maximum submission rate for nodes. Its purpose is to stop potential abuse or denial of service attacks.");
+ $output .= form_select("Maximum comment rate", "max_comment_rate", variable_get("max_comment_rate", 120), $rate, "The maximum submission rate for comments. Its purpose is to stop potential abuse or denial of service attacks.");
$output .= "<HR>\n";
// comment settings:
$output .= "<H3>Comment settings</H3>\n";
- $output .= form_select(t("Default display mode"), "default_comment_mode", $conf[default_comment_mode], $cmodes, t("The default mode in which comments are displayed."));
- $output .= form_select(t("Default display order"), "default_comment_order", $conf[default_comment_order], $corder, t("The default order in which comments are displayed."));
- for ($count = -1; $count < 6; $count++) $threshold[$count] = t("Filter") ." - $count";
- $output .= form_select(t("Default filter threshold"), "default_comment_threshold", $conf[default_comment_threshold], $threshold, t("The default threshold used to filter comments."));
+ $output .= form_select("Default display mode", "default_comment_mode", $conf[default_comment_mode], $cmodes, "The default mode in which comments are displayed.");
+ $output .= form_select("Default display order", "default_comment_order", $conf[default_comment_order], $corder, "The default order in which comments are displayed.");
+ for ($count = -1; $count < 6; $count++) $threshold[$count] = "Filter - $count";
+ $output .= form_select("Default filter threshold", "default_comment_threshold", $conf[default_comment_threshold], $threshold, "The default threshold used to filter comments.");
$output .= "<HR>\n";
// layout settings:
$output .= "<H3>Layout settings</H3>\n";
foreach ($themes as $key=>$value) $options .= "<OPTION VALUE=\"$key\"". (variable_get("theme_default", key($themes)) == $key ? " SELECTED" : "") .">$key</OPTION>\n";
- $output .= form_item(t("Default theme"), "<SELECT NAME=\"edit[theme_default]\">$options</SELECT>", t("The default theme as seen by visitors or anonymous users."));
+ $output .= form_item("Default theme", "<SELECT NAME=\"edit[theme_default]\">$options</SELECT>", "The default theme as seen by visitors or anonymous users.");
$output .= "<HR>\n";
// development settings:
$output .= "<H3>Development settings</H3>\n";
- $output .= form_select(t("Display timer information"), "dev_timer", variable_get("dev_timer", 0), array("Disabled", "Enabled"), t("Display the time it took to generate a page. For Drupal development only."));
+ $output .= form_select("Display timer information", "dev_timer", variable_get("dev_timer", 0), array("Disabled", "Enabled"), "Display the time it took to generate a page. For Drupal development only.");
$output .= "<HR>\n";
foreach (module_list() as $name) {
diff --git a/modules/system/system.module b/modules/system/system.module
index a3d746705102cee0c400045671f0427b74d0b9b3..7f9981727e5700beab02a3a9c89626e8a5c70000 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -29,46 +29,46 @@ function system_view_options() {
// general settings:
$output .= "<H3>General settings</H3>\n";
- $output .= form_textfield(t("Name"), "site_name", variable_get("site_name", "drupal"), 30, 55, t("The name of this website."));
- $output .= form_textfield(t("Slogan"), "site_slogan", variable_get("site_slogan", ""), 30, 55, t("The slogan of this website"));
- $output .= form_textfield(t("E-mail address"), "site_mail", variable_get("site_mail", "root@localhost"), 30, 55, t("A valid e-mail address for this website, used by the auto-mailer to create new user accounts."));
- $output .= form_textarea(t("Footer message"), "site_footer", variable_get("site_footer", ""), 55, 3, t("This text will be displayed at the bottom of each page. Useful for adding a copyright notice to your pages."));
- $output .= form_textfield(t("Anonymous user"), "anonymous", variable_get("anonymous", "Anonymous"), 30, 55, t("The name used to indicate anonymous users."));
+ $output .= form_textfield("Name", "site_name", variable_get("site_name", "drupal"), 30, 55, "The name of this website.");
+ $output .= form_textfield("Slogan", "site_slogan", variable_get("site_slogan", ""), 30, 55, "The slogan of this website");
+ $output .= form_textfield("E-mail address", "site_mail", variable_get("site_mail", "root@localhost"), 30, 55, "A valid e-mail address for this website, used by the auto-mailer to create new user accounts.");
+ $output .= form_textarea("Footer message", "site_footer", variable_get("site_footer", ""), 55, 3, "This text will be displayed at the bottom of each page. Useful for adding a copyright notice to your pages.");
+ $output .= form_textfield("Anonymous user", "anonymous", variable_get("anonymous", "Anonymous"), 30, 55, "The name used to indicate anonymous users.");
$output .= "<HR>\n";
// caching:
$output .= "<H3>Cache settings</H3>\n";
$period = array(10 => format_interval(10), 20 => format_interval(20), 30 => format_interval(30), 40 => format_interval(40), 50 => format_interval(50), 50 => format_interval(50), 60 => format_interval(60), 90 => format_interval(90), 120 => format_interval(120), 150 => format_interval(150), 180 => format_interval(180), 210 => format_interval(210), 240 => format_interval(240), 270 => format_interval(270), 300 => format_interval(300), 360 => format_interval(360), 420 => format_interval(420), 480 => format_interval(480), 540 => format_interval(540), 600 => format_interval(600), 1800 => format_interval(1800), 3600 => format_interval(3600), 7200 => format_interval(7200));
- $output .= form_select(t("Cache support"), "cache", variable_get("cache", 0), array("Disabled", "Enabled"), t("Enable or disable the caching of pages."));
- $output .= form_select(t("Discard cached pages older than"), "cache_clear", variable_get("cache_clear", 30), $period, t("The time cached pages should be kept. Older pages are automatically refreshed."));
+ $output .= form_select("Cache support", "cache", variable_get("cache", 0), array("Disabled", "Enabled"), "Enable or disable the caching of pages.");
+ $output .= form_select("Discard cached pages older than", "cache_clear", variable_get("cache_clear", 30), $period, "The time cached pages should be kept. Older pages are automatically refreshed.");
$output .= "<HR>\n";
// submission settings:
$output .= "<H3>Submission settings</H3>\n";
$size = array(1000 => "1.000 characters", 5000 => "5.000 characters", 10000 => "10.000 characters", 15000 => "15.000 characters", 30.000 => "30.000 characters", 50000 => "50.000 characters", 100000 => "100.000 characters");
- $output .= form_select(t("Maximum submission size"), "max_input_size", variable_get("max_input_size", 10000), $size, t("The maximum number of characters someone can enter in a form."));
+ $output .= form_select("Maximum submission size", "max_input_size", variable_get("max_input_size", 10000), $size, "The maximum number of characters someone can enter in a form.");
$rate = array(1 => "Maximum 1 every second", 5 => "Maximum 1 every 5 seconds", 15 => "Maximum 1 every 15 seconds", 30 => "Maximum 1 every 30 seconds", 60 => "Maximum 1 every minute", 300 => "Maximum 1 every 5 minutes", 900 => "Maximum 1 every 15 minutes", 1800 => "Maximum 1 every 30 minutes", 3600 => "Maximum 1 every hour", 21600 => "Maximum 1 every 6 hour", 43200 => "Maximum 1 every 12 hour");
- $output .= form_select(t("Maximum node rate"), "max_node_rate", variable_get("max_node_rate", 900), $rate, t("The maximum submission rate for nodes. Its purpose is to stop potential abuse or denial of service attacks."));
- $output .= form_select(t("Maximum comment rate"), "max_comment_rate", variable_get("max_comment_rate", 120), $rate, t("The maximum submission rate for comments. Its purpose is to stop potential abuse or denial of service attacks."));
+ $output .= form_select("Maximum node rate", "max_node_rate", variable_get("max_node_rate", 900), $rate, "The maximum submission rate for nodes. Its purpose is to stop potential abuse or denial of service attacks.");
+ $output .= form_select("Maximum comment rate", "max_comment_rate", variable_get("max_comment_rate", 120), $rate, "The maximum submission rate for comments. Its purpose is to stop potential abuse or denial of service attacks.");
$output .= "<HR>\n";
// comment settings:
$output .= "<H3>Comment settings</H3>\n";
- $output .= form_select(t("Default display mode"), "default_comment_mode", $conf[default_comment_mode], $cmodes, t("The default mode in which comments are displayed."));
- $output .= form_select(t("Default display order"), "default_comment_order", $conf[default_comment_order], $corder, t("The default order in which comments are displayed."));
- for ($count = -1; $count < 6; $count++) $threshold[$count] = t("Filter") ." - $count";
- $output .= form_select(t("Default filter threshold"), "default_comment_threshold", $conf[default_comment_threshold], $threshold, t("The default threshold used to filter comments."));
+ $output .= form_select("Default display mode", "default_comment_mode", $conf[default_comment_mode], $cmodes, "The default mode in which comments are displayed.");
+ $output .= form_select("Default display order", "default_comment_order", $conf[default_comment_order], $corder, "The default order in which comments are displayed.");
+ for ($count = -1; $count < 6; $count++) $threshold[$count] = "Filter - $count";
+ $output .= form_select("Default filter threshold", "default_comment_threshold", $conf[default_comment_threshold], $threshold, "The default threshold used to filter comments.");
$output .= "<HR>\n";
// layout settings:
$output .= "<H3>Layout settings</H3>\n";
foreach ($themes as $key=>$value) $options .= "<OPTION VALUE=\"$key\"". (variable_get("theme_default", key($themes)) == $key ? " SELECTED" : "") .">$key</OPTION>\n";
- $output .= form_item(t("Default theme"), "<SELECT NAME=\"edit[theme_default]\">$options</SELECT>", t("The default theme as seen by visitors or anonymous users."));
+ $output .= form_item("Default theme", "<SELECT NAME=\"edit[theme_default]\">$options</SELECT>", "The default theme as seen by visitors or anonymous users.");
$output .= "<HR>\n";
// development settings:
$output .= "<H3>Development settings</H3>\n";
- $output .= form_select(t("Display timer information"), "dev_timer", variable_get("dev_timer", 0), array("Disabled", "Enabled"), t("Display the time it took to generate a page. For Drupal development only."));
+ $output .= form_select("Display timer information", "dev_timer", variable_get("dev_timer", 0), array("Disabled", "Enabled"), "Display the time it took to generate a page. For Drupal development only.");
$output .= "<HR>\n";
foreach (module_list() as $name) {
diff --git a/modules/watchdog.module b/modules/watchdog.module
index aa7c5553db554b94d7d954dc25584b9d4382f58b..991ff0676176793f4d40b55790c28c0ac7f35b52 100644
--- a/modules/watchdog.module
+++ b/modules/watchdog.module
@@ -20,8 +20,8 @@ function watchdog_link($type) {
}
function watchdog_conf_options() {
- $period = array(3600 => format_interval(3600), 10800 => format_interval(10800), 21600 => format_interval(21600), 32400 => format_interval(32400), 43200 => format_interval(43200), 86400 => format_interval(86400), 172800 => format_interval(172800), 259200 => format_interval(259200), 604800 => format_interval(604800), 1209600 => format_interval(1209600), 2419200 => format_interval(2419200), 1000000000 => t("Never"));
- $output .= form_select(t("Discard entries older than"), "watchdog_clear", variable_get("watchdog_clear", 604800), $period, t("The time watchdog entries should be kept. Older entries will be automatically discarded. Requires crontab."));
+ $period = array(3600 => format_interval(3600), 10800 => format_interval(10800), 21600 => format_interval(21600), 32400 => format_interval(32400), 43200 => format_interval(43200), 86400 => format_interval(86400), 172800 => format_interval(172800), 259200 => format_interval(259200), 604800 => format_interval(604800), 1209600 => format_interval(1209600), 2419200 => format_interval(2419200), 1000000000 => "Never");
+ $output .= form_select("Discard entries older than", "watchdog_clear", variable_get("watchdog_clear", 604800), $period, "The time watchdog entries should be kept. Older entries will be automatically discarded. Requires crontab.");
return $output;
}
diff --git a/modules/watchdog/watchdog.module b/modules/watchdog/watchdog.module
index aa7c5553db554b94d7d954dc25584b9d4382f58b..991ff0676176793f4d40b55790c28c0ac7f35b52 100644
--- a/modules/watchdog/watchdog.module
+++ b/modules/watchdog/watchdog.module
@@ -20,8 +20,8 @@ function watchdog_link($type) {
}
function watchdog_conf_options() {
- $period = array(3600 => format_interval(3600), 10800 => format_interval(10800), 21600 => format_interval(21600), 32400 => format_interval(32400), 43200 => format_interval(43200), 86400 => format_interval(86400), 172800 => format_interval(172800), 259200 => format_interval(259200), 604800 => format_interval(604800), 1209600 => format_interval(1209600), 2419200 => format_interval(2419200), 1000000000 => t("Never"));
- $output .= form_select(t("Discard entries older than"), "watchdog_clear", variable_get("watchdog_clear", 604800), $period, t("The time watchdog entries should be kept. Older entries will be automatically discarded. Requires crontab."));
+ $period = array(3600 => format_interval(3600), 10800 => format_interval(10800), 21600 => format_interval(21600), 32400 => format_interval(32400), 43200 => format_interval(43200), 86400 => format_interval(86400), 172800 => format_interval(172800), 259200 => format_interval(259200), 604800 => format_interval(604800), 1209600 => format_interval(1209600), 2419200 => format_interval(2419200), 1000000000 => "Never");
+ $output .= form_select("Discard entries older than", "watchdog_clear", variable_get("watchdog_clear", 604800), $period, "The time watchdog entries should be kept. Older entries will be automatically discarded. Requires crontab.");
return $output;
}