From 4519840baa2350793df6b97c9b68a6d224de3555 Mon Sep 17 00:00:00 2001 From: vikrama Date: Wed, 23 Jun 2010 06:00:57 +0000 Subject: [PATCH] 1. Set up all strings in res/*/strings.xml rather than as string literals. 2. Using a very handy script for this purpose, and checking it into utils/ since it saved me some headache. 3. Turned tabs -> spaces for WifiResultHandler. 4. Better error handling on network types: look for exact matches rather than substrings. git-svn-id: http://zxing.googlecode.com/svn/trunk@1456 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- android/res/values-ar/strings.xml | 5 ++ android/res/values-cs/strings.xml | 5 ++ android/res/values-da/strings.xml | 7 +- android/res/values-de/strings.xml | 5 ++ android/res/values-es/strings.xml | 5 ++ android/res/values-fi/strings.xml | 5 ++ android/res/values-fr/strings.xml | 5 ++ android/res/values-hu/strings.xml | 5 ++ android/res/values-it/strings.xml | 5 ++ android/res/values-ja-rJP/strings.xml | 5 ++ android/res/values-nl/strings.xml | 5 ++ android/res/values-pl/strings.xml | 5 ++ android/res/values-pt/strings.xml | 5 ++ android/res/values-ru/strings.xml | 5 ++ android/res/values-sv/strings.xml | 5 ++ android/res/values-zh-rCN/strings.xml | 5 ++ android/res/values-zh-rTW/strings.xml | 5 ++ android/res/values/strings.xml | 5 ++ .../android/result/WifiResultHandler.java | 88 +++++++++---------- .../client/android/wifi/WifiActivity.java | 35 ++++---- android/utils/translate.py | 68 ++++++++++++++ 21 files changed, 218 insertions(+), 65 deletions(-) create mode 100755 android/utils/translate.py diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml index 059b51c9..53c0cfa5 100644 --- a/android/res/values-ar/strings.xml +++ b/android/res/values-ar/strings.xml @@ -121,5 +121,10 @@ مشاركة عبر الرمز الشريطي إصدار ماسح الرمز الشريطي التكوين اللاسلك + تغيير الشبكة + إنشاء شبكة + تعديل شبكة + اسم الشبكة مفقود + شبكة نوع غير صحيح http://code.google.com/p/zxing diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml index 86532669..ec072004 100644 --- a/android/res/values-cs/strings.xml +++ b/android/res/values-cs/strings.xml @@ -121,5 +121,10 @@ Sdílet pomocí čárového kódu Barcode Scanner v Bezdrátová konfigurace + Změna síť + Vytvoření sítě + Úprava sítě + Název sítě chybí + Typ sítě nesprávné http://code.google.com/p/zxing diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml index f6305e6e..c248741e 100644 --- a/android/res/values-da/strings.xml +++ b/android/res/values-da/strings.xml @@ -121,5 +121,10 @@ Del via stregkode Barcode Scanner v Wifi-forbindelse + Ændring Network + Oprettelse af netværk + Ændring Network + Netværk navn mangler + Netværk type forkert http://code.google.com/p/zxing - \ No newline at end of file + diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml index 204c94fb..2de5fc19 100644 --- a/android/res/values-de/strings.xml +++ b/android/res/values-de/strings.xml @@ -122,4 +122,9 @@ Barcode Scanner v Wifi konfiguration http://code.google.com/p/zxing + Ändern der Netzwerkeinstellungen + Erstellen Network + Ändern Network + Netzwerk-Name fehlt + Netzwerk-Typ nicht korrekt diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml index 67110284..bec26fc7 100644 --- a/android/res/values-es/strings.xml +++ b/android/res/values-es/strings.xml @@ -121,5 +121,10 @@ Compartir por códigos de barras Escáner de código de barras v Configuración de la red + Cambio de la red + Creación de la Red + Modificación de la Red + Nombre de la red desaparecidas + Red de tipo incorrecto http://code.google.com/p/zxing diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml index 975b7664..cc7015d6 100644 --- a/android/res/values-fi/strings.xml +++ b/android/res/values-fi/strings.xml @@ -121,5 +121,10 @@ Jaa viivakoodilla Viivakoodin lukija v Langattoman yhteyden + Vaihtaminen Verkko + Luominen verkoston + Muuttaminen Verkko + Verkon nimi puuttuu + Verkon tyyppi virheellinen http://code.google.com/p/zxing diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml index e8582fb9..c5048f6b 100644 --- a/android/res/values-fr/strings.xml +++ b/android/res/values-fr/strings.xml @@ -121,5 +121,10 @@ Partager par code barre Barcode Scanner v Configuration du réseau + Changement de réseau + Création d\u0026#39;un réseau + Modification du réseau + Le nom du réseau disparus + Réseau de type incorrect http://code.google.com/p/zxing diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml index a2f6a4a7..763cb087 100644 --- a/android/res/values-hu/strings.xml +++ b/android/res/values-hu/strings.xml @@ -121,5 +121,10 @@ Megosztás vonalkóddal Barcode Scanner v Hálózati konfiguráció + Változó Hálózat + Hálózat létrehozása + Módosítása Hálózat + A hálózat neve hiányzik + Hálózati típusú hibás http://code.google.com/p/zxing diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml index 54ac0703..4f9d8b62 100644 --- a/android/res/values-it/strings.xml +++ b/android/res/values-it/strings.xml @@ -121,5 +121,10 @@ Condividi tramite codice a barre Scansione codice a barre v Configurazione di rete + Cambiare Network + Creazione di rete + Modifica della rete + Nome della rete mancante + Tipo di rete non corretto http://code.google.com/p/zxing diff --git a/android/res/values-ja-rJP/strings.xml b/android/res/values-ja-rJP/strings.xml index 4889b64a..3c202df2 100644 --- a/android/res/values-ja-rJP/strings.xml +++ b/android/res/values-ja-rJP/strings.xml @@ -121,5 +121,10 @@ バーコードで共有する >QRコードスキャナー v ネットワーク構成 + ネットワークを変更する + 作成ネットワーク + ネットワークを変更する + ネットワーク名を欠いて + ネットワーク型不正 http://code.google.com/p/zxing diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml index 63972931..ee387dda 100644 --- a/android/res/values-nl/strings.xml +++ b/android/res/values-nl/strings.xml @@ -121,5 +121,10 @@ Deel via barcode Barcode Scanner v Netwerkconfiguratie + Veranderen van Netwerk + Creating Network + Het wijzigen van Netwerk + Netwerk naam ontbreekt + Netwerk soort onjuiste http://code.google.com/p/zxing diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml index 3be4e14e..1d794a22 100644 --- a/android/res/values-pl/strings.xml +++ b/android/res/values-pl/strings.xml @@ -121,5 +121,10 @@ Udostępnij przez kod paskowy Skaner Kodów Paskowych v Konfiguracja sieci + Zmiana sieci + Tworzenie sieci + Modyfikowanie sieci + Nazwa sieci brakuje + Typ sieci nieprawidłowe http://code.google.com/p/zxing diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml index 39c965b5..7100fa1b 100644 --- a/android/res/values-pt/strings.xml +++ b/android/res/values-pt/strings.xml @@ -121,5 +121,10 @@ Partilhar por código de barras Scanner de código barras v Configuração de rede + Mudar Rede + Criação da rede + Modificando Rede + Nome da rede em falta + Rede de tipo incorreto http://code.google.com/p/zxing diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml index 9e250247..e9228a51 100644 --- a/android/res/values-ru/strings.xml +++ b/android/res/values-ru/strings.xml @@ -121,5 +121,10 @@ Поделиться через штрих-код Сканер штрих-кодов версии конфигурации сети + Изменение сети + Создание сети + Изменение сети + Сеть отсутствует имя + Тип сети неправильный http://code.google.com/p/zxing diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml index 1175da20..b2bb5a62 100644 --- a/android/res/values-sv/strings.xml +++ b/android/res/values-sv/strings.xml @@ -121,5 +121,10 @@ Dela via streckkod Barcode Scanner v Nätverkskonfiguration + Ändra Network + Skapa nätverk + Modifiera nätverk + Nätverksnamn saknas + Nätverkstyp felaktig http://code.google.com/p/zxing diff --git a/android/res/values-zh-rCN/strings.xml b/android/res/values-zh-rCN/strings.xml index d2890cb0..21f7187d 100644 --- a/android/res/values-zh-rCN/strings.xml +++ b/android/res/values-zh-rCN/strings.xml @@ -121,5 +121,10 @@ 通过条码分享 条码扫描器 网络配置 + 不断变化的网络 + 创建网络 + 修改网络 + 网络实名失踪 + 网络类型不正确 http://code.google.com/p/zxing diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml index 666fe47b..fe0f7b58 100644 --- a/android/res/values-zh-rTW/strings.xml +++ b/android/res/values-zh-rTW/strings.xml @@ -121,5 +121,10 @@ 通過條碼分享 條碼掃描器 網絡配置 + 不斷變化的網絡 + 創建網絡 + 修改網絡 + 網絡實名失踪 + 網絡類型不正確 http://code.google.com/p/zxing diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index 81efca1c..da3200ab 100755 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -121,5 +121,10 @@ Share via barcode Barcode Scanner v Wifi Connection + Changing Network + Creating Network + Modifying Network + Network name missing + Network type incorrect http://code.google.com/p/zxing diff --git a/android/src/com/google/zxing/client/android/result/WifiResultHandler.java b/android/src/com/google/zxing/client/android/result/WifiResultHandler.java index ef6fbaa1..1cc2b5d5 100644 --- a/android/src/com/google/zxing/client/android/result/WifiResultHandler.java +++ b/android/src/com/google/zxing/client/android/result/WifiResultHandler.java @@ -28,53 +28,53 @@ import com.google.zxing.client.result.WifiParsedResult; * @author viki@google.com (Vikram Aggarwal) */ public final class WifiResultHandler extends ResultHandler { - Activity parentActivity = null; - public WifiResultHandler(Activity activity, ParsedResult result) { - super(activity, result); - parentActivity = activity; - } + Activity parentActivity = null; + public WifiResultHandler(Activity activity, ParsedResult result) { + super(activity, result); + parentActivity = activity; + } - @Override - public int getButtonCount() { - // We just need one button, and that is to configure the wireless. This could change in the future. - return 1; - } + @Override + public int getButtonCount() { + // We just need one button, and that is to configure the wireless. This could change in the future. + return 1; + } - @Override - public int getButtonText(int index) { - switch (index) { - case 0: - return R.string.button_wifi; - default: - throw new ArrayIndexOutOfBoundsException(); - } - } + @Override + public int getButtonText(int index) { + switch (index) { + case 0: + return R.string.button_wifi; + default: + throw new ArrayIndexOutOfBoundsException(); + } + } - @Override - public void handleButtonPress(int index) { - // Get the underlying wifi config - WifiParsedResult wifiResult = (WifiParsedResult) getResult(); - switch (index) { - case 0: - wifiConnect(wifiResult); - break; - default: - break; - } - } + @Override + public void handleButtonPress(int index) { + // Get the underlying wifi config + WifiParsedResult wifiResult = (WifiParsedResult) getResult(); + switch (index) { + case 0: + wifiConnect(wifiResult); + break; + default: + break; + } + } - // Display the name of the network and the network type to the user. - @Override - public CharSequence getDisplayContents() { - WifiParsedResult wifiResult = (WifiParsedResult) getResult(); - StringBuffer contents = new StringBuffer(); - ParsedResult.maybeAppend(wifiResult.getSsid(), contents); - ParsedResult.maybeAppend(wifiResult.getNetworkEncryption(), contents); - return contents.toString(); - } + // Display the name of the network and the network type to the user. + @Override + public CharSequence getDisplayContents() { + WifiParsedResult wifiResult = (WifiParsedResult) getResult(); + StringBuffer contents = new StringBuffer(); + ParsedResult.maybeAppend(wifiResult.getSsid(), contents); + ParsedResult.maybeAppend(wifiResult.getNetworkEncryption(), contents); + return contents.toString(); + } - @Override - public int getDisplayTitle() { - return R.string.result_wifi; - } + @Override + public int getDisplayTitle() { + return R.string.result_wifi; + } } \ No newline at end of file diff --git a/android/src/com/google/zxing/client/android/wifi/WifiActivity.java b/android/src/com/google/zxing/client/android/wifi/WifiActivity.java index b7ef8a30..b86fed0a 100644 --- a/android/src/com/google/zxing/client/android/wifi/WifiActivity.java +++ b/android/src/com/google/zxing/client/android/wifi/WifiActivity.java @@ -39,11 +39,6 @@ import com.google.zxing.client.android.R; * * TODO(viki): Tell the user when the network is not available here * TODO(viki): Incorrect password, could not connect, give an error - * TODO(viki): Should never crash: crashes on S:ssid;P:pass;T:something;else; - * TODO(viki): - * TODO(viki): - * TODO(viki): - * TODO(viki): * * @author Vikram Aggarwal */ @@ -64,13 +59,13 @@ public class WifiActivity extends Activity { // If the SSID is empty, throw an error and return if (setting.getSsid() == null || setting.getSsid().length() == 0) { - return doError("SSID name missing"); + return doError(R.string.wifi_ssid_missing); } // If the network type is invalid if (setting.getNetworkType() == NetworkType.NETWORK_INVALID){ - return doError("Network type incorrect"); + return doError(R.string.wifi_type_incorrect); } - + // If the password is empty, this is an unencrypted network if (setting.getPassword() == null || setting.getPassword().length() == 0 || setting.getNetworkType() == null || @@ -78,14 +73,14 @@ public class WifiActivity extends Activity { return changeNetworkUnEncrypted(setting); } if (setting.getNetworkType() == NetworkType.NETWORK_WPA) { - return changeNetworkWPA(setting); + return changeNetworkWPA(setting); } else { return changeNetworkWEP(setting); } } - private int doError(String string) { - statusView.setText(string); + private int doError(int resource_string) { + statusView.setText(resource_string); return -1; } @@ -101,13 +96,13 @@ public class WifiActivity extends Activity { config.allowedProtocols.clear(); // Android API insists that an ascii SSID must be quoted to be correctly handled. - config.SSID = NetworkUtil.convertToQuotedString(input.getSsid()); + config.SSID = NetworkUtil.convertToQuotedString(input.getSsid()); config.hiddenSSID = true; return config; } private int requestNetworkChange(WifiConfiguration config){ - statusView.setText("Changing Network..."); + statusView.setText(R.string.wifi_changing_network); return updateNetwork(config, false); } @@ -184,15 +179,15 @@ public class WifiActivity extends Activity { // TODO(vikrama): Error checking here, to ensure ssid exists. NetworkType networkT; - if (networkType.contains("WPA")) { + if (networkType.equals("WPA")) { networkT = NetworkType.NETWORK_WPA; - } else if (networkType.contains("WEP")) { + } else if (networkType.equals("WEP")) { networkT = NetworkType.NETWORK_WEP; - } else if (networkType.contains("nopass")) { - networkT = NetworkType.NETWORK_NOPASS; + } else if (networkType.equals("nopass")) { + networkT = NetworkType.NETWORK_NOPASS; } else { // Got an incorrect network type. Give an error - doError("Incorrect Network type: " + networkType); + doError(R.string.wifi_type_incorrect); return; } @@ -229,10 +224,10 @@ public class WifiActivity extends Activity { private int updateNetwork(WifiConfiguration config, boolean disableOthers){ int networkId; if (findNetworkInExistingConfig(config.SSID) == null){ - statusView.setText("Creating network..."); + statusView.setText(R.string.wifi_creating_network); networkId = wifiManager.addNetwork(config); } else { - statusView.setText("Modifying network..."); + statusView.setText(R.string.wifi_modifying_network); networkId = wifiManager.updateNetwork(config); } if (networkId == -1 || !wifiManager.enableNetwork(networkId, disableOthers)) { diff --git a/android/utils/translate.py b/android/utils/translate.py new file mode 100755 index 00000000..5f7e237b --- /dev/null +++ b/android/utils/translate.py @@ -0,0 +1,68 @@ +#!/usr/bin/env python +# +# Copyright (C) 2010 ZXing authors +# +# 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. + +# Translate a string from English to all locales used in the Barcode +# Scanner Android project +# +# Author: Neha Pandey + +from urllib2 import urlopen +from urllib import urlencode +import sys + +def translate (in_lang, out_lang, input): + """Translate the input from in_lang to out_lang using Google Translate""" + # Create the URL + langpair = '%s|%s' % (in_lang, out_lang) + base = 'http://ajax.googleapis.com/ajax/services/language/translate?' + params = urlencode ((('v',1.0), + ('q',input), + ('langpair',langpair),) ) + url = base + params + # Call translation + content = urlopen(url).read() + + # Snip out unwanted fluff from the translation + start_index = content.find('"translatedText":"') + 18 + translation = content [start_index:] + end_index = translation.find('"}, "') + output = translation[:end_index] + return output + +# All the languages to translate to +language_list = ['en', 'ar', 'cs', 'da', 'de', 'es', + 'fi', 'fr', 'hu', 'it', 'ja', 'nl', + 'pl', 'pt', 'ru', 'sv', 'zh-CN', + 'zh-TW'] + +if (len(sys.argv) < 3): + print "Usage: %s name String to translate" % sys.argv[0] + print "Sample: %s ask-banana Give me a banana" % sys.argv[0] + import sys + sys.exit (-1); + +# First argument is the name of the string +string_name = sys.argv[1] +# Remaining arguments is the string to be translated in English +input_string =' '.join(sys.argv[2:]) + +# Translate all languages +for i in range(len(language_list)) : + translation = translate ('en', language_list[i], input_string) + xml_string = '' + \ + translation + '' + print language_list[i], xml_string + -- 2.20.1