On 07/22/2013 05:33 PM, Ana Krivokapic wrote:
On 07/22/2013 09:01 AM, Martin Kosek wrote:
On 07/19/2013 11:19 PM, Dmitri Pal wrote:
On 07/19/2013 09:26 AM, Jan Pazdziora wrote:
On Fri, Jul 19, 2013 at 03:17:49PM +0200, Petr Vobornik wrote:
Disclaimer: I have no strong feelings in this matter, it just looks
weird to me, so I'm OK with not doing it if it's general consensus.
Originally we wanted to do this change in
https://fedorahosted.org/freeipa/ticket/3569 but it was not done
because of string freeze.

I guess you can add field suffix to every field from /etc/password
when you use it in a sentence but that doesn't necessary mean that
You can. But gid exists as a concept beyond /etc/passwd. So does home
directory. The GECOS field value does not, really.

it's its name. man 5 passwd doesn't use word 'field' next to GECOS
in fields description/list either. IMO our use case is the same.
It says:

        GECOS   This field (sometimes called the "comment field")
                [...]
                The gcos field in the password file was
                [...]

Historically correct label would probably be 'GECOS identity' but
that's not usable today as it's purpose is more general.
Do we have tips in the UI?
May be we should add them in future to provide extra information about
meaning of the field or button.
For now I think GECOS would probably be good enough.
Adding "field" makes it more precise but looks weird.
+1 for just "GECOS". Petr showed me both variants in the UI and "GECOS field"
really looked weird.

Martin>>


+1 for removing the word 'field'. The phrase 'GECOS field' also exists in the
following files:

install/ui/test/data/ipa_init_commands.json
install/ui/test/data/ipa_init_objects.json
install/ui/test/data/json_metadata.json

So it should be fixed there as well.


Fixed.
--
Petr Vobornik
From b0965b0c6cb056655a138205e0e205f21ddb2ee4 Mon Sep 17 00:00:00 2001
From: Petr Vobornik <pvobo...@redhat.com>
Date: Fri, 19 Jul 2013 13:35:17 +0200
Subject: [PATCH] Remove word 'field' from GECOS param label

No other param/field has 'field' in a label.
---
 install/ui/test/data/ipa_init_commands.json | 12 ++++++------
 install/ui/test/data/ipa_init_objects.json  |  4 ++--
 install/ui/test/data/json_metadata.json     |  4 ++--
 ipalib/plugins/user.py                      |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/install/ui/test/data/ipa_init_commands.json b/install/ui/test/data/ipa_init_commands.json
index f83059bcdb3eefa3b254c764c5d42234f697fcfd..3a812ef5143972c1b043bf5ef41be3e7dafe1a28 100644
--- a/install/ui/test/data/ipa_init_commands.json
+++ b/install/ui/test/data/ipa_init_commands.json
@@ -16976,9 +16976,9 @@
                     {
                         "attribute": true,
                         "class": "Str",
-                        "doc": "GECOS field",
+                        "doc": "GECOS",
                         "flags": [],
-                        "label": "GECOS field",
+                        "label": "GECOS",
                         "name": "gecos",
                         "noextrawhitespace": true,
                         "type": "unicode"
@@ -17350,9 +17350,9 @@
                     {
                         "attribute": true,
                         "class": "Str",
-                        "doc": "GECOS field",
+                        "doc": "GECOS",
                         "flags": [],
-                        "label": "GECOS field",
+                        "label": "GECOS",
                         "name": "gecos",
                         "noextrawhitespace": true,
                         "query": true,
@@ -17807,9 +17807,9 @@
                     {
                         "attribute": true,
                         "class": "Str",
-                        "doc": "GECOS field",
+                        "doc": "GECOS",
                         "flags": [],
-                        "label": "GECOS field",
+                        "label": "GECOS",
                         "name": "gecos",
                         "noextrawhitespace": true,
                         "type": "unicode"
diff --git a/install/ui/test/data/ipa_init_objects.json b/install/ui/test/data/ipa_init_objects.json
index 5d1fd65aaa2be6e1ed346ebb6072f618db944cf6..7d8baed33a073ea7a410fd44ac486360a627d3cf 100644
--- a/install/ui/test/data/ipa_init_objects.json
+++ b/install/ui/test/data/ipa_init_objects.json
@@ -7671,9 +7671,9 @@
                     },
                     {
                         "class": "Str",
-                        "doc": "GECOS field",
+                        "doc": "GECOS",
                         "flags": [],
-                        "label": "GECOS field",
+                        "label": "GECOS",
                         "name": "gecos",
                         "noextrawhitespace": true,
                         "type": "unicode"
diff --git a/install/ui/test/data/json_metadata.json b/install/ui/test/data/json_metadata.json
index a3febc1ff9f779f3274174a3ec2e4f46fe4b3391..928e5eafd66158ab41c40ce3f5c3b1d486cdf13f 100644
--- a/install/ui/test/data/json_metadata.json
+++ b/install/ui/test/data/json_metadata.json
@@ -8940,12 +8940,12 @@
                         "cli_name": "gecos",
                         "cli_short_name": null,
                         "default": null,
-                        "doc": "GECOS field",
+                        "doc": "GECOS",
                         "exclude": null,
                         "flags": [],
                         "hint": null,
                         "include": null,
-                        "label": "GECOS field",
+                        "label": "GECOS",
                         "length": null,
                         "maxlength": null,
                         "minlength": null,
diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py
index 4fd942109d07e3f21b638a6560061652fd5f09bd..471981f48204209753eda2fb994d4c653dca0fa2 100644
--- a/ipalib/plugins/user.py
+++ b/ipalib/plugins/user.py
@@ -264,7 +264,7 @@ class user(LDAPObject):
             label=_('Home directory'),
         ),
         Str('gecos?',
-            label=_('GECOS field'),
+            label=_('GECOS'),
             default_from=lambda givenname, sn: '%s %s' % (givenname, sn),
             autofill=True,
         ),
-- 
1.8.3.1

_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Reply via email to