[orca/new-settings] Add missing date formats from master to the new-settings branch.

[Joanmarie Diggs <joanied src gnome org>]

commit c439c2bfebea628433f18eac7a369794d40dc017
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Mon Oct 18 22:46:19 2010 -0400

    Add missing date formats from master to the new-settings branch.

 src/orca/backends/classic.py       |   34 ++++++++++++++++++++++++++++++----
 src/orca/backends/gconf_backend.py |   34 ++++++++++++++++++++++++++++++----
 2 files changed, 60 insertions(+), 8 deletions(-)
---
diff --git a/src/orca/backends/classic.py b/src/orca/backends/classic.py
index 7c081e8..c5276aa 100644
--- a/src/orca/backends/classic.py
+++ b/src/orca/backends/classic.py
@@ -349,10 +349,36 @@ class OrcaPrefs:
             return "orca.settings.TIME_FORMAT_LOCALE"
 
     def _getPresentDateString(self, val):
-        if val == settings.DATE_FORMAT_WITH_LONG_NAMES:
-            return "orca.settings.DATE_FORMAT_WITH_LONG_NAMES"
-        elif val == settings.DATE_FORMAT_WITH_SHORT_NAMES:
-            return "orca.settings.DATE_FORMAT_WITH_SHORT_NAMES"
+        if val == settings.DATE_FORMAT_NUMBERS_DM:
+            return "orca.settings.DATE_FORMAT_NUMBERS_DM"
+        elif val == settings.DATE_FORMAT_NUMBERS_MD:
+            return "orca.settings.DATE_FORMAT_NUMBERS_MD"
+        elif val == settings.DATE_FORMAT_NUMBERS_DMY:
+            return "orca.settings.DATE_FORMAT_NUMBERS_DMY"
+        elif val == settings.DATE_FORMAT_NUMBERS_MDY:
+            return "orca.settings.DATE_FORMAT_NUMBERS_MDY"
+        elif val == settings.DATE_FORMAT_NUMBERS_YMD:
+            return "orca.settings.DATE_FORMAT_NUMBERS_YMD"
+        elif val == settings.DATE_FORMAT_FULL_DM:
+            return "orca.settings.DATE_FORMAT_FULL_DM"
+        elif val == settings.DATE_FORMAT_FULL_MD:
+            return "orca.settings.DATE_FORMAT_FULL_MD"
+        elif val == settings.DATE_FORMAT_FULL_DMY:
+            return "orca.settings.DATE_FORMAT_FULL_DMY"
+        elif val == settings.DATE_FORMAT_FULL_MDY:
+            return "orca.settings.DATE_FORMAT_FULL_MDY"
+        elif val == settings.DATE_FORMAT_FULL_YMD:
+            return "orca.settings.DATE_FORMAT_FULL_YMD"
+        elif val == settings.DATE_FORMAT_ABBREVIATED_DM:
+            return "orca.settings.DATE_FORMAT_ABBREVIATED_DM"
+        elif val == settings.DATE_FORMAT_ABBREVIATED_MD:
+            return "orca.settings.DATE_FORMAT_ABBREVIATED_MD"
+        elif val == settings.DATE_FORMAT_ABBREVIATED_DMY:
+            return "orca.settings.DATE_FORMAT_ABBREVIATED_DMY"
+        elif val == settings.DATE_FORMAT_ABBREVIATED_MDY:
+            return "orca.settings.DATE_FORMAT_ABBREVIATED_MDY"
+        elif val == settings.DATE_FORMAT_ABBREVIATED_YMD:
+            return "orca.settings.DATE_FORMAT_ABBREVIATED_YMD"
         else:
             return "orca.settings.DATE_FORMAT_LOCALE"
 
diff --git a/src/orca/backends/gconf_backend.py b/src/orca/backends/gconf_backend.py
index 576654d..0348e9e 100644
--- a/src/orca/backends/gconf_backend.py
+++ b/src/orca/backends/gconf_backend.py
@@ -419,10 +419,36 @@ class OrcaPrefs():
             return "orca.settings.TIME_FORMAT_LOCALE"
 
     def _getPresentDateString(self, val):
-        if val == settings.DATE_FORMAT_WITH_LONG_NAMES:
-            return "orca.settings.DATE_FORMAT_WITH_LONG_NAMES"
-        elif val == settings.DATE_FORMAT_WITH_SHORT_NAMES:
-            return "orca.settings.DATE_FORMAT_WITH_SHORT_NAMES"
+        if val == settings.DATE_FORMAT_NUMBERS_DM:
+            return "orca.settings.DATE_FORMAT_NUMBERS_DM"
+        elif val == settings.DATE_FORMAT_NUMBERS_MD:
+            return "orca.settings.DATE_FORMAT_NUMBERS_MD"
+        elif val == settings.DATE_FORMAT_NUMBERS_DMY:
+            return "orca.settings.DATE_FORMAT_NUMBERS_DMY"
+        elif val == settings.DATE_FORMAT_NUMBERS_MDY:
+            return "orca.settings.DATE_FORMAT_NUMBERS_MDY"
+        elif val == settings.DATE_FORMAT_NUMBERS_YMD:
+            return "orca.settings.DATE_FORMAT_NUMBERS_YMD"
+        elif val == settings.DATE_FORMAT_FULL_DM:
+            return "orca.settings.DATE_FORMAT_FULL_DM"
+        elif val == settings.DATE_FORMAT_FULL_MD:
+            return "orca.settings.DATE_FORMAT_FULL_MD"
+        elif val == settings.DATE_FORMAT_FULL_DMY:
+            return "orca.settings.DATE_FORMAT_FULL_DMY"
+        elif val == settings.DATE_FORMAT_FULL_MDY:
+            return "orca.settings.DATE_FORMAT_FULL_MDY"
+        elif val == settings.DATE_FORMAT_FULL_YMD:
+            return "orca.settings.DATE_FORMAT_FULL_YMD"
+        elif val == settings.DATE_FORMAT_ABBREVIATED_DM:
+            return "orca.settings.DATE_FORMAT_ABBREVIATED_DM"
+        elif val == settings.DATE_FORMAT_ABBREVIATED_MD:
+            return "orca.settings.DATE_FORMAT_ABBREVIATED_MD"
+        elif val == settings.DATE_FORMAT_ABBREVIATED_DMY:
+            return "orca.settings.DATE_FORMAT_ABBREVIATED_DMY"
+        elif val == settings.DATE_FORMAT_ABBREVIATED_MDY:
+            return "orca.settings.DATE_FORMAT_ABBREVIATED_MDY"
+        elif val == settings.DATE_FORMAT_ABBREVIATED_YMD:
+            return "orca.settings.DATE_FORMAT_ABBREVIATED_YMD"
         else:
             return "orca.settings.DATE_FORMAT_LOCALE"