infobox.setView(message);\r
\r
//TRANS\r
- infobox.setPositiveButton("Ok", new DialogInterface.OnClickListener()\r
+ infobox.setPositiveButton(Navit.get_text("Ok"), new DialogInterface.OnClickListener()\r
{\r
public void onClick(DialogInterface arg0, int arg1)\r
{\r
Log.e("Navit", "Failed to extract navit.xml for ldpi device(s)");\r
}\r
}\r
+ // xhdpi display\r
+ else if (Navit.metrics.densityDpi == 320)\r
+ {\r
+ Log.e("Navit", "found xhdpi device, this is not fully supported!!");\r
+ Log.e("Navit", "using hdpi values");\r
+ my_display_density = "hdpi";\r
+ if (!extractRes("navithdpi", NAVIT_DATA_DIR + "/share/navit.xml"))\r
+ {\r
+ Log.e("Navit", "Failed to extract navit.xml for xhdpi device(s)");\r
+ }\r
+ }\r
else\r
{\r
/* default, meaning we just dont know what display this is */\r
if (Navit_last_address_search_string.equals(""))\r
{\r
// empty search string entered\r
- Toast.makeText(getApplicationContext(), "No address found", Toast.LENGTH_LONG).show(); //TRANS\r
+ Toast.makeText(getApplicationContext(), Navit.get_text("No address found"), Toast.LENGTH_LONG).show(); //TRANS\r
}\r
else\r
{\r
case 6 :\r
// ok startup address search activity\r
Intent search_intent = new Intent(this, NavitAddressSearchActivity.class);\r
- search_intent.putExtra("title", "Enter: City and Street"); //TRANS\r
+ search_intent.putExtra("title", Navit.get_text("Enter: City and Street")); //TRANS\r
search_intent.putExtra("address_string", Navit_last_address_search_string);\r
String pm_temp = "0";\r
if (Navit_last_address_partial_match)\r
if (addr.equals(""))\r
{\r
// empty search string entered\r
- Toast.makeText(getApplicationContext(), "No search string entered",\r
+ Toast.makeText(getApplicationContext(), Navit.get_text("No search string entered"),\r
Toast.LENGTH_LONG).show(); //TRANS\r
}\r
else\r
Toast\r
.makeText(\r
getApplicationContext(),\r
- "setting destination to\n"\r
+ Navit.get_text("setting destination to")+"\n"\r
+ Navit.NavitAddressResultList_foundItems\r
.get(destination_id).addr, Toast.LENGTH_LONG).show(); //TRANS\r
\r
b.putInt("dialog_num", this.dialog_num);\r
b.putInt("max", Navit.ADDRESS_RESULTS_DIALOG_MAX);\r
b.putInt("cur", this.spinner_current_value % (Navit.ADDRESS_RESULTS_DIALOG_MAX + 1));\r
- b.putString("title", "getting search results"); //TRANS\r
- b.putString("text", "searching ..."); //TRANS\r
+ b.putString("title", Navit.get_text("getting search results")); //TRANS\r
+ b.putString("text", Navit.get_text("searching ...")); //TRANS\r
msg.setData(b);\r
mHandler.sendMessage(msg);\r
try\r
b.putInt("dialog_num", this.my_dialog_num);\r
b.putInt("max", Navit.ADDRESS_RESULTS_DIALOG_MAX);\r
b.putInt("cur", 0);\r
- b.putString("title", "getting search results"); //TRANS\r
- b.putString("text", "searching ..."); //TRANS\r
+ b.putString("title", Navit.get_text("getting search results")); //TRANS\r
+ b.putString("text", Navit.get_text("searching ...")); //TRANS\r
msg.setData(b);\r
mHandler.sendMessage(msg);\r
\r
}\r
else\r
{\r
- //Toast.makeText(getApplicationContext(), "No Results found!", Toast.LENGTH_LONG).show();\r
// not results found, show toast\r
msg = mHandler.obtainMessage();\r
b = new Bundle();\r
msg.what = 3;\r
- b.putString("text", "No Results found!"); //TRANS\r
+ b.putString("text", Navit.get_text("No Results found!")); //TRANS\r
msg.setData(b);\r
mHandler.sendMessage(msg);\r
}\r
progressThread_pri.start();\r
// show license for OSM maps\r
Toast.makeText(getApplicationContext(),\r
- "Map data (c) OpenStreetMap contributors, CC-BY-SA", Toast.LENGTH_LONG).show(); //TRANS\r
+ Navit.get_text("Map data (c) OpenStreetMap contributors, CC-BY-SA"), Toast.LENGTH_LONG).show(); //TRANS\r
return mapdownloader_dialog_pri;\r
case Navit.MAPDOWNLOAD_SEC_DIALOG :\r
mapdownloader_dialog_sec = new ProgressDialog(this);\r
progressThread_sec.start();\r
// show license for OSM maps\r
Toast.makeText(getApplicationContext(),\r
- "Map data (c) OpenStreetMap contributors, CC-BY-SA", Toast.LENGTH_LONG).show(); //TRANS\r
+ Navit.get_text("Map data (c) OpenStreetMap contributors, CC-BY-SA"), Toast.LENGTH_LONG).show(); //TRANS\r
return mapdownloader_dialog_sec;\r
}\r
// should never get here!!\r
private void executeSearch(String search)\r
{\r
Intent search_intent = new Intent(this, NavitAddressSearchActivity.class);\r
- search_intent.putExtra("title", "Enter: City and Street"); //TRANS\r
+ search_intent.putExtra("title", Navit.get_text("Enter: City and Street")); //TRANS\r
search_intent.putExtra("address_string", search);\r
String pm_temp = "0";\r
if (Navit_last_address_partial_match)\r
+/**\r
+ * Navit, a modular navigation system.\r
+ * Copyright (C) 2005-2008 Navit Team\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * version 2 as published by the Free Software Foundation.\r
+ *\r
+ * This program is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program; if not, write to the\r
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\r
+ * Boston, MA 02110-1301, USA.\r
+ */\r
+\r
package org.navitproject.navit;\r
\r
\r
\r
// partial match checkbox\r
pm_checkbox = new CheckBox(this);\r
- pm_checkbox.setText("partial match"); //TRANS\r
+ pm_checkbox.setText(Navit.get_text("partial match")); //TRANS\r
pm_checkbox.setChecked(false);\r
pm_checkbox.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT,\r
LayoutParams.WRAP_CONTENT));\r
\r
// search button\r
final Button btnSearch = new Button(this);\r
- btnSearch.setText("Search"); //TRANS\r
+ btnSearch.setText(Navit.get_text("Search")); //TRANS\r
btnSearch.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT,\r
LayoutParams.WRAP_CONTENT));\r
btnSearch.setGravity(Gravity.CENTER);\r
bubble_paint.setTextSize((int) (20 / 1.5f * draw_factor));\r
bubble_paint.setStrokeWidth(3);\r
bubble_paint.setColor(Color.parseColor("#3b3131"));\r
- c.drawText(NavitTextTranslations.NAVIT_JAVA_OVERLAY_BUBBLE_DRIVEHERE, this.bubble_001.x + dx + inner_dx,\r
+ c.drawText(Navit.get_text("drive here"), this.bubble_001.x + dx + inner_dx,\r
this.bubble_001.y + dy + inner_dy, bubble_paint);\r
\r
}\r
b.putInt("max", Navit.ADDRESS_RESULTS_DIALOG_MAX);
b.putInt("cur", Navit.NavitAddressResultList_foundItems.size()
% (Navit.ADDRESS_RESULTS_DIALOG_MAX + 1));
- b.putString("title", "loading search results"); //TRANS
- b.putString("text", "towns:" + Navit.search_results_towns + " " + Navit.get_text("Streets")
+ b.putString("title", Navit.get_text("loading search results")); //TRANS
+ b.putString("text", Navit.get_text("towns")+":" + Navit.search_results_towns + " " + Navit.get_text("Streets")
+ ":" + (int) (Navit.search_results_streets + Navit.search_results_streets_hn));
Navit.msg_to_msg_handler(b, 10); //TRANS
}
"22.6", "56.7",\r
"26.5", 57419510L,\r
false, 2);\r
+ static final osm_map_values Australia2 = new osm_map_values(\r
+ "Australia", "110.5",\r
+ "-44.2", "154.9",\r
+ "-9.2", 128502185L,\r
+ true, 3);\r
static final osm_map_values Australia = new osm_map_values(\r
"Australia", "110.5",\r
"-44.2", "154.9",\r
"Nevada", "-120.2",\r
"35.0", "-113.8",\r
"42.1", 136754975L,\r
- false, 0);\r
+ false, 5);\r
static final osm_map_values Oregon = new osm_map_values(\r
"Oregon", "-124.8",\r
"41.8", "-116.3",\r
"46.3", 101627308L,\r
- false, 0);\r
+ false, 5);\r
static final osm_map_values Washington_State = new osm_map_values(\r
"Washington State",\r
"-125.0", "45.5",\r
"-116.9", "49.0",\r
- 98178877L, false, 0);\r
+ 98178877L, false, 5);\r
static final osm_map_values South_Middle_America = new osm_map_values(\r
"South+Middle America",\r
"-83.5", "-56.3",\r
"Argentina", "-73.9",\r
"-57.3", "-51.6",\r
"-21.0", 87516152L,\r
- false, 0);\r
+ false, 6);\r
static final osm_map_values Argentina_Chile = new osm_map_values(\r
"Argentina+Chile",\r
"-77.2", "-56.3",\r
"-52.7", "-16.1",\r
- 91976696L, false, 0);\r
+ 91976696L, false, 6);\r
static final osm_map_values Bolivia = new osm_map_values(\r
"Bolivia", "-70.5",\r
"-23.1", "-57.3",\r
"-9.3", 58242168L,\r
- false, 0);\r
+ false, 6);\r
static final osm_map_values Brazil = new osm_map_values(\r
"Brazil", "-71.4",\r
"-34.7", "-32.8",\r
"5.4", 105527899L,\r
- false, 0);\r
+ false, 6);\r
static final osm_map_values Cuba = new osm_map_values(\r
"Cuba", "-85.3",\r
"19.6", "-74.0",\r
"23.6", 56608942L,\r
- false, 0);\r
+ false, 6);\r
static final osm_map_values Colombia = new osm_map_values(\r
"Colombia", "-79.1",\r
"-4.0", "-66.7",\r
"12.6", 78658454L,\r
- false, 0);\r
+ false, 6);\r
static final osm_map_values Ecuador = new osm_map_values(\r
"Ecuador", "-82.6",\r
"-5.4", "-74.4",\r
"2.3", 61501914L,\r
- false, 0);\r
+ false, 6);\r
static final osm_map_values Guyana_Suriname_Guyane_Francaise = new osm_map_values(\r
"Guyana+Suriname+Guyane Francaise",\r
"-62.0", "1.0",\r
"-51.2", "8.9",\r
- 57040689L, false, 0);\r
+ 57040689L, false, 6);\r
static final osm_map_values Haiti_Republica_Dominicana = new osm_map_values(\r
"Haiti+Republica Dominicana",\r
"-74.8", "17.3",\r
"-68.2", "20.1",\r
- 63528584L, false, 0);\r
+ 63528584L, false, 6);\r
static final osm_map_values Jamaica = new osm_map_values(\r
"Jamaica", "-78.6",\r
"17.4", "-75.9",\r
"18.9", 53958307L,\r
- false, 0);\r
+ false, 6);\r
static final osm_map_values Mexico = new osm_map_values(\r
"Mexico", "-117.6",\r
"14.1", "-86.4",\r
"32.8", 251108617L,\r
- false, 0);\r
+ false, 6);\r
static final osm_map_values Paraguay = new osm_map_values(\r
"Paraguay", "-63.8",\r
"-28.1", "-53.6",\r
"-18.8", 57188715L,\r
- false, 0);\r
+ false, 6);\r
static final osm_map_values Peru = new osm_map_values(\r
"Peru", "-82.4",\r
"-18.1", "-67.5",\r
"0.4", 65421441L,\r
- false, 0);\r
+ false, 6);\r
static final osm_map_values Uruguay = new osm_map_values(\r
"Uruguay", "-59.2",\r
"-36.5", "-51.7",\r
"-29.7", 63542225L,\r
- false, 0);\r
+ false, 6);\r
static final osm_map_values Venezuela = new osm_map_values(\r
"Venezuela", "-73.6",\r
"0.4", "-59.7",\r
Whole_Planet, Africa, Angola, Burundi, Democratic_Republic_of_the_Congo, Kenya, Lesotho,\r
Madagascar, Nambia_Botswana, Reunion, Rwanda, South_Africa, Uganda, Asia, China, Cyprus,\r
India_Nepal, Indonesia, Iran, Iraq, Israel, Japan_Korea_Taiwan, Malasia_Singapore,\r
- Mongolia, Nambia_Botswana, Thailand, Turkey, UAE_Other, Australia, Tasmania,\r
+ Mongolia, Nambia_Botswana, Thailand, Turkey, UAE_Other, Australia2, Australia, Tasmania,\r
Victoria_New_South_Wales, New_Zealand, Europe, Western_Europe, Austria, BeNeLux,\r
Faroe_Islands, France, Germany, Bavaria, Saxonia, Germany_Austria_Switzerland, Iceland,\r
Ireland, Italy, Spain_Portugal, Mallorca, Galicia, Scandinavia, Finland, Denmark,\r
Argentina, Argentina_Chile, Bolivia, Brazil, Cuba, Colombia, Ecuador,\r
Guyana_Suriname_Guyane_Francaise, Haiti_Republica_Dominicana, Jamaica, Mexico, Paraguay,\r
Peru, Uruguay, Venezuela };\r
- //public static String[] OSM_MAP_NAME_LIST = null;\r
\r
public static String[] OSM_MAP_NAME_LIST_inkl_SIZE_ESTIMATE = null;\r
\r
private static Boolean already_inited = false;\r
\r
public Boolean stop_me = false;\r
- static final int SOCKET_CONNECT_TIMEOUT = 6000;\r
- static final int SOCKET_READ_TIMEOUT = 6000;\r
+ static final int SOCKET_CONNECT_TIMEOUT = 25000; // 25 secs.\r
+ static final int SOCKET_READ_TIMEOUT = 15000; // 15 secs.\r
static final int MAP_WRITE_FILE_BUFFER = 1024 * 64;\r
static final int MAP_WRITE_MEM_BUFFER = 1024 * 64;\r
static final int MAP_READ_FILE_BUFFER = 1024 * 64;\r
b.putInt("max", 20); // use a dummy number here\r
b.putInt("cur", 0);\r
b.putInt("dialog_num", my_dialog_num);\r
- b.putString("title", "Mapdownload"); //TRANS\r
- b.putString("text", "downloading: " + map_values.map_name); //TRANS\r
+ b.putString("title", Navit.get_text("Mapdownload")); //TRANS\r
+ b.putString("text", Navit.get_text("downloading") + ": " + map_values.map_name); //TRANS\r
msg.setData(b);\r
handler.sendMessage(msg);\r
try\r
b.putInt("max", (int) (map_values.est_size_bytes / 1024));\r
b.putInt("cur", (int) (already_read / 1024));\r
b.putInt("dialog_num", my_dialog_num);\r
- b.putString("title", "Map download"); //TRANS\r
+ b.putString("title", Navit.get_text("Mapdownload")); //TRANS\r
per_second_overall = (float) already_read\r
/ (float) ((System.currentTimeMillis() - start_timestamp) / 1000);\r
kbytes_per_second = formatter.format((per_second_overall / 1024f));\r
{\r
eta_string = eta_seconds + " s";\r
}\r
- b.putString("text", "downloading: " + map_values.map_name + "\n" + " "\r
- + (int) (already_read / 1024f / 1024f) + "Mb / "\r
- + (int) (map_values.est_size_bytes / 1024f / 1024f) + "Mb" + "\n" + " "\r
- + kbytes_per_second + "kb/s" + " ETA: " + eta_string); //TRANS\r
+ b\r
+ .putString("text", Navit.get_text("downloading") + ": " + map_values.map_name\r
+ + "\n" + " " + (int) (already_read / 1024f / 1024f) + "Mb / "\r
+ + (int) (map_values.est_size_bytes / 1024f / 1024f) + "Mb" + "\n" + " "\r
+ + kbytes_per_second + "kb/s" + " " + Navit.get_text("ETA") + ": "\r
+ + eta_string); //TRANS\r
msg.setData(b);\r
handler.sendMessage(msg);\r
}\r
b = new Bundle();\r
msg.what = 2;\r
b.putInt("dialog_num", my_dialog_num);\r
- b.putString("text", "Error downloading map!"); //TRANS\r
+ b.putString("text", Navit.get_text("Error downloading map!")); //TRANS\r
msg.setData(b);\r
handler.sendMessage(msg);\r
\r
b = new Bundle();\r
msg.what = 2;\r
b.putInt("dialog_num", my_dialog_num);\r
- b.putString("text", "Error downloading map!"); //TRANS\r
+ b.putString("text", Navit.get_text("Error downloading map!")); //TRANS\r
msg.setData(b);\r
handler.sendMessage(msg);\r
\r
b.putInt("max", (int) (map_values.est_size_bytes / 1024));\r
b.putInt("cur", (int) (map_values.est_size_bytes / 1024));\r
b.putInt("dialog_num", my_dialog_num);\r
- b.putString("title", "Mapdownload"); //TRANS\r
- b.putString("text", map_values.map_name + " ready"); //TRANS\r
+ b.putString("title", Navit.get_text("Mapdownload")); //TRANS\r
+ b.putString("text", map_values.map_name + " "+Navit.get_text("ready")); //TRANS\r
msg.setData(b);\r
handler.sendMessage(msg);\r
\r
+/**\r
+ * Navit, a modular navigation system.\r
+ * Copyright (C) 2005-2008 Navit Team\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * version 2 as published by the Free Software Foundation.\r
+ *\r
+ * This program is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program; if not, write to the\r
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\r
+ * Boston, MA 02110-1301, USA.\r
+ */\r
+\r
package org.navitproject.navit;\r
\r
import java.util.HashMap;\r
String k = null;\r
String[] v = null;\r
\r
+\r
k = "exit navit";\r
v = new String[]{"en", "Exit Navit", "de", "Navit beenden", "nl", "Navit afsluiten", "fr",\r
"Quittez Navit"};\r
"Cherchez adresse"};\r
p(k, v);\r
\r
+ k = "Mapdownload";\r
+ v = new String[]{"en", "Mapdownload", "de", "Kartendownload"};\r
+ p(k, v);\r
+\r
+ k = "downloading";\r
+ v = new String[]{"en", "downloading"};\r
+ p(k, v);\r
+\r
+ k = "ETA";\r
+ v = new String[]{"en", "ETA", "de", "fertig in"};\r
+ p(k, v);\r
+\r
+ k = "Error downloading map!";\r
+ v = new String[]{"en", "Error downloading map!", "de", "Fehler beim Kartendownload"};\r
+ p(k, v);\r
+\r
+ k = "ready";\r
+ v = new String[]{"en", "ready", "de", "fertig"};\r
+ p(k, v);\r
+\r
+ k = "Ok";\r
+ v = new String[]{"en", "Ok"};\r
+ p(k, v);\r
+\r
+ k = "No address found";\r
+ v = new String[]{"en", "No address found", "de", "Keine Adresse gefunden"};\r
+ p(k, v);\r
+\r
+ k = "Enter: City and Street";\r
+ v = new String[]{"en", "Enter: City and Street", "de", "Stadt und Straße:"};\r
+ p(k, v);\r
+\r
+ k = "No search string entered";\r
+ v = new String[]{"en", "No search string entered", "de", "Keine Eingabe"};\r
+ p(k, v);\r
+\r
+ k = "setting destination to";\r
+ v = new String[]{"en", "setting destination to", "de", "neues Fahrziel"};\r
+ p(k, v);\r
+\r
+ k = "getting search results";\r
+ v = new String[]{"en", "getting search results", "de", "lade Suchergebnisse"};\r
+ p(k, v);\r
+\r
+ k = "searching ...";\r
+ v = new String[]{"en", "searching ...", "de", "Suche läuft ..."};\r
+ p(k, v);\r
+\r
+ k = "No Results found!";\r
+ v = new String[]{"en", "No Results found!", "de", "Suche liefert kein Ergebnis!"};\r
+ p(k, v);\r
+\r
+ k = "Map data (c) OpenStreetMap contributors, CC-BY-SA";\r
+ v = new String[]{"en", "Map data (c) OpenStreetMap contributors, CC-BY-SA"};\r
+ p(k, v);\r
+\r
+ k = "partial match";\r
+ v = new String[]{"en", "partial match", "de", "ungefähr"};\r
+ p(k, v);\r
+\r
+ k = "Search";\r
+ v = new String[]{"en", "Search", "de", "suchen"};\r
+ p(k, v);\r
+\r
+ k = "drive here";\r
+ v = new String[]{"en", "drive here", "de", "Ziel setzen"};\r
+ p(k, v);\r
+\r
+ k = "loading search results";\r
+ v = new String[]{"en", "loading search results", "de", "lade Suchergebnisse"};\r
+ p(k, v);\r
+\r
+ k = "towns";\r
+ v = new String[]{"en", "towns", "de", "Städte"};\r
+ p(k, v);\r
+\r
+\r
Log.e("NavitTextTranslations", "... ready");\r
}\r
\r
{\r
String out = null;\r
\r
- Log.e("NavitTextTranslations", "lookup L:" + main_language + " T:" + in);\r
+ //Log.e("NavitTextTranslations", "lookup L:" + main_language + " T:" + in);\r
try\r
{\r
out = Navit_text_lookup.get(in).get(main_language);\r
catch (Exception e)\r
{\r
// most likely there is not translation yet\r
- Log.e("NavitTextTranslations", "lookup: exception");\r
+ //Log.e("NavitTextTranslations", "lookup: exception");\r
out = null;\r
}\r
\r
if (out == null)\r
{\r
// always return a string for output (use fallback language)\r
- Log.e("NavitTextTranslations", "using default language");\r
+ //Log.e("NavitTextTranslations", "using default language");\r
try\r
{\r
out = Navit_text_lookup.get(in).get(fallback_language);\r
}\r
catch (Exception e)\r
{\r
- Log.e("NavitTextTranslations", "using default language: exception");\r
+ //Log.e("NavitTextTranslations", "using default language: exception");\r
// most likely there is not translation yet\r
out = null;\r
}\r
{\r
// if we still dont have any text, use the ".mo" file and call the c-function gettext(in)\r
out = NavitGraphics.getLocalizedString(in);\r
- Log.e("NavitTextTranslations", "return the value from gettext() = " + out);\r
+ //Log.e("NavitTextTranslations", "return the value from gettext() = " + out);\r
}\r
return out;\r
}\r
projects / profile / ivi / navit.git / commitdiff