diff --git a/common/api.js b/common/api.js index 164a3d6..205fef0 100644 --- a/common/api.js +++ b/common/api.js @@ -7,12 +7,41 @@ var default_api = 'https://api.global-interaction.com/'; var ACCESS_TOKEN_KEY = 'hyapp_access_token'; var APP_CODE_KEY = 'hyapp_app_code'; var RENEWED_ACCESS_TOKEN_HEADER = 'X-Hyapp-Access-Token'; + var LANGUAGE_QUERY_KEYS = [ + 'language', + 'lang', + 'locale', + 'app_lang', + 'appLanguage', + ]; var memoryEnv = ''; var memoryAccessToken = ''; var memoryAppCode = ''; + function currentQueryParams() { + var params = new URLSearchParams(window.location.search); + var hash = window.location.hash || ''; + if (hash.indexOf('?') >= 0) { + new URLSearchParams(hash.split('?').slice(1).join('?')).forEach( + function (value, key) { + if (!params.has(key)) params.set(key, value); + } + ); + } + return params; + } + function readQuery(name) { - return new URLSearchParams(window.location.search).get(name); + return currentQueryParams().get(name); + } + + function readLanguageQuery() { + var params = currentQueryParams(); + for (var i = 0; i < LANGUAGE_QUERY_KEYS.length; i += 1) { + var value = params.get(LANGUAGE_QUERY_KEYS[i]); + if (value) return value; + } + return ''; } function normalizeToken(value) { @@ -365,6 +394,7 @@ var default_api = 'https://api.global-interaction.com/'; createOrder: function (payload) { return request('/api/v1/recharge/h5/orders', { method: 'POST', + query: { language: readLanguageQuery() }, body: payload || {}, }); }, diff --git a/common/i18n.js b/common/i18n.js index b0937c8..9c1f9e9 100644 --- a/common/i18n.js +++ b/common/i18n.js @@ -2,6 +2,13 @@ var STORAGE_KEY = 'hyapp_h5_lang'; var DEFAULT_LANG = 'en'; var SUPPORTED = ['en', 'ar', 'tr', 'es', 'zh', 'id']; + var LANG_QUERY_KEYS = [ + 'language', + 'lang', + 'locale', + 'app_lang', + 'appLanguage', + ]; var scriptURL = document.currentScript && document.currentScript.src ? document.currentScript.src @@ -19,8 +26,9 @@ var lang = String(value || '') .trim() .toLowerCase() - .replace('_', '-'); - if (lang.indexOf('ar') === 0) lang = 'ar'; + .replace(/_/g, '-'); + if (lang.indexOf('en') === 0) lang = 'en'; + else if (lang.indexOf('ar') === 0) lang = 'ar'; else if (lang.indexOf('tr') === 0) lang = 'tr'; else if (lang.indexOf('es') === 0) lang = 'es'; else if (lang.indexOf('zh') === 0) lang = 'zh'; @@ -70,23 +78,24 @@ function queryLang() { var params = currentParams(); - return ( - params.get('lang') || - params.get('language') || - params.get('locale') || - params.get('app_lang') || - params.get('appLanguage') || - '' - ); + for (var i = 0; i < LANG_QUERY_KEYS.length; i += 1) { + var value = params.get(LANG_QUERY_KEYS[i]); + if (value) return value; + } + return ''; } function normalizeLang(value) { var lang = String(value || '') .trim() .toLowerCase() - .replace('_', '-'); + .replace(/_/g, '-'); if (!lang) return ''; - if (lang.indexOf('ar') === 0) lang = 'ar'; + if (lang.indexOf(',') >= 0) lang = lang.split(',')[0]; + if (lang.indexOf(';') >= 0) lang = lang.split(';')[0]; + lang = lang.trim(); + if (lang.indexOf('en') === 0) lang = 'en'; + else if (lang.indexOf('ar') === 0) lang = 'ar'; else if (lang.indexOf('tr') === 0) lang = 'tr'; else if (lang.indexOf('es') === 0) lang = 'es'; else if (lang.indexOf('zh') === 0) lang = 'zh'; @@ -95,8 +104,9 @@ } function resolveLang() { + var requestedLang = queryLang(); + if (requestedLang) return normalizeLang(requestedLang) || DEFAULT_LANG; return ( - normalizeLang(queryLang()) || normalizeLang(storageGet(STORAGE_KEY)) || normalizeLang(window.navigator.language) || DEFAULT_LANG diff --git a/common/locales/ar.json b/common/locales/ar.json index abfc69c..6be7213 100644 --- a/common/locales/ar.json +++ b/common/locales/ar.json @@ -462,13 +462,14 @@ "cp.rewardCoins10000": "عملات*10000", "cp.rewardCount7": "عدّاد*7 أيام", "cp.copyright": "حقوق هذا النشاط تعود إلى Shila", - "recharge.pageTitle": "الشحن", - "recharge.pageSubtitle": "اختر باقة عملات وادفع عبر USDT-TRC20 أو طريقة دفع محلية مدعومة.", + "recharge.pageTitle": "Recharge Center", + "recharge.pageSubtitle": "اختر باقة عملات وأكمل الدفع.", "recharge.changeLanguage": "تغيير اللغة", "recharge.accountTitle": "الحساب", "recharge.accountHint": "أكد الحساب قبل اختيار الباقة.", "recharge.userIdPlaceholder": "أدخل معرف المستخدم", "recharge.searchAccount": "تأكيد", + "recharge.changeAccount": "تغيير", "recharge.loading": "جار التحميل...", "recharge.accountConfirmed": "تم تأكيد الحساب", "recharge.ordinaryUser": "مستخدم", @@ -483,7 +484,7 @@ "recharge.usdtTrc20": "USDT-TRC20", "recharge.usdtNetwork": "شبكة TRON", "recharge.thirdPartyPayment": "دفع محلي", - "recharge.createOrder": "إنشاء الطلب", + "recharge.createOrder": "ادفع الآن", "recharge.creating": "جار الإنشاء...", "recharge.orderTitle": "الطلب", "recharge.paymentOperation": "عملية الدفع", diff --git a/common/locales/en.json b/common/locales/en.json index 431c096..d3c19ef 100644 --- a/common/locales/en.json +++ b/common/locales/en.json @@ -468,13 +468,14 @@ "cp.rewardCoins10000": "Coins*10000", "cp.rewardCount7": "Count*7days", "cp.copyright": "The copyright of this activity belongs to Shila", - "recharge.pageTitle": "Recharge", - "recharge.pageSubtitle": "Choose a coin package and pay with USDT-TRC20 or a supported local payment method.", + "recharge.pageTitle": "Recharge Center", + "recharge.pageSubtitle": "Choose a coin package and pay.", "recharge.changeLanguage": "Change language", "recharge.accountTitle": "Account", "recharge.accountHint": "Confirm the account before selecting a package.", "recharge.userIdPlaceholder": "Enter user ID", "recharge.searchAccount": "Confirm", + "recharge.changeAccount": "Change", "recharge.loading": "Loading...", "recharge.accountConfirmed": "Account confirmed", "recharge.ordinaryUser": "User", @@ -489,7 +490,7 @@ "recharge.usdtTrc20": "USDT-TRC20", "recharge.usdtNetwork": "TRON network", "recharge.thirdPartyPayment": "Local payment", - "recharge.createOrder": "Create order", + "recharge.createOrder": "Pay now", "recharge.creating": "Creating...", "recharge.orderTitle": "Order", "recharge.paymentOperation": "Payment operation", diff --git a/common/locales/es.json b/common/locales/es.json index 44faf28..43bdd66 100644 --- a/common/locales/es.json +++ b/common/locales/es.json @@ -462,13 +462,14 @@ "cp.rewardCoins10000": "Monedas*10000", "cp.rewardCount7": "Contador*7 días", "cp.copyright": "Los derechos de esta actividad pertenecen a Shila", - "recharge.pageTitle": "Recarga", - "recharge.pageSubtitle": "Elige un paquete de monedas y paga con USDT-TRC20 o un método local compatible.", + "recharge.pageTitle": "Recharge Center", + "recharge.pageSubtitle": "Elige un paquete de monedas y completa el pago.", "recharge.changeLanguage": "Cambiar idioma", "recharge.accountTitle": "Cuenta", "recharge.accountHint": "Confirma la cuenta antes de elegir un paquete.", "recharge.userIdPlaceholder": "Ingresa el ID de usuario", "recharge.searchAccount": "Confirmar", + "recharge.changeAccount": "Cambiar", "recharge.loading": "Cargando...", "recharge.accountConfirmed": "Cuenta confirmada", "recharge.ordinaryUser": "Usuario", @@ -483,7 +484,7 @@ "recharge.usdtTrc20": "USDT-TRC20", "recharge.usdtNetwork": "Red TRON", "recharge.thirdPartyPayment": "Pago local", - "recharge.createOrder": "Crear pedido", + "recharge.createOrder": "Pagar ahora", "recharge.creating": "Creando...", "recharge.orderTitle": "Pedido", "recharge.paymentOperation": "Operación de pago", diff --git a/common/locales/id.json b/common/locales/id.json index 05f32e7..9c74ab3 100644 --- a/common/locales/id.json +++ b/common/locales/id.json @@ -429,13 +429,14 @@ "cp.rewardCoins10000": "Koin*10000", "cp.rewardCount7": "Hitungan*7 hari", "cp.copyright": "Hak cipta aktivitas ini milik Shila", - "recharge.pageTitle": "Top up", - "recharge.pageSubtitle": "Pilih paket coin dan bayar dengan USDT-TRC20 atau metode lokal yang didukung.", + "recharge.pageTitle": "Recharge Center", + "recharge.pageSubtitle": "Pilih paket coin dan selesaikan pembayaran.", "recharge.changeLanguage": "Ganti bahasa", "recharge.accountTitle": "Akun", "recharge.accountHint": "Konfirmasi akun sebelum memilih paket.", "recharge.userIdPlaceholder": "Masukkan ID pengguna", "recharge.searchAccount": "Konfirmasi", + "recharge.changeAccount": "Ganti", "recharge.loading": "Memuat...", "recharge.accountConfirmed": "Akun dikonfirmasi", "recharge.ordinaryUser": "Pengguna", @@ -450,7 +451,7 @@ "recharge.usdtTrc20": "USDT-TRC20", "recharge.usdtNetwork": "Jaringan TRON", "recharge.thirdPartyPayment": "Pembayaran lokal", - "recharge.createOrder": "Buat pesanan", + "recharge.createOrder": "Bayar sekarang", "recharge.creating": "Membuat...", "recharge.orderTitle": "Pesanan", "recharge.paymentOperation": "Operasi pembayaran", diff --git a/common/locales/tr.json b/common/locales/tr.json index 68ecaf2..7e82abb 100644 --- a/common/locales/tr.json +++ b/common/locales/tr.json @@ -429,13 +429,14 @@ "cp.rewardCoins10000": "Coin*10000", "cp.rewardCount7": "Sayaç*7 gün", "cp.copyright": "Bu etkinliğin telif hakkı Shila'ya aittir", - "recharge.pageTitle": "Yükleme", - "recharge.pageSubtitle": "Coin paketi seçin ve USDT-TRC20 ya da desteklenen yerel ödeme yöntemiyle ödeyin.", + "recharge.pageTitle": "Recharge Center", + "recharge.pageSubtitle": "Coin paketi seçin ve ödemeyi tamamlayın.", "recharge.changeLanguage": "Dili değiştir", "recharge.accountTitle": "Hesap", "recharge.accountHint": "Paket seçmeden önce hesabı onaylayın.", "recharge.userIdPlaceholder": "Kullanıcı ID girin", "recharge.searchAccount": "Onayla", + "recharge.changeAccount": "Değiştir", "recharge.loading": "Yükleniyor...", "recharge.accountConfirmed": "Hesap onaylandı", "recharge.ordinaryUser": "Kullanıcı", @@ -450,7 +451,7 @@ "recharge.usdtTrc20": "USDT-TRC20", "recharge.usdtNetwork": "TRON ağı", "recharge.thirdPartyPayment": "Yerel ödeme", - "recharge.createOrder": "Sipariş oluştur", + "recharge.createOrder": "Şimdi öde", "recharge.creating": "Oluşturuluyor...", "recharge.orderTitle": "Sipariş", "recharge.paymentOperation": "Ödeme işlemi", diff --git a/common/locales/zh.json b/common/locales/zh.json index 5b7eb94..4073169 100644 --- a/common/locales/zh.json +++ b/common/locales/zh.json @@ -435,13 +435,14 @@ "cp.rewardCoins10000": "金币*10000", "cp.rewardCount7": "计数*7天", "cp.copyright": "本活动版权归 Shila 所有", - "recharge.pageTitle": "充值", - "recharge.pageSubtitle": "选择金币档位，使用 USDT-TRC20 或支持的本地支付方式付款。", + "recharge.pageTitle": "Recharge Center", + "recharge.pageSubtitle": "选择金币档位并完成支付。", "recharge.changeLanguage": "切换语言", "recharge.accountTitle": "账号", "recharge.accountHint": "确认账号后再选择充值档位。", "recharge.userIdPlaceholder": "输入用户 ID", "recharge.searchAccount": "确认", + "recharge.changeAccount": "更换", "recharge.loading": "加载中...", "recharge.accountConfirmed": "账号已确认", "recharge.ordinaryUser": "普通用户", @@ -456,7 +457,7 @@ "recharge.usdtTrc20": "USDT-TRC20", "recharge.usdtNetwork": "TRON 网络", "recharge.thirdPartyPayment": "本地支付", - "recharge.createOrder": "创建订单", + "recharge.createOrder": "立即支付", "recharge.creating": "创建中...", "recharge.orderTitle": "订单", "recharge.paymentOperation": "支付操作", diff --git a/recharge/index.html b/recharge/index.html index 0c54f48..0d9c74e 100644 --- a/recharge/index.html +++ b/recharge/index.html @@ -6,7 +6,7 @@ name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover" /> - Recharge + Recharge Center
-
+
+
+

+ Recharge Center +

+

+ Choose a coin package and pay. +

+
-
-

- Recharge -

-

- Choose a coin package and pay with USDT-TRC20 or a - supported local payment method. -

-
- +
@@ -654,6 +778,14 @@
-
+
-
+

Package

@@ -678,34 +810,8 @@ No package is available for this account.
- -
-
- -

- Payment -

-
- -
-
-

- Selected package -

-
-
-
- -
+

Payment

@@ -718,20 +824,33 @@ > No payment method is available.
+
+
+ +
+ -