[glom/glom-1-20] Default to en rather than en_US for the original locale.

[Murray Cumming <murrayc src gnome org>]

commit 16942e81ffcb46fe53cfe1d763e39f0be085e042
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Jan 18 08:57:01 2012 +0100

    Default to en rather than en_US for the original locale.
    
    * glom/libglom/data_structure/translatable_item:
    get_original_locale(): Default to en rather than en_US.
    * examples/*.glom: Change the original locale from en_US to en.

 ChangeLog                                          |    7 +++++++
 examples/example_film_manager.glom                 |    2 +-
 examples/example_lesson_planner.glom               |    2 +-
 examples/example_music_collection.glom             |    2 +-
 examples/example_project_manager.glom              |    2 +-
 examples/example_smallbusiness.glom                |    2 +-
 .../test_sqlite_music/test_sqlite_music.glom       |    2 +-
 examples/tests/example_field_formatting_test.glom  |    2 +-
 glom/libglom/data_structure/translatable_item.cc   |    3 ++-
 9 files changed, 16 insertions(+), 8 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3509e10..64a2ceb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-01-18  Murray Cumming  <murrayc murrayc com>
+
+	Default to en rather than en_US for the original locale.
+
+	* glom/application.cc: get_original_locale(): Default to en rather than en_US.
+	* examples/*.glom: Change the original locale from en_US to en.
+
 1.20.6:
 
 2011-12-12  Murray Cumming  <murrayc murrayc com>
diff --git a/examples/example_film_manager.glom b/examples/example_film_manager.glom
index 49f5036..2a29d62 100644
--- a/examples/example_film_manager.glom
+++ b/examples/example_film_manager.glom
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glom_document xmlns="http://glom.org/glom_document"; database_title="Openismus Film Manager" is_example="true" translation_original_locale="en_US" format_version="7">
+<glom_document xmlns="http://glom.org/glom_document"; database_title="Openismus Film Manager" is_example="true" translation_original_locale="en" format_version="7">
   <connection server="localhost" user="" database="glom_film_production_manager" self_hosted="true" port="5435" try_other_ports="false" hosting_mode="postgres_self"/>
   <table name="accommodation" title="Accommodation">
     <example_rows/>
diff --git a/examples/example_lesson_planner.glom b/examples/example_lesson_planner.glom
index b8e20a7..d75a0c8 100644
--- a/examples/example_lesson_planner.glom
+++ b/examples/example_lesson_planner.glom
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glom_document xmlns="http://glom.org/glom_document"; database_title="Lesson Planner" is_example="true" translation_original_locale="en_US" format_version="7">
+<glom_document xmlns="http://glom.org/glom_document"; database_title="Lesson Planner" is_example="true" translation_original_locale="en" format_version="7">
   <connection server="localhost" user="" database="glom_example_lessonplanner_v2" self_hosted="true" port="5433" try_other_ports="false" hosting_mode="postgres_self"/>
   <table name="invoice_lines" hidden="true">
     <example_rows>
diff --git a/examples/example_music_collection.glom b/examples/example_music_collection.glom
index d7d84a1..9b45ebc 100644
--- a/examples/example_music_collection.glom
+++ b/examples/example_music_collection.glom
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glom_document xmlns="http://glom.org/glom_document"; translation_original_locale="en_US" database_title="Music Collection" is_example="true" format_version="7">
+<glom_document xmlns="http://glom.org/glom_document"; translation_original_locale="en" database_title="Music Collection" is_example="true" format_version="7">
   <connection server="localhost" database="glom_musiccollection211" port="5433" self_hosted="true" try_other_ports="false" hosting_mode="postgres_self"/>
   <table name="albums" overview_x="15" overview_y="9" title="Albums">
     <example_rows>
diff --git a/examples/example_project_manager.glom b/examples/example_project_manager.glom
index e82aac4..e5d1d16 100644
--- a/examples/example_project_manager.glom
+++ b/examples/example_project_manager.glom
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glom_document xmlns="http://glom.org/glom_document"; database_title="Project Manager Example" is_example="true" translation_original_locale="en_US" format_version="7">
+<glom_document xmlns="http://glom.org/glom_document"; database_title="Project Manager Example" is_example="true" translation_original_locale="en" format_version="7">
   <connection server="localhost" user="" database="glom_example_project_manager_v3" self_hosted="true" port="5433" try_other_ports="false" hosting_mode="postgres_self"/>
   <table name="contacts" title="Contacts">
     <example_rows>
diff --git a/examples/example_smallbusiness.glom b/examples/example_smallbusiness.glom
index eb7e992..2305faf 100644
--- a/examples/example_smallbusiness.glom
+++ b/examples/example_smallbusiness.glom
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glom_document xmlns="http://glom.org/glom_document"; database_title="Small Business Example" is_example="true" translation_original_locale="en_US" format_version="7">
+<glom_document xmlns="http://glom.org/glom_document"; database_title="Small Business Example" is_example="true" translation_original_locale="en" format_version="7">
   <connection server="localhost" user="" database="glom_example_smallbusiness_v2" self_hosted="true" port="5433" try_other_ports="false" hosting_mode="postgres_self"/>
   <startup_script/>
   <table name="contacts" default="true" title="Contacts">
diff --git a/examples/sqlite/test_sqlite_music/test_sqlite_music.glom b/examples/sqlite/test_sqlite_music/test_sqlite_music.glom
index cd2dc4f..805689f 100644
--- a/examples/sqlite/test_sqlite_music/test_sqlite_music.glom
+++ b/examples/sqlite/test_sqlite_music/test_sqlite_music.glom
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<glom_document xmlns="http://glom.org/glom_document"; translation_original_locale="en_US" database_title="Music Collection" is_example="false" format_version="4">
+<glom_document xmlns="http://glom.org/glom_document"; translation_original_locale="en" database_title="Music Collection" is_example="false" format_version="4">
   <connection server="localhost" database="glom_musiccollection21" port="0" self_hosted="true" try_other_ports="true" hosting_mode="sqlite"/>
   <table name="albums" overview_x="15" overview_y="9" title="Albums">
     <fields>
diff --git a/examples/tests/example_field_formatting_test.glom b/examples/tests/example_field_formatting_test.glom
index 3e6df49..9f65208 100644
--- a/examples/tests/example_field_formatting_test.glom
+++ b/examples/tests/example_field_formatting_test.glom
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<glom_document xmlns="http://glom.org/glom_document"; format_version="6" translation_original_locale="en_CA" database_title="Field Formatting Test" is_example="true">
+<glom_document xmlns="http://glom.org/glom_document"; format_version="6" translation_original_locale="en" database_title="Field Formatting Test" is_example="true">
   <connection hosting_mode="postgres_central" server="localhost" try_other_ports="false" database="glom_field_formatting_test" port="5432"/>
   <table name="alignment" title="Alignment">
     <example_rows>
diff --git a/glom/libglom/data_structure/translatable_item.cc b/glom/libglom/data_structure/translatable_item.cc
index 04fd85d..89d48a1 100644
--- a/glom/libglom/data_structure/translatable_item.cc
+++ b/glom/libglom/data_structure/translatable_item.cc
@@ -237,8 +237,9 @@ void TranslatableItem::set_original_locale(const Glib::ustring& locale)
 
 Glib::ustring TranslatableItem::get_original_locale()
 {
+  //Default to English:
   if(m_original_locale.empty())
-    m_original_locale = "en_US"; //"en_US.UTF-8";
+    m_original_locale = "en";
 
   return m_original_locale; 
 }