summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--examples/renderdemo.c2
-rw-r--r--pango/pango-utils.c9
3 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index cfabbb78..8fc8df17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2006-12-06 Behdad Esfahbod <behdad@gnome.org>
+ * examples/renderdemo.c (do_output): Set context language to
+ pango_language_get_default() instead of hardcoding "en-US".
+
+ * pango/pango-utils.c (pango_language_get_default): Improve docs.
+
+2006-12-06 Behdad Esfahbod <behdad@gnome.org>
+
Bug 333982 – Fallback to $LANG whenever NULL PangoLanguage is used
Patch from LingNing Zhang
diff --git a/examples/renderdemo.c b/examples/renderdemo.c
index 17b50612..d94053f7 100644
--- a/examples/renderdemo.c
+++ b/examples/renderdemo.c
@@ -274,7 +274,7 @@ do_output (PangoContext *context,
set_transform (context, transform_cb, cb_context, cb_data, NULL);
- pango_context_set_language (context, pango_language_from_string ("en_US"));
+ pango_context_set_language (context, pango_language_get_default ());
pango_context_set_base_dir (context,
opt_rtl ? PANGO_DIRECTION_RTL : PANGO_DIRECTION_LTR);
diff --git a/pango/pango-utils.c b/pango/pango-utils.c
index ea480840..d0acc836 100644
--- a/pango/pango-utils.c
+++ b/pango/pango-utils.c
@@ -1051,9 +1051,12 @@ _pango_get_lc_ctype (void)
/**
* pango_language_get_default:
*
- * Returns the #PangoLanguage for the current locale of the running
- * process. Note that this can change over the life of an
- * application.
+ * Returns the #PangoLanguage for the current locale of the process.
+ * Note that this can change over the life of an application.
+ *
+ * Your application should call <literal>setlocale (LC_ALL, "");</literal>
+ * for the user settings to take effect. Gtk+ does this in its initialization
+ * functions. See <literal>man setlocale</literal> for details.
*
* Return value: the default language as a #PangoLanguage, must not be
* freed.