[gnome-control-center] region: If no regional settings, use the configured language

[Rodrigo Moya <rodrigo src gnome org>]

commit ec843a03bb8c028507670af49e5d0ef00edda97a
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Thu Jul 7 18:23:53 2011 +0200

    region: If no regional settings, use the configured language

 panels/region/gnome-region-panel-system.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/panels/region/gnome-region-panel-system.c b/panels/region/gnome-region-panel-system.c
index 4ad667f..b9d1ba7 100644
--- a/panels/region/gnome-region-panel-system.c
+++ b/panels/region/gnome-region-panel-system.c
@@ -65,7 +65,13 @@ setup_system (GtkBuilder *builder)
 			  G_CALLBACK (locale_settings_changed), builder);
 
 	language = g_settings_get_string (locale_settings, "region");
-	display_language = gdm_get_language_from_name (language, NULL);
+	if (language && language[0])
+		display_language = gdm_get_language_from_name (language, NULL);
+	else {
+		language = cc_common_language_get_current_language ();
+		display_language = gdm_get_language_from_name (language, NULL);
+	}
+
 	gtk_label_set_text (GTK_LABEL (gtk_builder_get_object (builder, "user_format")),
 			    display_language);
 	g_free (language);