Work in progress renaming things.

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index f3d92dc..5830277 100644 (file)
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -389,9 +389,9 @@ $i18n_key_words = array(
 'form.profile.mode_projects' => 'projects',
 'form.profile.mode_projects_and_tasks' => 'projects and tasks',
 'form.profile.record_type' => 'Record type',
-'form.profile.uncompleted_entries' => 'Uncompleted indicators',
-'form.profile.entries_none' => 'do not show',
-'form.profile.entries_users_page' => 'show',
+'form.profile.uncompleted_indicators' => 'Uncompleted indicators',
+'form.profile.uncompleted_indicators_none' => 'do not show',
+'form.profile.uncompleted_indicators_show' => 'show',
 'form.profile.type_all' => 'all',
 'form.profile.type_start_finish' => 'start and finish',
 'form.profile.type_duration' => 'duration',

diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 7c1ca4a..9f14136 100644 (file)
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -389,9 +389,9 @@ $i18n_key_words = array(
 'form.profile.mode_projects_and_tasks' => 'Projekt och arbetsuppgifter',
 'form.profile.record_type' => 'Typ av tidsregistrering',
 // TODO: improve translation (English strings changed).
-//'form.profile.uncompleted_entries' => 'Oavslutade tidsregistreringar',
-//'form.profile.entries_none' => 'Visa inte',
-//'form.profile.entries_users_page' => 'Visa på sidan Användare',
+//'form.profile.uncompleted_indicators' => 'Oavslutade tidsregistreringar',
+//'form.profile.uncompleted_indicators_none' => 'Visa inte',
+//'form.profile.uncompleted_indicators_show' => 'Visa på sidan Användare',
 'form.profile.type_all' => 'Alla',
 'form.profile.type_start_finish' => 'Starttid och sluttid',
 'form.profile.type_duration' => 'Varaktighet',

diff --git a/WEB-INF/templates/profile_edit.tpl b/WEB-INF/templates/profile_edit.tpl
index d13e087..7f8cd28 100644 (file)
--- a/WEB-INF/templates/profile_edit.tpl
+++ b/WEB-INF/templates/profile_edit.tpl
@@ -140,7 +140,7 @@ function handlePluginCheckboxes() {
             <td>{$forms.profileForm.record_type.control}</td>
           </tr>
           <tr>
-            <td align="right" nowrap>{$i18n.form.profile.uncompleted_entries}:</td>
+            <td align="right" nowrap>{$i18n.form.profile.uncompleted_indicators}:</td>
             <td>{$forms.profileForm.uncompleted_entries.control}</td>
           </tr>
 

diff --git a/mobile/users.php b/mobile/users.php
index 0218458..0023154 100644 (file)
--- a/mobile/users.php
+++ b/mobile/users.php
@@ -44,7 +44,7 @@ if($user->canManageTeam()) {
   $inactive_users = ttTeamHelper::getInactiveUsers($user->team_id, true);
 }
 
-// Check if the user wants to show uncompleted time entries.
+// Check if the team is set to show indicators for uncompleted time entries.
 if (UNCOMPLETED_INDICATORS == $user->uncompleted_entries) {
   // Check each active user if they have an uncompleted time entry.
   foreach ($active_users as $key => $user) {

diff --git a/profile_edit.php b/profile_edit.php
index f49e70a..09e9110 100644 (file)
--- a/profile_edit.php
+++ b/profile_edit.php
@@ -172,8 +172,8 @@ if ($user->canManageTeam()) {
 
   // Prepare uncompleted entries choices.
   $uncompleted_entries_options = array();
-  $uncompleted_entries_options[UNCOMPLETED_INDICATORS_NONE] = $i18n->getKey('form.profile.entries_none');
-  $uncompleted_entries_options[UNCOMPLETED_INDICATORS] = $i18n->getKey('form.profile.entries_users_page');
+  $uncompleted_entries_options[UNCOMPLETED_INDICATORS_NONE] = $i18n->getKey('form.profile.uncompleted_indicators_none');
+  $uncompleted_entries_options[UNCOMPLETED_INDICATORS] = $i18n->getKey('form.profile.uncompleted_indicators_show');
   $form->addInput(array('type'=>'combobox','name'=>'uncompleted_entries','style'=>'width: 150px;','data'=>$uncompleted_entries_options,'value'=>$cl_uncompleted_entries));
 
   $form->addInput(array('type'=>'checkbox','name'=>'charts','data'=>1,'value'=>$cl_charts));

diff --git a/users.php b/users.php
index b1fe52a..ce29132 100644 (file)
--- a/users.php
+++ b/users.php
@@ -44,7 +44,7 @@ if($user->canManageTeam()) {
   $inactive_users = ttTeamHelper::getInactiveUsers($user->team_id, true);
 }
 
-// Check if the user wants to show uncompleted time entries.
+// Check if the team is set to show indicators for uncompleted time entries.
 if (UNCOMPLETED_INDICATORS == $user->uncompleted_entries) {
   // Check each active user if they have an uncompleted time entry.
   foreach ($active_users as $key => $user) {