Fix string resources and remove unnecessary changes

This commit is contained in:
Chumva 2019-02-17 23:57:34 +02:00
parent 4a5f9b8c0d
commit e58000f9a4
8 changed files with 19 additions and 16 deletions

View file

@ -185,7 +185,6 @@
<string name="open_in_osmand">In OsmAnd öffnen</string> <string name="open_in_osmand">In OsmAnd öffnen</string>
<string name="end_date">Endzeit</string> <string name="end_date">Endzeit</string>
<string name="start_date">Startzeit</string> <string name="start_date">Startzeit</string>
<string name="timeline_description">Überwachung aktivieren, um Bewegungsdaten im Hintergrund zu erfassen.</string>
<string name="timeline">Zeitachse</string> <string name="timeline">Zeitachse</string>
<string name="please_update_osmand">Bitte aktualisieren Sie OsmAnd, um die Daten auf der Karte zu sehen</string> <string name="please_update_osmand">Bitte aktualisieren Sie OsmAnd, um die Daten auf der Karte zu sehen</string>
<string name="shared_string_update">Aktualisieren</string> <string name="shared_string_update">Aktualisieren</string>

View file

@ -184,7 +184,6 @@
<string name="open_in_osmand">Abrir en OsmAnd</string> <string name="open_in_osmand">Abrir en OsmAnd</string>
<string name="end_date">Fecha de finalización</string> <string name="end_date">Fecha de finalización</string>
<string name="start_date">Fecha de inicio</string> <string name="start_date">Fecha de inicio</string>
<string name="timeline_description">Activar la monitorización para recopilar datos de movimiento en segundo plano.</string>
<string name="timeline">Línea de tiempo</string> <string name="timeline">Línea de tiempo</string>
<string name="gps_points_in_buffer">enviado (%1$d en búfer)</string> <string name="gps_points_in_buffer">enviado (%1$d en búfer)</string>
<string name="points_size">%1$d puntos</string> <string name="points_size">%1$d puntos</string>

View file

@ -28,7 +28,6 @@
<string name="open_in_osmand">Megnyitás az OsmAndban</string> <string name="open_in_osmand">Megnyitás az OsmAndban</string>
<string name="end_date">Záró dátum</string> <string name="end_date">Záró dátum</string>
<string name="start_date">Kezdő dátum</string> <string name="start_date">Kezdő dátum</string>
<string name="timeline_description">Figyelemmel kísérés engedélyezése a mozgási adatok háttérben történő gyűjtéséért.</string>
<string name="send_location_as">Helyzet elküldése mint</string> <string name="send_location_as">Helyzet elküldése mint</string>
<string name="send_location_as_descr">Válassza ki, hogyan nézzenek ki a helyzetét tartalmazó üzenetek.</string> <string name="send_location_as_descr">Válassza ki, hogyan nézzenek ki a helyzetét tartalmazó üzenetek.</string>
<string name="shared_string_map">Térkép</string> <string name="shared_string_map">Térkép</string>

View file

@ -185,7 +185,6 @@
<string name="open_in_osmand">Åpne i OsmAnd</string> <string name="open_in_osmand">Åpne i OsmAnd</string>
<string name="end_date">Sluttdato</string> <string name="end_date">Sluttdato</string>
<string name="start_date">Startdato</string> <string name="start_date">Startdato</string>
<string name="timeline_description">Skru på oppsyn for å samle bevegelsesdata i bakgrunnen.</string>
<string name="timeline">Tidslinje</string> <string name="timeline">Tidslinje</string>
<string name="shared_string_telegram">Telegram</string> <string name="shared_string_telegram">Telegram</string>
<string name="privacy_policy_telegram_client">Telegram åpen plattform, og OsmAnd-sporeren er én av kundene. Dine kontakter kan bruke enhver annen Telegram-klient.</string> <string name="privacy_policy_telegram_client">Telegram åpen plattform, og OsmAnd-sporeren er én av kundene. Dine kontakter kan bruke enhver annen Telegram-klient.</string>

View file

@ -1,5 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="shared_string_ok">OK</string>
<string name="timeline_available_for_free_now">Timeline is a feature available now for free.</string>
<string name="disable_monitoring">Disable monitoring</string>
<string name="location_recording_enabled">Location recording enabled</string>
<string name="timeline_description">Enable monitoring to save all locations in history.</string>
<string name="app_name_short_online">Online Tracker</string>
<string name="app_name_short">OsmAnd Tracker</string>
<string name="shared_string_telegram">Telegram</string> <string name="shared_string_telegram">Telegram</string>
<string name="privacy_policy_use_telegram">Telegram (the messaging app) is used to to connect to and communicate with people.</string> <string name="privacy_policy_use_telegram">Telegram (the messaging app) is used to to connect to and communicate with people.</string>
<string name="privacy_policy_telegram_client">Telegram open platform and OsmAnd Tracker is one of the customers. Your contacts can use any other Telegram client.</string> <string name="privacy_policy_telegram_client">Telegram open platform and OsmAnd Tracker is one of the customers. Your contacts can use any other Telegram client.</string>
@ -28,7 +35,6 @@
<string name="open_in_osmand">Open in OsmAnd</string> <string name="open_in_osmand">Open in OsmAnd</string>
<string name="end_date">End date</string> <string name="end_date">End date</string>
<string name="start_date">Start date</string> <string name="start_date">Start date</string>
<string name="timeline_description">Enable monitoring to collect movement data in the background.</string>
<string name="send_location_as">Send location as</string> <string name="send_location_as">Send location as</string>
<string name="send_location_as_descr">Choose how messages with your location will look like.</string> <string name="send_location_as_descr">Choose how messages with your location will look like.</string>
<string name="shared_string_map">Map</string> <string name="shared_string_map">Map</string>

View file

@ -619,7 +619,9 @@ class TelegramHelper private constructor() {
private fun processScannedLocationsForChat(chatId: Long, locations: MutableList<TdApi.Message>) { private fun processScannedLocationsForChat(chatId: Long, locations: MutableList<TdApi.Message>) {
if (locations.isNotEmpty()) { if (locations.isNotEmpty()) {
locations.sortBy { message -> OsmandLocationUtils.getLastUpdatedTime(message) } locations.sortBy { message -> OsmandLocationUtils.getLastUpdatedTime(message) }
updateLastMessage(locations.last()) locations.forEach {
updateLastMessage(it)
}
incomingMessagesListeners.forEach { incomingMessagesListeners.forEach {
it.onReceiveChatLocationMessages(chatId, *locations.toTypedArray()) it.onReceiveChatLocationMessages(chatId, *locations.toTypedArray())
} }
@ -709,10 +711,10 @@ class TelegramHelper private constructor() {
} }
if (oldMessage == null || (Math.max(message.editDate, message.date) > Math.max(oldMessage.editDate, oldMessage.date))) { if (oldMessage == null || (Math.max(message.editDate, message.date) > Math.max(oldMessage.editDate, oldMessage.date))) {
message.content = OsmandLocationUtils.parseMessageContent(message, this) message.content = OsmandLocationUtils.parseMessageContent(message, this)
usersLocationMessages[message.id] = message
oldMessage?.let { oldMessage?.let {
usersLocationMessages.remove(it.id) usersLocationMessages.remove(it.id)
} }
usersLocationMessages[message.id] = message
} }
} }
@ -876,6 +878,7 @@ class TelegramHelper private constructor() {
log.debug("handleMapLocationMessageUpdate - ERROR $obj") log.debug("handleMapLocationMessageUpdate - ERROR $obj")
val error = obj as TdApi.Error val error = obj as TdApi.Error
needRefreshActiveLiveLocationMessages = true needRefreshActiveLiveLocationMessages = true
shareInfo.pendingMapMessage = false
if (error.code != IGNORED_ERROR_CODE) { if (error.code != IGNORED_ERROR_CODE) {
shareInfo.hasSharingError = true shareInfo.hasSharingError = true
outgoingMessagesListeners.forEach { outgoingMessagesListeners.forEach {
@ -921,6 +924,7 @@ class TelegramHelper private constructor() {
TdApi.Error.CONSTRUCTOR -> { TdApi.Error.CONSTRUCTOR -> {
log.debug("handleTextLocationMessageUpdate - ERROR") log.debug("handleTextLocationMessageUpdate - ERROR")
val error = obj as TdApi.Error val error = obj as TdApi.Error
shareInfo.pendingMapMessage = false
if (error.code != IGNORED_ERROR_CODE) { if (error.code != IGNORED_ERROR_CODE) {
shareInfo.hasSharingError = true shareInfo.hasSharingError = true
outgoingMessagesListeners.forEach { outgoingMessagesListeners.forEach {

View file

@ -115,14 +115,11 @@ class TimelineTabFragment : Fragment() {
} }
fun tabOpened() { fun tabOpened() {
updateEnable = true
switcher.isChecked = settings.monitoringEnabled switcher.isChecked = settings.monitoringEnabled
updateList() updateList()
} }
fun tabClosed() { fun tabClosed() {}
updateEnable = false
}
private fun selectDate() { private fun selectDate() {
val dateFromDialog = val dateFromDialog =

View file

@ -2736,10 +2736,10 @@
<string name="add_destination_point">إضافة وجهة</string> <string name="add_destination_point">إضافة وجهة</string>
<string name="add_intermediate_point">أضف وجهة وسيطة</string> <string name="add_intermediate_point">أضف وجهة وسيطة</string>
<string name="add_start_point">إضافة نقطة البدء</string> <string name="add_start_point">إضافة نقطة البدء</string>
<string name="intermediate_waypoint">النقطة المتوسط : %1$ s</string> <string name="intermediate_waypoint">النقطة المتوسط : %1$s</string>
<string name="waypoints">نقاط الطريق: %1$ s</string> <string name="waypoints">نقاط الطريق: %1$s</string>
<string name="transfers">النقل:%1 $s</string> <string name="transfers">النقل:%1$s</string>
<string name="on_foot">سيرا على الأقدام: %1$ s</string> <string name="on_foot">سيرا على الأقدام: %1$s</string>
<string name="route_way">الطريقة: %1$s</string> <string name="route_way">الطريقة: %1$s</string>
<string name="points_of_interests">نقطة اهتمام (POI)</string> <string name="points_of_interests">نقطة اهتمام (POI)</string>
<string name="waiting_for_route_calculation">في انتظار لحساب المسار</string> <string name="waiting_for_route_calculation">في انتظار لحساب المسار</string>
@ -2751,7 +2751,7 @@
<string name="voice_announcements">إعلان صوتي</string> <string name="voice_announcements">إعلان صوتي</string>
<string name="intermediate_destinations">الوجهات المتوسطة : %1$s</string> <string name="intermediate_destinations">الوجهات المتوسطة : %1$s</string>
<string name="arrive_at_time">الوصول إلى %1$s</string> <string name="arrive_at_time">الوصول إلى %1$s</string>
<string name="send_search_query_description">سوف نقوم بإرسال استعلام البحث الخاص بك: <b>\"%1$ s\"</b>، وكذالك الموقع الخاص بك. <br/> <string name="send_search_query_description">سوف نقوم بإرسال استعلام البحث الخاص بك: <b>\"%1$s\"</b>، وكذالك الموقع الخاص بك. <br/>
<br/> نحن لا نجمع معلومات شخصية، ونحن فقط بحاجة إلى البحث عن البيانات لتحسين خوارزمية البحث. <br/> <br/> نحن لا نجمع معلومات شخصية، ونحن فقط بحاجة إلى البحث عن البيانات لتحسين خوارزمية البحث. <br/>
</string> </string>
<string name="off_road_render_descr">مناسبة للاستخدام أثناء القيادة على الطرق الوعرة. مناسب للاستخدام مع صور الأقمار الصناعية الخضراء كمخطط موضعها. النقاط الرئيسية: تخفيض سمك الطريق الرئيسية، وزيادة سمك المسارات والمسارات ودراجات وطرق أخرى. استناداً إلى نمط \'Topo\'.</string> <string name="off_road_render_descr">مناسبة للاستخدام أثناء القيادة على الطرق الوعرة. مناسب للاستخدام مع صور الأقمار الصناعية الخضراء كمخطط موضعها. النقاط الرئيسية: تخفيض سمك الطريق الرئيسية، وزيادة سمك المسارات والمسارات ودراجات وطرق أخرى. استناداً إلى نمط \'Topo\'.</string>