From 7106744372abce3c00dd326d4bc5d5ce5cac9d78 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Wed, 16 Jan 2013 19:07:54 +1100 Subject: Set locale in controller test by passing parameter in get Also using I18n.locale to pass the current locale around. --- spec/controllers/public_body_controller_spec.rb | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'spec') diff --git a/spec/controllers/public_body_controller_spec.rb b/spec/controllers/public_body_controller_spec.rb index 5f4012737..013c56129 100644 --- a/spec/controllers/public_body_controller_spec.rb +++ b/spec/controllers/public_body_controller_spec.rb @@ -43,18 +43,14 @@ describe PublicBodyController, "when showing a body" do :conditions => ["public_body_id = ?", public_bodies(:humpadink_public_body).id]) end - it "should assign the body using different locale from that used for url_name" do - PublicBody.with_locale(:es) do - get :show, {:url_name => "dfh", :view => 'all'} - assigns[:public_body].notes.should == "Baguette" - end + it "should redirect to the canonical name in the chosen locale" do + get :show, {:url_name => "dfh", :view => 'all', :show_locale => "es"} + response.should redirect_to "http://test.host/es/body/edfh" end it "should assign the body using same locale as that used in url_name" do - PublicBody.with_locale(:es) do - get :show, {:url_name => "edfh", :view => 'all'} - assigns[:public_body].notes.should == "Baguette" - end + get :show, {:url_name => "edfh", :view => 'all', :show_locale => "es"} + response.should include_text("Baguette") end it "should redirect use to the relevant locale even when url_name is for a different locale" do -- cgit v1.2.3 From 2bcf9eaa3e5b0e48ebc1a91de875481f63585622 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Fri, 22 Feb 2013 08:44:49 +1100 Subject: Use full url in test for redirect to ensure in correct locale --- spec/controllers/public_body_controller_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec') diff --git a/spec/controllers/public_body_controller_spec.rb b/spec/controllers/public_body_controller_spec.rb index 013c56129..6bcd25b62 100644 --- a/spec/controllers/public_body_controller_spec.rb +++ b/spec/controllers/public_body_controller_spec.rb @@ -65,7 +65,7 @@ describe PublicBodyController, "when showing a body" do it "should remember the filter (view) setting on redirecting" do get :show, :show_locale => "es", :url_name => "tgq", :view => 'successful' - response.should redirect_to show_public_body_successful_url(:url_name => "etgq") + response.should redirect_to 'http://test.host/es/body/etgq/successful' end it "should redirect to newest name if you use historic name of public body in URL" do -- cgit v1.2.3 From 5d22285eef67627c58320f031d03d2bffd0ba55e Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Thu, 17 Jan 2013 05:26:54 +1100 Subject: Set locale with I18n rather than through globalize Conflicts: app/controllers/general_controller.rb --- spec/controllers/admin_public_body_controller_spec.rb | 10 +++++----- spec/controllers/public_body_controller_spec.rb | 4 ++-- spec/models/public_body_spec.rb | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'spec') diff --git a/spec/controllers/admin_public_body_controller_spec.rb b/spec/controllers/admin_public_body_controller_spec.rb index 28182a3cd..317c186fa 100644 --- a/spec/controllers/admin_public_body_controller_spec.rb +++ b/spec/controllers/admin_public_body_controller_spec.rb @@ -301,7 +301,7 @@ describe AdminPublicBodyController, "when administering public bodies with i18n" end it "saves edits to a public body" do - PublicBody.with_locale(:es) do + I18n.with_locale(:es) do pb = PublicBody.find(id=3) pb.name.should == "El Department for Humpadinking" post :update, { @@ -321,10 +321,10 @@ describe AdminPublicBodyController, "when administering public bodies with i18n" end pb = PublicBody.find(public_bodies(:humpadink_public_body).id) - PublicBody.with_locale(:es) do + I18n.with_locale(:es) do pb.name.should == "Renamed" end - PublicBody.with_locale(:en) do + I18n.with_locale(:en) do pb.name.should == "Department for Humpadinking" end end @@ -370,12 +370,12 @@ describe AdminPublicBodyController, "when creating public bodies with i18n" do body = PublicBody.find_by_name("New Quango") body.translations.map {|t| t.locale.to_s}.sort.should == ["en", "es"] - PublicBody.with_locale(:en) do + I18n.with_locale(:en) do body.name.should == "New Quango" body.url_name.should == "new_quango" body.first_letter.should == "N" end - PublicBody.with_locale(:es) do + I18n.with_locale(:es) do body.name.should == "Mi Nuevo Quango" body.url_name.should == "mi_nuevo_quango" body.first_letter.should == "M" diff --git a/spec/controllers/public_body_controller_spec.rb b/spec/controllers/public_body_controller_spec.rb index 6bcd25b62..8f5b79489 100644 --- a/spec/controllers/public_body_controller_spec.rb +++ b/spec/controllers/public_body_controller_spec.rb @@ -88,7 +88,7 @@ describe PublicBodyController, "when listing bodies" do end it "should list all bodies from default locale, even when there are no translations for selected locale" do - PublicBody.with_locale(:en) do + I18n.with_locale(:en) do @english_only = PublicBody.new(:name => 'English only', :short_name => 'EO', :request_email => 'english@flourish.org', @@ -96,7 +96,7 @@ describe PublicBodyController, "when listing bodies" do :last_edit_comment => '') @english_only.save end - PublicBody.with_locale(:es) do + I18n.with_locale(:es) do get :list assigns[:public_bodies].include?(@english_only).should == true end diff --git a/spec/models/public_body_spec.rb b/spec/models/public_body_spec.rb index c2e0a6353..0b1bfccd7 100644 --- a/spec/models/public_body_spec.rb +++ b/spec/models/public_body_spec.rb @@ -210,7 +210,7 @@ describe PublicBody, "when searching" do end it "should cope with same url_name across multiple locales" do - PublicBody.with_locale(:es) do + I18n.with_locale(:es) do # use the unique spanish name to retrieve and edit body = PublicBody.find_by_url_name_with_historic('etgq') body.short_name = 'tgq' # Same as english version @@ -231,7 +231,7 @@ end describe PublicBody, " when dealing public body locales" do it "shouldn't fail if it internal_admin_body was created in a locale other than the default" do # first time, do it with the non-default locale - PublicBody.with_locale(:es) do + I18n.with_locale(:es) do PublicBody.internal_admin_body end @@ -378,7 +378,7 @@ describe PublicBody, " when loading CSV files" do PublicBody.count.should == original_count + 3 - # XXX Not sure why trying to do a PublicBody.with_locale fails here. Seems related to + # XXX Not sure why trying to do a I18n.with_locale fails here. Seems related to # the way categories are loaded every time from the PublicBody class. For now we just # test some translation was done. body = PublicBody.find_by_name('North West Fake Authority') -- cgit v1.2.3 From 965422836cbba050eab1682be8de5f83be3676b2 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Thu, 17 Jan 2013 08:42:30 +1100 Subject: Remove link html from translation message Conflicts: locale/id/app.po locale/pt_BR/app.po locale/ro_RO/app.po locale/sq/app.po_ locale/sq/app__.po locale/sq/app_old3.po locale/sq/app_old4.po locale/sq/app_old5.po --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 3fe8a569b..d8d5e6296 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -196,7 +196,7 @@ msgid "Add an annotation (to help the requester or others)" msgstr "" #: app/views/public_body/list.rhtml:29 -msgid "Are we missing a public authority?." +msgid "Are we missing a public authority?" msgstr "" #: app/views/request/_sidebar.rhtml:39 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 3fe8a569b..d8d5e6296 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -196,7 +196,7 @@ msgid "Add an annotation (to help the requester or others)" msgstr "" #: app/views/public_body/list.rhtml:29 -msgid "Are we missing a public authority?." +msgid "Are we missing a public authority?" msgstr "" #: app/views/request/_sidebar.rhtml:39 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index dbc7ab65b..8fc146572 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -213,8 +213,8 @@ msgid "Add an annotation (to help the requester or others)" msgstr "Añade un comentario (para ayudar al solicitante o a otros)" #: app/views/public_body/list.rhtml:29 -msgid "Are we missing a public authority?." -msgstr "¿Nos falta algún organismo público?." +msgid "Are we missing a public authority?" +msgstr "¿Nos falta algún organismo público?." #: app/views/request/_sidebar.rhtml:39 msgid "" -- cgit v1.2.3 From 5d3c098309dde34dcc125ab7d24e0a285cf9b3c1 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Thu, 17 Jan 2013 08:50:08 +1100 Subject: Remove HTML a tag from all msgids and msgstrs. Conflicts: locale/aln/app.po locale/ar/app.po locale/bs/app.po locale/ca/app.po locale/cs/app.po locale/cy/app.po locale/de/app.po locale/en_IE/app.po locale/es/app.po locale/eu/app.po locale/fr/app.po locale/gl/app.po locale/hu_HU/app.po locale/id/app.po locale/pt_BR/app.po locale/ro_RO/app.po locale/sq/app.po locale/sq/app__.po locale/sq/app_old3.po locale/sr@latin/app.po locale/tr/app.po locale/uk/app.po --- spec/fixtures/locale/en/app.po | 4 +--- spec/fixtures/locale/en_GB/app.po | 4 +--- spec/fixtures/locale/es/app.po | 6 ++---- 3 files changed, 4 insertions(+), 10 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index d8d5e6296..7718843c4 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -200,9 +200,7 @@ msgid "Are we missing a public authority?" msgstr "" #: app/views/request/_sidebar.rhtml:39 -msgid "" -"Are you the owner of\n" -" any commercial copyright on this page?" +msgid "Are you the owner of any commercial copyright on this page?" msgstr "" #: app/views/general/search.rhtml:168 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index d8d5e6296..7718843c4 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -200,9 +200,7 @@ msgid "Are we missing a public authority?" msgstr "" #: app/views/request/_sidebar.rhtml:39 -msgid "" -"Are you the owner of\n" -" any commercial copyright on this page?" +msgid "Are you the owner of any commercial copyright on this page?" msgstr "" #: app/views/general/search.rhtml:168 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 8fc146572..b0d7581e8 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -217,10 +217,8 @@ msgid "Are we missing a public authority?" msgstr "¿Nos falta algún organismo público?." #: app/views/request/_sidebar.rhtml:39 -msgid "" -"Are you the owner of\n" -" any commercial copyright on this page?" -msgstr "¿Posee el copyright\n de alguna información de esta página?" +msgid "Are you the owner of any commercial copyright on this page?" +msgstr "¿Posee el copyright de alguna información de esta página?" #: app/views/general/search.rhtml:168 msgid "Browse all or ask us to add one." -- cgit v1.2.3 From 21f2e40ee8fa8bdf7f449336196d4a36d2166bc5 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 9 Apr 2013 16:08:04 +0100 Subject: Remove link html from translation message Conflicts: locale/fr/app.po locale/sq/app.po_ locale/sq/app__.po locale/sq/app_old3.po locale/sq/app_old4.po locale/sq/app_old5.po --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 7718843c4..d361889d7 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -208,7 +208,7 @@ msgid "Browse all or ask us to add one." msgstr "" #: app/views/public_body/list.rhtml:51 -msgid "Can't find the one you want?" +msgid "Can't find the one you want?" msgstr "" #: app/views/user/show.rhtml:118 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 7718843c4..d361889d7 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -208,7 +208,7 @@ msgid "Browse all or ask us to add one." msgstr "" #: app/views/public_body/list.rhtml:51 -msgid "Can't find the one you want?" +msgid "Can't find the one you want?" msgstr "" #: app/views/user/show.rhtml:118 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index b0d7581e8..5aa93b95b 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -225,8 +225,8 @@ msgid "Browse all or ask us to add one." msgstr "Ver todas o pídanos que añadamos una." #: app/views/public_body/list.rhtml:51 -msgid "Can't find the one you want?" -msgstr "¿No encuentra el que busca?" +msgid "Can't find the one you want?" +msgstr "¿No encuentra el que busca?" #: app/views/user/show.rhtml:118 msgid "" -- cgit v1.2.3 From 5843eabfab7085a4a53210fe71ebd37242b46e6e Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 9 Apr 2013 16:15:47 +0100 Subject: Remove link html from translation message Conflicts: app/views/request/_followup.rhtml locale/fr/app.po locale/sq/app.po_ locale/sq/app__.po locale/sq/app_old3.po locale/sq/app_old4.po locale/sq/app_old5.po --- spec/fixtures/locale/en/app.po | 6 +++--- spec/fixtures/locale/en_GB/app.po | 6 +++--- spec/fixtures/locale/es/app.po | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index d361889d7..2c9a459a0 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -217,7 +217,7 @@ msgstr "" #: app/views/request/_followup.rhtml:66 app/views/request/_followup.rhtml:73 #: app/views/request/show.rhtml:83 app/views/request/show.rhtml:87 -msgid "details" +msgid "details" msgstr "" #: app/views/request/_followup.rhtml:101 @@ -2690,14 +2690,14 @@ msgstr "" #: app/views/request/_followup.rhtml:59 msgid "" -"The response to your request has been delayed. You can say that, \n" +"The response to your request has been delayed. You can say that,\n" " by law, the authority should normally have responded\n" " promptly and" msgstr "" #: app/views/request/_followup.rhtml:71 msgid "" -"The response to your request is long overdue. You can say that, by \n" +"The response to your request is long overdue. You can say that, by\n" " law, under all circumstances, the authority should have responded\n" " by now" msgstr "" diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index d361889d7..2c9a459a0 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -217,7 +217,7 @@ msgstr "" #: app/views/request/_followup.rhtml:66 app/views/request/_followup.rhtml:73 #: app/views/request/show.rhtml:83 app/views/request/show.rhtml:87 -msgid "details" +msgid "details" msgstr "" #: app/views/request/_followup.rhtml:101 @@ -2690,14 +2690,14 @@ msgstr "" #: app/views/request/_followup.rhtml:59 msgid "" -"The response to your request has been delayed. You can say that, \n" +"The response to your request has been delayed. You can say that,\n" " by law, the authority should normally have responded\n" " promptly and" msgstr "" #: app/views/request/_followup.rhtml:71 msgid "" -"The response to your request is long overdue. You can say that, by \n" +"The response to your request is long overdue. You can say that, by\n" " law, under all circumstances, the authority should have responded\n" " by now" msgstr "" diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 5aa93b95b..fc7a27230 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -236,8 +236,8 @@ msgstr "Abre una sesión para cambiar tu contraseña, suscrip #: app/views/request/_followup.rhtml:66 app/views/request/_followup.rhtml:73 #: app/views/request/show.rhtml:83 app/views/request/show.rhtml:87 -msgid "details" -msgstr "detalles" +msgid "details" +msgstr "detalles" #: app/views/request/_followup.rhtml:101 msgid "what's that?" @@ -2888,14 +2888,14 @@ msgstr "El creador de la solicitud la ha cancelado por algún motivo" #: app/views/request/_followup.rhtml:59 msgid "" -"The response to your request has been delayed. You can say that, \n" +"The response to your request has been delayed. You can say that,\n" " by law, the authority should normally have responded\n" " promptly and" msgstr "La respuesta a tu solicitud ha sido retrasada.\n Por ley, el organismo debería normalmente haber respondido\n rápidamente y" #: app/views/request/_followup.rhtml:71 msgid "" -"The response to your request is long overdue. You can say that, by \n" +"The response to your request is long overdue. You can say that, by\n" " law, under all circumstances, the authority should have responded\n" " by now" msgstr "La respuesta a tu solicitud ha sido muy retrasada.\n Por ley, bajo cualquier circunstancia, el organismo ya debería\n haber respondido" -- cgit v1.2.3 From f64f12368e41925f7e11913ce06e27e7f8ba4118 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Thu, 17 Jan 2013 08:42:30 +1100 Subject: Remove link html from translation message --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 91af9b72b..9aae82304 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -196,7 +196,7 @@ msgid "Add an annotation (to help the requester or others)" msgstr "" #: app/views/public_body/list.rhtml:29 -msgid "Are we missing a public authority?." +msgid "Are we missing a public authority?" msgstr "" #: app/views/request/_sidebar.rhtml:39 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 91af9b72b..9aae82304 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -196,7 +196,7 @@ msgid "Add an annotation (to help the requester or others)" msgstr "" #: app/views/public_body/list.rhtml:29 -msgid "Are we missing a public authority?." +msgid "Are we missing a public authority?" msgstr "" #: app/views/request/_sidebar.rhtml:39 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 4e54a1d40..4eb16739e 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -213,8 +213,8 @@ msgid "Add an annotation (to help the requester or others)" msgstr "Añade un comentario (para ayudar al solicitante o a otros)" #: app/views/public_body/list.rhtml:29 -msgid "Are we missing a public authority?." -msgstr "¿Nos falta algún organismo público?." +msgid "Are we missing a public authority?" +msgstr "¿Nos falta algún organismo público?." #: app/views/request/_sidebar.rhtml:39 msgid "" -- cgit v1.2.3 From 4369a320459c00ece0d56dc3e2000e43ac01c8c6 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Thu, 17 Jan 2013 08:50:08 +1100 Subject: Remove link html from translation message --- spec/fixtures/locale/en/app.po | 4 +--- spec/fixtures/locale/en_GB/app.po | 4 +--- spec/fixtures/locale/es/app.po | 6 ++---- 3 files changed, 4 insertions(+), 10 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 9aae82304..fd6706879 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -200,9 +200,7 @@ msgid "Are we missing a public authority?" msgstr "" #: app/views/request/_sidebar.rhtml:39 -msgid "" -"Are you the owner of\n" -" any commercial copyright on this page?" +msgid "Are you the owner of any commercial copyright on this page?" msgstr "" #: app/views/general/search.rhtml:168 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 9aae82304..fd6706879 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -200,9 +200,7 @@ msgid "Are we missing a public authority?" msgstr "" #: app/views/request/_sidebar.rhtml:39 -msgid "" -"Are you the owner of\n" -" any commercial copyright on this page?" +msgid "Are you the owner of any commercial copyright on this page?" msgstr "" #: app/views/general/search.rhtml:168 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 4eb16739e..66878ec3e 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -217,10 +217,8 @@ msgid "Are we missing a public authority?" msgstr "¿Nos falta algún organismo público?." #: app/views/request/_sidebar.rhtml:39 -msgid "" -"Are you the owner of\n" -" any commercial copyright on this page?" -msgstr "¿Posee el copyright\n de alguna información de esta página?" +msgid "Are you the owner of any commercial copyright on this page?" +msgstr "¿Posee el copyright de alguna información de esta página?" #: app/views/general/search.rhtml:168 msgid "Browse all or ask us to add one." -- cgit v1.2.3 From 5415e74f2308cae04609c638a5d6fdcd60dccc53 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Thu, 17 Jan 2013 09:04:04 +1100 Subject: Remove link html from translation message --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index fd6706879..fa2ebfa27 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -208,7 +208,7 @@ msgid "Browse all or ask us to add one." msgstr "" #: app/views/public_body/list.rhtml:51 -msgid "Can't find the one you want?" +msgid "Can't find the one you want?" msgstr "" #: app/views/user/show.rhtml:118 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index fd6706879..fa2ebfa27 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -208,7 +208,7 @@ msgid "Browse all or ask us to add one." msgstr "" #: app/views/public_body/list.rhtml:51 -msgid "Can't find the one you want?" +msgid "Can't find the one you want?" msgstr "" #: app/views/user/show.rhtml:118 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 66878ec3e..590f73198 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -225,8 +225,8 @@ msgid "Browse all or ask us to add one." msgstr "Ver todas o pídanos que añadamos una." #: app/views/public_body/list.rhtml:51 -msgid "Can't find the one you want?" -msgstr "¿No encuentra el que busca?" +msgid "Can't find the one you want?" +msgstr "¿No encuentra el que busca?" #: app/views/user/show.rhtml:118 msgid "" -- cgit v1.2.3 From 3634d085d1bfe49c993780b13b3014dda70b0f84 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Thu, 17 Jan 2013 09:19:31 +1100 Subject: Remove link html from translation message --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index fa2ebfa27..34ea16881 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -217,7 +217,7 @@ msgstr "" #: app/views/request/_followup.rhtml:66 app/views/request/_followup.rhtml:73 #: app/views/request/show.rhtml:83 app/views/request/show.rhtml:87 -msgid "details" +msgid "details" msgstr "" #: app/views/request/_followup.rhtml:101 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index fa2ebfa27..34ea16881 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -217,7 +217,7 @@ msgstr "" #: app/views/request/_followup.rhtml:66 app/views/request/_followup.rhtml:73 #: app/views/request/show.rhtml:83 app/views/request/show.rhtml:87 -msgid "details" +msgid "details" msgstr "" #: app/views/request/_followup.rhtml:101 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 590f73198..c2f194550 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -236,8 +236,8 @@ msgstr "Abre una sesión para cambiar tu contraseña, suscrip #: app/views/request/_followup.rhtml:66 app/views/request/_followup.rhtml:73 #: app/views/request/show.rhtml:83 app/views/request/show.rhtml:87 -msgid "details" -msgstr "detalles" +msgid "details" +msgstr "detalles" #: app/views/request/_followup.rhtml:101 msgid "what's that?" -- cgit v1.2.3 From 0bcc31dcb9a4e3e689290693ee0e0a157b3ce09d Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 21 Jan 2013 16:27:18 +0000 Subject: Replace %s with {{}} formatting in translation string with url. --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 34ea16881..0dd75cb59 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -1290,7 +1290,7 @@ msgstr "" msgid "" "If you are dissatisfied by the response you got from\n" " the public authority, you have the right to\n" -" complain (details)." +" complain (details)." msgstr "" #: app/views/user/no_cookies.rhtml:20 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 34ea16881..0dd75cb59 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -1290,7 +1290,7 @@ msgstr "" msgid "" "If you are dissatisfied by the response you got from\n" " the public authority, you have the right to\n" -" complain (details)." +" complain (details)." msgstr "" #: app/views/user/no_cookies.rhtml:20 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index c2f194550..c86d0c9ec 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # David Cabo , 2011, 2012. # skenaja , 2011. @@ -1421,8 +1421,8 @@ msgstr "Si no es correcto, o te gustaría enviar una respuesta a la solicitud\no msgid "" "If you are dissatisfied by the response you got from\n" " the public authority, you have the right to\n" -" complain (details)." -msgstr "Si no estás satisfecho con la respuesta que has recibido del\n organismo público, tienes derecho a\n apelar (detalles)." +" complain (details)." +msgstr "Si no estás satisfecho con la respuesta que has recibido del\n organismo público, tienes derecho a\n apelar (detalles)." #: app/views/user/no_cookies.rhtml:20 msgid "If you are still having trouble, please contact us." -- cgit v1.2.3 From d8ba66ec47569bb16b3f4d6410a6f97d6986df23 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 21 Jan 2013 16:45:49 +0000 Subject: Replace %s with {{}} interpolation format in url. --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 0dd75cb59..d246d644f 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -3710,7 +3710,7 @@ msgstr "" #: app/views/request/preview.rhtml:8 msgid "" "Your name, request and any responses will appear in search engines\n" -" (details)." +" (details)." msgstr "" #: app/views/user/_signup.rhtml:18 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 0dd75cb59..d246d644f 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -3710,7 +3710,7 @@ msgstr "" #: app/views/request/preview.rhtml:8 msgid "" "Your name, request and any responses will appear in search engines\n" -" (details)." +" (details)." msgstr "" #: app/views/user/_signup.rhtml:18 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index c86d0c9ec..dfccf8f74 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -3988,8 +3988,8 @@ msgstr "Tu nombre y su comentario aparecerán en los motores de búsqued #: app/views/request/preview.rhtml:8 msgid "" "Your name, request and any responses will appear in search engines\n" -" (details)." -msgstr "Tu nombre, tu solicitud y cualquier respuesta aparecerán en los motores de búsqueda\n (detalles)." +" (details)." +msgstr "Tu nombre, tu solicitud y cualquier respuesta aparecerán en los motores de búsqueda\n (detalles)." #: app/views/user/_signup.rhtml:18 msgid "Your name:" -- cgit v1.2.3 From 884b879400f7da1e70436a42469cbfdda6e2d6c2 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 21 Jan 2013 17:24:55 +0000 Subject: Use {{}} instead of %s in url interpolation. --- spec/fixtures/locale/en/app.po | 4 ++-- spec/fixtures/locale/en_GB/app.po | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index d246d644f..9d1e9fd00 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -291,11 +291,11 @@ msgid "

We're glad you got some of the information that you wanted. If you fou msgstr "" #: app/controllers/request_controller.rb:318 -msgid "

You do not need to include your email in the request in order to get a reply (details).

" +msgid "

You do not need to include your email in the request in order to get a reply (details).

" msgstr "" #: app/controllers/request_controller.rb:316 -msgid "

You do not need to include your email in the request in order to get a reply, as we will ask for it on the next screen (details).

" +msgid "

You do not need to include your email in the request in order to get a reply, as we will ask for it on the next screen (details).

" msgstr "" #: app/controllers/request_controller.rb:324 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index d246d644f..9d1e9fd00 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -291,11 +291,11 @@ msgid "

We're glad you got some of the information that you wanted. If you fou msgstr "" #: app/controllers/request_controller.rb:318 -msgid "

You do not need to include your email in the request in order to get a reply (details).

" +msgid "

You do not need to include your email in the request in order to get a reply (details).

" msgstr "" #: app/controllers/request_controller.rb:316 -msgid "

You do not need to include your email in the request in order to get a reply, as we will ask for it on the next screen (details).

" +msgid "

You do not need to include your email in the request in order to get a reply, as we will ask for it on the next screen (details).

" msgstr "" #: app/controllers/request_controller.rb:324 -- cgit v1.2.3 From 9fbfbbb4c5e492bd0a653a65bc651db7783a8f88 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Fri, 18 Jan 2013 11:52:37 +1100 Subject: Remove translation string that is just html and no words --- spec/fixtures/locale/en/app.po | 4 ---- spec/fixtures/locale/en_GB/app.po | 4 ---- spec/fixtures/locale/es/app.po | 4 ---- 3 files changed, 12 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 9d1e9fd00..be6ba9f29 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -187,10 +187,6 @@ msgstr "" msgid "3. Now check your request" msgstr "" -#: app/views/public_body/show.rhtml:56 -msgid "{{text}}" -msgstr "" - #: app/views/request/_after_actions.rhtml:9 msgid "Add an annotation (to help the requester or others)" msgstr "" diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 9d1e9fd00..be6ba9f29 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -187,10 +187,6 @@ msgstr "" msgid "3. Now check your request" msgstr "" -#: app/views/public_body/show.rhtml:56 -msgid "{{text}}" -msgstr "" - #: app/views/request/_after_actions.rhtml:9 msgid "Add an annotation (to help the requester or others)" msgstr "" diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index dfccf8f74..6cbb948dd 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -204,10 +204,6 @@ msgstr "2. Solicite información" msgid "3. Now check your request" msgstr "3. Revisa tu solicitud" -#: app/views/public_body/show.rhtml:56 -msgid "{{text}}" -msgstr "{{text}}" - #: app/views/request/_after_actions.rhtml:9 msgid "Add an annotation (to help the requester or others)" msgstr "Añade un comentario (para ayudar al solicitante o a otros)" -- cgit v1.2.3 From adb74ad68c8bfa22869bf21088767a85175edbbb Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 21 Jan 2013 17:48:17 +0000 Subject: Remove url from translation. --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index be6ba9f29..0fccc2a29 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -217,7 +217,7 @@ msgid "details" msgstr "" #: app/views/request/_followup.rhtml:101 -msgid "what's that?" +msgid "what's that?" msgstr "" #: app/controllers/request_game_controller.rb:23 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index be6ba9f29..0fccc2a29 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -217,7 +217,7 @@ msgid "details" msgstr "" #: app/views/request/_followup.rhtml:101 -msgid "what's that?" +msgid "what's that?" msgstr "" #: app/controllers/request_game_controller.rb:23 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 6cbb948dd..e582dac85 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -236,8 +236,8 @@ msgid "details" msgstr "detalles" #: app/views/request/_followup.rhtml:101 -msgid "what's that?" -msgstr "¿Qué es eso?" +msgid "what's that?" +msgstr "¿Qué es eso?" #: app/controllers/request_game_controller.rb:23 msgid "" -- cgit v1.2.3 From 59846923c92d25c6f8aad74836b9fc9244d20be0 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Fri, 18 Jan 2013 12:33:48 +1100 Subject: In translation strings replace %s with {{}} formatting --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 0fccc2a29..e6cad28e0 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -31,7 +31,7 @@ msgid "" msgstr "" #: app/views/comment/_comment_form.rhtml:16 -msgid " (no ranty politics, read our moderation policy)" +msgid " (no ranty politics, read our moderation policy)" msgstr "" #: app/views/request/upload_response.rhtml:40 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 0fccc2a29..e6cad28e0 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -31,7 +31,7 @@ msgid "" msgstr "" #: app/views/comment/_comment_form.rhtml:16 -msgid " (no ranty politics, read our moderation policy)" +msgid " (no ranty politics, read our moderation policy)" msgstr "" #: app/views/request/upload_response.rhtml:40 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index e582dac85..eac88bbf7 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -35,9 +35,9 @@ msgstr " Esto aparecerá en tu perfil de {{site_name}}, para facilitar\n #: app/views/comment/_comment_form.rhtml:16 msgid "" -" (no ranty politics, read our moderation " +" (no ranty politics, read our moderation " "policy)" -msgstr " (sin ataques políticos, lea nuestra política de moderación)" +msgstr " (sin ataques políticos, lea nuestra política de moderación)" #: app/views/request/upload_response.rhtml:40 msgid "" -- cgit v1.2.3 From a003563920333598c129c4b47410e621eb24a4eb Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Fri, 18 Jan 2013 12:40:57 +1100 Subject: In translation strings replace %s with {{}} formatting --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index e6cad28e0..7b1ad22bf 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -71,7 +71,7 @@ msgstr "" #: app/views/public_body/view_email.rhtml:30 msgid "" -" If you know the address to use, then please send it to us.\n" +" If you know the address to use, then please send it to us.\n" " You may be able to find the address on their website, or by phoning them up and asking." msgstr "" diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index e6cad28e0..7b1ad22bf 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -71,7 +71,7 @@ msgstr "" #: app/views/public_body/view_email.rhtml:30 msgid "" -" If you know the address to use, then please send it to us.\n" +" If you know the address to use, then please send it to us.\n" " You may be able to find the address on their website, or by phoning them up and asking." msgstr "" diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index eac88bbf7..8ebdd814c 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -80,9 +80,9 @@ msgstr " Ideas sobre qué otra información pedir que el organi #: app/views/public_body/view_email.rhtml:30 msgid "" -" If you know the address to use, then please send it to us.\n" +" If you know the address to use, then please send it to us.\n" " You may be able to find the address on their website, or by phoning them up and asking." -msgstr " Si conoces la dirección a utilizar, entonces por favor envíanosla.\n Puede que la encuentres en su página web, o llamándoles por teléfono y preguntando." +msgstr " Si conoces la dirección a utilizar, entonces por favor envíanosla.\n Puede que la encuentres en su página web, o llamándoles por teléfono y preguntando." #: app/views/user/set_profile_about_me.rhtml:26 msgid "" -- cgit v1.2.3 From 0196035acd1d7d113a7130263fda23f096306c84 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Fri, 18 Jan 2013 13:22:28 +1100 Subject: Override n_ to add interpolation --- spec/lib/i18n_interpolation.rb | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'spec') diff --git a/spec/lib/i18n_interpolation.rb b/spec/lib/i18n_interpolation.rb index e8d046757..b07cf1e9a 100644 --- a/spec/lib/i18n_interpolation.rb +++ b/spec/lib/i18n_interpolation.rb @@ -12,7 +12,35 @@ describe "when using i18n" do it "should assume that simple translations are always html safe" do _("Hello").should be_html_safe end +end + +describe "n_" do + it "should return the translated singular" do + FastGettext.should_receive(:n_).with("Apple", "Apples", 1).and_return("Apfel") + n_("Apple", "Apples", 1).should == "Apfel" + end + + it "should return the translated plural" do + FastGettext.should_receive(:n_).with("Apple", "Apples", 3).and_return("Äpfel") + n_("Apple", "Apples", 3).should == "Äpfel" + end + it "should return the translated singular interpolated" do + FastGettext.should_receive(:n_).with("I eat {{count}} apple", "I eat {{count}} apples", 1). + and_return("Ich esse {{count}} Apfel") + n_("I eat {{count}} apple", "I eat {{count}} apples", 1, :count => 1).should == "Ich esse 1 Apfel" + end + + it "should return the translated plural interpolated" do + FastGettext.should_receive(:n_).with("I eat {{count}} apple", "I eat {{count}} apples", 3). + and_return("Ich esse {{count}} Äpfel") + n_("I eat {{count}} apple", "I eat {{count}} apples", 3, :count => 3).should == "Ich esse 3 Äpfel" + end + + it "should always be html safe when there is no interpolation" do + FastGettext.should_receive(:n_).with("Apple", "Apples", 1).and_return("Apfel") + n_("Apple", "Apples", 1).should be_html_safe + end end describe "gettext_interpolate" do -- cgit v1.2.3 From 0b9378f8f4f621d403d7aa7b8060a9eddecb2e33 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Fri, 18 Jan 2013 13:45:20 +1100 Subject: In translation strings replace %s and %d with {{}} formatting --- spec/fixtures/locale/en/app.po | 4 ++-- spec/fixtures/locale/en_GB/app.po | 4 ++-- spec/fixtures/locale/es/app.po | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 7b1ad22bf..b3bd524d4 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -123,8 +123,8 @@ msgid " when you send this message." msgstr "" #: app/views/public_body/show.rhtml:87 -msgid "%d Freedom of Information request to %s" -msgid_plural "%d Freedom of Information requests to %s" +msgid "{{count}} Freedom of Information request to {{public_body_name}}" +msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}" msgstr[0] "" msgstr[1] "" diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 7b1ad22bf..b3bd524d4 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -123,8 +123,8 @@ msgid " when you send this message." msgstr "" #: app/views/public_body/show.rhtml:87 -msgid "%d Freedom of Information request to %s" -msgid_plural "%d Freedom of Information requests to %s" +msgid "{{count}} Freedom of Information request to {{public_body_name}}" +msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}" msgstr[0] "" msgstr[1] "" diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 8ebdd814c..e6ee59581 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -140,10 +140,10 @@ msgid " when you send this message." msgstr " cuando envió este mensaje." #: app/views/public_body/show.rhtml:87 -msgid "%d Freedom of Information request to %s" -msgid_plural "%d Freedom of Information requests to %s" -msgstr[0] "%d solicitud de información a %s" -msgstr[1] "%d solicitudes de información a %s" +msgid "{{count}} Freedom of Information request to {{public_body_name}}" +msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}" +msgstr[0] "{{count}} solicitud de información a {{public_body_name}}" +msgstr[1] "{{count}} solicitudes de información a {{public_body_name}}" #: app/views/general/frontpage.rhtml:43 msgid "%d request" -- cgit v1.2.3 From 26679b1b514e1a8f823cd86a81955a7867d537b6 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Fri, 18 Jan 2013 14:02:35 +1100 Subject: In translation strings replace %d with {{}} formatting --- spec/fixtures/locale/en/app.po | 4 ++-- spec/fixtures/locale/en_GB/app.po | 4 ++-- spec/fixtures/locale/es/app.po | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index b3bd524d4..6a21336bf 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -135,8 +135,8 @@ msgstr[0] "" msgstr[1] "" #: app/views/public_body/_body_listing_single.rhtml:21 -msgid "%d request made." -msgid_plural "%d requests made." +msgid "{{count}} request made." +msgid_plural "{{count}} requests made." msgstr[0] "" msgstr[1] "" diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index b3bd524d4..6a21336bf 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -135,8 +135,8 @@ msgstr[0] "" msgstr[1] "" #: app/views/public_body/_body_listing_single.rhtml:21 -msgid "%d request made." -msgid_plural "%d requests made." +msgid "{{count}} request made." +msgid_plural "{{count}} requests made." msgstr[0] "" msgstr[1] "" diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index e6ee59581..ab72de22f 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -152,10 +152,10 @@ msgstr[0] "%d solicitud" msgstr[1] "%d solicitudes" #: app/views/public_body/_body_listing_single.rhtml:21 -msgid "%d request made." -msgid_plural "%d requests made." -msgstr[0] "%d solicitud enviada." -msgstr[1] "%d solicitudes enviadas." +msgid "{{count}} request made." +msgid_plural "{{count}} requests made." +msgstr[0] "{{count}} solicitud enviada." +msgstr[1] "{{count}} solicitudes enviadas." #: app/views/request/new.rhtml:92 msgid "'Crime statistics by ward level for Wales'" -- cgit v1.2.3 From 54d9fcb1dd7218d23b3e162b22c87b7e2bce80e6 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Fri, 18 Jan 2013 14:10:05 +1100 Subject: In translation strings replace %d with {{}} formatting --- spec/fixtures/locale/en/app.po | 4 ++-- spec/fixtures/locale/en_GB/app.po | 4 ++-- spec/fixtures/locale/es/app.po | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 6a21336bf..06fae9a81 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -129,8 +129,8 @@ msgstr[0] "" msgstr[1] "" #: app/views/general/frontpage.rhtml:43 -msgid "%d request" -msgid_plural "%d requests" +msgid "{{count}} request" +msgid_plural "{{count}} requests" msgstr[0] "" msgstr[1] "" diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 6a21336bf..06fae9a81 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -129,8 +129,8 @@ msgstr[0] "" msgstr[1] "" #: app/views/general/frontpage.rhtml:43 -msgid "%d request" -msgid_plural "%d requests" +msgid "{{count}} request" +msgid_plural "{{count}} requests" msgstr[0] "" msgstr[1] "" diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index ab72de22f..626e39e94 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -146,10 +146,10 @@ msgstr[0] "{{count}} solicitud de información a {{public_body_name}}" msgstr[1] "{{count}} solicitudes de información a {{public_body_name}}" #: app/views/general/frontpage.rhtml:43 -msgid "%d request" -msgid_plural "%d requests" -msgstr[0] "%d solicitud" -msgstr[1] "%d solicitudes" +msgid "{{count}} request" +msgid_plural "{{count}} requests" +msgstr[0] "{{count}} solicitud" +msgstr[1] "{{count}} solicitudes" #: app/views/public_body/_body_listing_single.rhtml:21 msgid "{{count}} request made." -- cgit v1.2.3 From 20605630197686023576768f7abbc211a3044202 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Fri, 18 Jan 2013 15:02:33 +1100 Subject: In translation strings replace %{} with {{}} formatting --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 06fae9a81..915d80df8 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -1001,7 +1001,7 @@ msgid "Failed to convert image to a PNG" msgstr "" #: app/models/profile_photo.rb:105 -msgid "Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}" +msgid "Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}" msgstr "" #: app/views/general/search.rhtml:117 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 06fae9a81..915d80df8 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -1001,7 +1001,7 @@ msgid "Failed to convert image to a PNG" msgstr "" #: app/models/profile_photo.rb:105 -msgid "Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}" +msgid "Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}" msgstr "" #: app/views/general/search.rhtml:117 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 626e39e94..bb49e0ff6 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -1117,10 +1117,8 @@ msgid "Failed to convert image to a PNG" msgstr "Error al convertir la imagen a PNG" #: app/models/profile_photo.rb:105 -msgid "" -"Failed to convert image to the correct size: at %{cols}x%{rows}, need " -"%{width}x%{height}" -msgstr "Error al convertir la imagen al tamaño adecuado: es %{cols}x%{rows}, debería ser %{width}x%{height}" +msgid "Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}" +msgstr "Error al convertir la imagen al tamaño adecuado: es {{cols}}x{{rows}}, debería ser {{width}}x{{height}}" #: app/views/general/search.rhtml:117 msgid "Filter" -- cgit v1.2.3 From 327f8bbfa2a1a329fabdbf621cc2e024ce7e04ba Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 21 Jan 2013 18:35:01 +0000 Subject: Replace %s and %d with {{}} formatting in translated string. --- spec/fixtures/locale/en/app.po | 5 +++-- spec/fixtures/locale/en_GB/app.po | 4 ++-- spec/fixtures/locale/es/app.po | 8 ++++---- 3 files changed, 9 insertions(+), 8 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 915d80df8..f8ac163f1 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -2331,8 +2331,9 @@ msgid "Search the site to find what you were looking for." msgstr "" #: app/views/public_body/show.rhtml:85 -msgid "Search within the %d Freedom of Information requests to %s" -msgid_plural "Search within the %d Freedom of Information requests made to %s" +msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}" +msgid_plural "Search within the {{count}} Freedom of Information requests to {{public_body_name}}" + msgstr[0] "" msgstr[1] "" diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 915d80df8..6d665e27a 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -2331,8 +2331,8 @@ msgid "Search the site to find what you were looking for." msgstr "" #: app/views/public_body/show.rhtml:85 -msgid "Search within the %d Freedom of Information requests to %s" -msgid_plural "Search within the %d Freedom of Information requests made to %s" +msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}" +msgid_plural "Search within the {{count}} Freedom of Information requests to {{public_body_name}}" msgstr[0] "" msgstr[1] "" diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index bb49e0ff6..80439a59b 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -2511,10 +2511,10 @@ msgid "Search the site to find what you were looking for." msgstr "Buscar en esta web para encontrar lo que busca." #: app/views/public_body/show.rhtml:85 -msgid "Search within the %d Freedom of Information requests to %s" -msgid_plural "Search within the %d Freedom of Information requests made to %s" -msgstr[0] "Busca en la %d solicitud de información hecha a %s" -msgstr[1] "Busca en las %d solicitudes de información hechas a %s" +msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}" +msgid_plural "Search within the {{count}} Freedom of Information requests to {{public_body_name}}" +msgstr[0] "Busca en la {{count}} solicitud de información hecha a {{public_body_name}}" +msgstr[1] "Busca en las {{count}} solicitudes de información hechas a {{public_body_name}}" #: app/views/user/show.rhtml:132 msgid "Search your contributions" -- cgit v1.2.3 From dddd7c55dde90d2afa9019b862fedc6a78a393c2 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Fri, 18 Jan 2013 15:38:07 +1100 Subject: In translation strings replace %d with {{}} formatting --- spec/fixtures/locale/en/app.po | 4 ++-- spec/fixtures/locale/en_GB/app.po | 4 ++-- spec/fixtures/locale/es/app.po | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index f8ac163f1..6b2cf8348 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -2806,8 +2806,8 @@ msgstr[0] "" msgstr[1] "" #: app/views/request/_sidebar.rhtml:5 -msgid "There is %d person following this request" -msgid_plural "There are %d people following this request" +msgid "There is {{count}} person following this request" +msgid_plural "There are {{count}} people following this request" msgstr[0] "" msgstr[1] "" diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 6d665e27a..4b8bd90a7 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -2805,8 +2805,8 @@ msgstr[0] "" msgstr[1] "" #: app/views/request/_sidebar.rhtml:5 -msgid "There is %d person following this request" -msgid_plural "There are %d people following this request" +msgid "There is {{count}} person following this request" +msgid_plural "There are {{count}} people following this request" msgstr[0] "" msgstr[1] "" diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 80439a59b..639825f91 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -3015,10 +3015,10 @@ msgstr[0] "Hay %d persona siguiendo a este organismo." msgstr[1] "Hay %d personas siguiendo a este organismo." #: app/views/request/_sidebar.rhtml:5 -msgid "There is %d person following this request" -msgid_plural "There are %d people following this request" -msgstr[0] "Hay %d persona siguiendo esta solicitud." -msgstr[1] "Hay %d personas siguiendo esta solicitud." +msgid "There is {{count}} person following this request" +msgid_plural "There are {{count}} people following this request" +msgstr[0] "Hay {{count}} persona siguiendo esta solicitud." +msgstr[1] "Hay {{count}} personas siguiendo esta solicitud." #: app/views/user/show.rhtml:8 msgid "" -- cgit v1.2.3 From 3f894f807857b214a655c4b8fdef1956663cdcdc Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Mon, 21 Jan 2013 12:40:43 +1100 Subject: In translation strings replace %d with {{}} formatting --- spec/fixtures/locale/en/app.po | 4 ++-- spec/fixtures/locale/en_GB/app.po | 4 ++-- spec/fixtures/locale/es/app.po | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 6b2cf8348..6347d0256 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -2914,8 +2914,8 @@ msgid "This person has made no Freedom of Information requests using this site." msgstr "" #: app/views/user/show.rhtml:149 -msgid "This person's %d Freedom of Information request" -msgid_plural "This person's %d Freedom of Information requests" +msgid "This person's {{count}} Freedom of Information request" +msgid_plural "This person's {{count}} Freedom of Information requests" msgstr[0] "" msgstr[1] "" diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 4b8bd90a7..445aaea7c 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -2913,8 +2913,8 @@ msgid "This person has made no Freedom of Information requests using this site." msgstr "" #: app/views/user/show.rhtml:149 -msgid "This person's %d Freedom of Information request" -msgid_plural "This person's %d Freedom of Information requests" +msgid "This person's {{count}} Freedom of Information request" +msgid_plural "This person's {{count}} Freedom of Information requests" msgstr[0] "" msgstr[1] "" diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 639825f91..50de28a47 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -3146,10 +3146,10 @@ msgid "" msgstr "Esta persona no ha realizado solicitudes de información usando esta web." #: app/views/user/show.rhtml:149 -msgid "This person's %d Freedom of Information request" -msgid_plural "This person's %d Freedom of Information requests" -msgstr[0] "Tu %d solicitud de información" -msgstr[1] "Tus %d solicitudes de información" +msgid "This person's {{count}} Freedom of Information request" +msgid_plural "This person's {{count}} Freedom of Information requests" +msgstr[0] "Tu {{count}} solicitud de información" +msgstr[1] "Tus {{count}} solicitudes de información" #: app/views/user/show.rhtml:179 msgid "This person's %d annotation" -- cgit v1.2.3 From e39ca6eec6c06b9bf81b1ba622672284c4eb9d16 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Mon, 21 Jan 2013 12:48:19 +1100 Subject: In translation strings replace %d with {{}} formatting --- spec/fixtures/locale/en/app.po | 4 ++-- spec/fixtures/locale/en_GB/app.po | 4 ++-- spec/fixtures/locale/es/app.po | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 6347d0256..185e0c5aa 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -2920,8 +2920,8 @@ msgstr[0] "" msgstr[1] "" #: app/views/user/show.rhtml:179 -msgid "This person's %d annotation" -msgid_plural "This person's %d annotations" +msgid "This person's {{count}} annotation" +msgid_plural "This person's {{count}} annotations" msgstr[0] "" msgstr[1] "" diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 445aaea7c..050ce861b 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -2919,8 +2919,8 @@ msgstr[0] "" msgstr[1] "" #: app/views/user/show.rhtml:179 -msgid "This person's %d annotation" -msgid_plural "This person's %d annotations" +msgid "This person's {{count}} annotation" +msgid_plural "This person's {{count}} annotations" msgstr[0] "" msgstr[1] "" diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 50de28a47..0731edff2 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -3152,10 +3152,10 @@ msgstr[0] "Tu {{count}} solicitud de información" msgstr[1] "Tus {{count}} solicitudes de información" #: app/views/user/show.rhtml:179 -msgid "This person's %d annotation" -msgid_plural "This person's %d annotations" -msgstr[0] "Tu %d comentario" -msgstr[1] "Tus %d comentarios" +msgid "This person's {{count}} annotation" +msgid_plural "This person's {{count}} annotations" +msgstr[0] "Tu {{count}} comentario" +msgstr[1] "Tus {{count}} comentarios" #: app/views/user/show.rhtml:172 msgid "This person's annotations" -- cgit v1.2.3 From 14bc45c803422a0ba0702e7806f7bc2ffefb3ae7 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Mon, 21 Jan 2013 12:53:36 +1100 Subject: In translation strings replace %d with {{}} formatting --- spec/fixtures/locale/en/app.po | 4 ++-- spec/fixtures/locale/en_GB/app.po | 4 ++-- spec/fixtures/locale/es/app.po | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 185e0c5aa..11dd5751f 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -3637,8 +3637,8 @@ msgid "You've now cleared your profile photo" msgstr "" #: app/views/user/show.rhtml:149 -msgid "Your %d Freedom of Information request" -msgid_plural "Your %d Freedom of Information requests" +msgid "Your {{count}} Freedom of Information request" +msgid_plural "Your {{count}} Freedom of Information requests" msgstr[0] "" msgstr[1] "" diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 050ce861b..b7a00d3e6 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -3636,8 +3636,8 @@ msgid "You've now cleared your profile photo" msgstr "" #: app/views/user/show.rhtml:149 -msgid "Your %d Freedom of Information request" -msgid_plural "Your %d Freedom of Information requests" +msgid "Your {{count}} Freedom of Information request" +msgid_plural "Your {{count}} Freedom of Information requests" msgstr[0] "" msgstr[1] "" diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 0731edff2..309c383c9 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -3906,10 +3906,10 @@ msgid "You've now cleared your profile photo" msgstr "Has borrado la foto de tu perfil" #: app/views/user/show.rhtml:149 -msgid "Your %d Freedom of Information request" -msgid_plural "Your %d Freedom of Information requests" -msgstr[0] "Tu %d solicitud de información" -msgstr[1] "Tus %d solicitudes de información" +msgid "Your {{count}} Freedom of Information request" +msgid_plural "Your {{count}} Freedom of Information requests" +msgstr[0] "Tu {{count}} solicitud de información" +msgstr[1] "Tus {{count}} solicitudes de información" #: app/views/user/show.rhtml:179 msgid "Your %d annotation" -- cgit v1.2.3 From 7eb8d3ef1c1b784698346f8c148bdd3a652af150 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Mon, 21 Jan 2013 12:58:26 +1100 Subject: In translation strings replace %d with {{}} formatting --- spec/fixtures/locale/en/app.po | 4 ++-- spec/fixtures/locale/en_GB/app.po | 4 ++-- spec/fixtures/locale/es/app.po | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 11dd5751f..a1bde55ef 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -3643,8 +3643,8 @@ msgstr[0] "" msgstr[1] "" #: app/views/user/show.rhtml:179 -msgid "Your %d annotation" -msgid_plural "Your %d annotations" +msgid "Your {{count}} annotation" +msgid_plural "Your {{count}} annotations" msgstr[0] "" msgstr[1] "" diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index b7a00d3e6..c755c941a 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -3642,8 +3642,8 @@ msgstr[0] "" msgstr[1] "" #: app/views/user/show.rhtml:179 -msgid "Your %d annotation" -msgid_plural "Your %d annotations" +msgid "Your {{count}} annotation" +msgid_plural "Your {{count}} annotations" msgstr[0] "" msgstr[1] "" diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 309c383c9..3ecb66ebb 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -3912,10 +3912,10 @@ msgstr[0] "Tu {{count}} solicitud de información" msgstr[1] "Tus {{count}} solicitudes de información" #: app/views/user/show.rhtml:179 -msgid "Your %d annotation" -msgid_plural "Your %d annotations" -msgstr[0] "Tu %d comentario" -msgstr[1] "Tus %d comentarios" +msgid "Your {{count}} annotation" +msgid_plural "Your {{count}} annotations" +msgstr[0] "Tu {{count}} comentario" +msgstr[1] "Tus {{count}} comentarios" #: app/views/user/_signup.rhtml:22 msgid "" -- cgit v1.2.3 From dc0f6181e445a64cd14f6c5bb5e052dc320cd956 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 21 Jan 2013 19:30:39 +0000 Subject: Use {{}} not %s in translation. --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index a1bde55ef..d04fc1a57 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -3677,7 +3677,7 @@ msgid "Your email subscriptions" msgstr "" #: app/controllers/request_controller.rb:598 -msgid "Your follow up has not been sent because this request has been stopped to prevent spam. Please contact us if you really want to send a follow up message." +msgid "Your follow up has not been sent because this request has been stopped to prevent spam. Please contact us if you really want to send a follow up message." msgstr "" #: app/controllers/request_controller.rb:626 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index c755c941a..6d0ea237b 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -3676,7 +3676,7 @@ msgid "Your email subscriptions" msgstr "" #: app/controllers/request_controller.rb:598 -msgid "Your follow up has not been sent because this request has been stopped to prevent spam. Please contact us if you really want to send a follow up message." +msgid "Your follow up has not been sent because this request has been stopped to prevent spam. Please contact us if you really want to send a follow up message." msgstr "" #: app/controllers/request_controller.rb:626 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 3ecb66ebb..fa492f060 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -3948,9 +3948,9 @@ msgstr "Tus suscripciones de correo" #: app/controllers/request_controller.rb:598 msgid "" "Your follow up has not been sent because this request has been stopped to " -"prevent spam. Please contact us if you really want to " +"prevent spam. Please contact us if you really want to " "send a follow up message." -msgstr "Tu respuesta no ha sido enviada porque esta solicitud ha sido bloqueada para evitar spam. Por favor contáctanos si realmente quieres enviar una respuesta." +msgstr "Tu respuesta no ha sido enviada porque esta solicitud ha sido bloqueada para evitar spam. Por favor contáctanos si realmente quieres enviar una respuesta." #: app/controllers/request_controller.rb:626 msgid "Your follow up message has been sent on its way." -- cgit v1.2.3 From 230082876d069523d7c0b1bbf1578dc1419dfb23 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 21 Jan 2013 19:44:23 +0000 Subject: Replace %s with {{}} in translation for "Browse all..." --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index d04fc1a57..00eba5eb5 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -200,7 +200,7 @@ msgid "Are you the owner of any commercial copyright on this page?" msgstr "" #: app/views/general/search.rhtml:168 -msgid "Browse all or ask us to add one." +msgid "Browse all or ask us to add one." msgstr "" #: app/views/public_body/list.rhtml:51 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 6d0ea237b..6820b69f4 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -200,7 +200,7 @@ msgid "Are you the owner of any commercial copyright on this page?" msgstr "" #: app/views/general/search.rhtml:168 -msgid "Browse all or ask us to add one." +msgid "Browse all or ask us to add one." msgstr "" #: app/views/public_body/list.rhtml:51 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index fa492f060..0dc75d873 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -217,8 +217,8 @@ msgid "Are you the owner of any commercial copyright on this page?" msgstr "¿Posee el copyright de alguna información de esta página?" #: app/views/general/search.rhtml:168 -msgid "Browse all or ask us to add one." -msgstr "Ver todas o pídanos que añadamos una." +msgid "Browse all or ask us to add one." +msgstr "Ver todas o pídanos que añadamos una." #: app/views/public_body/list.rhtml:51 msgid "Can't find the one you want?" -- cgit v1.2.3 From 953e7fc3f934b0adec2eda26f1aa5c00f47afea1 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Wed, 23 Jan 2013 15:48:34 +0000 Subject: Replace %s with {{}} in translations. --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 00eba5eb5..b30a3d6a5 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -570,7 +570,7 @@ msgstr "" #: app/views/request/show_response.rhtml:29 msgid "" "At the bottom of this page, write a reply to them trying to persuade them to scan it in\n" -" (more details)." +" (more details)." msgstr "" #: app/views/request/upload_response.rhtml:33 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 6820b69f4..87e478d71 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -570,7 +570,7 @@ msgstr "" #: app/views/request/show_response.rhtml:29 msgid "" "At the bottom of this page, write a reply to them trying to persuade them to scan it in\n" -" (more details)." +" (more details)." msgstr "" #: app/views/request/upload_response.rhtml:33 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 0dc75d873..4b2786528 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -661,8 +661,8 @@ msgstr "Pide documentos o información específica, esta web no #: app/views/request/show_response.rhtml:29 msgid "" "At the bottom of this page, write a reply to them trying to persuade them to scan it in\n" -" (more details)." -msgstr "Al final de esta página, escribe una respuesta intentando convencerles de que lo escaneen\n (más detalles)." +" (more details)." +msgstr "Al final de esta página, escribe una respuesta intentando convencerles de que lo escaneen\n (más detalles)." #: app/views/request/upload_response.rhtml:33 msgid "Attachment (optional):" -- cgit v1.2.3 From 7e0163d15da2bc83eecc589937bd779d3a16c467 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Wed, 23 Jan 2013 16:05:34 +0000 Subject: Replace %s with {{}} in translation "If the address is wrong..." --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index b30a3d6a5..0716f0bb3 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -1272,7 +1272,7 @@ msgid "I've received an error message" msgstr "" #: app/views/public_body/view_email.rhtml:28 -msgid "If the address is wrong, or you know a better address, please contact us." +msgid "If the address is wrong, or you know a better address, please contact us." msgstr "" #: app/views/request_mailer/stopped_responses.rhtml:10 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 87e478d71..cfbf4a841 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -1272,7 +1272,7 @@ msgid "I've received an error message" msgstr "" #: app/views/public_body/view_email.rhtml:28 -msgid "If the address is wrong, or you know a better address, please contact us." +msgid "If the address is wrong, or you know a better address, please contact us." msgstr "" #: app/views/request_mailer/stopped_responses.rhtml:10 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 4b2786528..1aa99f156 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -1401,8 +1401,8 @@ msgstr "He recibido un mensaje de error" #: app/views/public_body/view_email.rhtml:28 msgid "" "If the address is wrong, or you know a better address, please contact us." -msgstr "Si la dirección es incorrecta, o conoce una más actualizada, por favor contáctenos." +"href=\"{{url}}\">contact us." +msgstr "Si la dirección es incorrecta, o conoce una más actualizada, por favor contáctenos." #: app/views/request_mailer/stopped_responses.rhtml:10 msgid "" -- cgit v1.2.3 From e88d925b41ae2c54e555cf0d536e8d2abe47b6d7 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Wed, 23 Jan 2013 16:08:17 +0000 Subject: Replace %s with {{}} in translation. --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 0716f0bb3..98f46d685 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -188,7 +188,7 @@ msgid "3. Now check your request" msgstr "" #: app/views/request/_after_actions.rhtml:9 -msgid "Add an annotation (to help the requester or others)" +msgid "Add an annotation (to help the requester or others)" msgstr "" #: app/views/public_body/list.rhtml:29 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index cfbf4a841..417c39836 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -188,7 +188,7 @@ msgid "3. Now check your request" msgstr "" #: app/views/request/_after_actions.rhtml:9 -msgid "Add an annotation (to help the requester or others)" +msgid "Add an annotation (to help the requester or others)" msgstr "" #: app/views/public_body/list.rhtml:29 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 1aa99f156..9648c010b 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -205,8 +205,8 @@ msgid "3. Now check your request" msgstr "3. Revisa tu solicitud" #: app/views/request/_after_actions.rhtml:9 -msgid "Add an annotation (to help the requester or others)" -msgstr "Añade un comentario (para ayudar al solicitante o a otros)" +msgid "Add an annotation (to help the requester or others)" +msgstr "Añade un comentario (para ayudar al solicitante o a otros)" #: app/views/public_body/list.rhtml:29 msgid "Are we missing a public authority?" -- cgit v1.2.3 From c216ecd7c15288a759d3c09781a7c29dad75fc49 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Wed, 23 Jan 2013 16:14:48 +0000 Subject: Replace %s with {{}} in translation. --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 98f46d685..7a1501189 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -208,7 +208,7 @@ msgid "Can't find the one you want?" msgstr "" #: app/views/user/show.rhtml:118 -msgid "Sign in to change password, subscriptions and more ({{user_name}} only)" +msgid "Sign in to change password, subscriptions and more ({{user_name}} only)" msgstr "" #: app/views/request/_followup.rhtml:66 app/views/request/_followup.rhtml:73 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 417c39836..1b8f078b9 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -208,7 +208,7 @@ msgid "Can't find the one you want?" msgstr "" #: app/views/user/show.rhtml:118 -msgid "Sign in to change password, subscriptions and more ({{user_name}} only)" +msgid "Sign in to change password, subscriptions and more ({{user_name}} only)" msgstr "" #: app/views/request/_followup.rhtml:66 app/views/request/_followup.rhtml:73 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 9648c010b..6d628f5b2 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -226,9 +226,9 @@ msgstr "¿No encuentra el que busca?" #: app/views/user/show.rhtml:118 msgid "" -"Sign in to change password, subscriptions and more " +"Sign in to change password, subscriptions and more " "({{user_name}} only)" -msgstr "Abre una sesión para cambiar tu contraseña, suscripciones... (sólo {{user_name}})" +msgstr "Abre una sesión para cambiar tu contraseña, suscripciones... (sólo {{user_name}})" #: app/views/request/_followup.rhtml:66 app/views/request/_followup.rhtml:73 #: app/views/request/show.rhtml:83 app/views/request/show.rhtml:87 -- cgit v1.2.3 From ad6d122d2ad401bbdfff3a61591f13df557c3bb7 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Wed, 23 Jan 2013 16:24:38 +0000 Subject: Replace %s with {{}} in translation "Can I request information about myself?..." --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 7a1501189..a3abc7029 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -321,7 +321,7 @@ msgstr "" #: app/views/request/new.rhtml:135 msgid "" " Can I request information about myself?\n" -"\t\t\tNo! (Click here for details)" +"\t\t\tNo! (Click here for details)" msgstr "" #: app/views/general/_advanced_search_tips.rhtml:12 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 1b8f078b9..1755b3dec 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -321,7 +321,7 @@ msgstr "" #: app/views/request/new.rhtml:135 msgid "" " Can I request information about myself?\n" -"\t\t\tNo! (Click here for details)" +"\t\t\tNo! (Click here for details)" msgstr "" #: app/views/general/_advanced_search_tips.rhtml:12 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 6d628f5b2..8689d4c3d 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -376,8 +376,8 @@ msgstr "Si usas correo web o tiene filtros \"anti spam\", por favor compr #: app/views/request/new.rhtml:135 msgid "" " Can I request information about myself?\n" -"\t\t\tNo! (Click here for details)" -msgstr " ¿Puedo pedir información sobre mí?\n\t\t\t¡No! (Pulse aquí para más detalles)" +"\t\t\tNo! (Click here for details)" +msgstr " ¿Puedo pedir información sobre mí?\n\t\t\t¡No! (Pulse aquí para más detalles)" #: app/views/general/_advanced_search_tips.rhtml:12 msgid "" -- cgit v1.2.3 From 684b44d9f12a2abe8fd02e811e91b2371ad99f29 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Wed, 23 Jan 2013 16:32:50 +0000 Subject: Replace %s with {{}} in translations. --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index a3abc7029..15a043b41 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -407,7 +407,7 @@ msgstr "" #: app/views/request/preview.rhtml:31 msgid "" "Privacy note: If you want to request private information about\n" -" yourself then click here." +" yourself then click here." msgstr "" #: app/views/user/set_crop_profile_photo.rhtml:35 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 1755b3dec..065478428 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -407,7 +407,7 @@ msgstr "" #: app/views/request/preview.rhtml:31 msgid "" "Privacy note: If you want to request private information about\n" -" yourself then click here." +" yourself then click here." msgstr "" #: app/views/user/set_crop_profile_photo.rhtml:35 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 8689d4c3d..cb7d95d19 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -480,8 +480,8 @@ msgstr "Nota: Te estás enviando un mensaje a ti mismo, suponem #: app/views/request/preview.rhtml:31 msgid "" "Privacy note: If you want to request private information about\n" -" yourself then click here." -msgstr "Nota sobre privacidad: Si quiere solicitar información privada\n sobre sí mismo entonces siga este enlace." +" yourself then click here." +msgstr "Nota sobre privacidad: Si quiere solicitar información privada\n sobre sí mismo entonces siga este enlace." #: app/views/user/set_crop_profile_photo.rhtml:35 msgid "" -- cgit v1.2.3 From 433034167b09df2e207810b04c6508985827becd Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Wed, 23 Jan 2013 16:46:26 +0000 Subject: Replace %s with {{}} in translation. --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 15a043b41..ff1604092 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -3197,7 +3197,7 @@ msgstr "" msgid "" "Unfortunately we don't know the FOI\n" "email address for that authority, so we can't validate this.\n" -"Please contact us to sort it out." +"Please contact us to sort it out." msgstr "" #: app/views/request/new_bad_contact.rhtml:5 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 065478428..620fd5dfe 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -3196,7 +3196,7 @@ msgstr "" msgid "" "Unfortunately we don't know the FOI\n" "email address for that authority, so we can't validate this.\n" -"Please contact us to sort it out." +"Please contact us to sort it out." msgstr "" #: app/views/request/new_bad_contact.rhtml:5 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index cb7d95d19..44c422c42 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -3442,8 +3442,8 @@ msgstr "Se encontró un tipo de resultado inesperado " msgid "" "Unfortunately we don't know the FOI\n" "email address for that authority, so we can't validate this.\n" -"Please contact us to sort it out." -msgstr "Desgraciadamente no tenemos la dirección\nde correo para este organismo, así que no podemos validarlo.\nPor favor contáctenos para arreglarlo." +"Please contact us to sort it out." +msgstr "Desgraciadamente no tenemos la dirección\nde correo para este organismo, así que no podemos validarlo.\nPor favor contáctenos para arreglarlo." #: app/views/request/new_bad_contact.rhtml:5 msgid "" -- cgit v1.2.3 From 8a2c486326db0b4f959a2d4168c985228b22bb9b Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Wed, 23 Jan 2013 16:49:14 +0000 Subject: Replace %s with {{}} in translation. --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index ff1604092..7e2aba26e 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -1831,7 +1831,7 @@ msgid "Please" msgstr "" #: app/views/user/no_cookies.rhtml:15 -msgid "Please get in touch with us so we can fix it." +msgid "Please get in touch with us so we can fix it." msgstr "" #: app/views/request/show.rhtml:52 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 620fd5dfe..315ae0ba7 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -1831,7 +1831,7 @@ msgid "Please" msgstr "" #: app/views/user/no_cookies.rhtml:15 -msgid "Please get in touch with us so we can fix it." +msgid "Please get in touch with us so we can fix it." msgstr "" #: app/views/request/show.rhtml:52 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 44c422c42..70cdda5be 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -1982,8 +1982,8 @@ msgid "Please" msgstr "Por favor" #: app/views/user/no_cookies.rhtml:15 -msgid "Please get in touch with us so we can fix it." -msgstr "Por favor contacta con nosotros para que podamos arreglarlo." +msgid "Please get in touch with us so we can fix it." +msgstr "Por favor contacta con nosotros para que podamos arreglarlo." #: app/views/request/show.rhtml:52 msgid "" -- cgit v1.2.3 From edd083fbb989248c48efcbb990b6dfee3531aa1d Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Wed, 23 Jan 2013 16:53:36 +0000 Subject: Replace %s with {{}} in translation. --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 7e2aba26e..2c33be48c 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -1290,7 +1290,7 @@ msgid "" msgstr "" #: app/views/user/no_cookies.rhtml:20 -msgid "If you are still having trouble, please contact us." +msgid "If you are still having trouble, please contact us." msgstr "" #: app/views/request/hidden.rhtml:15 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 315ae0ba7..ac3bfe507 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -1290,7 +1290,7 @@ msgid "" msgstr "" #: app/views/user/no_cookies.rhtml:20 -msgid "If you are still having trouble, please contact us." +msgid "If you are still having trouble, please contact us." msgstr "" #: app/views/request/hidden.rhtml:15 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 70cdda5be..3562e76fc 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -1419,8 +1419,8 @@ msgid "" msgstr "Si no estás satisfecho con la respuesta que has recibido del\n organismo público, tienes derecho a\n apelar (detalles)." #: app/views/user/no_cookies.rhtml:20 -msgid "If you are still having trouble, please contact us." -msgstr "Si aún tienes problemas, por favor contáctanos." +msgid "If you are still having trouble, please contact us." +msgstr "Si aún tienes problemas, por favor contáctanos." #: app/views/request/hidden.rhtml:15 msgid "" -- cgit v1.2.3 From a4cd441fa946680a48062eb14929d04361089c38 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Wed, 23 Jan 2013 17:01:41 +0000 Subject: Replace %s with {{}} in translation. --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 2c33be48c..fc7522c93 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -2960,7 +2960,7 @@ msgstr "" #: app/views/request/show.rhtml:11 msgid "" "This request is hidden, so that only you the requester can see it. Please\n" -" contact us if you are not sure why." +" contact us if you are not sure why." msgstr "" #: app/views/request/_describe_state.rhtml:7 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index ac3bfe507..5a4502646 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -2959,7 +2959,7 @@ msgstr "" #: app/views/request/show.rhtml:11 msgid "" "This request is hidden, so that only you the requester can see it. Please\n" -" contact us if you are not sure why." +" contact us if you are not sure why." msgstr "" #: app/views/request/_describe_state.rhtml:7 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 3562e76fc..d1344c8d6 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -3196,8 +3196,8 @@ msgstr "Esta solicitud tiene visibilidad 'oculta'. Puedes verla sólo porque est #: app/views/request/show.rhtml:11 msgid "" "This request is hidden, so that only you the requester can see it. Please\n" -" contact us if you are not sure why." -msgstr "Esta solicitud está oculta, por lo que sólo tú como creador puedes verla. Por favor\n contáctanos si no estás seguro de por qué." +" contact us if you are not sure why." +msgstr "Esta solicitud está oculta, por lo que sólo tú como creador puedes verla. Por favor\n contáctanos si no estás seguro de por qué." #: app/views/request/_describe_state.rhtml:7 #: app/views/request/_other_describe_state.rhtml:10 -- cgit v1.2.3 From 25c9865a793a3fa0029b40e1177496acc3024b7b Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Wed, 23 Jan 2013 17:56:55 +0000 Subject: Replace %s with {{}} in translations. --- spec/fixtures/locale/en/app.po | 7 +------ spec/fixtures/locale/en_GB/app.po | 7 +------ spec/fixtures/locale/es/app.po | 9 ++------- 3 files changed, 4 insertions(+), 19 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index fc7522c93..dccb7bc39 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -3649,12 +3649,7 @@ msgstr[0] "" msgstr[1] "" #: app/views/user/_signup.rhtml:22 -msgid "" -"Your name will appear publicly \n" -" (why?)\n" -" on this website and in search engines. If you\n" -" are thinking of using a pseudonym, please \n" -" read this first." +msgid "Your name will appear publicly \\n (why?)\\n on this website and in search engines. If you\\n are thinking of using a pseudonym, please \\n read this first." msgstr "" #: app/views/user/show.rhtml:172 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 5a4502646..9a5508a29 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -3648,12 +3648,7 @@ msgstr[0] "" msgstr[1] "" #: app/views/user/_signup.rhtml:22 -msgid "" -"Your name will appear publicly \n" -" (why?)\n" -" on this website and in search engines. If you\n" -" are thinking of using a pseudonym, please \n" -" read this first." +msgid "Your name will appear publicly \\n (why?)\\n on this website and in search engines. If you\\n are thinking of using a pseudonym, please \\n read this first." msgstr "" #: app/views/user/show.rhtml:172 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index d1344c8d6..50fec81d0 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -3918,13 +3918,8 @@ msgstr[0] "Tu {{count}} comentario" msgstr[1] "Tus {{count}} comentarios" #: app/views/user/_signup.rhtml:22 -msgid "" -"Your name will appear publicly \n" -" (why?)\n" -" on this website and in search engines. If you\n" -" are thinking of using a pseudonym, please \n" -" read this first." -msgstr "Tu nombre aparecerá públicamente \n (¿por qué?)\n en esta web y en motores de búsqueda. Si estás\n pensando en utilizar un seudónimo, por favor \n lee esto primero." +msgid "Your name will appear publicly \\n (why?)\\n on this website and in search engines. If you\\n are thinking of using a pseudonym, please \\n read this first." +msgstr "Tu nombre aparecerá públicamente \n (¿por qué?)\n en esta web y en motores de búsqueda. Si estás\n pensando en utilizar un seudónimo, por favor \n lee esto primero." #: app/views/user/show.rhtml:172 msgid "Your annotations" -- cgit v1.2.3 From d2bf5fd71f36b43615ffe57c9ee5134f0a1e2279 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Wed, 23 Jan 2013 18:22:45 +0000 Subject: Replace %s with {{}} in translation "Your response will appear.." --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index dccb7bc39..58380694c 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -3736,7 +3736,7 @@ msgid "Your request:" msgstr "" #: app/views/request/upload_response.rhtml:8 -msgid "Your response will appear on the Internet, read why and answers to other questions." +msgid "Your response will appear on the Internet, read why and answers to other questions." msgstr "" #: app/views/comment/new.rhtml:63 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 9a5508a29..8b176807b 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -3735,7 +3735,7 @@ msgid "Your request:" msgstr "" #: app/views/request/upload_response.rhtml:8 -msgid "Your response will appear on the Internet, read why and answers to other questions." +msgid "Your response will appear on the Internet, read why and answers to other questions." msgstr "" #: app/views/comment/new.rhtml:63 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 50fec81d0..4d8f30633 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -4015,8 +4015,8 @@ msgstr "Tu solicitud:" #: app/views/request/upload_response.rhtml:8 msgid "" "Your response will appear on the Internet, read why and answers to other questions." -msgstr "Tu respuesta aparecerá en Internet, lee por qué y respuestas a otras preguntas." +"href=\"{{url}}\">read why and answers to other questions." +msgstr "Tu respuesta aparecerá en Internet, lee por qué y respuestas a otras preguntas." #: app/views/comment/new.rhtml:63 msgid "" -- cgit v1.2.3 From 9ddb98511faf8b5d29223e5f0768818ac6438452 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Wed, 23 Jan 2013 19:33:59 +0000 Subject: Replacing %s with {{}} in translation of "Enter your response below..." --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 58380694c..1becc9662 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -915,7 +915,7 @@ msgstr "" #: app/views/request/upload_response.rhtml:23 msgid "" "Enter your response below. You may attach one file (use email, or \n" -"contact us if you need more)." +"contact us if you need more)." msgstr "" #: app/models/info_request.rb:259 app/models/info_request.rb:277 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 8b176807b..47091cfcc 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -915,7 +915,7 @@ msgstr "" #: app/views/request/upload_response.rhtml:23 msgid "" "Enter your response below. You may attach one file (use email, or \n" -"contact us if you need more)." +"contact us if you need more)." msgstr "" #: app/models/info_request.rb:259 app/models/info_request.rb:277 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 4d8f30633..72a306371 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -1031,8 +1031,8 @@ msgstr "Introduzca las palabras que desee separadas por espacio, es decir contact us if you need more)." -msgstr "Escribe tu solicitud a continuación. Puedes adjuntar un fichero (manda un correo,\n o contáctanos, si necesita más)." +"contact us if you need more)." +msgstr "Escribe tu solicitud a continuación. Puedes adjuntar un fichero (manda un correo,\n o contáctanos, si necesita más)." #: app/models/info_request.rb:259 app/models/info_request.rb:277 msgid "Environmental Information Regulations" -- cgit v1.2.3 From 903a90943e82fc7aee767ea7bca42e7e20f92fd7 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 28 Jan 2013 13:12:44 +0000 Subject: Replace %s with {{}} in 'Keep it focused' translation. --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 1becc9662..2decf8ec5 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -1491,7 +1491,7 @@ msgid "Joined {{site_name}} in" msgstr "" #: app/views/request/new.rhtml:106 -msgid "Keep it focused, you'll be more likely to get what you want (why?)." +msgid "Keep it focused, you'll be more likely to get what you want (why?)." msgstr "" #: app/views/request/_request_filter_form.rhtml:6 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 47091cfcc..b8b5edadc 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -1491,7 +1491,7 @@ msgid "Joined {{site_name}} in" msgstr "" #: app/views/request/new.rhtml:106 -msgid "Keep it focused, you'll be more likely to get what you want (why?)." +msgid "Keep it focused, you'll be more likely to get what you want (why?)." msgstr "" #: app/views/request/_request_filter_form.rhtml:6 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 72a306371..56a044d2d 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -1631,8 +1631,8 @@ msgstr "Registrado en {{site_name}} el" #: app/views/request/new.rhtml:106 msgid "" "Keep it focused, you'll be more likely to get what you want" -" (why?)." -msgstr "Sea específico, tendrá más probabilidades de conseguir lo que quiere (¿por qué?)." +" (why?)." +msgstr "Sea específico, tendrá más probabilidades de conseguir lo que quiere (¿por qué?)." #: app/views/request/_request_filter_form.rhtml:6 msgid "Keywords" -- cgit v1.2.3 From d19982f53deca9e5c4ce6726ff55f2534fe09267 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 28 Jan 2013 14:09:26 +0000 Subject: Replace %s with {{}} in translation "This response has been hidden." --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 2decf8ec5..0abdf6dba 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -2971,7 +2971,7 @@ msgstr "" #: app/views/request/_hidden_correspondence.rhtml:10 msgid "" "This response has been hidden. See annotations to find out why.\n" -" If you are the requester, then you may sign in to view the response." +" If you are the requester, then you may sign in to view the response." msgstr "" #: app/views/request/details.rhtml:6 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index b8b5edadc..095865139 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -2970,7 +2970,7 @@ msgstr "" #: app/views/request/_hidden_correspondence.rhtml:10 msgid "" "This response has been hidden. See annotations to find out why.\n" -" If you are the requester, then you may sign in to view the response." +" If you are the requester, then you may sign in to view the response." msgstr "" #: app/views/request/details.rhtml:6 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 56a044d2d..1bd39c900 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -3207,8 +3207,8 @@ msgstr "Esta solicitud está todavía en proceso:" #: app/views/request/_hidden_correspondence.rhtml:10 msgid "" "This response has been hidden. See annotations to find out why.\n" -" If you are the requester, then you may sign in to view the response." -msgstr "Este respuesta está oculta. Revisa los comentarios\n para descubrir por qué. Si es tu solicitud, abre una sesión para ver la respuesta." +" If you are the requester, then you may sign in to view the response." +msgstr "Este respuesta está oculta. Revisa los comentarios\n para descubrir por qué. Si es tu solicitud, abre una sesión para ver la respuesta." #: app/views/request/details.rhtml:6 msgid "" -- cgit v1.2.3 From 5ffe4c63c5e213a53baa2408855ecf5612e332ba Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 28 Jan 2013 14:14:07 +0000 Subject: Replace %s with {{}} in translation "This outgoing message has been hidden" --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 0abdf6dba..5fba93a55 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -2901,7 +2901,7 @@ msgstr "" #: app/views/request/_hidden_correspondence.rhtml:17 msgid "" "This outgoing message has been hidden. See annotations to\n" -"\t\t\t\t\t\tfind out why. If you are the requester, then you may sign in to view the response." +"\t\t\t\t\t\tfind out why. If you are the requester, then you may sign in to view the response." msgstr "" #: app/views/request/_describe_state.rhtml:44 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 095865139..a086c10b4 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -2900,7 +2900,7 @@ msgstr "" #: app/views/request/_hidden_correspondence.rhtml:17 msgid "" "This outgoing message has been hidden. See annotations to\n" -"\t\t\t\t\t\tfind out why. If you are the requester, then you may sign in to view the response." +"\t\t\t\t\t\tfind out why. If you are the requester, then you may sign in to view the response." msgstr "" #: app/views/request/_describe_state.rhtml:44 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 1bd39c900..279152559 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -3132,8 +3132,8 @@ msgstr "Esta es tu solicitud, por lo que recibirás correos automáticamente cua #: app/views/request/_hidden_correspondence.rhtml:17 msgid "" "This outgoing message has been hidden. See annotations to\n" -"\t\t\t\t\t\tfind out why. If you are the requester, then you may sign in to view the response." -msgstr "Este mensaje está oculto. Lee los comentarios\n\t\t\t\t\t\tpara descubrir por qué. Si es tu solicitud, abra una sesión para ver la respuesta." +"\t\t\t\t\t\tfind out why. If you are the requester, then you may sign in to view the response." +msgstr "Este mensaje está oculto. Lee los comentarios\n\t\t\t\t\t\tpara descubrir por qué. Si es tu solicitud, abra una sesión para ver la respuesta." #: app/views/request/_describe_state.rhtml:44 #: app/views/request/_other_describe_state.rhtml:40 -- cgit v1.2.3 From 8e9374145b7e153539285a4cd82dffa55bcddc9e Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 28 Jan 2013 14:17:00 +0000 Subject: Replace %s with {{}} in translation "When you're done..." --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 5fba93a55..e0e20d046 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -3434,7 +3434,7 @@ msgid "" msgstr "" #: app/views/request/new_please_describe.rhtml:16 -msgid "When you're done, come back here, reload this page and file your new request." +msgid "When you're done, come back here, reload this page and file your new request." msgstr "" #: app/views/request/show_response.rhtml:13 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index a086c10b4..23fbeacee 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -3433,7 +3433,7 @@ msgid "" msgstr "" #: app/views/request/new_please_describe.rhtml:16 -msgid "When you're done, come back here, reload this page and file your new request." +msgid "When you're done, come back here, reload this page and file your new request." msgstr "" #: app/views/request/show_response.rhtml:13 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 279152559..524cd5822 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -3691,9 +3691,9 @@ msgstr "Cuando reciba la respuesta en papel, por favor ayude\n a que #: app/views/request/new_please_describe.rhtml:16 msgid "" -"When you're done, come back here, reload " +"When you're done, come back here, reload " "this page and file your new request." -msgstr "Cuando esté listo, vuelva aquí, recargue esta página y cree una nueva solicitud." +msgstr "Cuando esté listo, vuelva aquí, recargue esta página y cree una nueva solicitud." #: app/views/request/show_response.rhtml:13 msgid "Which of these is happening?" -- cgit v1.2.3 From cc030d0925101e3c83159f1c308ddc553d69d472 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 28 Jan 2013 14:20:02 +0000 Subject: Replace %s with {{}} in translation "This comment has been hidden" --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index e0e20d046..b82aeb4a8 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -2871,7 +2871,7 @@ msgstr "" #: app/views/request/_hidden_correspondence.rhtml:23 msgid "" "This comment has been hidden. See annotations to\n" -" find out why. If you are the requester, then you may sign in to view the response." +" find out why. If you are the requester, then you may sign in to view the response." msgstr "" #: app/views/request/new.rhtml:63 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 23fbeacee..4f88cd764 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -2870,7 +2870,7 @@ msgstr "" #: app/views/request/_hidden_correspondence.rhtml:23 msgid "" "This comment has been hidden. See annotations to\n" -" find out why. If you are the requester, then you may sign in to view the response." +" find out why. If you are the requester, then you may sign in to view the response." msgstr "" #: app/views/request/new.rhtml:63 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 524cd5822..a6f978182 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -3091,8 +3091,8 @@ msgstr "Este organismo ya no existe, no pueden realizarse solicitudes de informa #: app/views/request/_hidden_correspondence.rhtml:23 msgid "" "This comment has been hidden. See annotations to\n" -" find out why. If you are the requester, then you may sign in to view the response." -msgstr "Este respuesta está oculta. Revisa los comentarios\n para descubrir por qué. Si es tu solicitud, abre una sesión para ver la respuesta." +" find out why. If you are the requester, then you may sign in to view the response." +msgstr "Este respuesta está oculta. Revisa los comentarios\n para descubrir por qué. Si es tu solicitud, abre una sesión para ver la respuesta." #: app/views/request/new.rhtml:63 msgid "" -- cgit v1.2.3 From 5a99c8650e9939da0b0b270cf1607e8a4be004cb Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 28 Jan 2013 14:25:44 +0000 Subject: Replacing %s with {{}} in translations "From the request page, try replying to a particular message.." --- spec/fixtures/locale/en/app.po | 4 ++-- spec/fixtures/locale/en_GB/app.po | 4 ++-- spec/fixtures/locale/es/app.po | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index b82aeb4a8..c7ae67452 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -1141,7 +1141,7 @@ msgstr "" msgid "" "From the request page, try replying to a particular message, rather than sending\n" " a general followup. If you need to make a general followup, and know\n" -" an email which will go to the right place, please send it to us." +" an email which will go to the right place, please send it to us." msgstr "" #: app/views/request/_correspondence.rhtml:12 @@ -3980,7 +3980,7 @@ msgid "" "no longer exists. If you are trying to make\n" " From the request page, try replying to a particular message, rather than sending\n" " a general followup. If you need to make a general followup, and know\n" -" an email which will go to the right place, please send it to us." +" an email which will go to the right place, please send it to us." msgstr "" #: app/views/request/show.rhtml:72 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 4f88cd764..d7d0c1986 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -1141,7 +1141,7 @@ msgstr "" msgid "" "From the request page, try replying to a particular message, rather than sending\n" " a general followup. If you need to make a general followup, and know\n" -" an email which will go to the right place, please send it to us." +" an email which will go to the right place, please send it to us." msgstr "" #: app/views/request/_correspondence.rhtml:12 @@ -3979,7 +3979,7 @@ msgid "" "no longer exists. If you are trying to make\n" " From the request page, try replying to a particular message, rather than sending\n" " a general followup. If you need to make a general followup, and know\n" -" an email which will go to the right place, please send it to us." +" an email which will go to the right place, please send it to us." msgstr "" #: app/views/request/show.rhtml:72 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index a6f978182..3b2eddb47 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -1264,8 +1264,8 @@ msgstr "Solicitudes de información a" msgid "" "From the request page, try replying to a particular message, rather than sending\n" " a general followup. If you need to make a general followup, and know\n" -" an email which will go to the right place, please send it to us." -msgstr "Desde la página de la solicitud, intenta responder a un mensaje en concreto, en vez de\n responder a la solicitud en general. Si necesitas hacerlo y tienes una dirección de\n correo válida, por favor mándanosla." +" an email which will go to the right place, please send it to us." +msgstr "Desde la página de la solicitud, intenta responder a un mensaje en concreto, en vez de\n responder a la solicitud en general. Si necesitas hacerlo y tienes una dirección de\n correo válida, por favor mándanosla." #: app/views/request/_correspondence.rhtml:12 #: app/views/request/_correspondence.rhtml:36 @@ -4263,8 +4263,8 @@ msgid "" "no longer exists. If you are trying to make\n" " From the request page, try replying to a particular message, rather than sending\n" " a general followup. If you need to make a general followup, and know\n" -" an email which will go to the right place, please send it to us." -msgstr "ya no existe. \nDesde la página de la solicitud, intenta responder a un mensaje en concreto, en vez de\n responder a la solicitud en general. Si necesitas hacerlo y tienes una dirección de\n correo válida, por favor mándanosla." +" an email which will go to the right place, please send it to us." +msgstr "ya no existe. \nDesde la página de la solicitud, intenta responder a un mensaje en concreto, en vez de\n responder a la solicitud en general. Si necesitas hacerlo y tienes una dirección de\n correo válida, por favor mándanosla." #: app/views/request/show.rhtml:72 msgid "normally" -- cgit v1.2.3 From 67ffc7a8724ea985e10246e5b7b2b87d5333a163 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 28 Jan 2013 14:37:21 +0000 Subject: Change %s to {{}} in translation "If you are the requester,..." --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index c7ae67452..f28f35c01 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -1294,7 +1294,7 @@ msgid "If you are still having trouble, please contact ussign in to view the request." +msgid "If you are the requester, then you may sign in to view the request." msgstr "" #: app/views/request/new.rhtml:123 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index d7d0c1986..6ef7babff 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -1294,7 +1294,7 @@ msgid "If you are still having trouble, please contact ussign in to view the request." +msgid "If you are the requester, then you may sign in to view the request." msgstr "" #: app/views/request/new.rhtml:123 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 3b2eddb47..a9f2f3b63 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -1424,9 +1424,9 @@ msgstr "Si aún tienes problemas, por favor contáctanos #: app/views/request/hidden.rhtml:15 msgid "" -"If you are the requester, then you may sign in to view " +"If you are the requester, then you may sign in to view " "the request." -msgstr "Si la solicitud es tuya, puedes abrir una sesión para verla." +msgstr "Si la solicitud es tuya, puedes abrir una sesión para verla." #: app/views/request/new.rhtml:123 msgid "" -- cgit v1.2.3 From 30df1366d783ea320f5f76d268101e63b549a0ac Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 28 Jan 2013 15:00:43 +0000 Subject: Replace %s with {{}} in translation "We do not have a working.." --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index f28f35c01..6145e27bc 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -3566,7 +3566,7 @@ msgstr "" msgid "" "You may be able to find\n" " one on their website, or by phoning them up and asking. If you manage\n" -" to find one, then please send it to us." +" to find one, then please send it to us." msgstr "" #: app/views/request/new_bad_contact.rhtml:6 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 6ef7babff..ef05cb694 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -3565,7 +3565,7 @@ msgstr "" msgid "" "You may be able to find\n" " one on their website, or by phoning them up and asking. If you manage\n" -" to find one, then please send it to us." +" to find one, then please send it to us." msgstr "" #: app/views/request/new_bad_contact.rhtml:6 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index a9f2f3b63..5e42c74a6 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -3832,8 +3832,8 @@ msgstr "Puede adjuntar ficheros. Si quiere adjuntar un fichero\ msgid "" "You may be able to find\n" " one on their website, or by phoning them up and asking. If you manage\n" -" to find one, then please send it to us." -msgstr "Puede que encuentres una\n en su página web, o preguntando por teléfono. Si la consigues\n por favor envíanosla." +" to find one, then please send it to us." +msgstr "Puede que encuentres una\n en su página web, o preguntando por teléfono. Si la consigues\n por favor envíanosla." #: app/views/request/new_bad_contact.rhtml:6 msgid "" -- cgit v1.2.3 From b84331ff0502e3fb3fdc8bcecbd6746d50df799b Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 28 Jan 2013 15:14:18 +0000 Subject: Replace %s with {{}} in translation "If you are thinking of using a pseudonym..." --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 6145e27bc..cc6c06f93 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -1300,7 +1300,7 @@ msgstr "" #: app/views/request/new.rhtml:123 msgid "" "If you are thinking of using a pseudonym,\n" -" please read this first." +" please read this first." msgstr "" #: app/views/request/show.rhtml:105 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index ef05cb694..b2a68a840 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -1300,7 +1300,7 @@ msgstr "" #: app/views/request/new.rhtml:123 msgid "" "If you are thinking of using a pseudonym,\n" -" please read this first." +" please read this first." msgstr "" #: app/views/request/show.rhtml:105 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 5e42c74a6..33ad82385 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -1431,8 +1431,8 @@ msgstr "Si la solicitud es tuya, puedes abrir una sesiónread this first." -msgstr "Si está pensando en utilizar un pseudónimo,\n por favor lea esto primero." +" please read this first." +msgstr "Si está pensando en utilizar un pseudónimo,\n por favor lea esto primero." #: app/views/request/show.rhtml:105 msgid "If you are {{user_link}}, please" -- cgit v1.2.3 From bc78d89e0db7e2a7049b06d20831f485786b699a Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 28 Jan 2013 15:23:05 +0000 Subject: Replace %s with {{}} in "Everything that you enter on this page..." --- spec/fixtures/locale/en/app.po | 4 ++-- spec/fixtures/locale/en_GB/app.po | 4 ++-- spec/fixtures/locale/es/app.po | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index cc6c06f93..d162b71f6 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -946,14 +946,14 @@ msgstr "" msgid "" "Everything that you enter on this page \n" " will be displayed publicly on\n" -" this website forever (why?)." +" this website forever (why?)." msgstr "" #: app/views/request/new.rhtml:120 msgid "" "Everything that you enter on this page, including your name, \n" " will be displayed publicly on\n" -" this website forever (why?)." +" this website forever (why?)." msgstr "" #: locale/model_attributes.rb:68 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index b2a68a840..3297ecbd9 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -946,14 +946,14 @@ msgstr "" msgid "" "Everything that you enter on this page \n" " will be displayed publicly on\n" -" this website forever (why?)." +" this website forever (why?)." msgstr "" #: app/views/request/new.rhtml:120 msgid "" "Everything that you enter on this page, including your name, \n" " will be displayed publicly on\n" -" this website forever (why?)." +" this website forever (why?)." msgstr "" #: locale/model_attributes.rb:68 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 33ad82385..33df65bd9 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -1062,15 +1062,15 @@ msgstr "Historial de eventos" msgid "" "Everything that you enter on this page \n" " will be displayed publicly on\n" -" this website forever (why?)." -msgstr "Todo lo que escriba en esta página \n estará disponible públicamente en\n está web para siempre (¿por qué?)." +" this website forever (why?)." +msgstr "Todo lo que escriba en esta página \n estará disponible públicamente en\n está web para siempre (¿por qué?)." #: app/views/request/new.rhtml:120 msgid "" "Everything that you enter on this page, including your name, \n" " will be displayed publicly on\n" -" this website forever (why?)." -msgstr "Todo lo que escribas en esta página, incluyendo tu nombre, \n estará disponible públicamente en\n está web para siempre (¿por qué?)." +" this website forever (why?)." +msgstr "Todo lo que escribas en esta página, incluyendo tu nombre, \n estará disponible públicamente en\n está web para siempre (¿por qué?)." #: locale/model_attributes.rb:68 msgid "EximLogDone|Filename" -- cgit v1.2.3 From 77ecc648e9d68927c2ddc8c5a30906d5946db5fc Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Mon, 21 Jan 2013 14:00:20 +1100 Subject: In translation strings replace %{} with {{}} formatting --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index d162b71f6..491d606d2 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -1984,7 +1984,7 @@ msgid "" msgstr "" #: app/models/outgoing_message.rb:157 -msgid "Please sign at the bottom with your name, or alter the \"%{signoff}\" signature" +msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature" msgstr "" #: app/views/user/sign.rhtml:8 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 3297ecbd9..31fbe777b 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -1984,7 +1984,7 @@ msgid "" msgstr "" #: app/models/outgoing_message.rb:157 -msgid "Please sign at the bottom with your name, or alter the \"%{signoff}\" signature" +msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature" msgstr "" #: app/views/user/sign.rhtml:8 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 33df65bd9..417cfd75a 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -2146,10 +2146,8 @@ msgid "" msgstr "Por favor elije estas solicitudes una a una, y haz que se sepa\nsi han tenido éxito o no." #: app/models/outgoing_message.rb:157 -msgid "" -"Please sign at the bottom with your name, or alter the \"%{signoff}\" " -"signature" -msgstr "Por favor, firma con tu nombre en la parte inferior, o cambia la firma \"%{signoff}\"" +msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature" +msgstr "Por favor, firma con tu nombre en la parte inferior, o cambia la firma \"{{signoff}}\"" #: app/views/user/sign.rhtml:8 msgid "Please sign in as " -- cgit v1.2.3 From 781502005b943bb2afb9adcacb01e07cb16ccdb9 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Mon, 21 Jan 2013 14:05:53 +1100 Subject: In translation strings replace %s with {{}} formatting Conflicts: locale/eu/app.po locale/sq/app.po --- spec/fixtures/locale/en/app.po | 5 +---- spec/fixtures/locale/en_GB/app.po | 5 +---- spec/fixtures/locale/es/app.po | 7 ++----- 3 files changed, 4 insertions(+), 13 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 491d606d2..0d7a87a0a 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -2675,10 +2675,7 @@ msgid "The request was refused by the public authority" msgstr "" #: app/views/request/hidden.rhtml:9 -msgid "" -"The request you have tried to view has been removed. There are\n" -"various reasons why we might have done this, sorry we can't be more specific here. Please contact us if you have any questions." +msgid "The request you have tried to view has been removed. There are\\nvarious reasons why we might have done this, sorry we can't be more specific here. Please contact us if you have any questions." msgstr "" #: app/views/general/_advanced_search_tips.rhtml:36 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 31fbe777b..c0e66ffba 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -2674,10 +2674,7 @@ msgid "The request was refused by the public authority" msgstr "" #: app/views/request/hidden.rhtml:9 -msgid "" -"The request you have tried to view has been removed. There are\n" -"various reasons why we might have done this, sorry we can't be more specific here. Please contact us if you have any questions." +msgid "The request you have tried to view has been removed. There are\\nvarious reasons why we might have done this, sorry we can't be more specific here. Please contact us if you have any questions." msgstr "" #: app/views/general/_advanced_search_tips.rhtml:36 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 417cfd75a..00667cc83 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -2868,11 +2868,8 @@ msgid "The request was refused by the public authority" msgstr "La solicitud ha sido rechazada por el organismo" #: app/views/request/hidden.rhtml:9 -msgid "" -"The request you have tried to view has been removed. There are\n" -"various reasons why we might have done this, sorry we can't be more specific here. Please contact us if you have any questions." -msgstr "La solicitud que has intentado ver ha sido eliminada. Hay\nvarios posibles motivos para esto, pero no podemos ser más específicos aquí. Por favor contáctanos si tiene cualquier pregunta." +msgid "The request you have tried to view has been removed. There are\\nvarious reasons why we might have done this, sorry we can't be more specific here. Please contact us if you have any questions." +msgstr "La solicitud que has intentado ver ha sido eliminada. Hay\nvarios posibles motivos para esto, pero no podemos ser más específicos aquí. Por favor contáctanos si tiene cualquier pregunta." #: app/views/general/_advanced_search_tips.rhtml:36 msgid "The requester has abandoned this request for some reason" -- cgit v1.2.3 From 49d70bdc7f8ea1e20060203b7ac53f9b63cbd369 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Mon, 21 Jan 2013 14:08:45 +1100 Subject: In translation strings replace %s with {{}} formatting --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- spec/fixtures/locale/es/app.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 0d7a87a0a..39946355a 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -1012,7 +1012,7 @@ msgstr "" msgid "" "First, type in the name of the UK public authority you'd \n" " like information from. By law, they have to respond\n" -" (why?)." +" (why?)." msgstr "" #: locale/model_attributes.rb:88 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index c0e66ffba..34eff1c24 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -1012,7 +1012,7 @@ msgstr "" msgid "" "First, type in the name of the UK public authority you'd \n" " like information from. By law, they have to respond\n" -" (why?)." +" (why?)." msgstr "" #: locale/model_attributes.rb:88 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 00667cc83..8b532788a 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -1128,8 +1128,8 @@ msgstr "Filtrar" msgid "" "First, type in the name of the UK public authority you'd \n" " like information from. By law, they have to respond\n" -" (why?)." -msgstr "Primero, escribe el nombre de la institución a la que quieres pedir información. Están obligados a responder (¿por qué?)." +" (why?)." +msgstr "Primero, escribe el nombre de la institución a la que quieres pedir información. Están obligados a responder (¿por qué?)." #: locale/model_attributes.rb:88 msgid "FoiAttachment|Charset" -- cgit v1.2.3 From b425caa018d1b2bafc632eec691b1702c48183dc Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Mon, 21 Jan 2013 16:17:45 +1100 Subject: Removing unused translation string --- spec/fixtures/locale/en/app.po | 6 ------ spec/fixtures/locale/en_GB/app.po | 6 ------ spec/fixtures/locale/es/app.po | 6 ------ 3 files changed, 18 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 39946355a..bb5265a5a 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -2796,12 +2796,6 @@ msgstr "" msgid "There are {{count}} new annotations on your {{info_request}} request. Follow this link to see what they wrote." msgstr "" -#: app/views/public_body/show.rhtml:7 -msgid "There is %d person following this authority" -msgid_plural "There are %d people following this authority" -msgstr[0] "" -msgstr[1] "" - #: app/views/request/_sidebar.rhtml:5 msgid "There is {{count}} person following this request" msgid_plural "There are {{count}} people following this request" diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 34eff1c24..d914d773b 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -2795,12 +2795,6 @@ msgstr "" msgid "There are {{count}} new annotations on your {{info_request}} request. Follow this link to see what they wrote." msgstr "" -#: app/views/public_body/show.rhtml:7 -msgid "There is %d person following this authority" -msgid_plural "There are %d people following this authority" -msgstr[0] "" -msgstr[1] "" - #: app/views/request/_sidebar.rhtml:5 msgid "There is {{count}} person following this request" msgid_plural "There are {{count}} people following this request" diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index 8b532788a..d5536713f 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -3003,12 +3003,6 @@ msgid "" " this link to see what they wrote." msgstr "Hay {{count}} comentarios en tu solicitud {{info_request}}. Sigue este enlace para leer lo que dicen." -#: app/views/public_body/show.rhtml:7 -msgid "There is %d person following this authority" -msgid_plural "There are %d people following this authority" -msgstr[0] "Hay %d persona siguiendo a este organismo." -msgstr[1] "Hay %d personas siguiendo a este organismo." - #: app/views/request/_sidebar.rhtml:5 msgid "There is {{count}} person following this request" msgid_plural "There are {{count}} people following this request" -- cgit v1.2.3 From 778390e55046eb1906db9a1d8c2ede18522a2b9b Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 16 Apr 2013 14:49:27 +0100 Subject: Remove trailing space. --- spec/fixtures/locale/en/app.po | 2 +- spec/fixtures/locale/en_GB/app.po | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'spec') diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index a4b8f78bd..ee5c8d9c8 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -3640,7 +3640,7 @@ msgstr[0] "" msgstr[1] "" #: app/views/user/_signup.rhtml:22 -msgid "Your name will appear publicly \\n (why?)\\n on this website and in search engines. If you\\n are thinking of using a pseudonym, please \\n read this first." +msgid "Your name will appear publicly\\n (why?)\\n on this website and in search engines. If you\\n are thinking of using a pseudonym, please\\n read this first." msgstr "" #: app/views/user/show.rhtml:172 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 3391c8987..84997a319 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -3639,7 +3639,7 @@ msgstr[0] "" msgstr[1] "" #: app/views/user/_signup.rhtml:22 -msgid "Your name will appear publicly \\n (why?)\\n on this website and in search engines. If you\\n are thinking of using a pseudonym, please \\n read this first." +msgid "Your name will appear publicly\\n (why?)\\n on this website and in search engines. If you\\n are thinking of using a pseudonym, please\\n read this first." msgstr "" #: app/views/user/show.rhtml:172 -- cgit v1.2.3 From e5bfc2500fc2d58be4cf7e497de63f8b77969806 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 23 Apr 2013 17:46:46 +0100 Subject: Make sure raw emails are loaded before running integration spec --- spec/integration/request_controller_spec.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'spec') diff --git a/spec/integration/request_controller_spec.rb b/spec/integration/request_controller_spec.rb index 24667bdf1..9e585448b 100644 --- a/spec/integration/request_controller_spec.rb +++ b/spec/integration/request_controller_spec.rb @@ -6,6 +6,7 @@ describe RequestController, "when classifying an information request" do describe 'when the request is internal' do before(:each) do + load_raw_emails_data @dog_request = info_requests(:fancy_dog_request) # This should happen automatically before each test but doesn't with these integration # tests for some reason. -- cgit v1.2.3