diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-05-11 16:38:07 +0200 |
|---|---|---|
| committer | Marek Kasik <mkasik@redhat.com> | 2010-05-11 16:38:07 +0200 |
| commit | 37bb7ea2a003c7cc24dbc88012fa1e1aef3c1212 (patch) | |
| tree | 3548467cedb811c06c3bf7af3902fd10704f5287 /gtk/gtkpapersize.c | |
| parent | e5c2c2e9fb6a99c258ef8193634e5a9d4f3d9449 (diff) | |
| download | gtk+-37bb7ea2a003c7cc24dbc88012fa1e1aef3c1212.tar.gz | |
Update list of US Letter locales
Sync paper size fallbacks with the latest 1.8.1 CLDR table (#618000).
Diffstat (limited to 'gtk/gtkpapersize.c')
| -rw-r--r-- | gtk/gtkpapersize.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gtk/gtkpapersize.c b/gtk/gtkpapersize.c index 7188cefe6c..894dca0b87 100644 --- a/gtk/gtkpapersize.c +++ b/gtk/gtkpapersize.c @@ -669,10 +669,11 @@ gtk_paper_size_get_default (void) if (!locale) return GTK_PAPER_NAME_A4; - if (g_str_has_prefix (locale, "en_CA") || - g_str_has_prefix (locale, "en_US") || - g_str_has_prefix (locale, "es_PR") || - g_str_has_prefix (locale, "es_US")) + /* CLDR 1.8.1 + * http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/territory_language_information.html + */ + if (g_regex_match_simple("[^_.@]{2,3}_(BZ|CA|CL|CO|CR|GT|MX|NI|PA|PH|PR|SV|US|VE)", + locale, G_REGEX_ANCHORED, G_REGEX_MATCH_ANCHORED)) paper_size = GTK_PAPER_NAME_LETTER; else paper_size = GTK_PAPER_NAME_A4; |