From 7990ac735dc8f8da9631cb058b6c2380c6ad6afb Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 5 Mar 2007 14:52:16 +0100 Subject: [PATCH] some i18n: pref-prefs --- modules/pref-prefs.php | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/pref-prefs.php b/modules/pref-prefs.php index 047fb186..e9ebc183 100644 --- a/modules/pref-prefs.php +++ b/modules/pref-prefs.php @@ -17,17 +17,17 @@ $con_pw = $_POST["CONFIRM_PASSWORD"]; if ($old_pw == "") { - print "ERROR: Old password cannot be blank."; + print "ERROR: ".__("Old password cannot be blank."); return; } if ($new_pw == "") { - print "ERROR: New password cannot be blank."; + print "ERROR: ".__("New password cannot be blank."); return; } if ($new_pw != $con_pw) { - print "ERROR: Entered passwords do not match."; + print "ERROR: ".__("Entered passwords do not match."); return; } @@ -48,9 +48,9 @@ db_query($link, "UPDATE ttrss_users SET pwd_hash = '$new_pw_hash' WHERE id = '$active_uid'"); - print "Password has been changed."; + print __("Password has been changed."); } else { - print "ERROR: Old password is incorrect."; + print "ERROR: ".__('Old password is incorrect.'); } } @@ -180,8 +180,8 @@ pwd_hash = 'SHA1:".sha1("password")."')"); if (db_num_rows($result) != 0) { - print format_warning("Your password is at default value, - please change it.", "default_pass_warning"); + print format_warning(__("Your password is at default value, + please change it."), "default_pass_warning"); } /* if ($_SESSION["pwd_change_result"] == "failed") { @@ -195,11 +195,11 @@ $_SESSION["pwd_change_result"] = ""; */ if ($_SESSION["prefs_op_result"] == "reset-to-defaults") { - print format_notice("The configuration was reset to defaults."); + print format_notice(__("The configuration was reset to defaults.")); } if ($_SESSION["prefs_op_result"] == "save-config") { - print format_notice("The configuration was saved."); + print format_notice(__("The configuration was saved.")); } $_SESSION["prefs_op_result"] = ""; @@ -207,7 +207,7 @@ print "
"; print ""; - print ""; + print ""; $result = db_query($link, "SELECT email FROM ttrss_users WHERE id = ".$_SESSION["uid"]); @@ -227,26 +227,26 @@ print ""; print "

"; + onclick=\"return changeUserEmail()\" value=\"".__("Change e-mail")."\">"; print "
"; print "

Personal data

".__("Personal data")."

"; - print ""; + print ""; - print ""; + print ""; print ""; - print ""; + print ""; print ""; - print ""; + print ""; print "

Authentication

".__("Authentication")."

Old password
".__("Old password")."
New password
".__("New password")."
Confirm password
".__("Confirm password").""; + value=\"".__("Change password")."\">"; } @@ -277,8 +277,8 @@ print ""; print ""; - print ""; - print ""; + print ""; + print ""; print "

Themes

Select theme

".__("Themes")."

".__("Select theme")."