Attachment 63538 Details for Bug 51488 – patch

[patch] patch

0001-Try-harder-to-look-up-the-right-localization.patch (text/plain), 1.80 KB, created by Matthias Clasen on 2012-06-27 17:30:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Clasen

Created: 2012-06-27 17:30:44 UTC

Size: 1.80 KB

patch

obsolete

>From 7cd80b2f5ce0cb136090264aa5c6653cec30affb Mon Sep 17 00:00:00 2001
>From: Matthias Clasen <mclasen@redhat.com>
>Date: Wed, 27 Jun 2012 20:28:00 -0400
>Subject: [PATCH] Try harder to look up the right localization
>
>The code for looking up localized strings for action descriptions
>was manually trying to break locale names into pieces, but didn't
>get it right for e.g. zh_CN.utf-8. Instead, use the GLib function
>g_get_locale_variants(), which handles this (and more). This fixes
>the translation problem reported in
>https://bugzilla.gnome.org/show_bug.cgi?id=665497
>---
> src/polkitbackend/polkitbackendactionpool.c |   16 +++++++---------
> 1 file changed, 7 insertions(+), 9 deletions(-)
>
>diff --git a/src/polkitbackend/polkitbackendactionpool.c b/src/polkitbackend/polkitbackendactionpool.c
>index e3ed38d..0af0010 100644
>--- a/src/polkitbackend/polkitbackendactionpool.c
>+++ b/src/polkitbackend/polkitbackendactionpool.c
>@@ -1108,7 +1108,7 @@ _localize (GHashTable *translations,
>            const gchar *lang)
> {
>   const gchar *result;
>-  gchar lang2[256];
>+  gchar **langs;
>   guint n;
> 
>   if (lang == NULL)
>@@ -1123,16 +1123,14 @@ _localize (GHashTable *translations,
>     goto out;
> 
>   /* we could have a translation for 'da' but lang=='da_DK'; cut off the last part and try again */
>-  strncpy (lang2, lang, sizeof (lang2));
>-  for (n = 0; lang2[n] != '\0'; n++)
>+  langs = g_get_locale_variants (lang);
>+  for (n = 0; langs[n] != NULL; n++)
>     {
>-      if (lang2[n] == '_')
>-        {
>-          lang2[n] = '\0';
>-          break;
>-        }
>+      result = (const char *) g_hash_table_lookup (translations, (void *) langs[n]);
>+      if (result != NULL)
>+        break;
>     }
>-  result = (const char *) g_hash_table_lookup (translations, (void *) lang2);
>+  g_strfreev (langs);
>   if (result != NULL)
>     goto out;
> 
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 51488: 63538

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.