From 303cf83f8cf0f80639fdaadf133a5ce19007b7da Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Thu, 23 Feb 2017 15:36:18 +0530 Subject: [PATCH] //language change --- .../com/gskmtorange/Database/GSKOrangeDB.java | 2 +- .../gskmtorange/GeoTag/GeoTagActivity.java | 27 +++++++-- .../gskmtorange/GeoTag/GeoTagStoreList.java | 27 +++++++-- .../cpm/com/gskmtorange/LoginActivity.java | 20 ++++++- .../cpm/com/gskmtorange/MainActivity.java | 21 ++++++- .../gskmtorange/SelectLanguageActivity.java | 25 ++++++-- .../autoupdate/AutoUpdateActivity.java | 21 ++++++- .../gskmtorange/constant/CommonString.java | 11 +++- .../dailyentry/AdditionalVisibility.java | 58 ++++++++++--------- .../dailyentry/CategoryPicture.java | 21 ++++++- .../dailyentry/CheckoutActivity.java | 27 +++++++-- .../dailyentry/NonWorkingReason.java | 27 +++++++-- .../dailyentry/ServiceActivity.java | 25 ++++++-- .../dailyentry/SettingsActivity.java | 25 ++++++-- .../dailyentry/StoreListActivity.java | 21 ++++++- .../dailyentry/StoreimageActivity.java | 27 +++++++-- .../dailyentry/T2PComplianceActivity.java | 21 ++++++- .../dailyentry/T2pBrand_Avaibility.java | 21 ++++++- .../download/DownloadActivity.java | 21 ++++++- .../fragment/SelectLanguageFragment.java | 25 ++++++-- .../gsk_dailyentry/CategoryListActivity.java | 21 ++++++- .../CategoryWisePerformanceActivity.java | 27 +++++++-- .../gsk_dailyentry/DailyDataMenuActivity.java | 21 ++++++- .../MSL_AvailabilityActivity.java | 21 ++++++- .../PromoComplianceActivity.java | 21 ++++++- .../StockFacing_PlanogramTrackerActivity.java | 23 +++++++- .../gsk_dailyentry/Stock_FacingActivity.java | 21 ++++++- .../StoreWisePerformanceActivity.java | 27 +++++++-- .../upload/PreviousDataUploadActivity.java | 21 ++++++- .../gskmtorange/upload/UploadActivity.java | 21 ++++++- ...ontent_stock_facing__planogram_tracker.xml | 2 +- .../dialog_stock_facing_planogram_tracker.xml | 10 ++-- ...stock_facing_planogram_tracker_add_sku.xml | 4 +- .../item_stock_facing_planogram_header.xml | 2 +- GSKMTOrange/src/main/res/values-ar/string.xml | 28 +++++---- GSKMTOrange/src/main/res/values-tr/string.xml | 12 +++- GSKMTOrange/src/main/res/values/strings.xml | 11 +++- 37 files changed, 619 insertions(+), 147 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java index 7f82e14..a418d7a 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -3724,7 +3724,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { StockFacing_PlanogramTrackerDataGetterSetter sb1 = new StockFacing_PlanogramTrackerDataGetterSetter(); sb1.setShelf_id("0"); - sb1.setShelf("Select"); + sb1.setShelf(context.getString(R.string.select)); Data.add(sb1); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java index 29fb5aa..652ea33 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java @@ -1057,16 +1057,31 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb private static boolean updateResources(Context context, String language) { - String lang ; + /*String lang; - if(language.equalsIgnoreCase("English")){ + if (language.equalsIgnoreCase("English")) { lang = "EN"; - } - else if(language.equalsIgnoreCase("UAE")) { + } else if (language.equalsIgnoreCase("ARABIC-KSA")) { lang = "AR"; - } - else { + } else { lang = "TR"; + }*/ + + String lang; + + if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { + lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; + }else{ + lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } Locale locale = new Locale(lang); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java index 1a2c111..7e280ab 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java @@ -289,16 +289,31 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi private static boolean updateResources(Context context, String language) { - String lang ; + /*String lang; - if(language.equalsIgnoreCase("English")){ + if (language.equalsIgnoreCase("English")) { lang = "EN"; - } - else if(language.equalsIgnoreCase("UAE")) { + } else if (language.equalsIgnoreCase("ARABIC-KSA")) { lang = "AR"; - } - else { + } else { lang = "TR"; + }*/ + + String lang; + + if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { + lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; + }else{ + lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } Locale locale = new Locale(lang); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java index 2e51eab..094424f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java @@ -690,7 +690,7 @@ public class LoginActivity extends AppCompatActivity { private static boolean updateResources(Context context, String language) { - String lang; + /*String lang; if (language.equalsIgnoreCase("English")) { lang = "EN"; @@ -698,8 +698,26 @@ public class LoginActivity extends AppCompatActivity { lang = "AR"; } else { lang = "TR"; + }*/ + + String lang; + + if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { + lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; + }else{ + lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } + Locale locale = new Locale(lang); Locale.setDefault(locale); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java index a922df5..0a314c7 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java @@ -383,14 +383,31 @@ public class MainActivity extends AppCompatActivity private static boolean updateResources(Context context, String language) { - String lang; + /*String lang; if (language.equalsIgnoreCase("English")) { lang = "EN"; - } else if (language.equalsIgnoreCase("UAE")) { + } else if (language.equalsIgnoreCase("ARABIC-KSA")) { lang = "AR"; } else { lang = "TR"; + }*/ + + String lang; + + if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { + lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; + }else{ + lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } Locale locale = new Locale(lang); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java index 1d7134d..1c035a7 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java @@ -125,16 +125,31 @@ public class SelectLanguageActivity extends AppCompatActivity implements View.On } private static boolean updateResources(Context context, String language) { - String lang; + /*String lang; - if(language.equalsIgnoreCase("English")){ + if (language.equalsIgnoreCase("English")) { lang = "EN"; - } - else if(language.equalsIgnoreCase("ARABIC-KSA")) { - + } else if (language.equalsIgnoreCase("ARABIC-KSA")) { lang = "AR"; } else { lang = "TR"; + }*/ + + String lang; + + if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { + lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; + }else{ + lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } Locale locale = new Locale(lang); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/autoupdate/AutoUpdateActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/autoupdate/AutoUpdateActivity.java index 3df5b7e..a375bed 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/autoupdate/AutoUpdateActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/autoupdate/AutoUpdateActivity.java @@ -291,14 +291,31 @@ public class AutoUpdateActivity extends AppCompatActivity { private static boolean updateResources(Context context, String language) { - String lang; + /*String lang; if (language.equalsIgnoreCase("English")) { lang = "EN"; - } else if (language.equalsIgnoreCase("UAE")) { + } else if (language.equalsIgnoreCase("ARABIC-KSA")) { lang = "AR"; } else { lang = "TR"; + }*/ + + String lang; + + if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { + lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; + }else{ + lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } Locale locale = new Locale(lang); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java index 358462d..6547a31 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java @@ -731,10 +731,19 @@ public class CommonString { + ")"; + public static final String KEY_LANGUAGE_DEFAULT = ""; + public static final String KEY_RETURN_LANGUAGE_DEFAULT = "EN"; + public static final String KEY_LANGUAGE_ENGLISH = "English"; + public static final String KEY_RETURE_LANGUAGE_ENGLISH = "EN"; + public static final String KEY_LANGUAGE_ARABIC_KSA = "ARABIC-KSA"; + public static final String KEY_RETURE_LANGUAGE_ARABIC_KSA = "AR"; + public static final String KEY_LANGUAGE_TURKISH = "TURKISH"; + public static final String KEY_RETURE_LANGUAGE_TURKISH = "TR"; - + public static final String KEY_LANGUAGE_OMAN = "English"; + public static final String KEY_RETURE_LANGUAGE_OMAN = "EN"; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java index 4e218c4..66cb7a4 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java @@ -83,7 +83,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl AdditionalDialogGetterSetter additionalgeetersetter; public static ArrayList data = new ArrayList(); ToggleButton btntoggle; - ImageView btnimage, btnedit,btnimage1,btnimage2; + ImageView btnimage, btnedit, btnimage1, btnimage2; Button btnsku, btnaddlayout; GSKOrangeDB db; ArrayList sku_list; @@ -98,11 +98,10 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl //ArrayList DisplayMaster_list; - ArrayList empty_list = new ArrayList<>(); - String _pathforcheck1,_pathforcheck2,_pathforcheck3, _path, str, msg; + String _pathforcheck1, _pathforcheck2, _pathforcheck3, _path, str, msg; private SharedPreferences preferences; - String store_id, date, intime, img_str1,img_str2,img_str3, togglevalue = "1", CATEGORY_ID, camera_allow,store_type_id,class_id,key_account_id; + String store_id, date, intime, img_str1, img_str2, img_str3, togglevalue = "1", CATEGORY_ID, camera_allow, store_type_id, class_id, key_account_id; ImageView img_cam, img_clicked; Button btn_add, btn_close; EditText Edt_txt; @@ -132,9 +131,9 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl preferences = PreferenceManager.getDefaultSharedPreferences(this); store_id = preferences.getString(CommonString.KEY_STORE_ID, null); camera_allow = preferences.getString(CommonString.KEY_CAMERA_ALLOW, ""); - store_type_id= preferences.getString(CommonString.KEY_STORETYPE_ID, ""); - class_id= preferences.getString(CommonString.KEY_CLASS_ID, ""); - key_account_id= preferences.getString(CommonString.KEY_KEYACCOUNT_ID, ""); + store_type_id = preferences.getString(CommonString.KEY_STORETYPE_ID, ""); + class_id = preferences.getString(CommonString.KEY_CLASS_ID, ""); + key_account_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, ""); updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); categoryName = getIntent().getStringExtra("categoryName"); @@ -355,7 +354,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl } else { Snackbar.make(view, getResources().getString(R.string.title_activity_Want_add), Snackbar.LENGTH_LONG).setAction("Action", null).show(); } - } else { + } else { AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( @@ -564,8 +563,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl listMain = db.getAdditionalMainStock(store_id, categoryId); - if(listMain.size()>0) - { + if (listMain.size() > 0) { AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( AdditionalVisibility.this); @@ -604,8 +602,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl // show it alertDialog.show(); - } - else{ + } else { togglevalue = "1"; btntoggle.setChecked(true); brandlayout.setVisibility(View.GONE); @@ -620,8 +617,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl } - - } } else { @@ -673,8 +668,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl AlertDialog alertDialog = alertDialogBuilder.create(); // show it alertDialog.show(); - } - else { + } else { togglevalue = "0"; defdata.clear(); btntoggle.setChecked(false); @@ -730,8 +724,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl }); - - } else { btnimage.setBackgroundResource(R.mipmap.camera_grey); btnimage1.setBackgroundResource(R.mipmap.camera_grey); @@ -1069,7 +1061,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl } - break; } @@ -1079,7 +1070,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl public void showSkuDialog() { - final ArrayList brandList = db.getBrandT2PData(store_type_id, class_id, key_account_id,categoryId); + final ArrayList brandList = db.getBrandT2PData(store_type_id, class_id, key_account_id, categoryId); BrandMasterGetterSetter brand = new BrandMasterGetterSetter(); brand.setBRAND(getResources().getString(R.string.select)); @@ -1165,7 +1156,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl ab.setSku_id(SKU_ID); ab.setSku_name(SKU_name); // ab.setProcess_id(process_id); - ab.setQuantity( Edt_txt.getText().toString().replaceFirst("^0+(?!$)", "")); + ab.setQuantity(Edt_txt.getText().toString().replaceFirst("^0+(?!$)", "")); // ab.setCategory_id(category_id); if (validateDialogData(ab)) { @@ -1589,8 +1580,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl errormsg = getResources().getString(R.string.title_activity_take_image); - } - else if (dialog.size() == 0) { + } else if (dialog.size() == 0) { errormsg = getResources().getString(R.string.title_activity_fill_sku); flag = false; } @@ -1646,15 +1636,31 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl private static boolean updateResources(Context context, String language) { - - String lang; + /*String lang; if (language.equalsIgnoreCase("English")) { lang = "EN"; - } else if (language.equalsIgnoreCase("UAE")) { + } else if (language.equalsIgnoreCase("ARABIC-KSA")) { lang = "AR"; } else { lang = "TR"; + }*/ + + String lang; + + if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { + lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; + }else{ + lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } Locale locale = new Locale(lang); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java index fe8c2fe..7702f06 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java @@ -268,14 +268,31 @@ public class CategoryPicture extends AppCompatActivity { private static boolean updateResources(Context context, String language) { - String lang; + /*String lang; if (language.equalsIgnoreCase("English")) { lang = "EN"; - } else if (language.equalsIgnoreCase("UAE")) { + } else if (language.equalsIgnoreCase("ARABIC-KSA")) { lang = "AR"; } else { lang = "TR"; + }*/ + + String lang; + + if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { + lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; + }else{ + lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } Locale locale = new Locale(lang); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java index 4b22ba2..f6f2d52 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java @@ -322,16 +322,31 @@ public class CheckoutActivity extends AppCompatActivity { private static boolean updateResources(Context context, String language) { - String lang ; + /*String lang; - if(language.equalsIgnoreCase("English")){ + if (language.equalsIgnoreCase("English")) { lang = "EN"; - } - else if(language.equalsIgnoreCase("UAE")) { + } else if (language.equalsIgnoreCase("ARABIC-KSA")) { lang = "AR"; - } - else { + } else { lang = "TR"; + }*/ + + String lang; + + if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { + lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; + }else{ + lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } Locale locale = new Locale(lang); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java index 24f3a0b..066d917 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java @@ -510,16 +510,31 @@ public class NonWorkingReason extends AppCompatActivity implements private static boolean updateResources(Context context, String language) { - String lang ; + /*String lang; - if(language.equalsIgnoreCase("English")){ + if (language.equalsIgnoreCase("English")) { lang = "EN"; - } - else if(language.equalsIgnoreCase("UAE")) { + } else if (language.equalsIgnoreCase("ARABIC-KSA")) { lang = "AR"; - } - else { + } else { lang = "TR"; + }*/ + + String lang; + + if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { + lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; + }else{ + lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } Locale locale = new Locale(lang); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ServiceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ServiceActivity.java index 6d3002f..188ec7c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ServiceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ServiceActivity.java @@ -83,16 +83,31 @@ public class ServiceActivity extends AppCompatActivity { } private static boolean updateResources(Context context, String language) { - String lang; + /*String lang; - if(language.equalsIgnoreCase("English")){ + if (language.equalsIgnoreCase("English")) { lang = "EN"; - } - else if(language.equalsIgnoreCase("UAE")) { - + } else if (language.equalsIgnoreCase("ARABIC-KSA")) { lang = "AR"; } else { lang = "TR"; + }*/ + + String lang; + + if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { + lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; + }else{ + lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } Locale locale = new Locale(lang); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SettingsActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SettingsActivity.java index 252ca4b..8174a51 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SettingsActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SettingsActivity.java @@ -137,16 +137,31 @@ public class SettingsActivity extends AppCompatActivity implements SelectLanguag } private static boolean updateResources(Context context, String language) { - String lang; + /*String lang; - if(language.equalsIgnoreCase("English")){ + if (language.equalsIgnoreCase("English")) { lang = "EN"; - } - else if(language.equalsIgnoreCase("UAE")) { - + } else if (language.equalsIgnoreCase("ARABIC-KSA")) { lang = "AR"; } else { lang = "TR"; + }*/ + + String lang; + + if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { + lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; + }else{ + lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } Locale locale = new Locale(lang); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java index 66330b8..287e9d9 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java @@ -620,14 +620,31 @@ public class StoreListActivity extends AppCompatActivity { private static boolean updateResources(Context context, String language) { - String lang; + /*String lang; if (language.equalsIgnoreCase("English")) { lang = "EN"; - } else if (language.equalsIgnoreCase("UAE")) { + } else if (language.equalsIgnoreCase("ARABIC-KSA")) { lang = "AR"; } else { lang = "TR"; + }*/ + + String lang; + + if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { + lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; + }else{ + lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } Locale locale = new Locale(lang); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java index e1cf55c..f8449c7 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java @@ -367,16 +367,31 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic private static boolean updateResources(Context context, String language) { - String lang ; + /*String lang; - if(language.equalsIgnoreCase("English")){ + if (language.equalsIgnoreCase("English")) { lang = "EN"; - } - else if(language.equalsIgnoreCase("UAE")) { + } else if (language.equalsIgnoreCase("ARABIC-KSA")) { lang = "AR"; - } - else { + } else { lang = "TR"; + }*/ + + String lang; + + if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { + lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; + }else{ + lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } Locale locale = new Locale(lang); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java index e03baa2..0253136 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java @@ -1193,14 +1193,31 @@ public class T2PComplianceActivity extends AppCompatActivity { private static boolean updateResources(Context context, String language) { - String lang; + /*String lang; if (language.equalsIgnoreCase("English")) { lang = "EN"; - } else if (language.equalsIgnoreCase("UAE")) { + } else if (language.equalsIgnoreCase("ARABIC-KSA")) { lang = "AR"; } else { lang = "TR"; + }*/ + + String lang; + + if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { + lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; + }else{ + lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } Locale locale = new Locale(lang); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2pBrand_Avaibility.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2pBrand_Avaibility.java index a604b36..01a1b18 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2pBrand_Avaibility.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2pBrand_Avaibility.java @@ -262,14 +262,31 @@ public class T2pBrand_Avaibility extends AppCompatActivity { private static boolean updateResources(Context context, String language) { - String lang; + /*String lang; if (language.equalsIgnoreCase("English")) { lang = "EN"; - } else if (language.equalsIgnoreCase("UAE")) { + } else if (language.equalsIgnoreCase("ARABIC-KSA")) { lang = "AR"; } else { lang = "TR"; + }*/ + + String lang; + + if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { + lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; + }else{ + lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } Locale locale = new Locale(lang); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java index ca91016..3de08cc 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java @@ -1047,14 +1047,31 @@ public class DownloadActivity extends AppCompatActivity { private static boolean updateResources(Context context, String language) { - String lang; + /*String lang; if (language.equalsIgnoreCase("English")) { lang = "EN"; - } else if (language.equalsIgnoreCase("UAE")) { + } else if (language.equalsIgnoreCase("ARABIC-KSA")) { lang = "AR"; } else { lang = "TR"; + }*/ + + String lang; + + if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { + lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; + }else{ + lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } Locale locale = new Locale(lang); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SelectLanguageFragment.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SelectLanguageFragment.java index b57f7a1..a7d2e76 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SelectLanguageFragment.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SelectLanguageFragment.java @@ -226,16 +226,31 @@ public class SelectLanguageFragment extends Fragment implements View.OnClickList } private static boolean updateResources(Context context, String language) { - String lang; + /*String lang; - if(language.equalsIgnoreCase("English")){ + if (language.equalsIgnoreCase("English")) { lang = "EN"; - } - else if(language.equalsIgnoreCase("UAE")) { - + } else if (language.equalsIgnoreCase("ARABIC-KSA")) { lang = "AR"; } else { lang = "TR"; + }*/ + + String lang; + + if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { + lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; + }else{ + lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } Locale locale = new Locale(lang); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java index 7e705bb..c956995 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java @@ -256,14 +256,31 @@ public class CategoryListActivity extends AppCompatActivity { private static boolean updateResources(Context context, String language) { - String lang; + /*String lang; if (language.equalsIgnoreCase("English")) { lang = "EN"; - } else if (language.equalsIgnoreCase("UAE")) { + } else if (language.equalsIgnoreCase("ARABIC-KSA")) { lang = "AR"; } else { lang = "TR"; + }*/ + + String lang; + + if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { + lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; + }else{ + lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } Locale locale = new Locale(lang); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java index fe2c4a7..11ada09 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java @@ -193,16 +193,31 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity { private static boolean updateResources(Context context, String language) { - String lang ; + /*String lang; - if(language.equalsIgnoreCase("English")){ + if (language.equalsIgnoreCase("English")) { lang = "EN"; - } - else if(language.equalsIgnoreCase("UAE")) { + } else if (language.equalsIgnoreCase("ARABIC-KSA")) { lang = "AR"; - } - else { + } else { lang = "TR"; + }*/ + + String lang; + + if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { + lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; + }else{ + lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } Locale locale = new Locale(lang); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java index 415d821..efeb49e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java @@ -391,14 +391,31 @@ public class DailyDataMenuActivity extends AppCompatActivity { private static boolean updateResources(Context context, String language) { - String lang; + /*String lang; if (language.equalsIgnoreCase("English")) { lang = "EN"; - } else if (language.equalsIgnoreCase("UAE")) { + } else if (language.equalsIgnoreCase("ARABIC-KSA")) { lang = "AR"; } else { lang = "TR"; + }*/ + + String lang; + + if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { + lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; + }else{ + lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } Locale locale = new Locale(lang); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java index c17b5d8..7424202 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java @@ -491,14 +491,31 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { private static boolean updateResources(Context context, String language) { - String lang; + /*String lang; if (language.equalsIgnoreCase("English")) { lang = "EN"; - } else if (language.equalsIgnoreCase("UAE")) { + } else if (language.equalsIgnoreCase("ARABIC-KSA")) { lang = "AR"; } else { lang = "TR"; + }*/ + + String lang; + + if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { + lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; + }else{ + lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } Locale locale = new Locale(lang); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java index 2f8cf50..8816426 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java @@ -50,14 +50,31 @@ public class PromoComplianceActivity extends AppCompatActivity { private static boolean updateResources(Context context, String language) { - String lang; + /*String lang; if (language.equalsIgnoreCase("English")) { lang = "EN"; - } else if (language.equalsIgnoreCase("UAE")) { + } else if (language.equalsIgnoreCase("ARABIC-KSA")) { lang = "AR"; } else { lang = "TR"; + }*/ + + String lang; + + if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { + lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; + }else{ + lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } Locale locale = new Locale(lang); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java index a9f4998..33e9f45 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java @@ -84,14 +84,31 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { private static boolean updateResources(Context context, String language) { - String lang; + /*String lang; if (language.equalsIgnoreCase("English")) { lang = "EN"; - } else if (language.equalsIgnoreCase("UAE")) { + } else if (language.equalsIgnoreCase("ARABIC-KSA")) { lang = "AR"; } else { lang = "TR"; + }*/ + + String lang; + + if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { + lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; + }else{ + lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } Locale locale = new Locale(lang); @@ -114,6 +131,7 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { try { Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + toolbar.setTitle(getResources().getString(R.string.stock_planogram_planogram_tracker)); setSupportActionBar(toolbar); getSupportActionBar().setHomeButtonEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true); @@ -164,7 +182,6 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { shelfAdapter.add(shelfList.get(j).getShelf()); } - //DefaultList prepareDefaultList(); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java index 24e3d3d..53a1bd7 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java @@ -107,14 +107,31 @@ public class Stock_FacingActivity extends AppCompatActivity { private static boolean updateResources(Context context, String language) { - String lang; + /*String lang; if (language.equalsIgnoreCase("English")) { lang = "EN"; - } else if (language.equalsIgnoreCase("UAE")) { + } else if (language.equalsIgnoreCase("ARABIC-KSA")) { lang = "AR"; } else { lang = "TR"; + }*/ + + String lang; + + if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { + lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; + }else{ + lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } Locale locale = new Locale(lang); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java index 004c2b7..751bb5f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java @@ -43,16 +43,31 @@ public class StoreWisePerformanceActivity extends AppCompatActivity { private static boolean updateResources(Context context, String language) { - String lang ; + /*String lang; - if(language.equalsIgnoreCase("English")){ + if (language.equalsIgnoreCase("English")) { lang = "EN"; - } - else if(language.equalsIgnoreCase("UAE")) { + } else if (language.equalsIgnoreCase("ARABIC-KSA")) { lang = "AR"; - } - else { + } else { lang = "TR"; + }*/ + + String lang; + + if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { + lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; + }else{ + lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } Locale locale = new Locale(lang); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java index 5e0a592..4a6b65f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java @@ -1349,14 +1349,31 @@ public class PreviousDataUploadActivity extends AppCompatActivity { private static boolean updateResources(Context context, String language) { - String lang; + /*String lang; if (language.equalsIgnoreCase("English")) { lang = "EN"; - } else if (language.equalsIgnoreCase("UAE")) { + } else if (language.equalsIgnoreCase("ARABIC-KSA")) { lang = "AR"; } else { lang = "TR"; + }*/ + + String lang; + + if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { + lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; + }else{ + lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } Locale locale = new Locale(lang); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java index 5c21c0e..a009c86 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -1706,14 +1706,31 @@ public class UploadActivity extends AppCompatActivity { private static boolean updateResources(Context context, String language) { - String lang; + /*String lang; if (language.equalsIgnoreCase("English")) { lang = "EN"; - } else if (language.equalsIgnoreCase("UAE")) { + } else if (language.equalsIgnoreCase("ARABIC-KSA")) { lang = "AR"; } else { lang = "TR"; + }*/ + + String lang; + + if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) { + lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH; + + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { + lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; + }else{ + lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } Locale locale = new Locale(lang); diff --git a/GSKMTOrange/src/main/res/layout/content_stock_facing__planogram_tracker.xml b/GSKMTOrange/src/main/res/layout/content_stock_facing__planogram_tracker.xml index 99e28b9..d2f9f84 100644 --- a/GSKMTOrange/src/main/res/layout/content_stock_facing__planogram_tracker.xml +++ b/GSKMTOrange/src/main/res/layout/content_stock_facing__planogram_tracker.xml @@ -27,7 +27,7 @@ android:layout_marginLeft="10dp" android:background="@color/colorPrimary" android:padding="5dp" - android:text="Add Shelf" + android:text="@string/stock_planogram_add_shelf" android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="@color/white" /> diff --git a/GSKMTOrange/src/main/res/layout/dialog_stock_facing_planogram_tracker.xml b/GSKMTOrange/src/main/res/layout/dialog_stock_facing_planogram_tracker.xml index 9b1c55d..b99187a 100644 --- a/GSKMTOrange/src/main/res/layout/dialog_stock_facing_planogram_tracker.xml +++ b/GSKMTOrange/src/main/res/layout/dialog_stock_facing_planogram_tracker.xml @@ -35,7 +35,7 @@ android:paddingLeft="20dp" android:paddingRight="10dp" android:paddingTop="15dp" - android:text="Add Shelf" + android:text="@string/stock_planogram_add_shelf" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@color/colorPrimary" /> @@ -161,7 +161,7 @@ android:paddingBottom="5dp" android:paddingLeft="10dp" android:paddingTop="5dp" - android:text="Add Shelf" + android:text="@string/stock_planogram_add_shelf" android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="@color/colorPrimary" /> @@ -187,7 +187,7 @@ android:paddingBottom="5dp" android:paddingLeft="10dp" android:paddingTop="5dp" - android:text="Position on Shelf" + android:text="@string/stock_planogram_position_on_shelf" android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="@color/colorPrimary" /> @@ -222,7 +222,7 @@ android:layout_marginLeft="10dp" android:background="@color/colorPrimary" android:padding="5dp" - android:text="Add Shelf" + android:text="@string/stock_planogram_add_shelf" android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="@color/white" /> @@ -234,7 +234,7 @@ android:layout_marginRight="10dp" android:background="@color/colorPrimary" android:padding="5dp" - android:text="Cancel" + android:text="@string/cancel" android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="@color/white" /> diff --git a/GSKMTOrange/src/main/res/layout/dialog_stock_facing_planogram_tracker_add_sku.xml b/GSKMTOrange/src/main/res/layout/dialog_stock_facing_planogram_tracker_add_sku.xml index f82acf9..76ef39c 100644 --- a/GSKMTOrange/src/main/res/layout/dialog_stock_facing_planogram_tracker_add_sku.xml +++ b/GSKMTOrange/src/main/res/layout/dialog_stock_facing_planogram_tracker_add_sku.xml @@ -73,7 +73,7 @@ android:layout_marginLeft="10dp" android:background="@color/colorPrimary" android:padding="5dp" - android:text="Add SKU to Shelf" + android:text="@string/stock_planogram_add_sku_to_shelf" android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="@color/white" /> @@ -85,7 +85,7 @@ android:layout_marginRight="10dp" android:background="@color/colorPrimary" android:padding="5dp" - android:text="Cancel" + android:text="@string/cancel" android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="@color/white" /> diff --git a/GSKMTOrange/src/main/res/layout/item_stock_facing_planogram_header.xml b/GSKMTOrange/src/main/res/layout/item_stock_facing_planogram_header.xml index 89d8b8c..4e510ea 100644 --- a/GSKMTOrange/src/main/res/layout/item_stock_facing_planogram_header.xml +++ b/GSKMTOrange/src/main/res/layout/item_stock_facing_planogram_header.xml @@ -54,7 +54,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="15dp" - android:text="Add SKU" + android:text="@string/stock_planogram_add_sku" android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="@color/black" /> diff --git a/GSKMTOrange/src/main/res/values-ar/string.xml b/GSKMTOrange/src/main/res/values-ar/string.xml index 85e259c..17de432 100644 --- a/GSKMTOrange/src/main/res/values-ar/string.xml +++ b/GSKMTOrange/src/main/res/values-ar/string.xml @@ -202,18 +202,24 @@ نعم - Stock Planogram Data Uploading + تحميل بيانات البلانوجرام الخاص بالمخزون - Category Pictures - CategoryPicture + صور الفئة + صور الفئة - Please fill the no camera data - Shelf - Position - is already exists - Please select atleast one sku - Add sku, shelf can not be empty + رجاء املأ بيانات عدم امكانية التصوير + الرف + الموقع + موجود بالفعل + رجاء اختيار صنف واحد على الأقل + أضف صنف لا يمكن ترك الرف فارغا + + الرف/ الموقع موجود بالفعل + + Add Shelf + Add Sku + Add Sku to Shelf + Planogram Tracker + Position on Shelf - ARABIC-KSA - AR diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml index fba174e..fb1a01a 100644 --- a/GSKMTOrange/src/main/res/values-tr/string.xml +++ b/GSKMTOrange/src/main/res/values-tr/string.xml @@ -243,7 +243,7 @@ Stok Planogram Veri Gönderimi Kategori Resimleri - KategoriResimleri + Kategori Resimleri Lütfen kamera yok datasını doldurun Raf @@ -252,8 +252,14 @@ En azindan 1 SKU seçmelisiniz SKU ekleyin, raf boş olamaz - English - TR + Raf / Konum zaten var + + Add Shelf + Add Sku + Add Sku to Shelf + Planogram Tracker + Position on Shelf + diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index b6e77c3..7ffc83b 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -286,7 +286,14 @@ Please select atleast one sku Add sku, shelf can not be empty - English - EN + Shelf/ Position already exists + + Add Shelf + Add Sku + Add Sku to Shelf + Planogram Tracker + Position on Shelf + +