[gnome-initial-setup] language: Use the words "locale ID" consistently

[Jasper St. Pierre <jstpierre src gnome org>]

commit 2dcd42b5c9ca8c5e78937564ba47e1a9a1724d1a
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Tue Aug 21 15:28:07 2012 -0400

    language: Use the words "locale ID" consistently

 .../pages/language/gis-language-page.c             |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/gnome-initial-setup/pages/language/gis-language-page.c b/gnome-initial-setup/pages/language/gis-language-page.c
index 0be14d1..38f3e8e 100644
--- a/gnome-initial-setup/pages/language/gis-language-page.c
+++ b/gnome-initial-setup/pages/language/gis-language-page.c
@@ -36,15 +36,15 @@ enum {
 };
 
 static void
-set_language (LanguageData *data,
-              gchar        *locale_id)
+set_locale_id (LanguageData *data,
+               gchar        *new_locale_id)
 {
-  gchar *current_locale_id = cc_common_language_get_current_language ();
-  if (g_strcmp0 (current_locale_id, locale_id) != 0) {
-    setlocale (LC_MESSAGES, locale_id);
+  gchar *old_locale_id = cc_common_language_get_current_language ();
+  if (g_strcmp0 (old_locale_id, new_locale_id) != 0) {
+    setlocale (LC_MESSAGES, new_locale_id);
     gis_locale_changed (data->setup);
   }
-  g_free (current_locale_id);
+  g_free (old_locale_id);
 }
 
 static gint
@@ -139,9 +139,9 @@ select_locale_id (GtkTreeView *treeview,
 static void
 select_current_locale (GtkTreeView *treeview)
 {
-  gchar *current_language = cc_common_language_get_current_language ();
-  select_locale_id (treeview, current_language);
-  g_free (current_language);
+  gchar *current_locale_id = cc_common_language_get_current_language ();
+  select_locale_id (treeview, current_locale_id);
+  g_free (current_locale_id);
 }
 
 static void
@@ -231,7 +231,7 @@ selection_changed (GtkTreeSelection *selection,
                       COL_LOCALE_ID, &new_locale_id,
                       -1);
 
-  set_language (data, new_locale_id);
+  set_locale_id (data, new_locale_id);
 }
 
 void