Some more work in progress on roles.

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index e306ced8722f2755bcb5c67f5d1d752030e1c2e5..3af484c8e83c61ddc3862e156103cb1fea186d14 100644 (file)
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -269,7 +269,7 @@ class ttTeamHelper {
     $result = array();
     $mdb2 = getConnection();
 
-    $sql = "select id, name, description from tt_roles where team_id = $team_id and status = 1 order by upper(name)";
+    $sql = "select id, name, description from tt_roles where team_id = $team_id and status = 1 order by rank";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -287,7 +287,7 @@ class ttTeamHelper {
     $mdb2 = getConnection();
 
     $sql = "select id, name, description from tt_roles
-      where team_id = $team_id and status = 0 order by upper(name)";
+      where team_id = $team_id and status = 0 order by rank";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 37907c4d4ffc96aa8a7e8b73f7b2d2b86b853d0b..815eff7c703029dd91657aba72661edcbe1c3766 100644 (file)
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -52,7 +52,6 @@ class ttUser {
   var $uncompleted_indicators = 0; // Uncompleted time entry indicators (show nowhere or on users page).
   var $bcc_email = null;        // Bcc email.
   var $currency = null;         // Currency.
-  var $roles = 1;               // Whether we use configurable roles.
   var $plugins = null;          // Comma-separated list of enabled plugins.
   var $config = null;           // Comma-separated list of miscellaneous config options.
   var $team = null;             // Team name.
@@ -117,7 +116,6 @@ class ttUser {
       $config_array = explode(',', $this->config);
 
       // Set user config options.
-      $this->roles = in_array('roles', $config_array);
       $this->show_holidays = in_array('show_holidays', $config_array);
       $this->punch_mode = in_array('punch_mode', $config_array);
       $this->allow_overlap = in_array('allow_overlap', $config_array);

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 3985d288a6610ef585897f66404cefe58e13e1db..6486845f43753f86166f869449cef29f91867b19 100644 (file)
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -511,24 +511,24 @@ $i18n_key_words = array(
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
-// 'role.user.label.low_case' => 'user',
+// 'role.user.low_case_label' => 'user',
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
-// 'role.client.label.low_case' => 'client',
+// 'role.client.low_case_label' => 'client',
 // 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
 // 'role.supervisor.label' => 'Supervisor',
-// 'role.supervisor.label.low_case' => 'supervisor',
+// 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
 // 'role.comanager.label' => 'Co-manager',
-// 'role.comanager.label.low_case' => 'co-manager',
+// 'role.comanager.low_case_label' => 'co-manager',
 // 'role.comanager.description' => 'A person with a big set of management functions.',
 // 'role.manager.label' => 'Manager',
-// 'role.manager.label.low_case' => 'manager',
+// 'role.manager.low_case_label' => 'manager',
 // 'role.manager.description' => 'Group manager. Can do most of things for a group.',
 // 'role.top_manager.label' => 'Top manager',
-// 'role.top_manager.label.low_case' => 'top manager',
+// 'role.top_manager.low_case_label' => 'top manager',
 // 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
 // 'role.admin.label' => 'Administrator',
-// 'role.admin.label.low_case' => 'administrator',
+// 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
 );

diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index adee949d46741195e75c9a6616df47a334d8357a..fbe11d688cb320ad01bb20d346b2c540c7cf642d 100644 (file)
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -526,24 +526,24 @@ $i18n_key_words = array(
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
-// 'role.user.label.low_case' => 'user',
+// 'role.user.low_case_label' => 'user',
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
-// 'role.client.label.low_case' => 'client',
+// 'role.client.low_case_label' => 'client',
 // 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
 // 'role.supervisor.label' => 'Supervisor',
-// 'role.supervisor.label.low_case' => 'supervisor',
+// 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
 // 'role.comanager.label' => 'Co-manager',
-// 'role.comanager.label.low_case' => 'co-manager',
+// 'role.comanager.low_case_label' => 'co-manager',
 // 'role.comanager.description' => 'A person with a big set of management functions.',
 // 'role.manager.label' => 'Manager',
-// 'role.manager.label.low_case' => 'manager',
+// 'role.manager.low_case_label' => 'manager',
 // 'role.manager.description' => 'Group manager. Can do most of things for a group.',
 // 'role.top_manager.label' => 'Top manager',
-// 'role.top_manager.label.low_case' => 'top manager',
+// 'role.top_manager.low_case_label' => 'top manager',
 // 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
 // 'role.admin.label' => 'Administrator',
-// 'role.admin.label.low_case' => 'administrator',
+// 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
 );

diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 7124c6a6a824526607898a8092a6b095972527bd..d997da672d2d4df7fb69fdec122ee7f48dcde262 100644 (file)
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -459,25 +459,25 @@ $i18n_key_words = array(
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
-// 'role.user.label.low_case' => 'user',
+// 'role.user.low_case_label' => 'user',
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
-// 'role.client.label.low_case' => 'client',
+// 'role.client.low_case_label' => 'client',
 // 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
 // 'role.supervisor.label' => 'Supervisor',
-// 'role.supervisor.label.low_case' => 'supervisor',
+// 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
 // 'role.comanager.label' => 'Co-manager',
-// 'role.comanager.label.low_case' => 'co-manager',
+// 'role.comanager.low_case_label' => 'co-manager',
 // 'role.comanager.description' => 'A person with a big set of management functions.',
 // 'role.manager.label' => 'Manager',
-// 'role.manager.label.low_case' => 'manager',
+// 'role.manager.low_case_label' => 'manager',
 // 'role.manager.description' => 'Group manager. Can do most of things for a group.',
 // 'role.top_manager.label' => 'Top manager',
-// 'role.top_manager.label.low_case' => 'top manager',
+// 'role.top_manager.low_case_label' => 'top manager',
 // 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
 // 'role.admin.label' => 'Administrator',
-// 'role.admin.label.low_case' => 'administrator',
+// 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
 );
 

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 41700b3f0f163de11eb6285da9beeb52a2fa0dc4..9ab421be423914abf04a200cef8597eab3029c82 100644 (file)
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -458,24 +458,24 @@ $i18n_key_words = array(
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
-// 'role.user.label.low_case' => 'user',
+// 'role.user.low_case_label' => 'user',
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
-// 'role.client.label.low_case' => 'client',
+// 'role.client.low_case_label' => 'client',
 // 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
 // 'role.supervisor.label' => 'Supervisor',
-// 'role.supervisor.label.low_case' => 'supervisor',
+// 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
 // 'role.comanager.label' => 'Co-manager',
-// 'role.comanager.label.low_case' => 'co-manager',
+// 'role.comanager.low_case_label' => 'co-manager',
 // 'role.comanager.description' => 'A person with a big set of management functions.',
 // 'role.manager.label' => 'Manager',
-// 'role.manager.label.low_case' => 'manager',
+// 'role.manager.low_case_label' => 'manager',
 // 'role.manager.description' => 'Group manager. Can do most of things for a group.',
 // 'role.top_manager.label' => 'Top manager',
-// 'role.top_manager.label.low_case' => 'top manager',
+// 'role.top_manager.low_case_label' => 'top manager',
 // 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
 // 'role.admin.label' => 'Administrator',
-// 'role.admin.label.low_case' => 'administrator',
+// 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
 );

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 0043121559a70c35d49c91c2defd0552c390089c..f5a1be1dd9c6a549bb71ca016cbdbe98c3917638 100644 (file)
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -449,24 +449,24 @@ $i18n_key_words = array(
 
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 'role.user.label' => 'User',
-'role.user.label.low_case' => 'user',
+'role.user.low_case_label' => 'user',
 'role.user.description' => 'A regular member without management rights.',
 'role.client.label' => 'Client',
-'role.client.label.low_case' => 'client',
+'role.client.low_case_label' => 'client',
 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
 'role.supervisor.label' => 'Supervisor',
-'role.supervisor.label.low_case' => 'supervisor',
+'role.supervisor.low_case_label' => 'supervisor',
 'role.supervisor.description' => 'A person with a small set of management rights.',
 'role.comanager.label' => 'Co-manager',
-'role.comanager.label.low_case' => 'co-manager',
+'role.comanager.low_case_label' => 'co-manager',
 'role.comanager.description' => 'A person with a big set of management functions.',
 'role.manager.label' => 'Manager',
-'role.manager.label.low_case' => 'manager',
+'role.manager.low_case_label' => 'manager',
 'role.manager.description' => 'Group manager. Can do most of things for a group.',
 'role.top_manager.label' => 'Top manager',
-'role.top_manager.label.low_case' => 'top manager',
+'role.top_manager.low_case_label' => 'top manager',
 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
 'role.admin.label' => 'Administrator',
-'role.admin.label.low_case' => 'administrator',
+'role.admin.low_case_label' => 'administrator',
 'role.admin.description' => 'Site adminsitrator.',
 );

diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 3ab5c755e61490025ac8b3dc2506103494e1c69d..5ab1ca4fffb31f6d459ed9d4febf1de8cab83da9 100644 (file)
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -524,24 +524,24 @@ $i18n_key_words = array(
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
-// 'role.user.label.low_case' => 'user',
+// 'role.user.low_case_label' => 'user',
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
-// 'role.client.label.low_case' => 'client',
+// 'role.client.low_case_label' => 'client',
 // 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
 // 'role.supervisor.label' => 'Supervisor',
-// 'role.supervisor.label.low_case' => 'supervisor',
+// 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
 // 'role.comanager.label' => 'Co-manager',
-// 'role.comanager.label.low_case' => 'co-manager',
+// 'role.comanager.low_case_label' => 'co-manager',
 // 'role.comanager.description' => 'A person with a big set of management functions.',
 // 'role.manager.label' => 'Manager',
-// 'role.manager.label.low_case' => 'manager',
+// 'role.manager.low_case_label' => 'manager',
 // 'role.manager.description' => 'Group manager. Can do most of things for a group.',
 // 'role.top_manager.label' => 'Top manager',
-// 'role.top_manager.label.low_case' => 'top manager',
+// 'role.top_manager.low_case_label' => 'top manager',
 // 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
 // 'role.admin.label' => 'Administrator',
-// 'role.admin.label.low_case' => 'administrator',
+// 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
 );

diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index d814b143e35b49492a4199b358306c79f34b9851..5d0479e14c9564c835295c1ca180af74fef3c1c1 100644 (file)
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -522,24 +522,24 @@ $i18n_key_words = array(
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
-// 'role.user.label.low_case' => 'user',
+// 'role.user.low_case_label' => 'user',
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
-// 'role.client.label.low_case' => 'client',
+// 'role.client.low_case_label' => 'client',
 // 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
 // 'role.supervisor.label' => 'Supervisor',
-// 'role.supervisor.label.low_case' => 'supervisor',
+// 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
 // 'role.comanager.label' => 'Co-manager',
-// 'role.comanager.label.low_case' => 'co-manager',
+// 'role.comanager.low_case_label' => 'co-manager',
 // 'role.comanager.description' => 'A person with a big set of management functions.',
 // 'role.manager.label' => 'Manager',
-// 'role.manager.label.low_case' => 'manager',
+// 'role.manager.low_case_label' => 'manager',
 // 'role.manager.description' => 'Group manager. Can do most of things for a group.',
 // 'role.top_manager.label' => 'Top manager',
-// 'role.top_manager.label.low_case' => 'top manager',
+// 'role.top_manager.low_case_label' => 'top manager',
 // 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
 // 'role.admin.label' => 'Administrator',
-// 'role.admin.label.low_case' => 'administrator',
+// 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
 );

diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index e99666e848742b34c5e32a1bc81a788b8e05b027..193d74d7e918e55099bea47f171b58541da29dce 100644 (file)
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -490,24 +490,24 @@ $i18n_key_words = array(
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
-// 'role.user.label.low_case' => 'user',
+// 'role.user.low_case_label' => 'user',
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
-// 'role.client.label.low_case' => 'client',
+// 'role.client.low_case_label' => 'client',
 // 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
 // 'role.supervisor.label' => 'Supervisor',
-// 'role.supervisor.label.low_case' => 'supervisor',
+// 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
 // 'role.comanager.label' => 'Co-manager',
-// 'role.comanager.label.low_case' => 'co-manager',
+// 'role.comanager.low_case_label' => 'co-manager',
 // 'role.comanager.description' => 'A person with a big set of management functions.',
 // 'role.manager.label' => 'Manager',
-// 'role.manager.label.low_case' => 'manager',
+// 'role.manager.low_case_label' => 'manager',
 // 'role.manager.description' => 'Group manager. Can do most of things for a group.',
 // 'role.top_manager.label' => 'Top manager',
-// 'role.top_manager.label.low_case' => 'top manager',
+// 'role.top_manager.low_case_label' => 'top manager',
 // 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
 // 'role.admin.label' => 'Administrator',
-// 'role.admin.label.low_case' => 'administrator',
+// 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
 );

diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index b765422ea785e640cb6bc1ffb873fdbb74b91c44..776da59c8d9a84f342bc959f3847175d57797e00 100644 (file)
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -467,24 +467,24 @@ $i18n_key_words = array(
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
-// 'role.user.label.low_case' => 'user',
+// 'role.user.low_case_label' => 'user',
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
-// 'role.client.label.low_case' => 'client',
+// 'role.client.low_case_label' => 'client',
 // 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
 // 'role.supervisor.label' => 'Supervisor',
-// 'role.supervisor.label.low_case' => 'supervisor',
+// 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
 // 'role.comanager.label' => 'Co-manager',
-// 'role.comanager.label.low_case' => 'co-manager',
+// 'role.comanager.low_case_label' => 'co-manager',
 // 'role.comanager.description' => 'A person with a big set of management functions.',
 // 'role.manager.label' => 'Manager',
-// 'role.manager.label.low_case' => 'manager',
+// 'role.manager.low_case_label' => 'manager',
 // 'role.manager.description' => 'Group manager. Can do most of things for a group.',
 // 'role.top_manager.label' => 'Top manager',
-// 'role.top_manager.label.low_case' => 'top manager',
+// 'role.top_manager.low_case_label' => 'top manager',
 // 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
 // 'role.admin.label' => 'Administrator',
-// 'role.admin.label.low_case' => 'administrator',
+// 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
 );

diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 9044398c76a98359f8692c9080a642903bc17452..a127c51961e7e8e76b58d3fa484f3f72b0ddb131 100644 (file)
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -456,24 +456,24 @@ $i18n_key_words = array(
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
-// 'role.user.label.low_case' => 'user',
+// 'role.user.low_case_label' => 'user',
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
-// 'role.client.label.low_case' => 'client',
+// 'role.client.low_case_label' => 'client',
 // 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
 // 'role.supervisor.label' => 'Supervisor',
-// 'role.supervisor.label.low_case' => 'supervisor',
+// 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
 // 'role.comanager.label' => 'Co-manager',
-// 'role.comanager.label.low_case' => 'co-manager',
+// 'role.comanager.low_case_label' => 'co-manager',
 // 'role.comanager.description' => 'A person with a big set of management functions.',
 // 'role.manager.label' => 'Manager',
-// 'role.manager.label.low_case' => 'manager',
+// 'role.manager.low_case_label' => 'manager',
 // 'role.manager.description' => 'Group manager. Can do most of things for a group.',
 // 'role.top_manager.label' => 'Top manager',
-// 'role.top_manager.label.low_case' => 'top manager',
+// 'role.top_manager.low_case_label' => 'top manager',
 // 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
 // 'role.admin.label' => 'Administrator',
-// 'role.admin.label.low_case' => 'administrator',
+// 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
 );

diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index faf34c4da03407a9e0da239f60ac2be784fcb91b..1835f96858175d2637e1306c9df1816b0eb3a45d 100644 (file)
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -494,24 +494,24 @@ $i18n_key_words = array(
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
-// 'role.user.label.low_case' => 'user',
+// 'role.user.low_case_label' => 'user',
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
-// 'role.client.label.low_case' => 'client',
+// 'role.client.low_case_label' => 'client',
 // 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
 // 'role.supervisor.label' => 'Supervisor',
-// 'role.supervisor.label.low_case' => 'supervisor',
+// 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
 // 'role.comanager.label' => 'Co-manager',
-// 'role.comanager.label.low_case' => 'co-manager',
+// 'role.comanager.low_case_label' => 'co-manager',
 // 'role.comanager.description' => 'A person with a big set of management functions.',
 // 'role.manager.label' => 'Manager',
-// 'role.manager.label.low_case' => 'manager',
+// 'role.manager.low_case_label' => 'manager',
 // 'role.manager.description' => 'Group manager. Can do most of things for a group.',
 // 'role.top_manager.label' => 'Top manager',
-// 'role.top_manager.label.low_case' => 'top manager',
+// 'role.top_manager.low_case_label' => 'top manager',
 // 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
 // 'role.admin.label' => 'Administrator',
-// 'role.admin.label.low_case' => 'administrator',
+// 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
 );

diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 3cbe5f11c9a7fa74921bce850f26cd91d5396c65..8070e59e121a59eee74462a3af462aec6ee74a23 100644 (file)
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -518,24 +518,24 @@ $i18n_key_words = array(
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
-// 'role.user.label.low_case' => 'user',
+// 'role.user.low_case_label' => 'user',
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
-// 'role.client.label.low_case' => 'client',
+// 'role.client.low_case_label' => 'client',
 // 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
 // 'role.supervisor.label' => 'Supervisor',
-// 'role.supervisor.label.low_case' => 'supervisor',
+// 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
 // 'role.comanager.label' => 'Co-manager',
-// 'role.comanager.label.low_case' => 'co-manager',
+// 'role.comanager.low_case_label' => 'co-manager',
 // 'role.comanager.description' => 'A person with a big set of management functions.',
 // 'role.manager.label' => 'Manager',
-// 'role.manager.label.low_case' => 'manager',
+// 'role.manager.low_case_label' => 'manager',
 // 'role.manager.description' => 'Group manager. Can do most of things for a group.',
 // 'role.top_manager.label' => 'Top manager',
-// 'role.top_manager.label.low_case' => 'top manager',
+// 'role.top_manager.low_case_label' => 'top manager',
 // 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
 // 'role.admin.label' => 'Administrator',
-// 'role.admin.label.low_case' => 'administrator',
+// 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
 );

diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 50561b5dc3835593b531166283d1856760946151..e524e14abedf3cf46224d995ca205dbc73d61081 100644 (file)
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -458,24 +458,24 @@ $i18n_key_words = array(
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
-// 'role.user.label.low_case' => 'user',
+// 'role.user.low_case_label' => 'user',
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
-// 'role.client.label.low_case' => 'client',
+// 'role.client.low_case_label' => 'client',
 // 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
 // 'role.supervisor.label' => 'Supervisor',
-// 'role.supervisor.label.low_case' => 'supervisor',
+// 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
 // 'role.comanager.label' => 'Co-manager',
-// 'role.comanager.label.low_case' => 'co-manager',
+// 'role.comanager.low_case_label' => 'co-manager',
 // 'role.comanager.description' => 'A person with a big set of management functions.',
 // 'role.manager.label' => 'Manager',
-// 'role.manager.label.low_case' => 'manager',
+// 'role.manager.low_case_label' => 'manager',
 // 'role.manager.description' => 'Group manager. Can do most of things for a group.',
 // 'role.top_manager.label' => 'Top manager',
-// 'role.top_manager.label.low_case' => 'top manager',
+// 'role.top_manager.low_case_label' => 'top manager',
 // 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
 // 'role.admin.label' => 'Administrator',
-// 'role.admin.label.low_case' => 'administrator',
+// 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
 );

diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index b0aa25574e6eb71247c7be13c3adda0cf6a630e5..ee0a958e3f89bd49e34764a4d9aba07775ca4be7 100644 (file)
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -512,24 +512,24 @@ $i18n_key_words = array(
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
-// 'role.user.label.low_case' => 'user',
+// 'role.user.low_case_label' => 'user',
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
-// 'role.client.label.low_case' => 'client',
+// 'role.client.low_case_label' => 'client',
 // 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
 // 'role.supervisor.label' => 'Supervisor',
-// 'role.supervisor.label.low_case' => 'supervisor',
+// 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
 // 'role.comanager.label' => 'Co-manager',
-// 'role.comanager.label.low_case' => 'co-manager',
+// 'role.comanager.low_case_label' => 'co-manager',
 // 'role.comanager.description' => 'A person with a big set of management functions.',
 // 'role.manager.label' => 'Manager',
-// 'role.manager.label.low_case' => 'manager',
+// 'role.manager.low_case_label' => 'manager',
 // 'role.manager.description' => 'Group manager. Can do most of things for a group.',
 // 'role.top_manager.label' => 'Top manager',
-// 'role.top_manager.label.low_case' => 'top manager',
+// 'role.top_manager.low_case_label' => 'top manager',
 // 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
 // 'role.admin.label' => 'Administrator',
-// 'role.admin.label.low_case' => 'administrator',
+// 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
 );

diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index c168bd7085f8130324a0d58a9c46638ba37f0427..f2cf55843a9b337f6770dc0e4757bd92552bdb88 100644 (file)
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -514,24 +514,24 @@ $i18n_key_words = array(
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
-// 'role.user.label.low_case' => 'user',
+// 'role.user.low_case_label' => 'user',
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
-// 'role.client.label.low_case' => 'client',
+// 'role.client.low_case_label' => 'client',
 // 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
 // 'role.supervisor.label' => 'Supervisor',
-// 'role.supervisor.label.low_case' => 'supervisor',
+// 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
 // 'role.comanager.label' => 'Co-manager',
-// 'role.comanager.label.low_case' => 'co-manager',
+// 'role.comanager.low_case_label' => 'co-manager',
 // 'role.comanager.description' => 'A person with a big set of management functions.',
 // 'role.manager.label' => 'Manager',
-// 'role.manager.label.low_case' => 'manager',
+// 'role.manager.low_case_label' => 'manager',
 // 'role.manager.description' => 'Group manager. Can do most of things for a group.',
 // 'role.top_manager.label' => 'Top manager',
-// 'role.top_manager.label.low_case' => 'top manager',
+// 'role.top_manager.low_case_label' => 'top manager',
 // 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
 // 'role.admin.label' => 'Administrator',
-// 'role.admin.label.low_case' => 'administrator',
+// 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
 );

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 42325a100da34aa9d549c122b8cc66dcfe6ec4b0..89c06c0e820549c537db29c25bb5ce9be12d81a5 100644 (file)
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -455,24 +455,24 @@ $i18n_key_words = array(
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
-// 'role.user.label.low_case' => 'user',
+// 'role.user.low_case_label' => 'user',
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
-// 'role.client.label.low_case' => 'client',
+// 'role.client.low_case_label' => 'client',
 // 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
 // 'role.supervisor.label' => 'Supervisor',
-// 'role.supervisor.label.low_case' => 'supervisor',
+// 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
 // 'role.comanager.label' => 'Co-manager',
-// 'role.comanager.label.low_case' => 'co-manager',
+// 'role.comanager.low_case_label' => 'co-manager',
 // 'role.comanager.description' => 'A person with a big set of management functions.',
 // 'role.manager.label' => 'Manager',
-// 'role.manager.label.low_case' => 'manager',
+// 'role.manager.low_case_label' => 'manager',
 // 'role.manager.description' => 'Group manager. Can do most of things for a group.',
 // 'role.top_manager.label' => 'Top manager',
-// 'role.top_manager.label.low_case' => 'top manager',
+// 'role.top_manager.low_case_label' => 'top manager',
 // 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
 // 'role.admin.label' => 'Administrator',
-// 'role.admin.label.low_case' => 'administrator',
+// 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
 );

diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 98d0f5c66b8b9c41cbf4639d5cb327ac5ec153bc..baaa0f0949a1d5b91d035217efb140fd4350a992 100644 (file)
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -509,24 +509,24 @@ $i18n_key_words = array(
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
-// 'role.user.label.low_case' => 'user',
+// 'role.user.low_case_label' => 'user',
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
-// 'role.client.label.low_case' => 'client',
+// 'role.client.low_case_label' => 'client',
 // 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
 // 'role.supervisor.label' => 'Supervisor',
-// 'role.supervisor.label.low_case' => 'supervisor',
+// 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
 // 'role.comanager.label' => 'Co-manager',
-// 'role.comanager.label.low_case' => 'co-manager',
+// 'role.comanager.low_case_label' => 'co-manager',
 // 'role.comanager.description' => 'A person with a big set of management functions.',
 // 'role.manager.label' => 'Manager',
-// 'role.manager.label.low_case' => 'manager',
+// 'role.manager.low_case_label' => 'manager',
 // 'role.manager.description' => 'Group manager. Can do most of things for a group.',
 // 'role.top_manager.label' => 'Top manager',
-// 'role.top_manager.label.low_case' => 'top manager',
+// 'role.top_manager.low_case_label' => 'top manager',
 // 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
 // 'role.admin.label' => 'Administrator',
-// 'role.admin.label.low_case' => 'administrator',
+// 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
 );

diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 859d33f9bcf489646fafba4e24c401ff68bb5c77..3eb14de184d3d20ad92761df673ade6e1e3b3ec7 100644 (file)
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -470,24 +470,24 @@ $i18n_key_words = array(
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
-// 'role.user.label.low_case' => 'user',
+// 'role.user.low_case_label' => 'user',
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
-// 'role.client.label.low_case' => 'client',
+// 'role.client.low_case_label' => 'client',
 // 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
 // 'role.supervisor.label' => 'Supervisor',
-// 'role.supervisor.label.low_case' => 'supervisor',
+// 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
 // 'role.comanager.label' => 'Co-manager',
-// 'role.comanager.label.low_case' => 'co-manager',
+// 'role.comanager.low_case_label' => 'co-manager',
 // 'role.comanager.description' => 'A person with a big set of management functions.',
 // 'role.manager.label' => 'Manager',
-// 'role.manager.label.low_case' => 'manager',
+// 'role.manager.low_case_label' => 'manager',
 // 'role.manager.description' => 'Group manager. Can do most of things for a group.',
 // 'role.top_manager.label' => 'Top manager',
-// 'role.top_manager.label.low_case' => 'top manager',
+// 'role.top_manager.low_case_label' => 'top manager',
 // 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
 // 'role.admin.label' => 'Administrator',
-// 'role.admin.label.low_case' => 'administrator',
+// 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
 );

diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index b8c217ed4356e78d5429660d7d810521de5c3c8a..cd5f41a53e6f565cfb2be8586d4e40eba807a5f7 100644 (file)
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -465,24 +465,24 @@ $i18n_key_words = array(
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
-// 'role.user.label.low_case' => 'user',
+// 'role.user.low_case_label' => 'user',
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
-// 'role.client.label.low_case' => 'client',
+// 'role.client.low_case_label' => 'client',
 // 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
 // 'role.supervisor.label' => 'Supervisor',
-// 'role.supervisor.label.low_case' => 'supervisor',
+// 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
 // 'role.comanager.label' => 'Co-manager',
-// 'role.comanager.label.low_case' => 'co-manager',
+// 'role.comanager.low_case_label' => 'co-manager',
 // 'role.comanager.description' => 'A person with a big set of management functions.',
 // 'role.manager.label' => 'Manager',
-// 'role.manager.label.low_case' => 'manager',
+// 'role.manager.low_case_label' => 'manager',
 // 'role.manager.description' => 'Group manager. Can do most of things for a group.',
 // 'role.top_manager.label' => 'Top manager',
-// 'role.top_manager.label.low_case' => 'top manager',
+// 'role.top_manager.low_case_label' => 'top manager',
 // 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
 // 'role.admin.label' => 'Administrator',
-// 'role.admin.label.low_case' => 'administrator',
+// 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
 );

diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index a7eaf8d5f036fda62d7b4feb3aa994afee9a77b1..96601719882423cca31ef465f72246e5f900ae18 100644 (file)
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -501,24 +501,24 @@ $i18n_key_words = array(
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
-// 'role.user.label.low_case' => 'user',
+// 'role.user.low_case_label' => 'user',
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
-// 'role.client.label.low_case' => 'client',
+// 'role.client.low_case_label' => 'client',
 // 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
 // 'role.supervisor.label' => 'Supervisor',
-// 'role.supervisor.label.low_case' => 'supervisor',
+// 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
 // 'role.comanager.label' => 'Co-manager',
-// 'role.comanager.label.low_case' => 'co-manager',
+// 'role.comanager.low_case_label' => 'co-manager',
 // 'role.comanager.description' => 'A person with a big set of management functions.',
 // 'role.manager.label' => 'Manager',
-// 'role.manager.label.low_case' => 'manager',
+// 'role.manager.low_case_label' => 'manager',
 // 'role.manager.description' => 'Group manager. Can do most of things for a group.',
 // 'role.top_manager.label' => 'Top manager',
-// 'role.top_manager.label.low_case' => 'top manager',
+// 'role.top_manager.low_case_label' => 'top manager',
 // 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
 // 'role.admin.label' => 'Administrator',
-// 'role.admin.label.low_case' => 'administrator',
+// 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
 );

diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 5993a797bd59f79178275a4ebe86ecccb2955bee..e4f15bbaa1d9d362c7ff1ee969aa90a424e280b6 100644 (file)
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -519,24 +519,24 @@ $i18n_key_words = array(
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
-// 'role.user.label.low_case' => 'user',
+// 'role.user.low_case_label' => 'user',
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
-// 'role.client.label.low_case' => 'client',
+// 'role.client.low_case_label' => 'client',
 // 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
 // 'role.supervisor.label' => 'Supervisor',
-// 'role.supervisor.label.low_case' => 'supervisor',
+// 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
 // 'role.comanager.label' => 'Co-manager',
-// 'role.comanager.label.low_case' => 'co-manager',
+// 'role.comanager.low_case_label' => 'co-manager',
 // 'role.comanager.description' => 'A person with a big set of management functions.',
 // 'role.manager.label' => 'Manager',
-// 'role.manager.label.low_case' => 'manager',
+// 'role.manager.low_case_label' => 'manager',
 // 'role.manager.description' => 'Group manager. Can do most of things for a group.',
 // 'role.top_manager.label' => 'Top manager',
-// 'role.top_manager.label.low_case' => 'top manager',
+// 'role.top_manager.low_case_label' => 'top manager',
 // 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
 // 'role.admin.label' => 'Administrator',
-// 'role.admin.label.low_case' => 'administrator',
+// 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
 );

diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 62695710ddf2e6ac6098e661ab7a90d8b6b737cf..b14d9242d0e134e7046fe4e9fe3df865f5f2272d 100644 (file)
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -448,24 +448,24 @@ $i18n_key_words = array(
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
-// 'role.user.label.low_case' => 'user',
+// 'role.user.low_case_label' => 'user',
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
-// 'role.client.label.low_case' => 'client',
+// 'role.client.low_case_label' => 'client',
 // 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
 // 'role.supervisor.label' => 'Supervisor',
-// 'role.supervisor.label.low_case' => 'supervisor',
+// 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
 // 'role.comanager.label' => 'Co-manager',
-// 'role.comanager.label.low_case' => 'co-manager',
+// 'role.comanager.low_case_label' => 'co-manager',
 // 'role.comanager.description' => 'A person with a big set of management functions.',
 // 'role.manager.label' => 'Manager',
-// 'role.manager.label.low_case' => 'manager',
+// 'role.manager.low_case_label' => 'manager',
 // 'role.manager.description' => 'Group manager. Can do most of things for a group.',
 // 'role.top_manager.label' => 'Top manager',
-// 'role.top_manager.label.low_case' => 'top manager',
+// 'role.top_manager.low_case_label' => 'top manager',
 // 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
 // 'role.admin.label' => 'Administrator',
-// 'role.admin.label.low_case' => 'administrator',
+// 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
 );

diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 3c6caed5988eff132be7852aea45da8c83313549..9c0159bdad689bfd661441677f9bf728ef736efe 100644 (file)
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -486,24 +486,24 @@ $i18n_key_words = array(
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
-// 'role.user.label.low_case' => 'user',
+// 'role.user.low_case_label' => 'user',
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
-// 'role.client.label.low_case' => 'client',
+// 'role.client.low_case_label' => 'client',
 // 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
 // 'role.supervisor.label' => 'Supervisor',
-// 'role.supervisor.label.low_case' => 'supervisor',
+// 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
 // 'role.comanager.label' => 'Co-manager',
-// 'role.comanager.label.low_case' => 'co-manager',
+// 'role.comanager.low_case_label' => 'co-manager',
 // 'role.comanager.description' => 'A person with a big set of management functions.',
 // 'role.manager.label' => 'Manager',
-// 'role.manager.label.low_case' => 'manager',
+// 'role.manager.low_case_label' => 'manager',
 // 'role.manager.description' => 'Group manager. Can do most of things for a group.',
 // 'role.top_manager.label' => 'Top manager',
-// 'role.top_manager.label.low_case' => 'top manager',
+// 'role.top_manager.low_case_label' => 'top manager',
 // 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
 // 'role.admin.label' => 'Administrator',
-// 'role.admin.label.low_case' => 'administrator',
+// 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
 );

diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index d093accccf18db671a0a42505f7f98d739197b55..89e212735755cf46357926a4049ffde0610e4c84 100644 (file)
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -497,24 +497,24 @@ $i18n_key_words = array(
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
-// 'role.user.label.low_case' => 'user',
+// 'role.user.low_case_label' => 'user',
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
-// 'role.client.label.low_case' => 'client',
+// 'role.client.low_case_label' => 'client',
 // 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
 // 'role.supervisor.label' => 'Supervisor',
-// 'role.supervisor.label.low_case' => 'supervisor',
+// 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
 // 'role.comanager.label' => 'Co-manager',
-// 'role.comanager.label.low_case' => 'co-manager',
+// 'role.comanager.low_case_label' => 'co-manager',
 // 'role.comanager.description' => 'A person with a big set of management functions.',
 // 'role.manager.label' => 'Manager',
-// 'role.manager.label.low_case' => 'manager',
+// 'role.manager.low_case_label' => 'manager',
 // 'role.manager.description' => 'Group manager. Can do most of things for a group.',
 // 'role.top_manager.label' => 'Top manager',
-// 'role.top_manager.label.low_case' => 'top manager',
+// 'role.top_manager.low_case_label' => 'top manager',
 // 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
 // 'role.admin.label' => 'Administrator',
-// 'role.admin.label.low_case' => 'administrator',
+// 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
 );

diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index ea4ea55d71b802cfbc509a52bf74952816e717f3..21de811f1871d3357f53a15cc1a47bd0b3d22e2f 100644 (file)
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -468,24 +468,24 @@ $i18n_key_words = array(
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
-// 'role.user.label.low_case' => 'user',
+// 'role.user.low_case_label' => 'user',
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
-// 'role.client.label.low_case' => 'client',
+// 'role.client.low_case_label' => 'client',
 // 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
 // 'role.supervisor.label' => 'Supervisor',
-// 'role.supervisor.label.low_case' => 'supervisor',
+// 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
 // 'role.comanager.label' => 'Co-manager',
-// 'role.comanager.label.low_case' => 'co-manager',
+// 'role.comanager.low_case_label' => 'co-manager',
 // 'role.comanager.description' => 'A person with a big set of management functions.',
 // 'role.manager.label' => 'Manager',
-// 'role.manager.label.low_case' => 'manager',
+// 'role.manager.low_case_label' => 'manager',
 // 'role.manager.description' => 'Group manager. Can do most of things for a group.',
 // 'role.top_manager.label' => 'Top manager',
-// 'role.top_manager.label.low_case' => 'top manager',
+// 'role.top_manager.low_case_label' => 'top manager',
 // 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
 // 'role.admin.label' => 'Administrator',
-// 'role.admin.label.low_case' => 'administrator',
+// 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
 );

diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index d9c02025492009485d14dbee7540ec1f734d98ef..69ebcc4cf5ea5a829ab5d855b1d1cda1e39ade1b 100644 (file)
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -464,24 +464,24 @@ $i18n_key_words = array(
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
-// 'role.user.label.low_case' => 'user',
+// 'role.user.low_case_label' => 'user',
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
-// 'role.client.label.low_case' => 'client',
+// 'role.client.low_case_label' => 'client',
 // 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
 // 'role.supervisor.label' => 'Supervisor',
-// 'role.supervisor.label.low_case' => 'supervisor',
+// 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
 // 'role.comanager.label' => 'Co-manager',
-// 'role.comanager.label.low_case' => 'co-manager',
+// 'role.comanager.low_case_label' => 'co-manager',
 // 'role.comanager.description' => 'A person with a big set of management functions.',
 // 'role.manager.label' => 'Manager',
-// 'role.manager.label.low_case' => 'manager',
+// 'role.manager.low_case_label' => 'manager',
 // 'role.manager.description' => 'Group manager. Can do most of things for a group.',
 // 'role.top_manager.label' => 'Top manager',
-// 'role.top_manager.label.low_case' => 'top manager',
+// 'role.top_manager.low_case_label' => 'top manager',
 // 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
 // 'role.admin.label' => 'Administrator',
-// 'role.admin.label.low_case' => 'administrator',
+// 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
 );

diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index f4e351f80f878fa1d4c190b00aea27dd59dd4317..ba909dac9f12633256a75efd5ad305cda63744b7 100644 (file)
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -530,24 +530,24 @@ $i18n_key_words = array(
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
-// 'role.user.label.low_case' => 'user',
+// 'role.user.low_case_label' => 'user',
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
-// 'role.client.label.low_case' => 'client',
+// 'role.client.low_case_label' => 'client',
 // 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
 // 'role.supervisor.label' => 'Supervisor',
-// 'role.supervisor.label.low_case' => 'supervisor',
+// 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
 // 'role.comanager.label' => 'Co-manager',
-// 'role.comanager.label.low_case' => 'co-manager',
+// 'role.comanager.low_case_label' => 'co-manager',
 // 'role.comanager.description' => 'A person with a big set of management functions.',
 // 'role.manager.label' => 'Manager',
-// 'role.manager.label.low_case' => 'manager',
+// 'role.manager.low_case_label' => 'manager',
 // 'role.manager.description' => 'Group manager. Can do most of things for a group.',
 // 'role.top_manager.label' => 'Top manager',
-// 'role.top_manager.label.low_case' => 'top manager',
+// 'role.top_manager.low_case_label' => 'top manager',
 // 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
 // 'role.admin.label' => 'Administrator',
-// 'role.admin.label.low_case' => 'administrator',
+// 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
 );

diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 73dda56df5f9271d9b977d2535f419ccebded1c6..f046bebeee0a60210d9151a67d606c0c27c7876a 100644 (file)
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -499,24 +499,24 @@ $i18n_key_words = array(
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
-// 'role.user.label.low_case' => 'user',
+// 'role.user.low_case_label' => 'user',
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
-// 'role.client.label.low_case' => 'client',
+// 'role.client.low_case_label' => 'client',
 // 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
 // 'role.supervisor.label' => 'Supervisor',
-// 'role.supervisor.label.low_case' => 'supervisor',
+// 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
 // 'role.comanager.label' => 'Co-manager',
-// 'role.comanager.label.low_case' => 'co-manager',
+// 'role.comanager.low_case_label' => 'co-manager',
 // 'role.comanager.description' => 'A person with a big set of management functions.',
 // 'role.manager.label' => 'Manager',
-// 'role.manager.label.low_case' => 'manager',
+// 'role.manager.low_case_label' => 'manager',
 // 'role.manager.description' => 'Group manager. Can do most of things for a group.',
 // 'role.top_manager.label' => 'Top manager',
-// 'role.top_manager.label.low_case' => 'top manager',
+// 'role.top_manager.low_case_label' => 'top manager',
 // 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
 // 'role.admin.label' => 'Administrator',
-// 'role.admin.label.low_case' => 'administrator',
+// 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
 );

diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 1d90b1c31949a28bc280227aaba5b335bda84e62..e6a8883a3dda9d9b312755e357371ca3c1373914 100644 (file)
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -509,24 +509,24 @@ $i18n_key_words = array(
 // Roles and rights. These strings are used in multiple places. Grouped here to provide consistent translations.
 // TODO: translate the following.
 // 'role.user.label' => 'User',
-// 'role.user.label.low_case' => 'user',
+// 'role.user.low_case_label' => 'user',
 // 'role.user.description' => 'A regular member without management rights.',
 // 'role.client.label' => 'Client',
-// 'role.client.label.low_case' => 'client',
+// 'role.client.low_case_label' => 'client',
 // 'role.client.description' => 'A client can view its own reports, charts, and invoices.',
 // 'role.supervisor.label' => 'Supervisor',
-// 'role.supervisor.label.low_case' => 'supervisor',
+// 'role.supervisor.low_case_label' => 'supervisor',
 // 'role.supervisor.description' => 'A person with a small set of management rights.',
 // 'role.comanager.label' => 'Co-manager',
-// 'role.comanager.label.low_case' => 'co-manager',
+// 'role.comanager.low_case_label' => 'co-manager',
 // 'role.comanager.description' => 'A person with a big set of management functions.',
 // 'role.manager.label' => 'Manager',
-// 'role.manager.label.low_case' => 'manager',
+// 'role.manager.low_case_label' => 'manager',
 // 'role.manager.description' => 'Group manager. Can do most of things for a group.',
 // 'role.top_manager.label' => 'Top manager',
-// 'role.top_manager.label.low_case' => 'top manager',
+// 'role.top_manager.low_case_label' => 'top manager',
 // 'role.top_manager.description' => 'Top group manager. Can do everything in a tree of groups.',
 // 'role.admin.label' => 'Administrator',
-// 'role.admin.label.low_case' => 'administrator',
+// 'role.admin.low_case_label' => 'administrator',
 // 'role.admin.description' => 'Site adminsitrator.',
 );

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b79de16706ce60a41c8a3b3b10fc589c44c225dc..351c189d715e82314af7e3dcec87dd361ad0aad4 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
-          <td align="center">&nbsp;Anuko Time Tracker 1.17.31.4020 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.31.4021 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/WEB-INF/templates/profile_edit.tpl b/WEB-INF/templates/profile_edit.tpl
index 5bb5080879f155ac3e6ab5f220d03e91f86c703e..955f7d5a028616db7f9f693eac57cf0b00ba0ac4 100644 (file)
--- a/WEB-INF/templates/profile_edit.tpl
+++ b/WEB-INF/templates/profile_edit.tpl
@@ -1,19 +1,4 @@
 <script>
-// handleRolesCheckbox - controls visibility of the Configure and What is it? links on the right.
-function handleRolesCheckbox() {
-  var rolesCheckbox = document.getElementById("roles");
-  var configureLabel = document.getElementById("roles_config");
-  var whatIsItLabel = document.getElementById("roles_what_is_it");
-  if (rolesCheckbox.checked) {
-    configureLabel.style.display = "inline";
-    whatIsItLabel.style.display = "none";
-  } else {
-    configureLabel.style.display = "none";
-    whatIsItLabel.style.display = "inline";
-  }
-}
-
-
 // handleTaskRequiredCheckbox - controls visibility of the Task Required checkbox.
 function handleTaskRequiredCheckbox() {
   var taskRequiredCheckbox = document.getElementById("task_required");
@@ -159,7 +144,7 @@ function handlePluginCheckboxes() {
   {if defined(DEBUG_ROLES)}
           <tr>
             <td align="right" nowrap>{$i18n.label.roles}:</td>
-            <td>{$forms.profileForm.roles.control} <span id="roles_config"><a href="roles.php">{$i18n.label.configure}</a></span> <span id="roles_what_is_it"><a href="https://www.anuko.com/lp/tt_19.htm" target="_blank">{$i18n.label.what_is_it}</a></span></td>
+            <td><a href="roles.php">{$i18n.label.configure}</a></td>
           </tr>
   {/if}
           <tr>

diff --git a/profile_edit.php b/profile_edit.php
index 7f024fe88b81a87a603775f45016f5671e1d3613..725d7a2eb698fbd1dcea742480ecf42e2e7d3b44 100644 (file)
--- a/profile_edit.php
+++ b/profile_edit.php
@@ -53,7 +53,6 @@ if ($request->isPost()) {
     $cl_team = trim($request->getParameter('team_name'));
     $cl_currency = trim($request->getParameter('currency'));
     if (!$cl_currency) $cl_currency = CURRENCY_DEFAULT;
-    $cl_roles = $request->getParameter('roles');
     $cl_lang = $request->getParameter('lang');
     $cl_decimal_mark = $request->getParameter('decimal_mark');
     $cl_date_format = $request->getParameter('date_format');
@@ -91,7 +90,6 @@ if ($request->isPost()) {
   if ($user->canManageTeam()) {
     $cl_team = $user->team;
     $cl_currency = ($user->currency == ''? CURRENCY_DEFAULT : $user->currency);
-    $cl_roles = $user->roles;
     $cl_lang = $user->lang;
     $cl_decimal_mark = $user->decimal_mark;
     $cl_date_format = $user->date_format;
@@ -136,8 +134,6 @@ $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','value'=
 if ($user->canManageTeam()) {
   $form->addInput(array('type'=>'text','maxlength'=>'200','name'=>'team_name','value'=>$cl_team));
   $form->addInput(array('type'=>'text','maxlength'=>'7','name'=>'currency','value'=>$cl_currency));
-  // Roles checkbox.
-  $form->addInput(array('type'=>'checkbox','name'=>'roles','value'=>$cl_roles,'onchange'=>'handleRolesCheckbox()'));
 
   // Prepare an array of available languages.
   $lang_files = I18n::getLangFileList();
@@ -300,15 +296,7 @@ if ($request->isPost()) {
 
       $plugins = trim($plugins, ',');
 
-      // If we use roles... No, we'll do it differently.
-      /*
-      if ($cl_roles && !ttRoleHelper::rolesExist()) {
-         ttRoleHelper::createDefaultRoles();
-      }*/
-
       // Prepare config string.
-      if ($cl_roles)
-        $config .= ',roles';
       if ($cl_show_holidays)
         $config .= ',show_holidays';
       if ($cl_punch_mode)
@@ -356,7 +344,7 @@ if ($request->isPost()) {
 
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="handleRolesCheckbox(); handleTaskRequiredCheckbox(); handlePluginCheckboxes();"');
+$smarty->assign('onload', 'onLoad="handleTaskRequiredCheckbox(); handlePluginCheckboxes();"');
 $smarty->assign('title', $i18n->getKey('title.profile'));
 $smarty->assign('content_page_name', 'profile_edit.tpl');
 $smarty->display('index.tpl');

diff --git a/roles.php b/roles.php
index 44255812fd76de358573de6b3962265e27c9c803..ebf416cc5d56ab3f6dc24db8cd5f83e571a5af68 100644 (file)
--- a/roles.php
+++ b/roles.php
@@ -29,6 +29,7 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttTeamHelper');
+import('ttRoleHelper');
 
 // Access check.
 if (!ttAccessCheck(right_manage_team)) {
@@ -36,6 +37,9 @@ if (!ttAccessCheck(right_manage_team)) {
   exit();
 }
 
+// If there are no roles in team, introduce default ones.
+if (!ttRoleHelper::rolesExist()) ttRoleHelper::createDefaultRoles();
+
 $smarty->assign('active_roles', ttTeamHelper::getActiveRoles($user->team_id));
 $smarty->assign('inactive_roles', ttTeamHelper::getInactiveRoles($user->team_id));
 $smarty->assign('title', $i18n->getKey('label.roles'));