From 52a1d1bbe80422ca7a8c79dde6fd92db542b9b2d Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Sat, 17 Feb 2001 12:59:24 +0000 Subject: - More updates on the translation support --- modules/diary.module | 10 ++--- modules/drupal.module | 8 ++-- modules/drupal/drupal.module | 8 ++-- modules/locale.module | 89 ++++++++++++++++++++++++++++++++++++---- modules/locale/locale.module | 89 ++++++++++++++++++++++++++++++++++++---- modules/watchdog.module | 2 +- modules/watchdog/watchdog.module | 2 +- 7 files changed, 179 insertions(+), 29 deletions(-) (limited to 'modules') diff --git a/modules/diary.module b/modules/diary.module index c4939bdca..381afc887 100644 --- a/modules/diary.module +++ b/modules/diary.module @@ -35,7 +35,7 @@ function diary_page_overview($num = 20) { while ($diary = db_fetch_object($result)) { if ($time != date("F jS", $diary->timestamp)) { - $output .= "". date("l, F jS", $diary->timestamp) ."\n"; + $output .= "". $date = t(date("l", $timestamp)) .", ". t(date("F", $timestamp)) ." ". date("j", $diary->timestamp) ."\n"; $time = date("F jS", $diary->timestamp); } $output .= "
\n"; @@ -55,13 +55,13 @@ function diary_page_overview($num = 20) { function diary_page_entry($timestamp, $text, $id = 0) { if ($id) { $output .= "
\n"; - $output .= "
". date("l, F jS", $timestamp) .":
\n"; + $output .= "
". format_date($timestamp, "large") .":
\n"; $output .= "

[ ". t("edit") ." ]

". check_output($text, 1) ."

\n"; $output .= "
\n"; } else { $output .= "
\n"; - $output .= "
". date("l, F jS", $timestamp) .":
\n"; + $output .= "
". format_date($timestamp, "large") .":
\n"; $output .= "

". check_output($text, 1) ."

\n"; $output .= "
\n"; } @@ -215,7 +215,7 @@ function diary_user($username, $section, $operation) { if ($section == "user" && $operation == "view") { $result = db_query("SELECT d.* FROM diaries d LEFT JOIN users u ON u.id = d.author WHERE u.userid = '$username' AND d.timestamp > ". (time() - 1209600) ." ORDER BY id DESC LIMIT 2"); while ($diary = db_fetch_object($result)) { - $content .= "
". date("l, F jS", $diary->timestamp) .":

". check_output($diary->text) ."

[ more ]

\n"; + $content .= "
". format_date($diary->timestamp, "large") .":

". check_output($diary->text) ."

[ more ]

\n"; $diaries++; } @@ -236,7 +236,7 @@ function diary_block() { while ($diary = db_fetch_object($result)) { if ($time != date("F jS", $diary->timestamp)) { - $content .= "

". date("l, M jS", $diary->timestamp) ."

\n"; + $content .= "

". t(date("l", $diary->timestamp)) ." (". date("m/d/Y", $diary->timestamp) .")

\n"; $time = date("F jS", $diary->timestamp); } $content .= "
  • userid\">$diary->userid
    • \n"; diff --git a/modules/drupal.module b/modules/drupal.module index 8ece0a6d9..47a08265a 100644 --- a/modules/drupal.module +++ b/modules/drupal.module @@ -43,12 +43,12 @@ function drupal_page() { global $cid, $comment, $id, $op, $pid, $lid, $link, $mode, $order, $subject, $theme, $threshold; switch($op) { - case "Preview comment": + case t("Preview comment"): $theme->header(); comment_preview($pid, $id, $subject, $comment); $theme->footer(); break; - case "Post comment": + case t("Post comment"): comment_post($pid, $id, $subject, $comment); $theme->header(); drupal_render($id, $cid); @@ -59,13 +59,13 @@ function drupal_page() { comment_reply($pid, $id); $theme->footer(); break; - case "Update settings": + case t("Update settings"): comment_settings($mode, $order, $threshold); $theme->header(); drupal_render($id, $cid); $theme->footer(); break; - case "Moderate comments": + case t("Moderate comments"): comment_moderate($moderate); $theme->header(); drupal_render($id, $cid); diff --git a/modules/drupal/drupal.module b/modules/drupal/drupal.module index 8ece0a6d9..47a08265a 100644 --- a/modules/drupal/drupal.module +++ b/modules/drupal/drupal.module @@ -43,12 +43,12 @@ function drupal_page() { global $cid, $comment, $id, $op, $pid, $lid, $link, $mode, $order, $subject, $theme, $threshold; switch($op) { - case "Preview comment": + case t("Preview comment"): $theme->header(); comment_preview($pid, $id, $subject, $comment); $theme->footer(); break; - case "Post comment": + case t("Post comment"): comment_post($pid, $id, $subject, $comment); $theme->header(); drupal_render($id, $cid); @@ -59,13 +59,13 @@ function drupal_page() { comment_reply($pid, $id); $theme->footer(); break; - case "Update settings": + case t("Update settings"): comment_settings($mode, $order, $threshold); $theme->header(); drupal_render($id, $cid); $theme->footer(); break; - case "Moderate comments": + case t("Moderate comments"): comment_moderate($moderate); $theme->header(); drupal_render($id, $cid); diff --git a/modules/locale.module b/modules/locale.module index 95594a65a..8a1c3e1ac 100644 --- a/modules/locale.module +++ b/modules/locale.module @@ -1,17 +1,92 @@ "locale", - "admin" => "locale"); +$module = array("help" => "locale_help", + "admin" => "locale_admin", + "locale" => "locale_locale"); -function locale() { - $result = db_query("SELECT * FROM locales ORDER BY english"); +function locale_help() { + print "under construction"; +} + +function locale_delete($id) { + db_query("DELETE FROM locales WHERE id = '$id'"); +} + +function locale_save($id, $edit) { + foreach ($edit as $key=>$value) { + db_query("UPDATE locales SET $key = '". check_input($value) ."' WHERE id = '$id'"); + } +} + +function locale_edit($id) { + global $languages; + $result = db_query("SELECT * FROM locales WHERE id = '$id'"); + if ($translation = db_fetch_object($result)) { + $output .= "
    \n"; + $output .= "Original string:
    \n"; + $output .= check_output($translation->string) ."

    "; + foreach ($languages as $code=>$language) { + $output .= "$language:
    "; + $output .= "$code) ."\">

    "; + } + $output .= "\n"; + $output .= "\n"; + $output .= "

    \n"; + + print $output; + } +} + +function locale_languages($translation) { + global $languages; + foreach ($languages as $key=>$value) { + $output .= ($translation->$key) ? "$key " : "$key "; + } + return $output; +} + +function locale_display() { + $result = db_query("SELECT * FROM locales ORDER BY string"); $output .= "\n"; - $output .= " \n"; + $output .= " \n"; while ($locale = db_fetch_object($result)) { - $output .= " "; + $languages = locale_languages($locale); + $output .= " "; } $output .= "
    stringoperations
    stringlanguagesoperations
    ". check_output($locale->english) ."
    $locale->location    		id\">editid\">delete
    ". check_output($locale->string) ."
    $locale->location    		$languagesid\">editid\">delete
    \n"; print $output; } -?> +function locale_admin() { + global $id, $edit, $op; + + print "overview | help
    \n"; + + switch ($op) { + case "delete": + locale_delete($id); + locale_display(); + break; + case "help": + locale_help(); + break; + case "edit": + locale_edit($id); + break; + case "Save translations": + locale_save($id, $edit); + // fall through + default: + locale_display(); + } +} + +function locale($string) { + global $locale; + $result = db_query("SELECT id, $locale FROM locales WHERE STRCMP(string, '". addslashes($string) ."') = 0"); + if ($translation = db_fetch_object($result)) $string = ($translation->$locale) ? check_output($translation->$locale) : $string; + else db_query("INSERT INTO locales (string, location) VALUES ('". addslashes($string) ."', '". check_input(getenv("REQUEST_URI")) ."')"); + return $string; +} + +?> \ No newline at end of file diff --git a/modules/locale/locale.module b/modules/locale/locale.module index 95594a65a..8a1c3e1ac 100644 --- a/modules/locale/locale.module +++ b/modules/locale/locale.module @@ -1,17 +1,92 @@ "locale", - "admin" => "locale"); +$module = array("help" => "locale_help", + "admin" => "locale_admin", + "locale" => "locale_locale"); -function locale() { - $result = db_query("SELECT * FROM locales ORDER BY english"); +function locale_help() { + print "under construction"; +} + +function locale_delete($id) { + db_query("DELETE FROM locales WHERE id = '$id'"); +} + +function locale_save($id, $edit) { + foreach ($edit as $key=>$value) { + db_query("UPDATE locales SET $key = '". check_input($value) ."' WHERE id = '$id'"); + } +} + +function locale_edit($id) { + global $languages; + $result = db_query("SELECT * FROM locales WHERE id = '$id'"); + if ($translation = db_fetch_object($result)) { + $output .= "
    \n"; + $output .= "Original string:
    \n"; + $output .= check_output($translation->string) ."

    "; + foreach ($languages as $code=>$language) { + $output .= "$language:
    "; + $output .= "$code) ."\">

    "; + } + $output .= "\n"; + $output .= "\n"; + $output .= "

    \n"; + + print $output; + } +} + +function locale_languages($translation) { + global $languages; + foreach ($languages as $key=>$value) { + $output .= ($translation->$key) ? "$key " : "$key "; + } + return $output; +} + +function locale_display() { + $result = db_query("SELECT * FROM locales ORDER BY string"); $output .= "\n"; - $output .= " \n"; + $output .= " \n"; while ($locale = db_fetch_object($result)) { - $output .= " "; + $languages = locale_languages($locale); + $output .= " "; } $output .= "
    stringoperations
    stringlanguagesoperations
    ". check_output($locale->english) ."
    $locale->location    		id\">editid\">delete
    ". check_output($locale->string) ."
    $locale->location    		$languagesid\">editid\">delete
    \n"; print $output; } -?> +function locale_admin() { + global $id, $edit, $op; + + print "overview | help
    \n"; + + switch ($op) { + case "delete": + locale_delete($id); + locale_display(); + break; + case "help": + locale_help(); + break; + case "edit": + locale_edit($id); + break; + case "Save translations": + locale_save($id, $edit); + // fall through + default: + locale_display(); + } +} + +function locale($string) { + global $locale; + $result = db_query("SELECT id, $locale FROM locales WHERE STRCMP(string, '". addslashes($string) ."') = 0"); + if ($translation = db_fetch_object($result)) $string = ($translation->$locale) ? check_output($translation->$locale) : $string; + else db_query("INSERT INTO locales (string, location) VALUES ('". addslashes($string) ."', '". check_input(getenv("REQUEST_URI")) ."')"); + return $string; +} + +?> \ No newline at end of file diff --git a/modules/watchdog.module b/modules/watchdog.module index 81593d4c0..f1bb7925f 100644 --- a/modules/watchdog.module +++ b/modules/watchdog.module @@ -50,7 +50,7 @@ function watchdog_view($id) { if ($watchdog = db_fetch_object($result)) { $output .= "\n"; $output .= " \n"; - $output .= " \n"; + $output .= " \n"; $output .= " \n"; $output .= " \n"; $output .= " \n"; diff --git a/modules/watchdog/watchdog.module b/modules/watchdog/watchdog.module index 81593d4c0..f1bb7925f 100644 --- a/modules/watchdog/watchdog.module +++ b/modules/watchdog/watchdog.module @@ -50,7 +50,7 @@ function watchdog_view($id) { if ($watchdog = db_fetch_object($result)) { $output .= "
    Level:$watchdog->level
    Date:". format_date($watchdog->timestamp, "extra large") ."
    Date:". format_date($watchdog->timestamp, "large") ."
    User:". format_username($watchdog->userid) ."
    Location:$watchdog->location
    Message:$watchdog->message
    \n"; $output .= " \n"; - $output .= " \n"; + $output .= " \n"; $output .= " \n"; $output .= " \n"; $output .= " \n"; -- cgit v1.2.3
    Level:$watchdog->level
    Date:". format_date($watchdog->timestamp, "extra large") ."
    Date:". format_date($watchdog->timestamp, "large") ."
    User:". format_username($watchdog->userid) ."
    Location:$watchdog->location
    Message:$watchdog->message