[gnome-control-center] common: Always collect locales from the directory



commit 1a2845dfa4a4f9a8afc5b505c5dcf2aba2b5da78
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Oct 7 15:19:38 2011 +0100

    common: Always collect locales from the directory
    
    Even if those locales do not exist in the locale-archive file,
    their definition could be in the locale directories. The glibc
    will look in directories as well when the locale-archive doesn't
    contain it, so both behaviours match.
    
    See also:
    http://repo.or.cz/w/glibc.git/blob/HEAD:/locale/findlocale.c#l62
    
    https://bugzilla.gnome.org/show_bug.cgi?id=660725

 panels/common/gdm-languages.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/panels/common/gdm-languages.c b/panels/common/gdm-languages.c
index 1a1ad1c..2dfc436 100644
--- a/panels/common/gdm-languages.c
+++ b/panels/common/gdm-languages.c
@@ -655,9 +655,10 @@ collect_locales (void)
                            "guessing possible locales from available translations, "
                            "but list may be incomplete!");
 #endif
-
-                collect_locales_from_directory ();
         }
+
+        collect_locales_from_directory ();
+
         collect_locales_from_locale_file (ALIASES_FILE);
 
 	count_languages_and_territories ();



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]