[maemo-commits] [maemo-commits] r17916 - in projects/haf/trunk/osso-af-startup: debian services

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2009-04-01 11:18:26 +0300 (Wed, 01 Apr 2009)
New Revision: 17916

Modified:
   projects/haf/trunk/osso-af-startup/debian/changelog
   projects/haf/trunk/osso-af-startup/services/af-defines.sh
Log:
set hardcoded en_GB locale if /etc/osso-af-init/locale is absent

Modified: projects/haf/trunk/osso-af-startup/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/changelog	2009-03-31 19:03:50 UTC (rev 17915)
+++ projects/haf/trunk/osso-af-startup/debian/changelog	2009-04-01 08:18:26 UTC (rev 17916)
@@ -1,3 +1,11 @@
+osso-af-startup (1.79-1) unstable; urgency=low
+
+  * If /etc/osso-af-init/locale is missing, undefine LC_ALL, and define LC_MESSAGES,
+    LANG, and LC_TIME as en_GB
+  * Fixes: NB#106724 (Only logical ids on UI string after creating a new SB target)
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Wed,  1 Apr 2009 11:09:38 +0300
+
 osso-af-startup (1.78-1) unstable; urgency=low
 
   * Don't touch $HOME from (pre|post)(inst|rm) scripts. Use /etc/skel instead.

Modified: projects/haf/trunk/osso-af-startup/services/af-defines.sh
===================================================================
--- projects/haf/trunk/osso-af-startup/services/af-defines.sh	2009-03-31 19:03:50 UTC (rev 17915)
+++ projects/haf/trunk/osso-af-startup/services/af-defines.sh	2009-04-01 08:18:26 UTC (rev 17916)
@@ -51,7 +51,14 @@
 fi
 
 # these could have changed since last sourcing
-source_if_is locale
+if test -f $AF_INIT_DIR/locale; then
+  source $AF_INIT_DIR/locale
+else
+  unset LC_ALL
+  export LC_MESSAGES=en_GB
+  export LANG=en_GB
+  export LC_TIME=en_GB
+fi
 
 if [ -r $SESSION_BUS_ADDRESS_FILE ]; then
   source $SESSION_BUS_ADDRESS_FILE