Some more work in progress on roles.

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index e306ced..3af484c 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 37907c4..815eff7 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 3985d28..6486845 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 adee949..fbe11d6 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 7124c6a..d997da6 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 41700b3..9ab421b 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 0043121..f5a1be1 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 3ab5c75..5ab1ca4 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 d814b14..5d0479e 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 e99666e..193d74d 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 b765422..776da59 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 9044398..a127c51 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 faf34c4..1835f96 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 3cbe5f1..8070e59 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 50561b5..e524e14 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 b0aa255..ee0a958 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 c168bd7..f2cf558 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 42325a1..89c06c0 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 98d0f5c..baaa0f0 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 859d33f..3eb14de 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 b8c217e..cd5f41a 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 a7eaf8d..9660171 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 5993a79..e4f15bb 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 6269571..b14d924 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 3c6caed..9c0159b 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 d093acc..89e2127 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 ea4ea55..21de811 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 d9c0202..69ebcc4 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 f4e351f..ba909da 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 73dda56..f046beb 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 1d90b1c..e6a8883 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 b79de16..351c189 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 5bb5080..955f7d5 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 7f024fe..725d7a2 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 4425581..ebf416c 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'));