Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Replacing MessageFormat with Formatter

Browse source
This commit is contained in:
Pavol Zibrita 2011-12-28 01:54:22 +01:00
parent be8c46d3c1
commit cdd83fdb07
16 changed files with 34 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/res/values-cs/strings.xml
View file

@ -670,7 +670,7 @@
<string name="vector_data">Vektorové mapy OSM</string>
<string name="transport_context_menu">Hledat dopravu ze zastávky</string>
<string name="point_on_map">Bod na mapě\n Šíř. {0,number,#.####} Dél. {1,number,#.####}</string>
<string name="point_on_map">Bod na mapě\n Šíř. %1$.4f Dél. %2$.4f</string>
<string name="osb_bug_name">Chyba</string>
<string name="poi_context_menu_modify">Upravit POI</string>
<string name="poi_context_menu_delete">Smazat POI</string>
@ -814,7 +814,7 @@
<string name="max_level_download_tile">Maximální zvětšení</string>
<string name="max_level_download_tile_descr">Jaké nejvyšší zvětšení mapy stahovat</string>
<string name="route_about">O cestě</string>
<string name="route_general_information">Celková vzdálenost {0}, doba cesty {1} h {2} m.</string>
<string name="route_general_information">Celková vzdálenost %s, doba cesty %d h %d m.</string>
<string name="router_service_descr">Vyberte navigační službu</string>
<string name="router_service">Navigace</string>
<string name="sd_dir_not_accessible">Adresář pro uložení na SD kartě není dostupný</string>

4
OsmAnd/res/values-de/strings.xml
View file

@ -432,7 +432,7 @@
<string name="vector_data">Offline-Vektor-Karten</string>
<string name="transport_context_menu">Suche nach Verbindung an Haltestelle</string>
<string name="point_on_map">Punkt auf Karte:\n Lat {0,number,#.####}\n Lon {1,number,#.####}</string>
<string name="point_on_map">Punkt auf Karte:\n Lat %1$.4f\n Lon %2$.4f</string>
<string name="osb_bug_name">OSM Fehler</string>
<string name="poi_context_menu_modify">Bearbeite POI</string>
<string name="poi_context_menu_delete">Lösche POI</string>
@ -568,7 +568,7 @@
<string name="max_level_download_tile">Max. Online-Zoom</string>
<string name="max_level_download_tile_descr">Maximale Vergrößerung bis zu der Online-Karten-Daten (Kacheln) aus dem Internet geladen werden</string>
<string name="route_about">Routeninformationen</string>
<string name="route_general_information">{0} Gesamtentfernung\n{1}:{2} Reisezeit</string>
<string name="route_general_information">%s Gesamtentfernung\n%d:%d Reisezeit</string>
<string name="router_service_descr">Online- oder Offline-Dienst zur Streckenberechnung wählen</string>
<string name="router_service">Routingdienst</string>
<string name="sd_dir_not_accessible"> Auf das Verzeichnis auf der SD-Karte kann nicht zugegriffen werden</string>

4
OsmAnd/res/values-es/strings.xml
View file

@ -281,7 +281,7 @@
<string name="poi_remove_confirm_template">Borrar {0} (añadir comentario) ?</string>
<string name="poi_remove_success">se eliminó el POI</string>
<string name="poi_remove_title">Borrar POI</string>
<string name="point_on_map">Punto en el mapa\n Lat {0,number,#.####} Lon {1,number,#.####}</string>
<string name="point_on_map">Punto en el mapa\n Lat %1$.4f Lon %2$.4f</string>
<string name="position_on_map">Posición en el mapa</string>
<string name="position_on_map_bottom">Fondo</string>
<string name="position_on_map_center">Centro</string>
@ -308,7 +308,7 @@
<string name="rotate_map_to_bearing">Rotar mapa</string>
<string name="rotate_map_to_bearing_descr">Seleccionar cómo rotar el mapa</string>
<string name="route_about">Acerca de ruta</string>
<string name="route_general_information">Distancia total = {0}, tiempo de viaje = {1} h {2} m.</string>
<string name="route_general_information">Distancia total = %s, tiempo de viaje = %d h %d m.</string>
<string name="route_head">Cabecera</string>
<string name="route_tl">Gire a la izquierda y siga</string>
<string name="route_tr">Gire a la derecha y siga</string>

4
OsmAnd/res/values-fr/strings.xml
View file

@ -406,7 +406,7 @@
<string name="error_reading_gpx">Erreur de lecteur des données GPX</string>
<string name="vector_data">Cartes vectorielles OSM</string>
<string name="transport_context_menu">Chercher transport à l\'arrivée</string>
<string name="point_on_map">Point sur la carte\n Lat {0,number,#.####} Long {1,number,#.####}</string>
<string name="point_on_map">Point sur la carte\n Lat %1$.4f Long %2$.4f</string>
<string name="osb_bug_name">Bogue</string>
<string name="poi_context_menu_modify">Modifier PI</string>
<string name="poi_context_menu_delete">Supprimer PI</string>
@ -539,7 +539,7 @@
<string name="max_level_download_tile">Niveau de zoom max.</string>
<string name="max_level_download_tile_descr">Choisir un niveau de zoom maximum pour le téléchargement</string>
<string name="route_about">À propos du trajet</string>
<string name="route_general_information">Distance totale = {0}, temps de déplacement = {1} h {2} m.</string>
<string name="route_general_information">Distance totale = %s, temps de déplacement = %d h %d m.</string>
<string name="router_service_descr">Choisir la source de l\'itinéraire à suivre</string>
<string name="router_service">Itinéraire</string>
<string name="sd_dir_not_accessible">Répertoire sur la carte SD inaccessible en écriture</string>

4
OsmAnd/res/values-hu/strings.xml
View file

@ -411,7 +411,7 @@
<string name="vector_data">Vektoros OSM térkép</string>
<string name="transport_context_menu">Közlekedés keresése a célnál</string>
<string name="point_on_map">Pont a térképen\n szélesség {0,number,#.####}, hosszúság {1,number,#.####}</string>
<string name="point_on_map">Pont a térképen\n szélesség %1$.4f, hosszúság %2$.4f</string>
<string name="osb_bug_name">Hiba</string>
<string name="poi_context_menu_modify">POI módosítás</string>
<string name="poi_context_menu_delete">POI törlés</string>
@ -547,7 +547,7 @@
<string name="max_level_download_tile">Max. online nagyítás</string>
<string name="max_level_download_tile_descr">Maximum nagyítási szint kiválasztása térképcsempék letöltéshez</string>
<string name="route_about">Útvonalterv</string>
<string name="route_general_information">Teljes távolság {0}, utazási idő {1} ó. {2} p.</string>
<string name="route_general_information">Teljes távolság %s, utazási idő %d ó. %d p.</string>
<string name="router_service_descr">Online vagy offline útvonaltervező szolgáltatás kiválasztása</string>
<string name="router_service">Útvonaltervező</string>
<string name="sd_dir_not_accessible">Nem található könyvtár az SD kártyán mentésre</string>

4
OsmAnd/res/values-it/strings.xml
View file

@ -405,7 +405,7 @@
<string name="vector_data">Mappe vettoriali offline</string>
<string name="transport_context_menu">Cercare un trasporto pubblico all\'arrivo</string>
<string name="point_on_map">Punto sulla mappa\n Lat {0,number,#.####} Lon {1,number,#.####}</string>
<string name="point_on_map">Punto sulla mappa\n Lat %1$.4f Lon %2$.4f</string>
<string name="osb_bug_name">Bug</string>
<string name="poi_context_menu_modify">Modificare PDI</string>
<string name="poi_context_menu_delete">Eliminare PDI</string>
@ -540,7 +540,7 @@
<string name="max_level_download_tile">Max zoom online</string>
<string name="max_level_download_tile_descr">Scegliere il massimo livello di zoom usando internet</string>
<string name="route_about">Info sul percorso</string>
<string name="route_general_information">Distanza totale = {0}, tempo di viaggio = {1} h {2} m.</string>
<string name="route_general_information">Distanza totale = %s, tempo di viaggio = %d h %d m.</string>
<string name="router_service_descr">Scegliere il servizio di generazione percorso</string>
<string name="router_service">Generazione percorso</string>
<string name="sd_dir_not_accessible">Directory su SD card inaccessibile</string>

6
OsmAnd/res/values-jp/strings.xml
View file

@ -362,7 +362,7 @@ name="maps_could_not_be_downloaded">このマップはダウンロードでき
<string name="vector_data">オフラインベクターマップ</string>
<string name="transport_context_menu">交通機関を乗り場で探す</string>
<string name="point_on_map">マップ上の地点:\n 緯度
{0,number,#.####}\n 経度 {1,number,#.####}</string>
%1$.4f\n 経度 %2$.4f</string>
<string name="osb_bug_name">バグ</string>
<string name="poi_context_menu_modify">POIを変更</string>
<string name="poi_context_menu_delete">POIを削除</string>
@ -512,8 +512,8 @@ POIの更新は利用できません</string>
<string name="max_level_download_tile_descr">オンラインマップタイル用にダウンロードする
最大ズームレベルを選ぶ</string>
<string name="route_about">ルートについて</string>
<string name="route_general_information">総距離 {0},
移動時間 {1} 時間 {2} 分。</string>
<string name="route_general_information">総距離 %s,
移動時間 %d 時間 %d 分。</string>
<string name="router_service_descr">オンラインまたはオフラインルーティングサービスを選択</string>
<string name="router_service">経路案内サービス</string>
<string name="sd_dir_not_accessible">SDカードの保存ディレクトリにアクセスできません</string>

4
OsmAnd/res/values-pl/strings.xml
View file

@ -419,7 +419,7 @@
<string name="vector_data">Mapy wektorowe offline</string>
<string name="transport_context_menu">Search transport at stop</string>
<string name="point_on_map">Punkt na mapie:\n Szer. {0,number,#.####}\n Dł. {1,number,#.####}</string>
<string name="point_on_map">Punkt na mapie:\n Szer. %1$.4f\n Dł. %2$.4f</string>
<string name="osb_bug_name">Błąd</string>
<string name="poi_context_menu_modify">Modyfikuj POI</string>
<string name="poi_context_menu_delete">Usuń POI</string>
@ -554,7 +554,7 @@
<string name="max_level_download_tile">Maks. zoom online</string>
<string name="max_level_download_tile_descr">Choose maximum zoom level to download for online map tiles</string>
<string name="route_about">O trasie</string>
<string name="route_general_information">Dystans całkowity {0}, czas podróży {1} h {2} m.</string>
<string name="route_general_information">Dystans całkowity %s, czas podróży %d h %d m.</string>
<string name="router_service_descr">Wybierz usługę routującą (offline lub online)</string>
<string name="router_service">Usługa routująca</string>
<string name="sd_dir_not_accessible">Katalog zapisu na karcie SD jest niedostępny.</string>

4
OsmAnd/res/values-pt/strings.xml
View file

@ -104,7 +104,7 @@
<string name="error_reading_gpx">Erro na leitura de dados GPX</string>
<string name="vector_data">Mapas vetoriais offline</string>
<string name="transport_context_menu">Procurar transporte na parada</string>
<string name="point_on_map">Ponto no mapa\n Lat {0,number,#.####} Long {1,number,#.####}</string>
<string name="point_on_map">Ponto no mapa\n Lat %1$.4f Long %2$.4f</string>
<string name="osb_bug_name">Bug</string>
<string name="poi_context_menu_modify">Modificar POI</string>
<string name="poi_context_menu_delete">Apagar POI</string>
@ -239,7 +239,7 @@
<string name="max_level_download_tile">Nível de zoom máx.</string>
<string name="max_level_download_tile_descr">Escolher um nível máximo de zoom para download</string>
<string name="route_about">Sobre a viagem</string>
<string name="route_general_information">Distância total = {0} tempo de viagem, = {1}h {2}m.</string>
<string name="route_general_information">Distância total = %s tempo de viagem, = %dh %dm.</string>
<string name="router_service_descr">Escolha o sistema de navegação</string>
<string name="router_service">Serviço de navegação</string>
<string name="sd_dir_not_accessible">Diretório do cartão SD inacessível</string>

4
OsmAnd/res/values-ru/strings.xml
View file

@ -364,7 +364,7 @@
<string name="error_reading_gpx">Ошибка при чтении gpx файла</string>
<string name="vector_data">Векторные osm карты</string>
<string name="point_on_map">Точка на карте\n Ш {0,number,#.####} Д {1,number,#.####}</string>
<string name="point_on_map">Точка на карте\n Ш %1$.4f Д %2$.4f</string>
<string name="osb_bug_name">Bug</string>
<string name="poi_context_menu_modify">Редактировать POI</string>
<string name="poi_context_menu_delete">Удалить POI</string>
@ -499,7 +499,7 @@
<string name="max_level_download_tile">Уровень детализации</string>
<string name="max_level_download_tile_descr">Выберите максимальный уровень для загрузки из интернета</string>
<string name="route_about">О маршруте</string>
<string name="route_general_information">Общая протяженность = {0}, время в пути = {1} ч. {2} мин.</string>
<string name="route_general_information">Общая протяженность = %s, время в пути = %d ч. %d мин.</string>
<string name="router_service_descr">Выберите сервис для прокладки маршрута</string>
<string name="router_service">Прокладка маршрута</string>
<string name="sd_dir_not_accessible">Директория на SD карточке не доступна для сохранения</string>

4
OsmAnd/res/values-sk/strings.xml
View file

@ -418,7 +418,7 @@
<string name="vector_data">Vektorové OSM mapy</string>
<string name="transport_context_menu">Hľadať prepravu po zastavení</string>
<string name="point_on_map">Bod na mape:\n Zem. šírka {0,number,#.####}\n Zem. dĺžka {1,number,#.####}</string>
<string name="point_on_map">Bod na mape:\n Zem. šírka %1$.4f\n Zem. dĺžka %2$.4f</string>
<string name="osb_bug_name">Chyba</string>
<string name="poi_context_menu_modify">Upraviť bod záujmu (POI)</string>
<string name="poi_context_menu_delete">Vymazať bod záujmu (POI)</string>
@ -553,7 +553,7 @@
<string name="max_level_download_tile">Max. úroveň priblíženia</string>
<string name="max_level_download_tile_descr">Výber maximálnej úrovne priblíženia na stiahnutie</string>
<string name="route_about">O ceste</string>
<string name="route_general_information">Celková vzdialenosť {0}, čas cestovania {1} h {2} m.</string>
<string name="route_general_information">Celková vzdialenosť %s, čas cestovania %d h %d m.</string>
<string name="router_service_descr">Výber rutovacej služby</string>
<string name="router_service">Rutovanie</string>
<string name="sd_dir_not_accessible">Adresár pre uloženie na SD karte nie je prístupný</string>

4
OsmAnd/res/values-vi/strings.xml
View file

@ -415,7 +415,7 @@ Translator: Le Viet Thanh; email: lethanhx2k@gmail.com -->
<string name="vector_data">Bản đồ vector Offline</string>
<string name="transport_context_menu">Search transport at stop</string>
<string name="point_on_map">Điểm trên bản đồ:\n VĐ {0,number,#.####}\n KĐ {1,số,#.####}</string>
<string name="point_on_map">Điểm trên bản đồ:\n VĐ %1$.4f\n KĐ %2$.4f</string>
<string name="osb_bug_name">Bug</string>
<string name="poi_context_menu_modify">Sửa POI</string>
<string name="poi_context_menu_delete">Xóa POI</string>
@ -550,7 +550,7 @@ Translator: Le Viet Thanh; email: lethanhx2k@gmail.com -->
<string name="max_level_download_tile">Online zoom lớn nhất</string>
<string name="max_level_download_tile_descr">Chọn tỉ lệ Zoom lớn nhất để tải về bản đồ tile online</string>
<string name="route_about">Thông tin về quãng đường</string>
<string name="route_general_information">Tổng khoảng cách {0}, thời gian đi {1} h {2} m.</string>
<string name="route_general_information">Tổng khoảng cách %s, thời gian đi %d h %d m.</string>
<string name="router_service_descr">Chọn dịch vụ tìm đường Online hoặc Offline</string>
<string name="router_service">Dịch vụ tìm đường</string>
<string name="sd_dir_not_accessible">Không truy xuất được thư mục trên thẻ nhớ</string>

4
OsmAnd/res/values/strings.xml
View file

@ -434,7 +434,7 @@
<string name="vector_data">Offline vector maps</string>
<string name="transport_context_menu">Search transport at stop</string>
<string name="point_on_map">Point on map:\n Lat {0,number,#.####}\n Lon {1,number,#.####}</string>
<string name="point_on_map">Point on map:\n Lat %1$.4f\n Lon %2$.4f</string>
<string name="osb_bug_name">Bug</string>
<string name="poi_context_menu_modify">Modify POI</string>
<string name="poi_context_menu_delete">Delete POI</string>
@ -569,7 +569,7 @@
<string name="max_level_download_tile">Max. online zoom</string>
<string name="max_level_download_tile_descr">Choose maximum zoom level to download for online map tiles</string>
<string name="route_about">About route</string>
<string name="route_general_information">Total distance {0}, travelling time {1} h {2} m.</string>
<string name="route_general_information">Total distance %s, travelling time %d h %d m.</string>
<string name="router_service_descr">Choose online or offline routing services</string>
<string name="router_service">Routing service</string>
<string name="sd_dir_not_accessible">Save directory on SD card not accessible</string>

7
OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java
View file

@ -1,9 +1,9 @@
package net.osmand.plus.activities.search;
import java.io.Serializable;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Formatter;
import java.util.Locale;
import net.osmand.Algoritms;
@ -28,8 +28,8 @@ import android.widget.Button;
import android.widget.ImageView;
import android.widget.Spinner;
import android.widget.TabHost;
import android.widget.TabWidget;
import android.widget.TabHost.TabSpec;
import android.widget.TabWidget;
public class SearchActivity extends TabActivity {
@ -266,8 +266,7 @@ public class SearchActivity extends TabActivity {
}
private String formatLatLon(LatLon searchPoint){
MessageFormat format = new MessageFormat(" ({0,number,#.##};{1,number,#.##})", Locale.US);
return format.format(new Object[]{searchPoint.getLatitude(), searchPoint.getLongitude()});
return new Formatter(Locale.US).format(" %.2f;%.2f", searchPoint.getLatitude(), searchPoint.getLongitude()).toString();
}
public void updateSearchPoint(LatLon searchPoint, String message, boolean showLoc){

5
OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
View file

@ -1,13 +1,12 @@
package net.osmand.plus.routing;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import net.osmand.GPXUtilities.GPXFile;
import net.osmand.LogUtil;
import net.osmand.OsmAndFormatter;
import net.osmand.GPXUtilities.GPXFile;
import net.osmand.osm.LatLon;
import net.osmand.osm.MapUtils;
import net.osmand.plus.OsmandSettings;
@ -383,7 +382,7 @@ public class RoutingHelper {
int dist = getLeftDistance();
int hours = getLeftTime() / (60 * 60);
int minutes = (getLeftTime() / 60) % 60;
return MessageFormat.format(context.getString(R.string.route_general_information), OsmAndFormatter.getFormattedDistance(dist, context),
return context.getString(R.string.route_general_information, OsmAndFormatter.getFormattedDistance(dist, context),
hours, minutes);
}

5
OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
View file

@ -1,6 +1,5 @@
package net.osmand.plus.views;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
@ -20,8 +19,8 @@ import android.util.DisplayMetrics;
import android.view.Gravity;
import android.view.MotionEvent;
import android.view.WindowManager;
import android.widget.TextView;
import android.widget.FrameLayout.LayoutParams;
import android.widget.TextView;
public class ContextMenuLayer extends OsmandMapLayer {
@ -138,7 +137,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
latLon = loc;
if(latLon != null){
if(description == null || description.length() == 0){
description = MessageFormat.format(view.getContext().getString(R.string.point_on_map),
description = view.getContext().getString(R.string.point_on_map,
latLon.getLatitude(), latLon.getLongitude());
}
textView.setText(description);