Merge lp:~mandel/ubuntu-sso-client/fix-credentials-text into lp:ubuntu-sso-client

[Manuel de la Peña]

Ensure that the strings used are the ones provided by design.

Ensure that the strings used are the ones provided by design.

[lp:~mandel/ubuntu-sso-client/fix-credentials-text]

891. By Manuel de la Peña on 2012-02-23

Merged with changes from trunk.

892. By Manuel de la Peña on 2012-02-23

Link bug.

893. By Manuel de la Peña on 2012-02-23

Merged ssl-dialog into fix-credentials-text.

894. By Manuel de la Peña on 2012-02-24

Merged ssl-dialog into fix-credentials-text.

895. By Manuel de la Peña on 2012-02-24

Merged ssl-dialog into fix-credentials-text.

896. By Manuel de la Peña on 2012-02-24

Merged ssl-dialog into fix-credentials-text.

[David Planella (dpm)]

Thanks for notifying translators about the UIFe.

Looking at the strings, and for the sake of translator's sanity, I'd recommend being consistent in the use of capitalization. I'm not sure whether we've got our own guidelines for this, and the only public document I found was the GNOME HIG at http://developer.gnome.org/hig-book/3.0/design-text-labels.html.en#layout-capitalization.

From there, these two messages should become:

-PROXY_CREDS_SAVE_BUTTON = _('Save And Connect')
+PROXY_CREDS_SAVE_BUTTON = _('Save and Connect')

-PROXY_CREDS_DIALOG_TITLE = _('Proxy Settings')
+PROXY_CREDS_DIALOG_TITLE = _('Proxy settings')

I'm not meaning to be pedantic, but at least that 'And' hurts my eyes ;). In any case, the real reason is that I've seen many occasions where such strings keep being fixed in subsequent releases, thus loosing existing translations. So I think it's best to get them right the first time and avoid extra work from translators.

Thanks!

[dobey (dobey)]

Actually, David, the _DIALOG_TITLE is the correct capitalization, as it
is the window title bar label. You are correct about the and being
lowercased here though in the SAVE_BUTTON text.

On Sat, 2012-02-25 at 08:26 +0000, David Planella wrote:
> Thanks for notifying translators about the UIFe.
>
> Looking at the strings, and for the sake of translator's sanity, I'd recommend being consistent in the use of capitalization. I'm not sure whether we've got our own guidelines for this, and the only public document I found was the GNOME HIG at http://developer.gnome.org/hig-book/3.0/design-text-labels.html.en#layout-capitalization.
>
> >From there, these two messages should become:
>
> -PROXY_CREDS_SAVE_BUTTON = _('Save And Connect')
> +PROXY_CREDS_SAVE_BUTTON = _('Save and Connect')
>
> -PROXY_CREDS_DIALOG_TITLE = _('Proxy Settings')
> +PROXY_CREDS_DIALOG_TITLE = _('Proxy settings')
>
> I'm not meaning to be pedantic, but at least that 'And' hurts my eyes ;). In any case, the real reason is that I've seen many occasions where such strings keep being fixed in subsequent releases, thus loosing existing translations. So I think it's best to get them right the first time and avoid extra work from translators.
>
> Thanks!

[lp:~mandel/ubuntu-sso-client/fix-credentials-text]

897. By Manuel de la Peña on 2012-02-27

Merged ssl-dialog into fix-credentials-text.

898. By Manuel de la Peña on 2012-02-27

Removed duplication and sorted labels.

[David Planella (dpm)]

Thanks Rodney for the correction, you're right.

Looking at the latest diff, I can still see 'Save And Connect' in the _SAVE_BUTTON, though.

[dobey (dobey)]

Manuel, please fix the "Save And Connect" string to be "Save and Connect" as David suggests.

review: Needs Fixing

[lp:~mandel/ubuntu-sso-client/fix-credentials-text]

899. By Manuel de la Peña on 2012-02-29

Merged ssl-dialog into fix-credentials-text.

900. By Manuel de la Peña on 2012-02-29

Merged ssl-dialog into fix-credentials-text.

901. By Manuel de la Peña on 2012-02-29

Merged ssl-dialog into fix-credentials-text.

902. By Manuel de la Peña on 2012-02-29

Merged ssl-dialog into fix-credentials-text.

903. By Manuel de la Peña on 2012-03-01

Merged ssl-dialog into fix-credentials-text.

[Manuel de la Peña (mandel)]

> Manuel, please fix the "Save And Connect" string to be "Save and Connect" as
> David suggests.

Ok, I just followed the comments from design.. Jesus! don't they have the same office ;)

[lp:~mandel/ubuntu-sso-client/fix-credentials-text]

904. By Manuel de la Peña on 2012-03-01

Change string following the comments from the review.

[Natalia Bidart (nataliabidart)]

Looks great!

review: Approve

[dobey (dobey)]

+PROXY_CREDS_EXPLANATION = _('Please provide login details.')

This should probably say "provide the proxy login deatails" or "provide your login details" instead, no?

[dobey (dobey)]

Err, details on that first one, not deatails

[Robert Grant (rtgrant)]

I'm fine with the design decision as suggested.

[dobey (dobey)]

review: Abstain

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'ubuntu_sso/qt/proxy_dialog.py'
--- ubuntu_sso/qt/proxy_dialog.py	2012-02-27 12:48:55 +0000
+++ ubuntu_sso/qt/proxy_dialog.py	2012-03-01 15:27:19 +0000
@@ -25,6 +25,7 @@
 from ubuntu_sso.keyring import Keyring
 from ubuntu_sso.qt.ui.proxy_credentials_dialog_ui import Ui_ProxyCredsDialog
 from ubuntu_sso.utils.ui import (
+    CANCEL_BUTTON,
     PROXY_CREDS_DIALOG_TITLE,
     PROXY_CREDS_HEADER,
     PROXY_CREDS_EXPLANATION,
@@ -33,7 +34,6 @@
     PROXY_CREDS_USER_LABEL,
     PROXY_CREDS_PSWD_LABEL,
     PROXY_CREDS_HELP_BUTTON,
-    PROXY_CREDS_CANCEL_BUTTON,
     PROXY_CREDS_SAVE_BUTTON,
 )
 
@@ -120,7 +120,7 @@
     def _set_buttons(self):
         """Set the labels of the buttons."""
         self.ui.help_button.setText(PROXY_CREDS_HELP_BUTTON)
-        self.ui.cancel_button.setText(PROXY_CREDS_CANCEL_BUTTON)
+        self.ui.cancel_button.setText(CANCEL_BUTTON)
         self.ui.cancel_button.clicked.connect(self._on_cancel_clicked)
         self.ui.save_button.setText(PROXY_CREDS_SAVE_BUTTON)
         self.ui.save_button.clicked.connect(self._on_save_clicked)

=== modified file 'ubuntu_sso/utils/ui.py'
--- ubuntu_sso/utils/ui.py	2012-02-29 14:28:56 +0000
+++ ubuntu_sso/utils/ui.py	2012-03-01 15:27:19 +0000
@@ -94,16 +94,14 @@
 PASSWORD_TOO_WEAK = _('The password is too weak.')
 PASSWORD_UPPER = _("At least one uppercase letter")
 PRIVACY_POLICY_TEXT = _("Privacy Policy")
-PROXY_CREDS_CANCEL_BUTTON = _('Cancel and Close')
 PROXY_CREDS_CONNECTION = _('Connecting to:')
-PROXY_CREDS_DIALOG_TITLE = _('Add proxy settings')
-PROXY_CREDS_EXPLANATION = _('Please provide login details below, '
-    'or check your system settings.')
-PROXY_CREDS_ERROR = _('These credentials are incorrect; please try again.')
+PROXY_CREDS_DIALOG_TITLE = _('Proxy Settings')
+PROXY_CREDS_ERROR = _('Incorrect login details. Please try again.')
+PROXY_CREDS_EXPLANATION = _('Please provide login details.')
 PROXY_CREDS_HEADER = _('You are connecting through a proxy.')
 PROXY_CREDS_HELP_BUTTON = _('Get Help With Proxies')
 PROXY_CREDS_PSWD_LABEL = _('Proxy password:')
-PROXY_CREDS_SAVE_BUTTON = _('Save')
+PROXY_CREDS_SAVE_BUTTON = _('Save and Connect')
 PROXY_CREDS_USER_LABEL = _('Proxy username:')
 RESET_TITLE = _("Reset password")
 RESET_SUBTITLE = _("A password reset code has been sent to your e-mail."