From e2abf1254bbadf4827f3f74a0b890622fbf11b00 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Wed, 29 Jul 2009 11:05:17 +0000 Subject: [PATCH] * Turn the hardcoded #<%= changeset.id %> into t('msg', :id => changeset.id). Some languages may have a different numeric indicator than the ASCII pound symbol * Instead of including a column on :user/edits with a "more" link make the changeset ID link to the changeset page. --- app/views/changeset/_changeset.html.erb | 11 ++++++----- app/views/changeset/_changesets.html.erb | 1 - config/locales/be.yml | 1 - config/locales/de.yml | 1 - config/locales/en.yml | 2 +- config/locales/es.yml | 1 - config/locales/he.yml | 1 - config/locales/hi.yml | 1 - config/locales/hu.yml | 1 - config/locales/is.yml | 1 - config/locales/it.yml | 1 - config/locales/ja.yml | 1 - config/locales/ko.yml | 1 - config/locales/nl.yml | 1 - config/locales/pl.yml | 1 - config/locales/pt-BR.yml | 1 - config/locales/ro.yml | 1 - config/locales/ru.yml | 1 - config/locales/sl.yml | 1 - config/locales/vi.yml | 1 - config/locales/yo.yml | 1 - config/locales/zh-CN.yml | 1 - config/locales/zh-TW.yml | 1 - script/locale/diff | 3 +++ 24 files changed, 10 insertions(+), 27 deletions(-) diff --git a/app/views/changeset/_changeset.html.erb b/app/views/changeset/_changeset.html.erb index 81ee5423f..b682f1b4b 100644 --- a/app/views/changeset/_changeset.html.erb +++ b/app/views/changeset/_changeset.html.erb @@ -2,7 +2,12 @@ <% cl = cycle('table0', 'table1') %> - #<%= changeset.id %> + <%= + id_link = link_to(changeset.id, + {:controller => 'browse', :action => 'changeset', :id => changeset.id}, + {:title => t('changeset.changeset.view_changeset_details')}) + t'changeset.changeset.id', :id => id_link + %> @@ -48,8 +53,4 @@ %> - - <%= link_to t('changeset.changeset.more'), {:controller => 'browse', :action => 'changeset', :id => changeset.id}, {:title => t('changeset.changeset.view_changeset_details')} %> - - diff --git a/app/views/changeset/_changesets.html.erb b/app/views/changeset/_changesets.html.erb index d9e01235c..e177f666e 100644 --- a/app/views/changeset/_changesets.html.erb +++ b/app/views/changeset/_changesets.html.erb @@ -8,7 +8,6 @@ <% end %> <%= t'changeset.changesets.comment' %> <%= t'changeset.changesets.area' %> - <%= render :partial => 'changeset', :locals => {:showusername => showusername}, :collection => @edits unless @edits.nil? %> diff --git a/config/locales/be.yml b/config/locales/be.yml index 9cb4bd40c..c84def63c 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -184,7 +184,6 @@ be: show_area_box: "паказаць мяжу мясцовасці" big_area: "(вялікая)" view_changeset_details: "Падрабязней пра набор зменаў" - more: "больш" changesets: id: "ID" saved_at: "Запісаны" diff --git a/config/locales/de.yml b/config/locales/de.yml index 02f0ee0a1..b1db7a2ad 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -246,7 +246,6 @@ de: show_area_box: "Bereich anzeigen" big_area: "(groß)" view_changeset_details: "Details des Changesets" - more: "mehr" changesets: id: "ID" saved_at: "Gespeichert am" diff --git a/config/locales/en.yml b/config/locales/en.yml index 5df7504f5..93fdb29e2 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -239,6 +239,7 @@ en: showing_page: "Showing page" of: "of" changeset: + id: "#{{id}}" still_editing: "(still editing)" anonymous: "Anonymous" no_comment: "(none)" @@ -246,7 +247,6 @@ en: show_area_box: "show area box" big_area: "(big)" view_changeset_details: "View changeset details" - more: "more" changesets: id: "ID" saved_at: "Saved at" diff --git a/config/locales/es.yml b/config/locales/es.yml index 6363f58b9..908173d3a 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -202,7 +202,6 @@ es: show_area_box: "mostrar caja" big_area: "(grande)" view_changeset_details: "Ver detalles del conjunto de cambios" - more: "más" changesets: id: "ID" saved_at: "Guardado en" diff --git a/config/locales/he.yml b/config/locales/he.yml index b5001ade3..ce8c75a72 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -184,7 +184,6 @@ he: show_area_box: "show area box" big_area: "(big)" view_changeset_details: "View changeset details" - more: "more" changesets: id: "ID" saved_at: "Saved at" diff --git a/config/locales/hi.yml b/config/locales/hi.yml index 5f1cb6787..b81c666f5 100644 --- a/config/locales/hi.yml +++ b/config/locales/hi.yml @@ -209,7 +209,6 @@ hi: show_area_box: "show area box" big_area: "(बड़ा क्षेत्र)" view_changeset_details: "इस changeset के विवरण देखे" - more: "और दिखाए" changesets: id: "आईडी" saved_at: "समय जब सुरक्षित किया गया" diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 391a37770..7679ac2ca 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -246,7 +246,6 @@ hu: show_area_box: "területhatároló megjelenítése" big_area: "(nagy)" view_changeset_details: "Módosításcsomag részleteinek megtekintése" - more: "tovább" changesets: id: "Azonosító" saved_at: "Mentve" diff --git a/config/locales/is.yml b/config/locales/is.yml index 932ef92be..a1c3a477e 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -245,7 +245,6 @@ is: show_area_box: "sýna svæðismörk" big_area: "(stórt)" view_changeset_details: "Skoða breytingarsett" - more: "meira" changesets: id: "Kennitala" saved_at: "Vistað" diff --git a/config/locales/it.yml b/config/locales/it.yml index 6c22de3b5..6d4735c1c 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -184,7 +184,6 @@ it: show_area_box: "visualizza il riquadro dell'area" big_area: "(grande)" view_changeset_details: "Visualizza i dettagli del gruppo di modifiche" - more: "maggiori informazioni" changesets: id: "ID" saved_at: "Salvato il" diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 114e36067..915506a73 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -210,7 +210,6 @@ ja: show_area_box: "領域境界を表示" big_area: "（大）" view_changeset_details: "変更セットの詳細表示" - more: "詳細" changesets: id: "ID" saved_at: "保存日時" diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 414927ba3..fcb092446 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -210,7 +210,6 @@ ko: show_area_box: "지역 박스 보기" big_area: "(큰 지역)" view_changeset_details: "변경셋 세부 사항 보기" - more: "more" changesets: id: "ID" saved_at: "저장 시간" diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 67ce9a2b2..20c0073be 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -184,7 +184,6 @@ nl: show_area_box: "toon rechthoek" big_area: "(groot)" view_changeset_details: "Toon changeset-details" - more: "meer" changesets: id: "ID" saved_at: "Opgeslagen op" diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 2d261acd3..054fd7066 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -184,7 +184,6 @@ pl: show_area_box: "pokaż prostokąt zawierający" big_area: "(pełny)" view_changeset_details: "Zobacz szczegóły changesetu" - more: "więcej" changesets: id: "ID" saved_at: "Zapisano" diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 25b8f18ff..f61716dc3 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -210,7 +210,6 @@ pt-BR: show_area_box: "exibir limite da área" big_area: "(grande)" view_changeset_details: "Ver detalhes das alterações" - more: "mais" changesets: id: "ID" saved_at: "Salvo em" diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 1f9b0ecb6..88df00ed3 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -229,7 +229,6 @@ ro: show_area_box: "afișează chenarul zonei" big_area: "(mare)" view_changeset_details: "Vizualizare detalii set de schimbări" - more: "mai mult" changesets: id: "ID" saved_at: "Salvat la" diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 58859588a..87d6b88c8 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -184,7 +184,6 @@ ru: show_area_box: "Показать границы сеанса" big_area: "(большая)" view_changeset_details: "Просмотреть данные сеанса" - more: "подробнее" changesets: id: "ID" saved_at: "Завершено" diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 2bcec4e69..7423977ec 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -236,7 +236,6 @@ sl: show_area_box: "prikaži pravokotno področje" big_area: "(veliko)" view_changeset_details: "Ogled podrobnosti paketa sprememb" - more: "več" changesets: id: "ID" saved_at: "Shranjen" diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 41f84b66e..8f5e8364e 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -229,7 +229,6 @@ vi: show_area_box: "hiện hộp vùng" big_area: "(lớn)" view_changeset_details: "Xem chi tiết của bộ thay đổi" - more: "thêm" changesets: id: "ID" saved_at: "Lúc Lưu" diff --git a/config/locales/yo.yml b/config/locales/yo.yml index ce6c05644..b210e3177 100644 --- a/config/locales/yo.yml +++ b/config/locales/yo.yml @@ -210,7 +210,6 @@ yo: show_area_box: "show area box" big_area: "(big)" view_changeset_details: "View changeset details" - more: "more" changesets: id: "ID" saved_at: "Saved at" diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index b4a7e027d..4cca27908 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -186,7 +186,6 @@ zh-CN: show_area_box: "显示区域窗口" big_area: "(大)" view_changeset_details: "查看详细变更" - more: "更多" changesets: id: "ID" saved_at: "保存在" diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 9792d1477..f5fa89aef 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -210,7 +210,6 @@ zh-TW: show_area_box: "顯示區域方塊" big_area: "(big)" view_changeset_details: "檢視變更組合詳細資訊" - more: "更多" changesets: id: "ID" saved_at: "儲存於" diff --git a/script/locale/diff b/script/locale/diff index 52fc11180..b19d42a26 100755 --- a/script/locale/diff +++ b/script/locale/diff @@ -246,6 +246,9 @@ untranslated_values: site.index.license.project_url: true browse.relation_member.entry: true + # #{{id}} + changeset.changeset.id: true + de: activerecord.attributes.message.sender: true activerecord.attributes.trace.name: true -- 2.43.2