Merge lp:~zyga/checkbox/provider-manager-improvements into lp:checkbox

[Zygmunt Krynicki]

99882ae plainbox:provider_manager: support i18n in manage_py_extension
ddfce85 plainbox:provider_manager: fix PEP-8 issue
24a9066 plainbox:provider_manager: fail gracefully in InstallCommand.get_command_epilog()

[Sylvain Pineau (sylvain-pineau)]

How can I test rev 3487?

review: Needs Information

[Zygmunt Krynicki (zyga)]

Run the new regression provider with a polish locale, manage.py --help will show that run is now translated. You will have to run manage.py i18n first though.

[Zygmunt Krynicki (zyga)]

Bump, can we please have some feedback on this?

[Sylvain Pineau (sylvain-pineau)]

I ran:

$ PLAINBOX_I18N_MODE=lorem-ipsum-pl ./manage.py i18n
( cd po && intltool-update --gettext-package=plainbox-provider-checkbox-regressions --pot )
( cd po && intltool-update --gettext-package=plainbox-provider-checkbox-regressions --dist pl )
........... done.
6 translated messages, 5 fuzzy translations, 3 untranslated messages.
msgfmt po/pl.po -o build/mo/pl/LC_MESSAGES/plainbox-provider-checkbox-regressions.mo

##########################
And then the following manager command:

$ PLAINBOX_I18N_MODE=lorem-ipsum-pl ./manage.py --help
usage: <plainbox: bardzo.na [--albo] [--położył] [solwuję]>

<plainbox: Nie-ozdabiał utrzymanie poczuł>

positional arguments:
  {info,validate,develop,install,sdist,i18n,build,clean,run}
    info <plainbox:
    validate <plainbox:
    develop <plainbox:
    install <plainbox:
    sdist <plainbox:
    i18n <plainbox:
    build <plainbox:
    clean <plainbox:
    run <plainbox-provider-checkbox-regressions:

optional arguments:
  -h, --help show this help message and exit
  --version <plainbox: lecz dowiodę'i grządek będzie niż jako>

<plainbox: dowiodę tak przekradł>:
  -v, --verbose <plainbox: ją czuł stracił (dziś na --tak-bawić=PSÓW)>
  -D, --debug <plainbox: uparta TERAZ początek bo się lecz suwała>
  -C, --debug-console <plainbox: solwuję TERAZ sędziego na nie solwuję>
  -T <plainbox: CHARTY>, --trace <plainbox: CHARTY>
                        <plainbox: szybko TERAZ widziana po jak radziwiłł
                        pewnie (jak że lecz widziana lekki)>
  -P, --pdb <plainbox: czuł pali tak (charty ozdabiał) całe w
                        kłótnia zdrowie>
  -I, --debug-interrupt
                        <plainbox: brali na ZMRUŻA/Przedstawiając, bardzo było
                        --cię>

For me the run command is still empty, is that the expected output?

review: Needs Information

[Zygmunt Krynicki (zyga)]

Nope, I'll see what's going on there. Though I didn't use the loerm
ipsum mode. Thanks

On Mon, Jan 26, 2015 at 4:42 PM, Sylvain Pineau
<email address hidden> wrote:
> Review: Needs Information
>
> I ran:
>
> $ PLAINBOX_I18N_MODE=lorem-ipsum-pl ./manage.py i18n
> ( cd po && intltool-update --gettext-package=plainbox-provider-checkbox-regressions --pot )
> ( cd po && intltool-update --gettext-package=plainbox-provider-checkbox-regressions --dist pl )
> ........... done.
> 6 translated messages, 5 fuzzy translations, 3 untranslated messages.
> msgfmt po/pl.po -o build/mo/pl/LC_MESSAGES/plainbox-provider-checkbox-regressions.mo
>
> ##########################
> And then the following manager command:
>
> $ PLAINBOX_I18N_MODE=lorem-ipsum-pl ./manage.py --help
> usage: <plainbox: bardzo.na [--albo] [--położył] [solwuję]>
>
> <plainbox: Nie-ozdabiał utrzymanie poczuł>
>
> positional arguments:
> {info,validate,develop,install,sdist,i18n,build,clean,run}
> info <plainbox:
> validate <plainbox:
> develop <plainbox:
> install <plainbox:
> sdist <plainbox:
> i18n <plainbox:
> build <plainbox:
> clean <plainbox:
> run <plainbox-provider-checkbox-regressions:
>
> optional arguments:
> -h, --help show this help message and exit
> --version <plainbox: lecz dowiodę'i grządek będzie niż jako>
>
> <plainbox: dowiodę tak przekradł>:
> -v, --verbose <plainbox: ją czuł stracił (dziś na --tak-bawić=PSÓW)>
> -D, --debug <plainbox: uparta TERAZ początek bo się lecz suwała>
> -C, --debug-console <plainbox: solwuję TERAZ sędziego na nie solwuję>
> -T <plainbox: CHARTY>, --trace <plainbox: CHARTY>
> <plainbox: szybko TERAZ widziana po jak radziwiłł
> pewnie (jak że lecz widziana lekki)>
> -P, --pdb <plainbox: czuł pali tak (charty ozdabiał) całe w
> kłótnia zdrowie>
> -I, --debug-interrupt
> <plainbox: brali na ZMRUŻA/Przedstawiając, bardzo było
> --cię>
>
> For me the run command is still empty, is that the expected output?
> --
> https://code.launchpad.net/~zkrynicki/checkbox/provider-manager-improvements/+merge/244174
> You are the owner of lp:~zkrynicki/checkbox/provider-manager-improvements.

Unmerged revisions

3489. By Zygmunt Krynicki on 2014-12-09

plainbox:provider_manager: fail gracefully in InstallCommand.get_command_epilog()

This patch fixes an issue where InstallCommand would crash when plainbox
is started with PLAINBOX_I18N_MODE=lorem-ipsum-XX (e.g. lorem-ipsum-pl)
where a special trigger word would be faux-translated and a subsequent
lookup would fail.

Signed-off-by: Zygmunt Krynicki <email address hidden>

3488. By Zygmunt Krynicki on 2014-12-09

plainbox:provider_manager: fix PEP-8 issue

Signed-off-by: Zygmunt Krynicki <email address hidden>

3487. By Zygmunt Krynicki on 2014-12-09

plainbox:provider_manager: support i18n in manage_py_extension

This patch allows custom management commands to be correctly translated
by loading the provider-specific translation catalog early in the
initialization of the management tool.

Signed-off-by: Zygmunt Krynicki <email address hidden>

=== modified file 'plainbox/plainbox/provider_manager.py'
--- plainbox/plainbox/provider_manager.py	2014-09-29 18:48:58 +0000
+++ plainbox/plainbox/provider_manager.py	2014-12-09 16:27:56 +0000
@@ -37,6 +37,7 @@
 import tarfile
 
 from plainbox import __version__ as version
+from plainbox.i18n import bindtextdomain
 from plainbox.i18n import docstring
 from plainbox.i18n import gettext as _
 from plainbox.i18n import gettext_noop as N_
@@ -225,10 +226,13 @@
                 '    * {:10} => {}'.format(src, dest)
                 for src, dest in sorted(layout.items())
             )
-        return re.sub(
-            '@LAYOUT\[(\w+)]@',
-            lambda m: format_layout(self._INSTALL_LAYOUT[m.group(1)]),
-            super().get_command_epilog())
+        try:
+            return re.sub(
+                '@LAYOUT\[(\w+)]@',
+                lambda m: format_layout(self._INSTALL_LAYOUT[m.group(1)]),
+                super().get_command_epilog())
+        except:
+            return super().get_command_epilog()
 
     def register_parser(self, subparsers):
         """
@@ -1030,7 +1034,8 @@
         provider_list = all_providers.get_all_plugin_objects()
         if all(p.name != provider.name for p in provider_list):
             provider_list.append(provider)
-        # Add the built-in 'categories' provider, unless that's the one we're testing
+        # Add the built-in 'categories' provider, unless that's the one we're
+        # testing
         categories_provider = get_categories()
         if provider.base_dir != categories_provider.base_dir:
             provider_list.append(categories_provider)
@@ -1403,6 +1408,14 @@
         raise SystemExit(_("{}: bad value of {!r}, {}").format(
             manage_py, exc.variable.name, exc.message))
     else:
+        # Install provider's i18n, if possible, this makes management
+        # extensions localizable as long as they use the same gettext
+        # domain name.
+        if (definition.effective_gettext_domain
+                and definition.effective_locale_dir):
+            bindtextdomain(
+                definition.effective_gettext_domain,
+                definition.effective_locale_dir)
         raise SystemExit(ProviderManagerTool(definition, kwargs).main())