From b353239e59a8eb32fb1ac66e29228dc95b74e4e6 Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Wed, 18 Jan 2012 21:54:41 -0600
Subject: Fixed inconsistent status labels.

This patch modifies the status attributes in users, DNS zones,
HBAC/sudo rules, HBAC test, and SELinux User Map to use the same
label (i.e. Status) and values (i.e. Enabled/Disabled). The method
to change the status will be modified separately.

Ticket #2247
---
 ipalib/plugins/internal.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'ipalib')

diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py
index 94be9107d..05fb96875 100644
--- a/ipalib/plugins/internal.py
+++ b/ipalib/plugins/internal.py
@@ -339,12 +339,10 @@ class i18n_messages(Command):
                 "posix": _("Is this a POSIX group?"),
             },
             "hbacrule": {
-                "active": _("Active"),
                 "any_host": _("Any Host"),
                 "any_service": _("Any Service"),
                 "anyone": _("Anyone"),
                 "host": _("Accessing"),
-                "inactive": _("Inactive"),
                 "ipaenabledflag": _("Rule status"),
                 "service": _("Via Service"),
                 "sourcehost": _("From"),
@@ -449,7 +447,6 @@ class i18n_messages(Command):
                 "commands": _("Commands"),
             },
             "sudorule": {
-                "active": _("Active"),
                 "allow": _("Allow"),
                 "any_command": _("Any Command"),
                 "any_group": _("Any Group"),
@@ -459,7 +456,6 @@ class i18n_messages(Command):
                 "deny": _("Deny"),
                 "external": _("External"),
                 "host": _("Access this host"),
-                "inactive": _("Inactive"),
                 "ipaenabledflag": _("Rule status"),
                 "options": _("Options"),
                 "runas": _("As Whom"),
@@ -472,17 +468,13 @@ class i18n_messages(Command):
             "user": {
                 "account": _("Account Settings"),
                 "account_status": _("Account Status"),
-                "activate": _("Activate"),
-                "activation_confirmation": _("Are you sure you want to ${action} the user?<br/>The change will take effect immediately."),
-                "activation_link": _("Click to ${action}"),
-                "active": _("Active"),
                 "contact": _("Contact Settings"),
-                "deactivate": _("Deactivate"),
                 "employee": _("Employee Information"),
                 "error_changing_status": _("Error changing account status"),
-                "inactive": _("Inactive"),
                 "mailing": _("Mailing Address"),
                 "misc": _("Misc. Information"),
+                "status_confirmation": _("Are you sure you want to ${action} the user?<br/>The change will take effect immediately."),
+                "status_link": _("Click to ${action}"),
             },
         },
         "password": {
@@ -502,6 +494,13 @@ class i18n_messages(Command):
             "truncated": _("Query returned more results than the configured size limit. Displaying the first ${counter} results."),
             "unselect_all": _("Unselect All"),
         },
+        "status": {
+            "disable": _("Disable"),
+            "disabled": _("Disabled"),
+            "enable": _("Enable"),
+            "enabled": _("Enabled"),
+            "label": _("Status"),
+        },
         "tabs": {
             "audit": _("Audit"),
             "automount": _("Automount"),
-- 
cgit