From e3ad7ce57d9b067894ca2a37e39e4db03c9f6972 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Thu, 28 Feb 2008 15:37:14 +1300 Subject: [PATCH] Change the user menu to be better able to be localised. --- htdocs/usr.php | 6 +++--- po/de_DE.po | 23 ++++++++++++++--------- po/en_NZ.po | 19 ++++++++++++------- po/es_AR.po | 23 ++++++++++++++--------- po/es_ES.po | 23 ++++++++++++++--------- po/es_MX.po | 23 ++++++++++++++--------- po/fr_FR.po | 33 +++++++++++++++++++-------------- po/hu_HU.po | 23 ++++++++++++++--------- po/ja_JP.po | 22 +++++++++++++++------- po/messages.po | 19 ++++++++++++------- po/nl_NL.po | 23 ++++++++++++++--------- po/pl_PL.po | 23 ++++++++++++++--------- po/ru_RU.po | 22 +++++++++++++++------- 13 files changed, 174 insertions(+), 108 deletions(-) diff --git a/htdocs/usr.php b/htdocs/usr.php index e33e166b..8bef7276 100644 --- a/htdocs/usr.php +++ b/htdocs/usr.php @@ -81,11 +81,11 @@ $user_menu->AddOption(translate("New User"),"$c->base_url/usr.php?create",translate("Add a new user"), false, 10); if ( $user->user_no > 0 ) { - if ( $user->AllowedTo('update') ) { - $user_menu->AddOption( translate($user->EditMode?"View":"Edit")." ".$user->Values->fullname, "$c->base_url/usr.php?user_no=$user->user_no".($user->EditMode?"":"&edit=1"), translate(($user->EditMode?"View":"Edit")." this user record"), true, 900 ); + if ( $user->AllowedTo('update') && ! $user->EditMode ) { + $user_menu->AddOption( sprintf(translate("Edit %s"), $user->Values->fullname), "$c->base_url/usr.php?user_no=$user->user_no&edit=1", translate("Edit this user record"), true, 900 ); } else { - $user_menu->AddOption( translate("View")." ".$user->Values->fullname, "$c->base_url/usr.php?user_no=$user->user_no", translate("View this user record"), true, 900 ); + $user_menu->AddOption( sprintf(translate("View %s"), $user->Values->fullname), "$c->base_url/usr.php?user_no=$user->user_no", translate("View this user record"), true, 900 ); } } diff --git a/po/de_DE.po b/po/de_DE.po index 4e97e8f5..a4881703 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: RSCDS 0.2.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-28 13:53+1300\n" +"POT-Creation-Date: 2008-02-28 14:55+1300\n" "PO-Revision-Date: 2006-11-06 17:24+1300\n" "Last-Translator: Cristina Radalescu \n" "MIME-Version: 1.0\n" @@ -147,6 +147,9 @@ msgstr "Erstellen" msgid "Created On" msgstr "Erstellen" +msgid "DAViCal CalDAV Server" +msgstr "" + #, fuzzy msgid "Database Error" msgstr "Datenbank Error" @@ -187,6 +190,10 @@ msgstr "FEHLER: %s" msgid "ERROR: There was a database error writing the roles information!" msgstr "FEHLER: Ein Datenbank Fehler ist beim Schreiben auf der Rolleninformation aufgetretten" +#, fuzzy, c-format +msgid "Edit %s" +msgstr "Bearbeiten" + msgid "Edit this user record" msgstr "Benutzerdaten bearbeiten" @@ -367,9 +374,6 @@ msgstr "" msgid "REPORT body is not valid XML data!" msgstr "" -msgid "Really Simple CalDAV Store" -msgstr "Wirklich einfacher CalDAV Store" - msgid "Relationship " msgstr "Verhältnis" @@ -542,15 +546,16 @@ msgstr "Benutzerdatensatz geschrieben" msgid "Users" msgstr "Benutzer" +#, fuzzy, c-format +msgid "View %s" +msgstr "Anzeigen" + msgid "View my own user record" msgstr "Meine eigenen Benutzerdaten anzeigen" msgid "View this user record" msgstr "Diesen Benutzerdatensatz anzeigen" -msgid "View" -msgstr "Anzeigen" - msgid "When the user's e-mail account was validated." msgstr "Wenn das E-Mail Konto des Benutzers bestätigt wird" @@ -656,8 +661,8 @@ msgstr "Bitte loggen Sie sich mit den Ihnen zugeteilten Benutzernamen und Passwo msgid "This operation does the following: