Translations added to setting-main

Change-Id: I6a34b78bc9c58afb4a11e06a13d3ece9d05e0d32
Signed-off-by: Michal Skorupinski <m.skorupinsk@samsung.com>

diff --git a/setting-common/inc/setting-common-init.h b/setting-common/inc/setting-common-init.h
index f67b19663acb45c88aa340e56f2a9c82efafa75e..df8fd57453808793f37e40b07e0bfb52892dd974 100644 (file)
--- a/setting-common/inc/setting-common-init.h
+++ b/setting-common/inc/setting-common-init.h
@@ -40,5 +40,6 @@ int view_rotate_support(MainData *md);
 int app_control_init(MainData *md, app_control_h service);
 int app_control_finish(MainData *md);
 int add_app_reply(MainData *md, const char *key, const char *val);
+char *get_resource_path(char *name);
 
 #endif                         /*__SETTING_COMMON_INIT_H__ */

diff --git a/setting-common/src/setting-common-init.c b/setting-common/src/setting-common-init.c
index 9acf53ad36a6d8ac50ddd59e8eefaee3c897c8a9..7d0d477d1c737dfa04a7f8c6d5fb6d4bec1245ea 100644 (file)
--- a/setting-common/src/setting-common-init.c
+++ b/setting-common/src/setting-common-init.c
@@ -22,6 +22,16 @@
 #include "setting-debug.h"
 #include <efl_extension.h>
 
+EXPORT_PUBLIC
+char *get_resource_path(char *name)
+{
+       char *final_path = calloc(PATH_MAX, sizeof(char));
+       char *res = app_get_resource_path();
+
+       snprintf(final_path,  PATH_MAX, "%s/%s", res, name);
+       return final_path;
+}
+
 static Evas_Object *_create_main_window(char *name)
 {
        Evas_Object *win = NULL;
@@ -52,8 +62,14 @@ int app_init(MainData *md, char *name)
 
        elm_app_base_scale_set(2.4);
 
-//     bindtextdomain(SETTING_PACKAGE, SETTING_LOCALEDIR);
-//     textdomain(SETTING_PACKAGE);
+       char *locale = get_resource_path("locale");
+
+       bindtextdomain("setting-common", locale);
+       textdomain("setting-common");
+
+       dlog_print(DLOG_DEBUG, LOG_TAG, "LOCALE PATH: %s", locale);
+       free(locale);
+
 
        /* create window */
        md->window = _create_main_window(name);

diff --git a/setting-main/.cproject b/setting-main/.cproject
index 4ea36f7e69c749762bbaf584d42bc12464132499..73420364c0ebfbd1c2236697f7328c39a12ff291 100644 (file)
--- a/setting-main/.cproject
+++ b/setting-main/.cproject
@@ -306,7 +306,7 @@
                                                        <tool id="org.tizen.nativecore.tool.sbi.gnu.archiver.mergelib.247414245" name="Archive Generator" superClass="org.tizen.nativecore.tool.sbi.gnu.archiver.mergelib"/>
                                                        <tool id="org.tizen.nativecore.tool.sbi.po.compiler.1087510703" name="PO Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.po.compiler"/>
                                                        <tool id="org.tizen.nativecore.tool.sbi.edc.compiler.722810134" name="EDC Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.edc.compiler">
-                                                               <option id="sbi.gnu.edc.compiler.option.misc.id.586709976" superClass="sbi.gnu.edc.compiler.option.misc.id" useByScannerDiscovery="false" valueType="stringList">
+                                                               <option command="-id " id="sbi.gnu.edc.compiler.option.misc.id.586709976" name="Image Path (-id)" superClass="sbi.gnu.edc.compiler.option.misc.id" useByScannerDiscovery="false" valueType="stringList">
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/edje/images&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/res/images&quot;"/>
                                                                </option>

diff --git a/setting-main/.project b/setting-main/.project
index 8c577850c73be60cc4f58914807e242954e6a4a9..d639f29921cc73805b330383fac9a806ca3e95de 100644 (file)
--- a/setting-main/.project
+++ b/setting-main/.project
@@ -56,7 +56,7 @@
        </natures>
        <filteredResources>
                <filter>
-                       <id>1528472606115</id>
+                       <id>0</id>
                        <name></name>
                        <type>26</type>
                        <matcher>
@@ -65,7 +65,7 @@
                        </matcher>
                </filter>
                <filter>
-                       <id>1528472606117</id>
+                       <id>0</id>
                        <name></name>
                        <type>6</type>
                        <matcher>