From cc5694da1ca047c3e7c57f4de287367788328783 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Sat, 6 Jun 2009 19:22:39 +0000 Subject: [PATCH] More progress on ticket:1919 These messages now don't use JavaScript string concatenation but variable interpolation: * browse.start_rjs.history_for_feature * browse.start_rjs.edited_by_user_at_timestamp * browse.start_rjs.object_list.selected.type.node * browse.start_rjs.object_list.selected.type.way * browse.start_rjs.object_list.history.type.node * browse.start_rjs.object_list.history.type.way These previously extant messages have been deleted, merged, and given more descriptive names: * browse.start_rjs.history_for * browse.start_rjs.edited_by * browse.start_rjs.at_timestamp --- app/views/browse/start.rjs | 12 ++++++------ config/locales/de.yml | 5 ++--- config/locales/en.yml | 13 ++++++------- config/locales/fr.yml | 5 ++--- config/locales/he.yml | 5 ++--- config/locales/is.yml | 15 +++++++-------- config/locales/it.yml | 5 ++--- config/locales/nl.yml | 5 ++--- config/locales/pl.yml | 5 ++--- config/locales/ru.yml | 5 ++--- config/locales/sl.yml | 5 ++--- config/locales/zh-CN.yml | 5 ++--- 12 files changed, 37 insertions(+), 48 deletions(-) diff --git a/app/views/browse/start.rjs b/app/views/browse/start.rjs index 4df614847..64e4431a4 100644 --- a/app/views/browse/start.rjs +++ b/app/views/browse/start.rjs @@ -421,7 +421,7 @@ page << < '{{feature}}')}", { feature: featureNameHistory(this.feature) }))); tr.appendChild(heading); var td = document.createElement("td"); @@ -442,7 +442,7 @@ page << < '{{user}}', :timestamp => '{{timestamp}}')}", { user: user, timestamp: timestamp }))); history.appendChild(item); } div.appendChild(history); @@ -470,9 +470,9 @@ page << < '{{id}}')}", { id: feature.osm_id }); } else if (featureType(feature) == "way") { - return "#{I18n.t('browse.start_rjs.object_list.selected.type.way')} " + feature.osm_id; + return i18n_js("#{I18n.t('browse.start_rjs.object_list.selected.type.way', :id => '{{id}}')}", { id: feature.osm_id }); } } @@ -480,9 +480,9 @@ page << < '{{id}}')}", { id: feature.osm_id }); } else if (featureType(feature) == "way") { - return "#{I18n.t('browse.start_rjs.object_list.history.type.way')} " + feature.osm_id; + return i18n_js("#{I18n.t('browse.start_rjs.object_list.history.type.way', :id => '{{id}}')}", { id: feature.osm_id }); } } diff --git a/config/locales/de.yml b/config/locales/de.yml index 279ae8eb0..9d3ebed0a 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -155,11 +155,10 @@ de: loading: "Laden..." show_history: "Chronik" wait: "Verarbeiten..." - history_for: "Chronik für" + history_for_feature: "Chronik für {{feature}}" details: "Details" private_user: "Anonymer Benutzer" - edited_by: "Bearbeitet von" - at_timestamp: "am" + edited_by_user_at_timestamp: "Bearbeitet von {{user}} am {{timestamp}}" tag_details: tags: "Tags:" way_details: diff --git a/config/locales/en.yml b/config/locales/en.yml index 7fe8b60ff..1635f6b67 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -155,11 +155,10 @@ en: loading: "Loading..." show_history: "Show History" wait: "Wait..." - history_for: "History for" + history_for_feature: "History for {{feature}}" details: "Details" private_user: "private user" - edited_by: "Edited by" - at_timestamp: "at" + edited_by_user_at_timestamp: "Edited by {{user}} at {{timestamp}}" object_list: heading: "Object list" back: "Display object list" @@ -171,13 +170,13 @@ en: details: "Details" selected: type: - node: "Node" - way: "Way" + node: "Node {{id}}" + way: "Way {{id}}" # There's no 'relation' type because it isn't represented in OpenLayers history: type: - node: "Node" - way: "Way" + node: "Node {{id}}" + way: "Way {{id}}" # There's no 'relation' type because it isn't represented in OpenLayers tag_details: tags: "Tags:" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index be9417793..e844d028c 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -70,11 +70,10 @@ fr: loading: "Chargement..." show_history: "Montrer l'historique" wait: "Patienter..." - history_for: "Historique pour" + history_for_feature: "Historique pour {{feature}}" details: "Détails" private_user: "utilisateur privé" - edited_by: "Édité par" - at_timestamp: "le" + edited_by_user_at_timestamp: "Édité par {{user}} le {{timestamp}}" diary_entry: new: title: "Nouvelle entrée du journal" diff --git a/config/locales/he.yml b/config/locales/he.yml index d340d37b4..886ed19ee 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -151,11 +151,10 @@ he: loading: "Loading..." show_history: "Show History" wait: "Wait..." - history_for: "History for" + history_for_feature: "History for {{feature}}" details: "Details" private_user: "private user" - edited_by: "Edited by" - at_timestamp: "at" + edited_by_user_at_timestamp: "Edited by {{user}} at {{timestamp}}" tag_details: tags: "Tags:" way_details: diff --git a/config/locales/is.yml b/config/locales/is.yml index 032e48e72..189f44963 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -155,11 +155,10 @@ is: loading: "Hleð inn gögnum..." show_history: "Sýna breytingarsögu" wait: "Augnablik..." - history_for: "Breytingarskrá fyrir" + history_for_feature: "Breytingarskrá fyrir {{feature}}" details: "Nánar" - private_user: "private user" - edited_by: "Breytt af" - at_timestamp: "klukkan" + private_user: "ónafngreindum" + edited_by_user_at_timestamp: "Breytt af {{user}} klukkan {{timestamp}}" object_list: heading: "Hlutir" back: "Aftur á listann yfir hluti á þessu svæði" @@ -170,13 +169,13 @@ is: details: "Nánar" selected: type: - node: "Hnútur" - way: "Vegur" + node: "Hnútur {{id}}" + way: "Vegur {{id}}" # There's no 'relation' type because it isn't represented in OpenLayers history: type: - node: "hnút" - way: "veg" + node: "hnút {{id}}" + way: "veg {{id}}" # There's no 'relation' type because it isn't represented in OpenLayers tag_details: tags: "Eigindi:" diff --git a/config/locales/it.yml b/config/locales/it.yml index 09edbcf40..2335a99fb 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -151,11 +151,10 @@ it: loading: "Caricamento in corso..." show_history: "Visualizza storico" wait: "Attendere..." - history_for: "Storico per" + history_for_feature: "Storico per {{feature}}" details: "Dettagli" private_user: "utente privato" - edited_by: "Modificato da" - at_timestamp: "il" + edited_by_user_at_timestamp: "Modificato da {{user}} il {{timestamp}}" tag_details: tags: "Etichette:" way_details: diff --git a/config/locales/nl.yml b/config/locales/nl.yml index a1bafbd64..b9e9299c2 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -151,11 +151,10 @@ nl: loading: "Laden..." show_history: "Geschiedenis weergeven" wait: "Een ogenblik geduld a.u.b..." - history_for: "Geschiedenis voor" + history_for_feature: "Geschiedenis voor {{feature}}" details: "Details" private_user: "private user" #to be translated - edited_by: "Bewerkt door" - at_timestamp: "op" + edited_by_user_at_timestamp: "Bewerkt door {{user}} op {{timestamp}}" tag_details: tags: "Tags:" way_details: diff --git a/config/locales/pl.yml b/config/locales/pl.yml index ada4113ff..3903c6f0c 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -151,11 +151,10 @@ pl: loading: "Wczytywanie..." show_history: "Pokaż zmiany" wait: "Moment..." - history_for: "Historia zmian dla" + history_for_feature: "Historia zmian dla {{feature}}" details: "Szczegóły" private_user: "prywatny użytkownika" - edited_by: "Edytowany przez" - at_timestamp: "ostatni raz" + edited_by_user_at_timestamp: "Edytowany przez {{user}} ostatni raz {{timestamp}}" tag_details: tags: "Tagi:" way_details: diff --git a/config/locales/ru.yml b/config/locales/ru.yml index dacecc4ec..8e643997a 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -151,11 +151,10 @@ ru: loading: "Загрузка..." show_history: "Показать историю" wait: "Подождите..." - history_for: "История" + history_for_feature: "История {{feature}}" details: "Детали" private_user: "частный пользователь" - edited_by: "Изменен" - at_timestamp: "в" + edited_by_user_at_timestamp: "Изменен {{user}} в {{timestamp}}" tag_details: tags: "Теги:" way_details: diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 02707c18a..3962cae21 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -151,11 +151,10 @@ sl: loading: "Nalaganje..." show_history: "Prikaži zgodovino" wait: "Počakajte..." - history_for: "Zgodovina" + history_for_feature: "Zgodovina {{feature}}" details: "Podrobnosti" private_user: "anonimni uporabnik" - edited_by: "Uredil" - at_timestamp: "ob" + edited_by_user_at_timestamp: "Uredil {{user}} ob {{timestamp}}" tag_details: tags: "Oznake:" way_details: diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 5ca8a4874..1541e8d5e 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -151,11 +151,10 @@ loading: "读取中" show_history: "显示历史" wait: "等待中..." - history_for: "历史" + history_for_feature: "历史 {{feature}}" details: "细节" private_user: "个人用户" - edited_by: "Edited by" - at_timestamp: "at" + edited_by_user_at_timestamp: "Edited by {{user}} at {{timestamp}}" tag_details: tags: "标签:" way_details: -- 2.43.2