Multilingual support and UI / UX improvements.submit/tizen/20161210.071601accepted/tizen/mobile/20161212.025712

Signed-off-by: segwon <segwon.han@samsung.com>
Change-Id: I29ff8fa48a21375f82c50237a3b1f3079e4bb0be

2 files changed, 41 insertions, 20 deletions

diff --git a/inc/language.h b/inc/language.h
new file mode 100644
index 0000000..fb5e240
--- /dev/null
+++ b/inc/language.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <libintl.h>
+
+#define TITLE_TEXT					dgettext(PACKAGE, "IDS_ST_HEADER_TIZEN_CONNECT")
+
+#define NOTICE_TEXT_POWER_OFF		dgettext(PACKAGE, "IDS_ST_BODY_CONNECT_TO_OTHER_DEVICES_TO_OPEN_APPS_ON_THEM_ACCESS_THEIR_DATA_AND_USE_APPS_ON_MULTIPLE_DEVICES_AT_THE_SAME_TIME_YOU_CAN_ALLOW_OTHER_DEVICES_TO_CONNECT_MSG")
+
+#define DEVICE_LIST_TEXT_ALLOWED	dgettext(PACKAGE, "IDS_ST_MBODY_ALLOWED_DEVICES")
+#define DEVICE_LIST_TEXT_DENIED		dgettext(PACKAGE, "IDS_ST_MBODY_DENIED_DEVICES")
+#define DEVICE_LIST_TEXT_AVAILABLE	dgettext(PACKAGE, "IDS_ST_MBODY_AVAILABLE_DEVICES")
+
+#define BUTTON_TEXT_SCAN			dgettext(PACKAGE, "IDS_ST_BUTTON_SCAN_ABB6")
+#define BUTTON_TEXT_STOP			dgettext(PACKAGE, "IDS_ST_BUTTON_STOP_SCANNING_ABB")
+
+#define POPUP_TITLE_TEXT			dgettext(PACKAGE, "IDS_ST_HEADER_ALLOW_DEVICE_ACCESS")
+
+#define POPUP_TEXT_ALLOWED			dgettext(PACKAGE, "IDS_ST_POP_DENY_PS_THE_ABILITY_TO_CONNECT_TO_THIS_DEVICE_AT_ALL_OR_JUST_REMOVE_IT_FROM_ALLOWED_DEVICES_Q_ABB")
+#define POPUP_TEXT_DENIED			dgettext(PACKAGE, "IDS_AT_POP_ALLOW_PS_THE_ABILITY_TO_CONNECT_TO_THIS_DEVICE_AND_ACCESS_THE_DATA_ON_IT_WITHOUT_A_PASSWORD_OR_JUST_REMOVE_IT_FROM_DENIED_DEVICES_Q")
+#define POPUP_TEXT_AVAILABLE		dgettext(PACKAGE, "IDS_ST_POP_ALLOW_PS_TO_ACCESS_THIS_DEVICE_AND_ITS_DATA_WITHOUT_A_PASSWORD_OR_DENY_IT_THE_ABILITY_TO_CONNECT_AT_ALL_Q_ABB")
+
+#define POPUP_BUTTON_TEXT_ALLOW		dgettext(PACKAGE, "IDS_ST_BUTTON_ALLOW_ABB8")
+#define POPUP_BUTTON_TEXT_DENY		dgettext(PACKAGE, "IDS_ST_BUTTON_DENY_ABB4")
+#define POPUP_BUTTON_TEXT_REMOVE	dgettext(PACKAGE, "IDS_ST_BUTTON_REMOVE_ABB9")
+#define POPUP_BUTTON_TEXT_CANCEL	dgettext(PACKAGE, "IDS_ST_BUTTON_CANCEL_ABB11")
+ 
\ No newline at end of file
diff --git a/inc/main.h b/inc/main.h
index fa22698..d120325 100644
--- a/inc/main.h
+++ b/inc/main.h
@@ -25,9 +25,9 @@
 #include <device/haptic.h>
 #include <dlog.h>
 #include <glib.h>
-#include <libintl.h>
 #include <d2d_conv_manager.h>
 #include <d2d_conv_internal.h>
+#include "language.h"
 
 #ifdef  LOG_TAG
 #undef  LOG_TAG
@@ -50,25 +50,6 @@ typedef enum state {
 	APP_TERMINATE
 } state_e;
 
-#define TITLE_TEXT					dgettext(PACKAGE, "D2D_CONV_SETTING_M_TITLE_TEXT")
-#define ACCESS_CONTROL_TEXT			dgettext(PACKAGE, "D2D_CONV_SETTING_M_ACCESS_CONTROL_TEXT")
-#define NOTICE_TITLE_TEXT			dgettext(PACKAGE, "D2D_CONV_SETTING_M_NOTICE_TITLE_TEXT")
-#define POWER_ON_NOTICE_TEXT		dgettext(PACKAGE, "D2D_CONV_SETTING_M_POWER_ON_NOTICE_TEXT")
-#define POWER_OFF_NOTICE_TEXT		dgettext(PACKAGE, "D2D_CONV_SETTING_M_POWER_OFF_NOTICE_TEXT")
-#define ALLOWED_DEVICE_LIST_TEXT	dgettext(PACKAGE, "D2D_CONV_SETTING_M_ALLOWED_DEVICE_LIST_TEXT")
-#define DENIED_DEVICE_LIST_TEXT		dgettext(PACKAGE, "D2D_CONV_SETTING_M_DENIED_DEVICE_LIST_TEXT")
-#define AVAILABLE_DEVICE_LIST_TEXT	dgettext(PACKAGE, "D2D_CONV_SETTING_M_AVAILABLE_DEVICE_LIST_TEXT")
-#define SCAN_BUTTON_TEXT			dgettext(PACKAGE, "D2D_CONV_SETTING_M_SCAN_BUTTON_TEXT")
-#define STOP_BUTTON_TEXT			dgettext(PACKAGE, "D2D_CONV_SETTING_M_STOP_BUTTON_TEXT")
-#define AVAILABLE_POPUP_TEXT		dgettext(PACKAGE, "D2D_CONV_SETTING_M_AVAILABLE_POPUP_TEXT")
-#define ALLOWED_POPUP_TEXT			dgettext(PACKAGE, "D2D_CONV_SETTING_M_ALLOWED_POPUP_TEXT")
-#define DENIED_POPUP_TEXT			dgettext(PACKAGE, "D2D_CONV_SETTING_M_DENIED_POPUP_TEXT")
-#define CANCEL_BUTTON_TEXT			dgettext(PACKAGE, "D2D_CONV_SETTING_M_CANCEL_BUTTON_TEXT")
-#define ALLOW_BUTTON_TEXT			dgettext(PACKAGE, "D2D_CONV_SETTING_M_ALLOW_BUTTON_TEXT")
-#define DENY_BUTTON_TEXT			dgettext(PACKAGE, "D2D_CONV_SETTING_M_DENY_BUTTON_TEXT")
-#define REMOVE_BUTTON_TEXT			dgettext(PACKAGE, "D2D_CONV_SETTING_M_REMOVE_BUTTON_TEXT")
-#define REMOVE_BUTTON_TEXT			dgettext(PACKAGE, "D2D_CONV_SETTING_M_REMOVE_BUTTON_TEXT")
-
 /* state event lisetner */
 typedef void (*event_listener)(state_e state);
 extern void add_state_change_event_listener(event_listener listener);