[gnome-control-center] region: Display all example strings, even though some are wrong

[Rodrigo Moya <rodrigo src gnome org>]

commit 066209d095f46995f489943c513cf2032e5ce858
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Tue Jun 14 18:27:36 2011 +0200

    region: Display all example strings, even though some are wrong

 panels/region/gnome-region-panel-formats.c |   16 ++++++++++++++--
 panels/region/gnome-region-panel.ui        |   26 +++++++++++++-------------
 2 files changed, 27 insertions(+), 15 deletions(-)
---
diff --git a/panels/region/gnome-region-panel-formats.c b/panels/region/gnome-region-panel-formats.c
index 2b59fda..0856562 100644
--- a/panels/region/gnome-region-panel-formats.c
+++ b/panels/region/gnome-region-panel-formats.c
@@ -46,16 +46,28 @@ selection_changed_cb (GtkComboBox *combo, gpointer user_data)
 	dt = g_date_time_new_now_local ();
 
 	/* Display dates */
+	s = g_date_time_format (dt, "%A %e %B %Y");
+	gtk_label_set_text (GTK_LABEL (gtk_builder_get_object (builder, "full_date_format")), s);
+	g_free (s);
+
+	s = g_date_time_format (dt, "%e %B %Y");
+	gtk_label_set_text (GTK_LABEL (gtk_builder_get_object (builder, "full_day_format")), s);
+	g_free (s);
+
+	s = g_date_time_format (dt, "%e %b %Y");
+	gtk_label_set_text (GTK_LABEL (gtk_builder_get_object (builder, "short_day_format")), s);
+	g_free (s);
+
 	s = g_date_time_format (dt, "%x");
 	gtk_label_set_text (GTK_LABEL (gtk_builder_get_object (builder, "shortest_day_format")), s);
 	g_free (s);
 	
 	/* Display times */
-	s = g_date_time_format (dt, "%r");
+	s = g_date_time_format (dt, "%r %Z");
 	gtk_label_set_text (GTK_LABEL (gtk_builder_get_object (builder, "full_time_format")), s);
 	g_free (s);
 
-	s = g_date_time_format (dt, "%R");
+	s = g_date_time_format (dt, "%X");
 	gtk_label_set_text (GTK_LABEL (gtk_builder_get_object (builder, "short_time_format")), s);
 	g_free (s);
 
diff --git a/panels/region/gnome-region-panel.ui b/panels/region/gnome-region-panel.ui
index 0431009..47a7515 100644
--- a/panels/region/gnome-region-panel.ui
+++ b/panels/region/gnome-region-panel.ui
@@ -247,22 +247,10 @@
                                     <property name="x_options">GTK_FILL</property>
                                     <property name="y_options">GTK_FILL</property>
                                     <property name="x_padding">3</property>
-                                    <property name="y_padding">6</property>
+                                    <property name="y_padding">3</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
                                   <object class="GtkLabel" id="full_date_format">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
@@ -468,6 +456,18 @@
                                     <property name="y_padding">3</property>
                                   </packing>
                                 </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
                               </object>
                             </child>
                           </object>