trac-admin should respect LC_ALL environment variable

[Jun Omae]

trac-admin command prints localized text by LANG environment.

$ LANG=fr_FR.UTF8 ~/venv/trac/1.0.10/bin/trac-admin help
trac-admin - La console d'administration de Trac 1.0.10

Utilisation : trac-admin </chemin/vers/env_du_projet> [commande [sous-command] [option ...]]

Le lancement de trac-admin sans commandes déclenche le mode interactif.

help     Show documentation
initenv  Create and initialize a new environment

However, it ignores when LC_ALL is used.

$ LC_ALL=fr_FR.UTF8 ~/venv/trac/1.0.10/bin/trac-admin help
trac-admin - The Trac Administration Console 1.0.10

Usage: trac-admin </path/to/projenv> [command [subcommand] [option ...]]

Invoking trac-admin without command starts interactive mode.

help     Show documentation
initenv  Create and initialize a new environment

It prints by LANG=de_DE.UTF8 even though LC_ALL=fr_FR.UTF8.

$ LC_ALL=fr_FR.UTF8 LANG=de_DE.UTF8 ~/venv/trac/1.0.10/bin/trac-admin help
trac-admin - Die Administrations-Konsole von Trac 1.0.10

Aufruf: trac-admin </pfad/zur/projektumgebung> [Kommando [Subkommando] [Option ...]]

Der Aufruf von trac-admin ohne Kommando startet den interaktiven Modus.

help     Show documentation
initenv  Create and initialize a new environment

[Jun Omae]

According to ​GNU gettext utilities: Locale Environment Variables, the priority order is:

1. LANGUAGE
2. LC_ALL
3. LC_xxx, according to selected locale category: LC_CTYPE, LC_NUMERIC, LC_TIME, LC_COLLATE, LC_MONETARY, LC_MESSAGES, …
4. LANG

See also babel:source:/tags/0.9.6/babel/core.py@:633#L610.

trac/admin/api.py

@@ -197 +197 @@
     return result
 
 
-def get_console_locale(env=None, lang=LANG):
-    """Return negotiated locale for console by LANG environment and
+def get_console_locale(env=None, categories=('LANGUAGE', 'LC_ALL', 'LC_CTYPE',
+                                             'LANG')):
+    """Return negotiated locale for console by locale environments and
     [trac] default_language."""
     if has_babel:
         from babel.core import Locale, UnknownLocaleError, parse_locale
+        preferred = []
+        for category in categories:
+            value = os.environ.get(category)
+            if not value:
+                continue
+            try:
+                locale = '_'.join(filter(None, parse_locale(value)))
+            except:
+                continue
+            preferred.append(locale)
+        if env:
+            preferred.append(env.config.get('trac', 'default_language', ''))
         try:
-            lang = '_'.join(filter(None, parse_locale(lang)))
-        except:
-            lang = None
-        default = env.config.get('trac', 'default_language', '') \
-                  if env else None
-        try:
-            return get_negotiated_locale([lang, default]) or Locale.default()
+            return get_negotiated_locale(preferred)
         except UnknownLocaleError:
             pass
     return None

I'll push it with unit tests.

[Jun Omae]

Proposed changes in jomae.git@t12418.

[Ryan J Ollos]

Did you want to commit the change for 1.0.13, or should I move to 1.0.14?

[Jun Omae]

Yeah, I'll push tonight. Also, I noticed default width of east asian ambiguous should respect locale environments. Updated jomae.git@t12418.

[Jun Omae]

Committed to 1.0-stable in [15119-15120] and merged to 1.2-stable and trunk in [15121-15122].