diff -r 1ddbe54d0645 -r ccb4f6b3db21 sysstatemgmt/ssmutilityplugins/ssmlocaleobserversup/inc/ssmlocaleobserversup.h
--- a/sysstatemgmt/ssmutilityplugins/ssmlocaleobserversup/inc/ssmlocaleobserversup.h	Thu Aug 19 11:09:10 2010 +0300
+++ b/sysstatemgmt/ssmutilityplugins/ssmlocaleobserversup/inc/ssmlocaleobserversup.h	Tue Aug 31 16:29:05 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -15,13 +15,15 @@
 *
 */
 
-#ifndef C_SSMLOCALEOBSERVERSUP_H
-#define C_SSMLOCALEOBSERVERSUP_H
+#ifndef __SSMLOCALEOBSERVERSUP_H__
+#define __SSMLOCALEOBSERVERSUP_H__
 
+#include "ssmcommonlocale.h"
 #include <e32base.h>
 #include <e32property.h>
 #include <f32file.h>
 #include <ssm/ssmutility.h>
+#include <e32hashtab.h> 
 
 class CEnvironmentChangeNotifier;
 
@@ -75,34 +77,32 @@
     /**
     * Copied fron SysLocale.
     * SaveLocaleL saves TLocale class to the given directory
-    * and initiates missing independent data, if any.
-    * Note, that independent data is created only once and it is
-    * shared by all the locales. Therefore, it is recommended
-    * to call this method upon early boot phase of a device.
+    * 
     * @param aPath Directory path containing locale data files.
     *              (e.g. "c:\dir" or c:\dir\")
     */
-    void SaveLocaleL( const TDesC& aPath );
+    void SaveRegionL( const TDesC& aPath );
 
     /**
     * Copied fron SysLocale.
-    * LoadLocaleL restores TLocale class from the given directory.
-    * If locale independent data (see note)
-    * exists, its data overrides the restored TLocale data.
+    * LoadRegionL restores TLocale class from the given directory.
+    *
     * @param aPath Directory path containing locale data files
     *              (e.g. "c:\dir" or c:\dir\")
     */
-    void LoadLocaleL( const TDesC& aPath );
-
+    void LoadRegionL( const TDesC& aPath );
+    
     /**
-    * Stores locale independent data.
+    * Initialize the language region mapping
+    * 
     */
-    void SaveIndependentDataL( const TLocale& aLocale, const TDesC& aPath );
-
+    void InitializeRegionMappingL();
+    
     /**
-    * Loads locale independent data.
+    * Gets the associated region for the given language
+    * 
     */
-    void LoadIndependentDataL( TLocale& aLocale, const TDesC& aPath );
+    TInt MappedRegionL(const TInt aLanguage);
 
 private: // data
 
@@ -127,6 +127,10 @@
     */
     RFs iFs;
 
+    /**
+    * Array of  language and region mappings.
+    */
+    RHashSet<TLanguageRegion>  iLangRegionMappingHashSet;
     };
 
-#endif // C_SSMLOCALEOBSERVERSUP_H
+#endif // __SSMLOCALEOBSERVERSUP_H__