From b7f20daa2633c9caf3c72a1f522ada76f598f122 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 20 Sep 2013 20:56:46 +0200 Subject: [PATCH] use translation for hardcoded strings --- languages/de_DE/lang.inc | 3 +++ languages/en_GB/lang.inc | 3 +++ views/bootstrap/class.ViewDocument.php | 8 +++++--- views/bootstrap/class.WorkflowMgr.php | 8 +++++--- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index e760fbebc..1cd5a6dbc 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -85,6 +85,7 @@ $text = array( 'assign_reviewers' => "Prüfer zuweisen", 'assign_user_property_to' => "Dokumente einem anderen Benutzer zuweisen", 'assumed_released' => "Angenommen, freigegeben", +'at_least_n_users_of_group' => "Mindestens [number_of_users] Benutzer der Gruppe [group]", 'attrdef_management' => "Attributdefinitions-Management", 'attrdef_exists' => "Attributdefinition existiert bereits", 'attrdef_in_use' => "Definition des Attributs noch in Gebrauch", @@ -790,6 +791,7 @@ $text = array( 'splash_settings_saved' => "Einstellungen gesichert", 'splash_substituted_user' => "Benutzer gewechselt", 'splash_switched_back_user' => "Zum ursprünglichen Benutzer zurückgekehrt", +'state_and_next_state' => "Status/Nächster Status", 'statistic' => "Statistik", 'status_approval_rejected' => "Entwurf abgelehnt", 'status_approved' => "freigegeben", @@ -860,6 +862,7 @@ $text = array( 'user_management' => "Benutzerverwaltung", 'user_name' => "Vollst. Name", 'users' => "Benutzer", +'users_and_groups' => "Benutzer/Gruppen", 'user' => "Benutzer", 'version_deleted_email' => "Version gelöscht", 'version_deleted_email_subject' => "[sitename]: [name] - Version gelöscht", diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 78266cf7e..0cf232862 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -85,6 +85,7 @@ $text = array( 'assign_reviewers' => "Assign Reviewers", 'assign_user_property_to' => "Assign user's properties to", 'assumed_released' => "Assumed released", +'at_least_n_users_of_group' => "At least [number_of_users] users of [group]", 'attr_no_regex_match' => "The attribute value does not match the regular expression", 'attrdef_management' => "Attribute definition management", 'attrdef_exists' => "Attribute definition already exists", @@ -814,6 +815,7 @@ $text = array( 'splash_settings_saved' => "Settings saved", 'splash_substituted_user' => "Substituted user", 'splash_switched_back_user' => "Switched back to original user", +'state_and_next_state' => "State/Next state", 'statistic' => "Statistic", 'status_approval_rejected' => "Draft rejected", 'status_approved' => "Approved", @@ -884,6 +886,7 @@ $text = array( 'user_management' => "Users management", 'user_name' => "Full name", 'users' => "Users", +'users_and_groups' => "Users/Groups", 'user' => "User", 'version_deleted_email' => "Version deleted", 'version_deleted_email_subject' => "[sitename]: [name] - Version deleted", diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index b1d5f5ddb..c8281653e 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -623,7 +623,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { } echo ""; echo ""; - echo "Users:"; + echo "".getMLText('users').":"; foreach($transitions as $transition) { $transusers = $transition->getUsers(); echo ""; @@ -639,13 +639,15 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { } echo ""; echo ""; - echo "Groups:"; + echo "".getMLText('groups').":"; foreach($transitions as $transition) { $transgroups = $transition->getGroups(); echo ""; foreach($transgroups as $transgroup) { $g = $transgroup->getGroup(); - echo "At least ".$transgroup->getNumOfUsers()." users of ".$g->getName(); + echo getMLText('at_least_n_users_of_group', + array("number_of_users" => $transgroup->getNumOfUsers(), + "group" => $g->getName())); if ($document->getGroupAccessMode($g) < M_READ) { echo " (no access)"; } diff --git a/views/bootstrap/class.WorkflowMgr.php b/views/bootstrap/class.WorkflowMgr.php index 8c199f61a..41d8828da 100644 --- a/views/bootstrap/class.WorkflowMgr.php +++ b/views/bootstrap/class.WorkflowMgr.php @@ -235,7 +235,7 @@ function showWorkflow(selectObj) { if($actions) { $transitions = $currWorkflow->getTransitions(); echo ""; - echo ""; + echo ""; if($transitions) { foreach($transitions as $transition) { $state = $transition->getState(); @@ -258,12 +258,14 @@ function showWorkflow(selectObj) { echo "";
State/Next stateAction".getMLText('user')."/".getMLText('group')."
".getMLText('state_and_next_state')."".getMLText('action')."".getMLText('users_and_groups')."
"; foreach($transusers as $transuser) { $u = $transuser->getUser(); - echo "User ".$u->getFullName(); + echo getMLText('user').": ".$u->getFullName(); echo "
"; } foreach($transgroups as $transgroup) { $g = $transgroup->getGroup(); - echo "At least ".$transgroup->getNumOfUsers()." users of ".$g->getName(); + echo getMLText('at_least_n_users_of_group', + array("number_of_users" => $transgroup->getNumOfUsers(), + "group" => $g->getName())); echo "
"; } echo "