diff --git a/strings.txt b/strings.txt index 683f906de1..223e97c99d 100644 --- a/strings.txt +++ b/strings.txt @@ -469,6 +469,7 @@ pt = A minha posição hu = Saját helyzet [no_internet_connection_detected] + tags = tizen en = No Internet connection detected comment = Settings/Downloader - No internet connection dialog title cs = Nenalezeno připojení k Internetu @@ -486,6 +487,7 @@ pt = Não foi detetada uma ligação à Internet hu = Nem találtam internet kapcsolatot [no_wifi_ask_cellular_download] + tags = tizen en = No WiFi connection detected. Would you like to use cellular data (GPRS, EDGE or 3G) to download %@? comment = Settings/Downloader - 3G download warning dialog title cs = Nenalezeno připojení k WiFi. Chceš použít mobilní sítě (GPRS, EDGE nebo 3G) pro stažení %@? @@ -711,6 +713,7 @@ pt = Sim hu = Igen [use_wifi_recommendation_text] + tags = tizen en = We recommend using WiFi to download large maps comment = Settings/Downloader - No internet connection dialog message cs = Doporučujeme použít WiFi pro stahování větších map diff --git a/tizen/MapsWithMe/inc/AppResourceId.h b/tizen/MapsWithMe/inc/AppResourceId.h index b17215a69b..f8a4dacbad 100644 --- a/tizen/MapsWithMe/inc/AppResourceId.h +++ b/tizen/MapsWithMe/inc/AppResourceId.h @@ -74,7 +74,9 @@ extern const wchar_t* IDS_MEASUREMENT_UNITS_SUMMARY; extern const wchar_t* IDS_MESSAGE; extern const wchar_t* IDS_MILES; extern const wchar_t* IDS_MY_POSITION_SHARE_SMS; +extern const wchar_t* IDS_NO_INTERNET_CONNECTION_DETECTED; extern const wchar_t* IDS_NO_SEARCH_RESULTS_FOUND; +extern const wchar_t* IDS_NO_WIFI_ASK_CELLULAR_DOWNLOAD; extern const wchar_t* IDS_PARKING; extern const wchar_t* IDS_PHARMACY; extern const wchar_t* IDS_POLICE; @@ -89,6 +91,7 @@ extern const wchar_t* IDS_TOILET; extern const wchar_t* IDS_TOURISM; extern const wchar_t* IDS_TRANSPORT; extern const wchar_t* IDS_UNKNOWN_CURRENT_POSITION; +extern const wchar_t* IDS_USE_WIFI_RECOMMENDATION_TEXT; extern const wchar_t* IDS_VISIBLE; extern const wchar_t* IDS_VERSION; // main form diff --git a/tizen/MapsWithMe/res/ces-CZ.xml b/tizen/MapsWithMe/res/ces-CZ.xml index 529323c0d7..520fbc45d4 100644 --- a/tizen/MapsWithMe/res/ces-CZ.xml +++ b/tizen/MapsWithMe/res/ces-CZ.xml @@ -17,6 +17,12 @@ Kilometry Míle + + Nenalezeno připojení k Internetu + + Nenalezeno připojení k WiFi. Chceš použít mobilní sítě (GPRS, EDGE nebo 3G) pro stažení %s? + + Doporučujeme použít WiFi pro stahování větších map Stáhnout Stahování selhalo: %s diff --git a/tizen/MapsWithMe/res/deu-DE.xml b/tizen/MapsWithMe/res/deu-DE.xml index e2a7f25bef..f435d3dac9 100644 --- a/tizen/MapsWithMe/res/deu-DE.xml +++ b/tizen/MapsWithMe/res/deu-DE.xml @@ -17,6 +17,12 @@ Kilometer Meilen + + Keine Internetverbindung + + Keine WLAN-Verbindung. Möchten Sie %s über das Mobilnetz (GPRS, EDGE oder 3G) herunterladen? + + Wir empfehlen Ihnen, grosse Länder über eine WLAN-Verbindung herunterzuladen Herunterladen %s herunterladen fehlgeschlagen diff --git a/tizen/MapsWithMe/res/eng-GB.xml b/tizen/MapsWithMe/res/eng-GB.xml index 93accb55c1..94720d14d1 100644 --- a/tizen/MapsWithMe/res/eng-GB.xml +++ b/tizen/MapsWithMe/res/eng-GB.xml @@ -19,6 +19,12 @@ MB Miles + + No Internet connection detected + + No WiFi connection detected. Would you like to use cellular data (GPRS, EDGE or 3G) to download %s? + + We recommend using WiFi to download large maps Download %s download has failed diff --git a/tizen/MapsWithMe/res/fra-FR.xml b/tizen/MapsWithMe/res/fra-FR.xml index 7d885e034b..99c2c2965a 100644 --- a/tizen/MapsWithMe/res/fra-FR.xml +++ b/tizen/MapsWithMe/res/fra-FR.xml @@ -19,6 +19,12 @@ Mo Miles + + Pas de connexion internet + + Pas de connexion WiFi. Désirez-vous télécharger par le réseau de téléphone mobile (GPRS, EDGE ou 3G) ? + + Nous recommandons d\'utiliser le WiFi pour télécharger de grandes cartes Télécharger %s : échec du téléchargement diff --git a/tizen/MapsWithMe/res/ita-IT.xml b/tizen/MapsWithMe/res/ita-IT.xml index c8119ff0b2..64153a7182 100644 --- a/tizen/MapsWithMe/res/ita-IT.xml +++ b/tizen/MapsWithMe/res/ita-IT.xml @@ -19,6 +19,12 @@ MB Miglia + + Non è stata rilevata alcuna connessione Internet + + Non è stata rilevata alcuna connessione WiFi. Vuoi utilizzare i dati cellulare (GPRS, EDGE o 3G) per scaricare %s? + + Ti consigliamo di utilizzare il WiFi per scaricare mappe di grandi dimensioni Carica Il trasferimento di %s non è riuscito diff --git a/tizen/MapsWithMe/res/pol-PL.xml b/tizen/MapsWithMe/res/pol-PL.xml index f60b270aa8..7a0c7d0057 100644 --- a/tizen/MapsWithMe/res/pol-PL.xml +++ b/tizen/MapsWithMe/res/pol-PL.xml @@ -19,6 +19,12 @@ MB Mile + + Nie wykryto połączenia z Internetem + + Nie wykryto połączenia z siecią WiFi. Czy chciałbyś skorzystać z trybu sieci danych (GPRS, EDGE lub 3G), aby pobrać %s? + + Zalecamy korzystanie z WiFi przy pobieraniu dużych map Pobierz %s pobieranie nie powiodło się diff --git a/tizen/MapsWithMe/res/por-PT.xml b/tizen/MapsWithMe/res/por-PT.xml index cf6154bf56..d9beb0884f 100644 --- a/tizen/MapsWithMe/res/por-PT.xml +++ b/tizen/MapsWithMe/res/por-PT.xml @@ -19,6 +19,12 @@ MB Milhas + + Não foi detetada uma ligação à Internet + + Não detetada uma ligação WiFi. Pretende utilizar os dados por pacotes (GPRS, EDGE or 3G) para descarregar %s? + + Recomendamos a utilização de WiFi para descarregar grandes mapas Descarga %s descarga falhou diff --git a/tizen/MapsWithMe/res/rus-RU.xml b/tizen/MapsWithMe/res/rus-RU.xml index b27cfbb6d3..beeab3d62d 100644 --- a/tizen/MapsWithMe/res/rus-RU.xml +++ b/tizen/MapsWithMe/res/rus-RU.xml @@ -19,6 +19,12 @@ МБ Мили + + Отсутствует подключение к интернету + + Нет WiFi соединения. Вы хотите скачать %s через сотового оператора (GPRS, EDGE или 3G)? + + Мы рекомендуем загружать большие страны через WiFi Загрузить Не удалось загрузить %s diff --git a/tizen/MapsWithMe/res/screen-size-normal/IDF_CATEGORY_FORM.xml b/tizen/MapsWithMe/res/screen-size-normal/IDF_CATEGORY_FORM.xml index 071b91b204..268aa16c23 100644 --- a/tizen/MapsWithMe/res/screen-size-normal/IDF_CATEGORY_FORM.xml +++ b/tizen/MapsWithMe/res/screen-size-normal/IDF_CATEGORY_FORM.xml @@ -18,7 +18,7 @@ - + diff --git a/tizen/MapsWithMe/res/spa-ES.xml b/tizen/MapsWithMe/res/spa-ES.xml index 0beeaefef4..d5ecbc7b74 100644 --- a/tizen/MapsWithMe/res/spa-ES.xml +++ b/tizen/MapsWithMe/res/spa-ES.xml @@ -17,6 +17,12 @@ Kilómetros Milla + + No hay conexión al Internet + + No hay conexión WiFi. ¿Quieres descargar con el %s operador (GPRS, EDGE or 3G)? + + Recomendamos usar WiFi para descarga de los países grandes Descargar %s la descarga ha fallado diff --git a/tizen/MapsWithMe/res/ukr-UA.xml b/tizen/MapsWithMe/res/ukr-UA.xml index af4fd7a211..b9717ffd35 100644 --- a/tizen/MapsWithMe/res/ukr-UA.xml +++ b/tizen/MapsWithMe/res/ukr-UA.xml @@ -19,6 +19,12 @@ МБ Милі + + Відсутнє підключення до інтернету + + Відсутнє WiFi з\'єднання. Ви бажаєте завантажити %s через стільникового оператора (GPRS, EDGE або 3G)? + + Ми рекомендуємо завантажувати великі країни через WiFi Завантажити Не вдалося завантажити %s diff --git a/tizen/MapsWithMe/src/AppResourceId.cpp b/tizen/MapsWithMe/src/AppResourceId.cpp index 5cb9ff5f41..42ffde9438 100644 --- a/tizen/MapsWithMe/src/AppResourceId.cpp +++ b/tizen/MapsWithMe/src/AppResourceId.cpp @@ -75,7 +75,9 @@ const wchar_t* IDS_MEASUREMENT_UNITS_SUMMARY = L"IDS_MEASUREMENT_UNITS_SUMMARY"; const wchar_t* IDS_MESSAGE = L"IDS_MESSAGE"; const wchar_t* IDS_MILES = L"IDS_MILES"; const wchar_t* IDS_MY_POSITION_SHARE_SMS = L"IDS_MY_POSITION_SHARE_SMS"; +const wchar_t* IDS_NO_INTERNET_CONNECTION_DETECTED = L"IDS_NO_INTERNET_CONNECTION_DETECTED"; const wchar_t* IDS_NO_SEARCH_RESULTS_FOUND = L"IDS_NO_SEARCH_RESULTS_FOUND"; +const wchar_t* IDS_NO_WIFI_ASK_CELLULAR_DOWNLOAD = L"IDS_NO_WIFI_ASK_CELLULAR_DOWNLOAD"; const wchar_t* IDS_PARKING = L"IDS_PARKING"; const wchar_t* IDS_PHARMACY = L"IDS_PHARMACY"; const wchar_t* IDS_POLICE = L"IDS_POLICE"; @@ -90,6 +92,7 @@ const wchar_t* IDS_TOILET = L"IDS_TOILET"; const wchar_t* IDS_TOURISM = L"IDS_TOURISM"; const wchar_t* IDS_TRANSPORT = L"IDS_TRANSPORT"; const wchar_t* IDS_UNKNOWN_CURRENT_POSITION = L"IDS_UNKNOWN_CURRENT_POSITION"; +const wchar_t* IDS_USE_WIFI_RECOMMENDATION_TEXT = L"IDS_USE_WIFI_RECOMMENDATION_TEXT"; const wchar_t* IDS_VERSION = L"IDS_VERSION"; const wchar_t* IDS_VISIBLE = L"IDS_VISIBLE"; // main form diff --git a/tizen/MapsWithMe/src/DownloadCountryForm.cpp b/tizen/MapsWithMe/src/DownloadCountryForm.cpp index 75dba56843..b46822c3e1 100644 --- a/tizen/MapsWithMe/src/DownloadCountryForm.cpp +++ b/tizen/MapsWithMe/src/DownloadCountryForm.cpp @@ -15,6 +15,7 @@ #include #include #include +#include using namespace Tizen::Base; using namespace Tizen::Base::Collection; @@ -22,6 +23,7 @@ using namespace Tizen::Ui; using namespace Tizen::Ui::Controls; using namespace Tizen::Ui::Scenes; using namespace Tizen::App; +using namespace Tizen::Net; using namespace Tizen::Web::Controls; using namespace Tizen::Graphics; using namespace storage; @@ -245,12 +247,27 @@ void DownloadCountryForm::OnListViewItemStateChanged(ListView & listView, int in if (status == ENotDownloaded || status == EDownloadFailed) { storage::LocalAndRemoteSizeT size = Storage().CountrySizeInBytes(country); + int const sz_in_MB = int((size.second - size.first) >> 20); String msg = GetString(IDS_DOWNLOAD); msg.Append(" "); - msg.Append(int((size.second - size.first) >> 20)); + msg.Append(sz_in_MB); msg.Append(GetString(IDS_MB)); - if (MessageBoxAsk(name, msg)) + NetConnectionManager connectionManager; + connectionManager.Construct(); + ManagedNetConnection * pManagedNetConnection = connectionManager.GetManagedNetConnectionN(); + const NetConnectionInfo * pInfo = pManagedNetConnection->GetNetConnectionInfo(); + + bool bDownload = true; + if (pInfo == 0 || pInfo->GetBearerType() == NET_BEARER_NONE) + { + bDownload = false; + MessageBoxOk(GetString(IDS_NO_INTERNET_CONNECTION_DETECTED), GetString(IDS_USE_WIFI_RECOMMENDATION_TEXT)); + } + if (bDownload && pInfo->GetBearerType() != NET_BEARER_WIFI && (sz_in_MB > 10)) + bDownload = MessageBoxAsk(name, FormatString1(IDS_NO_WIFI_ASK_CELLULAR_DOWNLOAD, name)); + + if (bDownload && MessageBoxAsk(name, msg)) Storage().DownloadCountry(country); } else if (status == EDownloading || status == EInQueue)