From 2cf5196239727f2d3846e2d91b8b0b3b605ea30c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 5 Oct 2018 16:24:14 +0000 Subject: [PATCH 001/100] Bump cancancan from 2.1.2 to 2.3.0 Bumps [cancancan](https://github.com/CanCanCommunity/cancancan) from 2.1.2 to 2.3.0. - [Release notes](https://github.com/CanCanCommunity/cancancan/releases) - [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md) - [Commits](https://github.com/CanCanCommunity/cancancan/compare/2.1.2...2.3.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index cf1e64b74..234a31f6b 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem 'ahoy_matey', '~> 1.6.0' gem 'ancestry', '~> 3.0.2' gem 'autoprefixer-rails', '~> 9.1.4' gem 'browser', '~> 2.5.3' -gem 'cancancan', '~> 2.1.2' +gem 'cancancan', '~> 2.3.0' gem 'ckeditor', '~> 4.2.3' gem 'cocoon', '~> 1.2.9' gem 'coffee-rails', '~> 4.2.2' diff --git a/Gemfile.lock b/Gemfile.lock index 581ec0b3e..457e68995 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -74,7 +74,7 @@ GEM activesupport (>= 3.0.0) uniform_notifier (~> 1.11.0) byebug (10.0.0) - cancancan (2.1.2) + cancancan (2.3.0) capistrano (3.10.1) airbrussh (>= 1.0.0) i18n @@ -500,7 +500,7 @@ DEPENDENCIES browser (~> 2.5.3) bullet (~> 5.7.0) byebug (~> 10.0.0) - cancancan (~> 2.1.2) + cancancan (~> 2.3.0) capistrano (~> 3.10.1) capistrano-bundler (~> 1.2) capistrano-rails (~> 1.4.0) From 64574b936918eff7dd7c9358b12696666b8dcdcf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 5 Oct 2018 16:25:15 +0000 Subject: [PATCH 002/100] Bump rollbar from 2.15.5 to 2.18.0 Bumps [rollbar](https://github.com/rollbar/rollbar-gem) from 2.15.5 to 2.18.0. - [Release notes](https://github.com/rollbar/rollbar-gem/releases) - [Changelog](https://github.com/rollbar/rollbar-gem/blob/master/CHANGELOG.md) - [Commits](https://github.com/rollbar/rollbar-gem/compare/v2.15.5...v2.18.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index cf1e64b74..544246d77 100644 --- a/Gemfile +++ b/Gemfile @@ -41,7 +41,7 @@ gem 'pg_search', '~> 2.0.1' gem 'redcarpet', '~> 3.4.0' gem 'responders', '~> 2.4.0' gem 'rinku', '~> 2.0.2', require: 'rails_rinku' -gem 'rollbar', '~> 2.15.5' +gem 'rollbar', '~> 2.18.0' gem 'sass-rails', '~> 5.0', '>= 5.0.4' gem 'savon', '~> 2.12.0' gem 'sitemap_generator', '~> 6.0.1' diff --git a/Gemfile.lock b/Gemfile.lock index 581ec0b3e..71074f11b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -263,7 +263,7 @@ GEM mixlib-cli (1.7.0) mixlib-config (2.2.13) tomlrb - multi_json (1.12.2) + multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) net-scp (1.2.1) @@ -363,7 +363,7 @@ GEM actionpack (>= 4.2.0, < 5.3) railties (>= 4.2.0, < 5.3) rinku (2.0.4) - rollbar (2.15.5) + rollbar (2.18.0) multi_json rspec-core (3.7.1) rspec-support (~> 3.7.0) @@ -554,7 +554,7 @@ DEPENDENCIES redcarpet (~> 3.4.0) responders (~> 2.4.0) rinku (~> 2.0.2) - rollbar (~> 2.15.5) + rollbar (~> 2.18.0) rspec-rails (~> 3.6) rubocop (~> 0.54.0) rubocop-rspec (~> 1.26.0) From 5e81977bc65f86bf43da542993329b89ace5d7a1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 8 Oct 2018 06:11:38 +0000 Subject: [PATCH 003/100] Bump letter_opener_web from 1.3.2 to 1.3.4 Bumps [letter_opener_web](https://github.com/fgrehm/letter_opener_web) from 1.3.2 to 1.3.4. - [Release notes](https://github.com/fgrehm/letter_opener_web/releases) - [Changelog](https://github.com/fgrehm/letter_opener_web/blob/master/CHANGELOG.md) - [Commits](https://github.com/fgrehm/letter_opener_web/compare/v1.3.2...v1.3.4) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index cf1e64b74..07a787448 100644 --- a/Gemfile +++ b/Gemfile @@ -68,7 +68,7 @@ group :development, :test do gem 'i18n-tasks', '~> 0.9.25' gem 'knapsack_pro', '~> 0.53.0' gem 'launchy', '~> 2.4.3' - gem 'letter_opener_web', '~> 1.3.2' + gem 'letter_opener_web', '~> 1.3.4' gem 'quiet_assets', '~> 1.1.0' gem 'spring', '~> 2.0.1' gem 'spring-commands-rspec', '~> 1.0.4' diff --git a/Gemfile.lock b/Gemfile.lock index 581ec0b3e..c9ebb94ca 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -240,7 +240,7 @@ GEM addressable (~> 2.3) letter_opener (1.6.0) launchy (~> 2.2) - letter_opener_web (1.3.2) + letter_opener_web (1.3.4) actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) @@ -257,7 +257,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mimemagic (0.3.2) - mini_mime (1.0.0) + mini_mime (1.0.1) mini_portile2 (2.3.0) minitest (5.11.3) mixlib-cli (1.7.0) @@ -270,7 +270,7 @@ GEM net-ssh (>= 2.6.5) net-ssh (5.0.2) newrelic_rpm (4.1.0.333) - nokogiri (1.8.4) + nokogiri (1.8.5) mini_portile2 (~> 2.3.0) nori (2.6.0) oauth (0.5.3) @@ -317,7 +317,7 @@ GEM activesupport (>= 4.2) arel (>= 6) powerpack (0.1.2) - public_suffix (3.0.1) + public_suffix (3.0.3) quiet_assets (1.1.0) railties (>= 3.1, < 5.0) rack (1.6.10) @@ -536,7 +536,7 @@ DEPENDENCIES kaminari (~> 1.1.1) knapsack_pro (~> 0.53.0) launchy (~> 2.4.3) - letter_opener_web (~> 1.3.2) + letter_opener_web (~> 1.3.4) mdl (~> 0.5.0) newrelic_rpm (~> 4.1.0.333) omniauth (~> 1.8.1) From ccd342bb51e33bae9daf2092d73c4eeb0f29cd40 Mon Sep 17 00:00:00 2001 From: voodoorai2000 Date: Wed, 10 Oct 2018 12:47:40 +0200 Subject: [PATCH 004/100] Fix flaky spec for translations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This spec was causing a side effect on another spec[2], making it fail 😌 I think it was because no translation had been called yet, in the failing spec, and so the the i18n backend translations had not been initialized, and was always returning empty translations for any locale. This might have been due to tampering with translations in the this newly introduced spec. By forcing translations to load after this new spec, the other spec passes again [2] https://github.com/AyuntamientoMadrid/consul/blob/master/spec/features/localization_spec.rb#L20 --- spec/helpers/locales_helper_spec.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/helpers/locales_helper_spec.rb b/spec/helpers/locales_helper_spec.rb index 2eb10be05..6031ae144 100644 --- a/spec/helpers/locales_helper_spec.rb +++ b/spec/helpers/locales_helper_spec.rb @@ -13,6 +13,7 @@ describe LocalesHelper do after do I18n.backend.reload! I18n.enforce_available_locales = default_enforce + I18n.backend.send(:init_translations) end it "returns the language name in i18n.language.name translation" do @@ -29,4 +30,4 @@ describe LocalesHelper do end end -end \ No newline at end of file +end From cd22c440bf02df514970a59416f77b0a73fdb5bb Mon Sep 17 00:00:00 2001 From: voodoorai2000 Date: Tue, 9 Oct 2018 22:08:25 +0200 Subject: [PATCH 005/100] Fix locale folder names There seems to be some differences between the folder name and the locale name used in the files themselves. For example: the folder might have been called "de-DE", for German, but the files use one "de" And thus translations where not being displayed Using the locale key in the files and modifying the folder name if neccesary, let's see what happens in the next Crowdin pull, might need to review more thoroughly why this is happening (maybe due to custom settings in Crowdin) --- config/locales/{de-DE => de}/activemodel.yml | 0 config/locales/{de-DE => de}/activerecord.yml | 0 config/locales/{de-DE => de}/admin.yml | 0 config/locales/{de-DE => de}/budgets.yml | 0 config/locales/{de-DE => de}/community.yml | 0 config/locales/{de-DE => de}/devise.yml | 0 config/locales/{de-DE => de}/devise_views.yml | 0 config/locales/{de-DE => de}/documents.yml | 0 config/locales/{de-DE => de}/general.yml | 0 config/locales/{de-DE => de}/guides.yml | 0 config/locales/de/i18n.yml | 4 ++++ config/locales/{de-DE => de}/images.yml | 0 config/locales/{de-DE => de}/kaminari.yml | 0 config/locales/{de-DE => de}/legislation.yml | 0 config/locales/{de-DE => de}/mailers.yml | 0 config/locales/{de-DE => de}/management.yml | 0 config/locales/{de-DE => de}/moderation.yml | 0 config/locales/{de-DE => de}/officing.yml | 0 config/locales/{de-DE => de}/pages.yml | 0 config/locales/{de-DE => de}/rails.yml | 0 config/locales/{de-DE => de}/responders.yml | 0 config/locales/{de-DE => de}/seeds.yml | 0 config/locales/{de-DE => de}/settings.yml | 0 config/locales/{de-DE => de}/social_share_button.yml | 0 config/locales/{de-DE => de}/valuation.yml | 0 config/locales/{de-DE => de}/verification.yml | 0 config/locales/{fa-IR => fa}/activemodel.yml | 0 config/locales/{fa-IR => fa}/activerecord.yml | 0 config/locales/{fa-IR => fa}/admin.yml | 0 config/locales/{fa-IR => fa}/budgets.yml | 0 config/locales/{fa-IR => fa}/community.yml | 0 config/locales/{fa-IR => fa}/devise.yml | 0 config/locales/{fa-IR => fa}/devise_views.yml | 0 config/locales/{fa-IR => fa}/documents.yml | 0 config/locales/{fa-IR => fa}/general.yml | 0 config/locales/{fa-IR => fa}/guides.yml | 0 config/locales/fa/i18n.yml | 4 ++++ config/locales/{fa-IR => fa}/images.yml | 0 config/locales/{fa-IR => fa}/kaminari.yml | 0 config/locales/{fa-IR => fa}/legislation.yml | 0 config/locales/{fa-IR => fa}/mailers.yml | 0 config/locales/{fa-IR => fa}/management.yml | 0 config/locales/{fa-IR => fa}/moderation.yml | 0 config/locales/{fa-IR => fa}/officing.yml | 0 config/locales/{fa-IR => fa}/pages.yml | 0 config/locales/{fa-IR => fa}/rails.yml | 0 config/locales/{fa-IR => fa}/responders.yml | 0 config/locales/{fa-IR => fa}/seeds.yml | 0 config/locales/{fa-IR => fa}/settings.yml | 0 config/locales/{fa-IR => fa}/social_share_button.yml | 0 config/locales/{fa-IR => fa}/valuation.yml | 0 config/locales/{fa-IR => fa}/verification.yml | 0 config/locales/{pl-PL => pl}/activemodel.yml | 0 config/locales/{pl-PL => pl}/activerecord.yml | 0 config/locales/{pl-PL => pl}/admin.yml | 0 config/locales/{pl-PL => pl}/budgets.yml | 0 config/locales/{pl-PL => pl}/community.yml | 0 config/locales/{pl-PL => pl}/devise.yml | 0 config/locales/{pl-PL => pl}/devise_views.yml | 0 config/locales/{pl-PL => pl}/documents.yml | 0 config/locales/{pl-PL => pl}/general.yml | 1 - config/locales/{pl-PL => pl}/guides.yml | 0 config/locales/pl/i18n.yml | 4 ++++ config/locales/{pl-PL => pl}/images.yml | 0 config/locales/{pl-PL => pl}/kaminari.yml | 0 config/locales/{pl-PL => pl}/legislation.yml | 0 config/locales/{pl-PL => pl}/mailers.yml | 0 config/locales/{pl-PL => pl}/management.yml | 0 config/locales/{pl-PL => pl}/moderation.yml | 0 config/locales/{pl-PL => pl}/officing.yml | 0 config/locales/{pl-PL => pl}/pages.yml | 0 config/locales/{pl-PL => pl}/rails.yml | 0 config/locales/{pl-PL => pl}/responders.yml | 0 config/locales/{pl-PL => pl}/seeds.yml | 0 config/locales/{pl-PL => pl}/settings.yml | 0 config/locales/{pl-PL => pl}/social_share_button.yml | 0 config/locales/{pl-PL => pl}/valuation.yml | 0 config/locales/{pl-PL => pl}/verification.yml | 0 config/locales/{sq-AL => sq}/activemodel.yml | 0 config/locales/{sq-AL => sq}/activerecord.yml | 0 config/locales/{sq-AL => sq}/admin.yml | 0 config/locales/{sq-AL => sq}/budgets.yml | 0 config/locales/{sq-AL => sq}/community.yml | 0 config/locales/{sq-AL => sq}/devise.yml | 0 config/locales/{sq-AL => sq}/devise_views.yml | 0 config/locales/{sq-AL => sq}/documents.yml | 0 config/locales/{sq-AL => sq}/general.yml | 1 - config/locales/{sq-AL => sq}/guides.yml | 0 config/locales/sq/i18n.yml | 4 ++++ config/locales/{sq-AL => sq}/images.yml | 0 config/locales/{sq-AL => sq}/kaminari.yml | 0 config/locales/{sq-AL => sq}/legislation.yml | 0 config/locales/{sq-AL => sq}/mailers.yml | 0 config/locales/{sq-AL => sq}/management.yml | 0 config/locales/{sq-AL => sq}/moderation.yml | 0 config/locales/{sq-AL => sq}/officing.yml | 0 config/locales/{sq-AL => sq}/pages.yml | 0 config/locales/{sq-AL => sq}/rails.yml | 0 config/locales/{sq-AL => sq}/responders.yml | 0 config/locales/{sq-AL => sq}/seeds.yml | 0 config/locales/{sq-AL => sq}/settings.yml | 0 config/locales/{sq-AL => sq}/social_share_button.yml | 0 config/locales/{sq-AL => sq}/valuation.yml | 0 config/locales/{sq-AL => sq}/verification.yml | 0 config/locales/{sv-SE => sv}/activemodel.yml | 0 config/locales/{sv-SE => sv}/activerecord.yml | 0 config/locales/{sv-SE => sv}/admin.yml | 0 config/locales/{sv-SE => sv}/budgets.yml | 0 config/locales/{sv-SE => sv}/community.yml | 0 config/locales/{sv-SE => sv}/devise.yml | 0 config/locales/{sv-SE => sv}/devise_views.yml | 0 config/locales/{sv-SE => sv}/documents.yml | 0 config/locales/{sv-SE => sv}/general.yml | 0 config/locales/{sv-SE => sv}/guides.yml | 0 config/locales/sv/i18n.yml | 4 ++++ config/locales/{sv-SE => sv}/images.yml | 0 config/locales/{sv-SE => sv}/kaminari.yml | 0 config/locales/{sv-SE => sv}/legislation.yml | 0 config/locales/{sv-SE => sv}/mailers.yml | 0 config/locales/{sv-SE => sv}/management.yml | 0 config/locales/{sv-SE => sv}/moderation.yml | 0 config/locales/{sv-SE => sv}/officing.yml | 0 config/locales/{sv-SE => sv}/pages.yml | 0 config/locales/{sv-SE => sv}/rails.yml | 0 config/locales/{sv-SE => sv}/responders.yml | 0 config/locales/{sv-SE => sv}/seeds.yml | 0 config/locales/{sv-SE => sv}/settings.yml | 0 config/locales/{sv-SE => sv}/social_share_button.yml | 0 config/locales/{sv-SE => sv}/valuation.yml | 0 config/locales/{sv-SE => sv}/verification.yml | 0 130 files changed, 20 insertions(+), 2 deletions(-) rename config/locales/{de-DE => de}/activemodel.yml (100%) rename config/locales/{de-DE => de}/activerecord.yml (100%) rename config/locales/{de-DE => de}/admin.yml (100%) rename config/locales/{de-DE => de}/budgets.yml (100%) rename config/locales/{de-DE => de}/community.yml (100%) rename config/locales/{de-DE => de}/devise.yml (100%) rename config/locales/{de-DE => de}/devise_views.yml (100%) rename config/locales/{de-DE => de}/documents.yml (100%) rename config/locales/{de-DE => de}/general.yml (100%) rename config/locales/{de-DE => de}/guides.yml (100%) create mode 100644 config/locales/de/i18n.yml rename config/locales/{de-DE => de}/images.yml (100%) rename config/locales/{de-DE => de}/kaminari.yml (100%) rename config/locales/{de-DE => de}/legislation.yml (100%) rename config/locales/{de-DE => de}/mailers.yml (100%) rename config/locales/{de-DE => de}/management.yml (100%) rename config/locales/{de-DE => de}/moderation.yml (100%) rename config/locales/{de-DE => de}/officing.yml (100%) rename config/locales/{de-DE => de}/pages.yml (100%) rename config/locales/{de-DE => de}/rails.yml (100%) rename config/locales/{de-DE => de}/responders.yml (100%) rename config/locales/{de-DE => de}/seeds.yml (100%) rename config/locales/{de-DE => de}/settings.yml (100%) rename config/locales/{de-DE => de}/social_share_button.yml (100%) rename config/locales/{de-DE => de}/valuation.yml (100%) rename config/locales/{de-DE => de}/verification.yml (100%) rename config/locales/{fa-IR => fa}/activemodel.yml (100%) rename config/locales/{fa-IR => fa}/activerecord.yml (100%) rename config/locales/{fa-IR => fa}/admin.yml (100%) rename config/locales/{fa-IR => fa}/budgets.yml (100%) rename config/locales/{fa-IR => fa}/community.yml (100%) rename config/locales/{fa-IR => fa}/devise.yml (100%) rename config/locales/{fa-IR => fa}/devise_views.yml (100%) rename config/locales/{fa-IR => fa}/documents.yml (100%) rename config/locales/{fa-IR => fa}/general.yml (100%) rename config/locales/{fa-IR => fa}/guides.yml (100%) create mode 100644 config/locales/fa/i18n.yml rename config/locales/{fa-IR => fa}/images.yml (100%) rename config/locales/{fa-IR => fa}/kaminari.yml (100%) rename config/locales/{fa-IR => fa}/legislation.yml (100%) rename config/locales/{fa-IR => fa}/mailers.yml (100%) rename config/locales/{fa-IR => fa}/management.yml (100%) rename config/locales/{fa-IR => fa}/moderation.yml (100%) rename config/locales/{fa-IR => fa}/officing.yml (100%) rename config/locales/{fa-IR => fa}/pages.yml (100%) rename config/locales/{fa-IR => fa}/rails.yml (100%) rename config/locales/{fa-IR => fa}/responders.yml (100%) rename config/locales/{fa-IR => fa}/seeds.yml (100%) rename config/locales/{fa-IR => fa}/settings.yml (100%) rename config/locales/{fa-IR => fa}/social_share_button.yml (100%) rename config/locales/{fa-IR => fa}/valuation.yml (100%) rename config/locales/{fa-IR => fa}/verification.yml (100%) rename config/locales/{pl-PL => pl}/activemodel.yml (100%) rename config/locales/{pl-PL => pl}/activerecord.yml (100%) rename config/locales/{pl-PL => pl}/admin.yml (100%) rename config/locales/{pl-PL => pl}/budgets.yml (100%) rename config/locales/{pl-PL => pl}/community.yml (100%) rename config/locales/{pl-PL => pl}/devise.yml (100%) rename config/locales/{pl-PL => pl}/devise_views.yml (100%) rename config/locales/{pl-PL => pl}/documents.yml (100%) rename config/locales/{pl-PL => pl}/general.yml (99%) rename config/locales/{pl-PL => pl}/guides.yml (100%) create mode 100644 config/locales/pl/i18n.yml rename config/locales/{pl-PL => pl}/images.yml (100%) rename config/locales/{pl-PL => pl}/kaminari.yml (100%) rename config/locales/{pl-PL => pl}/legislation.yml (100%) rename config/locales/{pl-PL => pl}/mailers.yml (100%) rename config/locales/{pl-PL => pl}/management.yml (100%) rename config/locales/{pl-PL => pl}/moderation.yml (100%) rename config/locales/{pl-PL => pl}/officing.yml (100%) rename config/locales/{pl-PL => pl}/pages.yml (100%) rename config/locales/{pl-PL => pl}/rails.yml (100%) rename config/locales/{pl-PL => pl}/responders.yml (100%) rename config/locales/{pl-PL => pl}/seeds.yml (100%) rename config/locales/{pl-PL => pl}/settings.yml (100%) rename config/locales/{pl-PL => pl}/social_share_button.yml (100%) rename config/locales/{pl-PL => pl}/valuation.yml (100%) rename config/locales/{pl-PL => pl}/verification.yml (100%) rename config/locales/{sq-AL => sq}/activemodel.yml (100%) rename config/locales/{sq-AL => sq}/activerecord.yml (100%) rename config/locales/{sq-AL => sq}/admin.yml (100%) rename config/locales/{sq-AL => sq}/budgets.yml (100%) rename config/locales/{sq-AL => sq}/community.yml (100%) rename config/locales/{sq-AL => sq}/devise.yml (100%) rename config/locales/{sq-AL => sq}/devise_views.yml (100%) rename config/locales/{sq-AL => sq}/documents.yml (100%) rename config/locales/{sq-AL => sq}/general.yml (99%) rename config/locales/{sq-AL => sq}/guides.yml (100%) create mode 100644 config/locales/sq/i18n.yml rename config/locales/{sq-AL => sq}/images.yml (100%) rename config/locales/{sq-AL => sq}/kaminari.yml (100%) rename config/locales/{sq-AL => sq}/legislation.yml (100%) rename config/locales/{sq-AL => sq}/mailers.yml (100%) rename config/locales/{sq-AL => sq}/management.yml (100%) rename config/locales/{sq-AL => sq}/moderation.yml (100%) rename config/locales/{sq-AL => sq}/officing.yml (100%) rename config/locales/{sq-AL => sq}/pages.yml (100%) rename config/locales/{sq-AL => sq}/rails.yml (100%) rename config/locales/{sq-AL => sq}/responders.yml (100%) rename config/locales/{sq-AL => sq}/seeds.yml (100%) rename config/locales/{sq-AL => sq}/settings.yml (100%) rename config/locales/{sq-AL => sq}/social_share_button.yml (100%) rename config/locales/{sq-AL => sq}/valuation.yml (100%) rename config/locales/{sq-AL => sq}/verification.yml (100%) rename config/locales/{sv-SE => sv}/activemodel.yml (100%) rename config/locales/{sv-SE => sv}/activerecord.yml (100%) rename config/locales/{sv-SE => sv}/admin.yml (100%) rename config/locales/{sv-SE => sv}/budgets.yml (100%) rename config/locales/{sv-SE => sv}/community.yml (100%) rename config/locales/{sv-SE => sv}/devise.yml (100%) rename config/locales/{sv-SE => sv}/devise_views.yml (100%) rename config/locales/{sv-SE => sv}/documents.yml (100%) rename config/locales/{sv-SE => sv}/general.yml (100%) rename config/locales/{sv-SE => sv}/guides.yml (100%) create mode 100644 config/locales/sv/i18n.yml rename config/locales/{sv-SE => sv}/images.yml (100%) rename config/locales/{sv-SE => sv}/kaminari.yml (100%) rename config/locales/{sv-SE => sv}/legislation.yml (100%) rename config/locales/{sv-SE => sv}/mailers.yml (100%) rename config/locales/{sv-SE => sv}/management.yml (100%) rename config/locales/{sv-SE => sv}/moderation.yml (100%) rename config/locales/{sv-SE => sv}/officing.yml (100%) rename config/locales/{sv-SE => sv}/pages.yml (100%) rename config/locales/{sv-SE => sv}/rails.yml (100%) rename config/locales/{sv-SE => sv}/responders.yml (100%) rename config/locales/{sv-SE => sv}/seeds.yml (100%) rename config/locales/{sv-SE => sv}/settings.yml (100%) rename config/locales/{sv-SE => sv}/social_share_button.yml (100%) rename config/locales/{sv-SE => sv}/valuation.yml (100%) rename config/locales/{sv-SE => sv}/verification.yml (100%) diff --git a/config/locales/de-DE/activemodel.yml b/config/locales/de/activemodel.yml similarity index 100% rename from config/locales/de-DE/activemodel.yml rename to config/locales/de/activemodel.yml diff --git a/config/locales/de-DE/activerecord.yml b/config/locales/de/activerecord.yml similarity index 100% rename from config/locales/de-DE/activerecord.yml rename to config/locales/de/activerecord.yml diff --git a/config/locales/de-DE/admin.yml b/config/locales/de/admin.yml similarity index 100% rename from config/locales/de-DE/admin.yml rename to config/locales/de/admin.yml diff --git a/config/locales/de-DE/budgets.yml b/config/locales/de/budgets.yml similarity index 100% rename from config/locales/de-DE/budgets.yml rename to config/locales/de/budgets.yml diff --git a/config/locales/de-DE/community.yml b/config/locales/de/community.yml similarity index 100% rename from config/locales/de-DE/community.yml rename to config/locales/de/community.yml diff --git a/config/locales/de-DE/devise.yml b/config/locales/de/devise.yml similarity index 100% rename from config/locales/de-DE/devise.yml rename to config/locales/de/devise.yml diff --git a/config/locales/de-DE/devise_views.yml b/config/locales/de/devise_views.yml similarity index 100% rename from config/locales/de-DE/devise_views.yml rename to config/locales/de/devise_views.yml diff --git a/config/locales/de-DE/documents.yml b/config/locales/de/documents.yml similarity index 100% rename from config/locales/de-DE/documents.yml rename to config/locales/de/documents.yml diff --git a/config/locales/de-DE/general.yml b/config/locales/de/general.yml similarity index 100% rename from config/locales/de-DE/general.yml rename to config/locales/de/general.yml diff --git a/config/locales/de-DE/guides.yml b/config/locales/de/guides.yml similarity index 100% rename from config/locales/de-DE/guides.yml rename to config/locales/de/guides.yml diff --git a/config/locales/de/i18n.yml b/config/locales/de/i18n.yml new file mode 100644 index 000000000..d361336f0 --- /dev/null +++ b/config/locales/de/i18n.yml @@ -0,0 +1,4 @@ +de: + i18n: + language: + name: 'Deutsch' \ No newline at end of file diff --git a/config/locales/de-DE/images.yml b/config/locales/de/images.yml similarity index 100% rename from config/locales/de-DE/images.yml rename to config/locales/de/images.yml diff --git a/config/locales/de-DE/kaminari.yml b/config/locales/de/kaminari.yml similarity index 100% rename from config/locales/de-DE/kaminari.yml rename to config/locales/de/kaminari.yml diff --git a/config/locales/de-DE/legislation.yml b/config/locales/de/legislation.yml similarity index 100% rename from config/locales/de-DE/legislation.yml rename to config/locales/de/legislation.yml diff --git a/config/locales/de-DE/mailers.yml b/config/locales/de/mailers.yml similarity index 100% rename from config/locales/de-DE/mailers.yml rename to config/locales/de/mailers.yml diff --git a/config/locales/de-DE/management.yml b/config/locales/de/management.yml similarity index 100% rename from config/locales/de-DE/management.yml rename to config/locales/de/management.yml diff --git a/config/locales/de-DE/moderation.yml b/config/locales/de/moderation.yml similarity index 100% rename from config/locales/de-DE/moderation.yml rename to config/locales/de/moderation.yml diff --git a/config/locales/de-DE/officing.yml b/config/locales/de/officing.yml similarity index 100% rename from config/locales/de-DE/officing.yml rename to config/locales/de/officing.yml diff --git a/config/locales/de-DE/pages.yml b/config/locales/de/pages.yml similarity index 100% rename from config/locales/de-DE/pages.yml rename to config/locales/de/pages.yml diff --git a/config/locales/de-DE/rails.yml b/config/locales/de/rails.yml similarity index 100% rename from config/locales/de-DE/rails.yml rename to config/locales/de/rails.yml diff --git a/config/locales/de-DE/responders.yml b/config/locales/de/responders.yml similarity index 100% rename from config/locales/de-DE/responders.yml rename to config/locales/de/responders.yml diff --git a/config/locales/de-DE/seeds.yml b/config/locales/de/seeds.yml similarity index 100% rename from config/locales/de-DE/seeds.yml rename to config/locales/de/seeds.yml diff --git a/config/locales/de-DE/settings.yml b/config/locales/de/settings.yml similarity index 100% rename from config/locales/de-DE/settings.yml rename to config/locales/de/settings.yml diff --git a/config/locales/de-DE/social_share_button.yml b/config/locales/de/social_share_button.yml similarity index 100% rename from config/locales/de-DE/social_share_button.yml rename to config/locales/de/social_share_button.yml diff --git a/config/locales/de-DE/valuation.yml b/config/locales/de/valuation.yml similarity index 100% rename from config/locales/de-DE/valuation.yml rename to config/locales/de/valuation.yml diff --git a/config/locales/de-DE/verification.yml b/config/locales/de/verification.yml similarity index 100% rename from config/locales/de-DE/verification.yml rename to config/locales/de/verification.yml diff --git a/config/locales/fa-IR/activemodel.yml b/config/locales/fa/activemodel.yml similarity index 100% rename from config/locales/fa-IR/activemodel.yml rename to config/locales/fa/activemodel.yml diff --git a/config/locales/fa-IR/activerecord.yml b/config/locales/fa/activerecord.yml similarity index 100% rename from config/locales/fa-IR/activerecord.yml rename to config/locales/fa/activerecord.yml diff --git a/config/locales/fa-IR/admin.yml b/config/locales/fa/admin.yml similarity index 100% rename from config/locales/fa-IR/admin.yml rename to config/locales/fa/admin.yml diff --git a/config/locales/fa-IR/budgets.yml b/config/locales/fa/budgets.yml similarity index 100% rename from config/locales/fa-IR/budgets.yml rename to config/locales/fa/budgets.yml diff --git a/config/locales/fa-IR/community.yml b/config/locales/fa/community.yml similarity index 100% rename from config/locales/fa-IR/community.yml rename to config/locales/fa/community.yml diff --git a/config/locales/fa-IR/devise.yml b/config/locales/fa/devise.yml similarity index 100% rename from config/locales/fa-IR/devise.yml rename to config/locales/fa/devise.yml diff --git a/config/locales/fa-IR/devise_views.yml b/config/locales/fa/devise_views.yml similarity index 100% rename from config/locales/fa-IR/devise_views.yml rename to config/locales/fa/devise_views.yml diff --git a/config/locales/fa-IR/documents.yml b/config/locales/fa/documents.yml similarity index 100% rename from config/locales/fa-IR/documents.yml rename to config/locales/fa/documents.yml diff --git a/config/locales/fa-IR/general.yml b/config/locales/fa/general.yml similarity index 100% rename from config/locales/fa-IR/general.yml rename to config/locales/fa/general.yml diff --git a/config/locales/fa-IR/guides.yml b/config/locales/fa/guides.yml similarity index 100% rename from config/locales/fa-IR/guides.yml rename to config/locales/fa/guides.yml diff --git a/config/locales/fa/i18n.yml b/config/locales/fa/i18n.yml new file mode 100644 index 000000000..b619d31fb --- /dev/null +++ b/config/locales/fa/i18n.yml @@ -0,0 +1,4 @@ +fa: + i18n: + language: + name: 'فارسى' \ No newline at end of file diff --git a/config/locales/fa-IR/images.yml b/config/locales/fa/images.yml similarity index 100% rename from config/locales/fa-IR/images.yml rename to config/locales/fa/images.yml diff --git a/config/locales/fa-IR/kaminari.yml b/config/locales/fa/kaminari.yml similarity index 100% rename from config/locales/fa-IR/kaminari.yml rename to config/locales/fa/kaminari.yml diff --git a/config/locales/fa-IR/legislation.yml b/config/locales/fa/legislation.yml similarity index 100% rename from config/locales/fa-IR/legislation.yml rename to config/locales/fa/legislation.yml diff --git a/config/locales/fa-IR/mailers.yml b/config/locales/fa/mailers.yml similarity index 100% rename from config/locales/fa-IR/mailers.yml rename to config/locales/fa/mailers.yml diff --git a/config/locales/fa-IR/management.yml b/config/locales/fa/management.yml similarity index 100% rename from config/locales/fa-IR/management.yml rename to config/locales/fa/management.yml diff --git a/config/locales/fa-IR/moderation.yml b/config/locales/fa/moderation.yml similarity index 100% rename from config/locales/fa-IR/moderation.yml rename to config/locales/fa/moderation.yml diff --git a/config/locales/fa-IR/officing.yml b/config/locales/fa/officing.yml similarity index 100% rename from config/locales/fa-IR/officing.yml rename to config/locales/fa/officing.yml diff --git a/config/locales/fa-IR/pages.yml b/config/locales/fa/pages.yml similarity index 100% rename from config/locales/fa-IR/pages.yml rename to config/locales/fa/pages.yml diff --git a/config/locales/fa-IR/rails.yml b/config/locales/fa/rails.yml similarity index 100% rename from config/locales/fa-IR/rails.yml rename to config/locales/fa/rails.yml diff --git a/config/locales/fa-IR/responders.yml b/config/locales/fa/responders.yml similarity index 100% rename from config/locales/fa-IR/responders.yml rename to config/locales/fa/responders.yml diff --git a/config/locales/fa-IR/seeds.yml b/config/locales/fa/seeds.yml similarity index 100% rename from config/locales/fa-IR/seeds.yml rename to config/locales/fa/seeds.yml diff --git a/config/locales/fa-IR/settings.yml b/config/locales/fa/settings.yml similarity index 100% rename from config/locales/fa-IR/settings.yml rename to config/locales/fa/settings.yml diff --git a/config/locales/fa-IR/social_share_button.yml b/config/locales/fa/social_share_button.yml similarity index 100% rename from config/locales/fa-IR/social_share_button.yml rename to config/locales/fa/social_share_button.yml diff --git a/config/locales/fa-IR/valuation.yml b/config/locales/fa/valuation.yml similarity index 100% rename from config/locales/fa-IR/valuation.yml rename to config/locales/fa/valuation.yml diff --git a/config/locales/fa-IR/verification.yml b/config/locales/fa/verification.yml similarity index 100% rename from config/locales/fa-IR/verification.yml rename to config/locales/fa/verification.yml diff --git a/config/locales/pl-PL/activemodel.yml b/config/locales/pl/activemodel.yml similarity index 100% rename from config/locales/pl-PL/activemodel.yml rename to config/locales/pl/activemodel.yml diff --git a/config/locales/pl-PL/activerecord.yml b/config/locales/pl/activerecord.yml similarity index 100% rename from config/locales/pl-PL/activerecord.yml rename to config/locales/pl/activerecord.yml diff --git a/config/locales/pl-PL/admin.yml b/config/locales/pl/admin.yml similarity index 100% rename from config/locales/pl-PL/admin.yml rename to config/locales/pl/admin.yml diff --git a/config/locales/pl-PL/budgets.yml b/config/locales/pl/budgets.yml similarity index 100% rename from config/locales/pl-PL/budgets.yml rename to config/locales/pl/budgets.yml diff --git a/config/locales/pl-PL/community.yml b/config/locales/pl/community.yml similarity index 100% rename from config/locales/pl-PL/community.yml rename to config/locales/pl/community.yml diff --git a/config/locales/pl-PL/devise.yml b/config/locales/pl/devise.yml similarity index 100% rename from config/locales/pl-PL/devise.yml rename to config/locales/pl/devise.yml diff --git a/config/locales/pl-PL/devise_views.yml b/config/locales/pl/devise_views.yml similarity index 100% rename from config/locales/pl-PL/devise_views.yml rename to config/locales/pl/devise_views.yml diff --git a/config/locales/pl-PL/documents.yml b/config/locales/pl/documents.yml similarity index 100% rename from config/locales/pl-PL/documents.yml rename to config/locales/pl/documents.yml diff --git a/config/locales/pl-PL/general.yml b/config/locales/pl/general.yml similarity index 99% rename from config/locales/pl-PL/general.yml rename to config/locales/pl/general.yml index f5bbbebf3..d8a0aeafa 100644 --- a/config/locales/pl-PL/general.yml +++ b/config/locales/pl/general.yml @@ -257,7 +257,6 @@ pl: text_sign_in: zaloguj się text_sign_up: zarejestruj się title: Jak mogę skomentować ten dokument? - locale: angielski notifications: index: empty_notifications: Nie masz nowych powiadomień. diff --git a/config/locales/pl-PL/guides.yml b/config/locales/pl/guides.yml similarity index 100% rename from config/locales/pl-PL/guides.yml rename to config/locales/pl/guides.yml diff --git a/config/locales/pl/i18n.yml b/config/locales/pl/i18n.yml new file mode 100644 index 000000000..fc91ff330 --- /dev/null +++ b/config/locales/pl/i18n.yml @@ -0,0 +1,4 @@ +pl: + i18n: + language: + name: 'Polski' \ No newline at end of file diff --git a/config/locales/pl-PL/images.yml b/config/locales/pl/images.yml similarity index 100% rename from config/locales/pl-PL/images.yml rename to config/locales/pl/images.yml diff --git a/config/locales/pl-PL/kaminari.yml b/config/locales/pl/kaminari.yml similarity index 100% rename from config/locales/pl-PL/kaminari.yml rename to config/locales/pl/kaminari.yml diff --git a/config/locales/pl-PL/legislation.yml b/config/locales/pl/legislation.yml similarity index 100% rename from config/locales/pl-PL/legislation.yml rename to config/locales/pl/legislation.yml diff --git a/config/locales/pl-PL/mailers.yml b/config/locales/pl/mailers.yml similarity index 100% rename from config/locales/pl-PL/mailers.yml rename to config/locales/pl/mailers.yml diff --git a/config/locales/pl-PL/management.yml b/config/locales/pl/management.yml similarity index 100% rename from config/locales/pl-PL/management.yml rename to config/locales/pl/management.yml diff --git a/config/locales/pl-PL/moderation.yml b/config/locales/pl/moderation.yml similarity index 100% rename from config/locales/pl-PL/moderation.yml rename to config/locales/pl/moderation.yml diff --git a/config/locales/pl-PL/officing.yml b/config/locales/pl/officing.yml similarity index 100% rename from config/locales/pl-PL/officing.yml rename to config/locales/pl/officing.yml diff --git a/config/locales/pl-PL/pages.yml b/config/locales/pl/pages.yml similarity index 100% rename from config/locales/pl-PL/pages.yml rename to config/locales/pl/pages.yml diff --git a/config/locales/pl-PL/rails.yml b/config/locales/pl/rails.yml similarity index 100% rename from config/locales/pl-PL/rails.yml rename to config/locales/pl/rails.yml diff --git a/config/locales/pl-PL/responders.yml b/config/locales/pl/responders.yml similarity index 100% rename from config/locales/pl-PL/responders.yml rename to config/locales/pl/responders.yml diff --git a/config/locales/pl-PL/seeds.yml b/config/locales/pl/seeds.yml similarity index 100% rename from config/locales/pl-PL/seeds.yml rename to config/locales/pl/seeds.yml diff --git a/config/locales/pl-PL/settings.yml b/config/locales/pl/settings.yml similarity index 100% rename from config/locales/pl-PL/settings.yml rename to config/locales/pl/settings.yml diff --git a/config/locales/pl-PL/social_share_button.yml b/config/locales/pl/social_share_button.yml similarity index 100% rename from config/locales/pl-PL/social_share_button.yml rename to config/locales/pl/social_share_button.yml diff --git a/config/locales/pl-PL/valuation.yml b/config/locales/pl/valuation.yml similarity index 100% rename from config/locales/pl-PL/valuation.yml rename to config/locales/pl/valuation.yml diff --git a/config/locales/pl-PL/verification.yml b/config/locales/pl/verification.yml similarity index 100% rename from config/locales/pl-PL/verification.yml rename to config/locales/pl/verification.yml diff --git a/config/locales/sq-AL/activemodel.yml b/config/locales/sq/activemodel.yml similarity index 100% rename from config/locales/sq-AL/activemodel.yml rename to config/locales/sq/activemodel.yml diff --git a/config/locales/sq-AL/activerecord.yml b/config/locales/sq/activerecord.yml similarity index 100% rename from config/locales/sq-AL/activerecord.yml rename to config/locales/sq/activerecord.yml diff --git a/config/locales/sq-AL/admin.yml b/config/locales/sq/admin.yml similarity index 100% rename from config/locales/sq-AL/admin.yml rename to config/locales/sq/admin.yml diff --git a/config/locales/sq-AL/budgets.yml b/config/locales/sq/budgets.yml similarity index 100% rename from config/locales/sq-AL/budgets.yml rename to config/locales/sq/budgets.yml diff --git a/config/locales/sq-AL/community.yml b/config/locales/sq/community.yml similarity index 100% rename from config/locales/sq-AL/community.yml rename to config/locales/sq/community.yml diff --git a/config/locales/sq-AL/devise.yml b/config/locales/sq/devise.yml similarity index 100% rename from config/locales/sq-AL/devise.yml rename to config/locales/sq/devise.yml diff --git a/config/locales/sq-AL/devise_views.yml b/config/locales/sq/devise_views.yml similarity index 100% rename from config/locales/sq-AL/devise_views.yml rename to config/locales/sq/devise_views.yml diff --git a/config/locales/sq-AL/documents.yml b/config/locales/sq/documents.yml similarity index 100% rename from config/locales/sq-AL/documents.yml rename to config/locales/sq/documents.yml diff --git a/config/locales/sq-AL/general.yml b/config/locales/sq/general.yml similarity index 99% rename from config/locales/sq-AL/general.yml rename to config/locales/sq/general.yml index a764eacf1..a0b763ff0 100644 --- a/config/locales/sq-AL/general.yml +++ b/config/locales/sq/general.yml @@ -249,7 +249,6 @@ sq: text_sign_in: Kycu text_sign_up: Rregjistrohu title: Si mund ta komentoj këtë dokument? - locale: Anglisht notifications: index: empty_notifications: Ju nuk keni njoftime të reja diff --git a/config/locales/sq-AL/guides.yml b/config/locales/sq/guides.yml similarity index 100% rename from config/locales/sq-AL/guides.yml rename to config/locales/sq/guides.yml diff --git a/config/locales/sq/i18n.yml b/config/locales/sq/i18n.yml new file mode 100644 index 000000000..0e11bbb68 --- /dev/null +++ b/config/locales/sq/i18n.yml @@ -0,0 +1,4 @@ +sq: + i18n: + language: + name: 'Shqiptar' \ No newline at end of file diff --git a/config/locales/sq-AL/images.yml b/config/locales/sq/images.yml similarity index 100% rename from config/locales/sq-AL/images.yml rename to config/locales/sq/images.yml diff --git a/config/locales/sq-AL/kaminari.yml b/config/locales/sq/kaminari.yml similarity index 100% rename from config/locales/sq-AL/kaminari.yml rename to config/locales/sq/kaminari.yml diff --git a/config/locales/sq-AL/legislation.yml b/config/locales/sq/legislation.yml similarity index 100% rename from config/locales/sq-AL/legislation.yml rename to config/locales/sq/legislation.yml diff --git a/config/locales/sq-AL/mailers.yml b/config/locales/sq/mailers.yml similarity index 100% rename from config/locales/sq-AL/mailers.yml rename to config/locales/sq/mailers.yml diff --git a/config/locales/sq-AL/management.yml b/config/locales/sq/management.yml similarity index 100% rename from config/locales/sq-AL/management.yml rename to config/locales/sq/management.yml diff --git a/config/locales/sq-AL/moderation.yml b/config/locales/sq/moderation.yml similarity index 100% rename from config/locales/sq-AL/moderation.yml rename to config/locales/sq/moderation.yml diff --git a/config/locales/sq-AL/officing.yml b/config/locales/sq/officing.yml similarity index 100% rename from config/locales/sq-AL/officing.yml rename to config/locales/sq/officing.yml diff --git a/config/locales/sq-AL/pages.yml b/config/locales/sq/pages.yml similarity index 100% rename from config/locales/sq-AL/pages.yml rename to config/locales/sq/pages.yml diff --git a/config/locales/sq-AL/rails.yml b/config/locales/sq/rails.yml similarity index 100% rename from config/locales/sq-AL/rails.yml rename to config/locales/sq/rails.yml diff --git a/config/locales/sq-AL/responders.yml b/config/locales/sq/responders.yml similarity index 100% rename from config/locales/sq-AL/responders.yml rename to config/locales/sq/responders.yml diff --git a/config/locales/sq-AL/seeds.yml b/config/locales/sq/seeds.yml similarity index 100% rename from config/locales/sq-AL/seeds.yml rename to config/locales/sq/seeds.yml diff --git a/config/locales/sq-AL/settings.yml b/config/locales/sq/settings.yml similarity index 100% rename from config/locales/sq-AL/settings.yml rename to config/locales/sq/settings.yml diff --git a/config/locales/sq-AL/social_share_button.yml b/config/locales/sq/social_share_button.yml similarity index 100% rename from config/locales/sq-AL/social_share_button.yml rename to config/locales/sq/social_share_button.yml diff --git a/config/locales/sq-AL/valuation.yml b/config/locales/sq/valuation.yml similarity index 100% rename from config/locales/sq-AL/valuation.yml rename to config/locales/sq/valuation.yml diff --git a/config/locales/sq-AL/verification.yml b/config/locales/sq/verification.yml similarity index 100% rename from config/locales/sq-AL/verification.yml rename to config/locales/sq/verification.yml diff --git a/config/locales/sv-SE/activemodel.yml b/config/locales/sv/activemodel.yml similarity index 100% rename from config/locales/sv-SE/activemodel.yml rename to config/locales/sv/activemodel.yml diff --git a/config/locales/sv-SE/activerecord.yml b/config/locales/sv/activerecord.yml similarity index 100% rename from config/locales/sv-SE/activerecord.yml rename to config/locales/sv/activerecord.yml diff --git a/config/locales/sv-SE/admin.yml b/config/locales/sv/admin.yml similarity index 100% rename from config/locales/sv-SE/admin.yml rename to config/locales/sv/admin.yml diff --git a/config/locales/sv-SE/budgets.yml b/config/locales/sv/budgets.yml similarity index 100% rename from config/locales/sv-SE/budgets.yml rename to config/locales/sv/budgets.yml diff --git a/config/locales/sv-SE/community.yml b/config/locales/sv/community.yml similarity index 100% rename from config/locales/sv-SE/community.yml rename to config/locales/sv/community.yml diff --git a/config/locales/sv-SE/devise.yml b/config/locales/sv/devise.yml similarity index 100% rename from config/locales/sv-SE/devise.yml rename to config/locales/sv/devise.yml diff --git a/config/locales/sv-SE/devise_views.yml b/config/locales/sv/devise_views.yml similarity index 100% rename from config/locales/sv-SE/devise_views.yml rename to config/locales/sv/devise_views.yml diff --git a/config/locales/sv-SE/documents.yml b/config/locales/sv/documents.yml similarity index 100% rename from config/locales/sv-SE/documents.yml rename to config/locales/sv/documents.yml diff --git a/config/locales/sv-SE/general.yml b/config/locales/sv/general.yml similarity index 100% rename from config/locales/sv-SE/general.yml rename to config/locales/sv/general.yml diff --git a/config/locales/sv-SE/guides.yml b/config/locales/sv/guides.yml similarity index 100% rename from config/locales/sv-SE/guides.yml rename to config/locales/sv/guides.yml diff --git a/config/locales/sv/i18n.yml b/config/locales/sv/i18n.yml new file mode 100644 index 000000000..442c30426 --- /dev/null +++ b/config/locales/sv/i18n.yml @@ -0,0 +1,4 @@ +sv: + i18n: + language: + name: 'Svenska' \ No newline at end of file diff --git a/config/locales/sv-SE/images.yml b/config/locales/sv/images.yml similarity index 100% rename from config/locales/sv-SE/images.yml rename to config/locales/sv/images.yml diff --git a/config/locales/sv-SE/kaminari.yml b/config/locales/sv/kaminari.yml similarity index 100% rename from config/locales/sv-SE/kaminari.yml rename to config/locales/sv/kaminari.yml diff --git a/config/locales/sv-SE/legislation.yml b/config/locales/sv/legislation.yml similarity index 100% rename from config/locales/sv-SE/legislation.yml rename to config/locales/sv/legislation.yml diff --git a/config/locales/sv-SE/mailers.yml b/config/locales/sv/mailers.yml similarity index 100% rename from config/locales/sv-SE/mailers.yml rename to config/locales/sv/mailers.yml diff --git a/config/locales/sv-SE/management.yml b/config/locales/sv/management.yml similarity index 100% rename from config/locales/sv-SE/management.yml rename to config/locales/sv/management.yml diff --git a/config/locales/sv-SE/moderation.yml b/config/locales/sv/moderation.yml similarity index 100% rename from config/locales/sv-SE/moderation.yml rename to config/locales/sv/moderation.yml diff --git a/config/locales/sv-SE/officing.yml b/config/locales/sv/officing.yml similarity index 100% rename from config/locales/sv-SE/officing.yml rename to config/locales/sv/officing.yml diff --git a/config/locales/sv-SE/pages.yml b/config/locales/sv/pages.yml similarity index 100% rename from config/locales/sv-SE/pages.yml rename to config/locales/sv/pages.yml diff --git a/config/locales/sv-SE/rails.yml b/config/locales/sv/rails.yml similarity index 100% rename from config/locales/sv-SE/rails.yml rename to config/locales/sv/rails.yml diff --git a/config/locales/sv-SE/responders.yml b/config/locales/sv/responders.yml similarity index 100% rename from config/locales/sv-SE/responders.yml rename to config/locales/sv/responders.yml diff --git a/config/locales/sv-SE/seeds.yml b/config/locales/sv/seeds.yml similarity index 100% rename from config/locales/sv-SE/seeds.yml rename to config/locales/sv/seeds.yml diff --git a/config/locales/sv-SE/settings.yml b/config/locales/sv/settings.yml similarity index 100% rename from config/locales/sv-SE/settings.yml rename to config/locales/sv/settings.yml diff --git a/config/locales/sv-SE/social_share_button.yml b/config/locales/sv/social_share_button.yml similarity index 100% rename from config/locales/sv-SE/social_share_button.yml rename to config/locales/sv/social_share_button.yml diff --git a/config/locales/sv-SE/valuation.yml b/config/locales/sv/valuation.yml similarity index 100% rename from config/locales/sv-SE/valuation.yml rename to config/locales/sv/valuation.yml diff --git a/config/locales/sv-SE/verification.yml b/config/locales/sv/verification.yml similarity index 100% rename from config/locales/sv-SE/verification.yml rename to config/locales/sv/verification.yml From 14a1eeb44f9cdf5d2cc5a45fb865a97548b09d05 Mon Sep 17 00:00:00 2001 From: kreopelle Date: Wed, 10 Oct 2018 21:02:55 -0400 Subject: [PATCH 006/100] Change spelling for constant to TITLE_LENGTH_RANGE, instead of TITLE_LEGHT_RANGE --- app/models/image.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/image.rb b/app/models/image.rb index 25cf449bd..8f62f94d8 100644 --- a/app/models/image.rb +++ b/app/models/image.rb @@ -2,7 +2,7 @@ class Image < ActiveRecord::Base include ImagesHelper include ImageablesHelper - TITLE_LEGHT_RANGE = 4..80 + TITLE_LENGTH_RANGE = 4..80 MIN_SIZE = 475 MAX_IMAGE_SIZE = 1.megabyte ACCEPTED_CONTENT_TYPE = %w(image/jpeg image/jpg).freeze @@ -23,7 +23,7 @@ class Image < ActiveRecord::Base validate :attachment_presence validate :validate_attachment_content_type, if: -> { attachment.present? } validate :validate_attachment_size, if: -> { attachment.present? } - validates :title, presence: true, length: { in: TITLE_LEGHT_RANGE } + validates :title, presence: true, length: { in: TITLE_LENGTH_RANGE } validates :user_id, presence: true validates :imageable_id, presence: true, if: -> { persisted? } validates :imageable_type, presence: true, if: -> { persisted? } From 5ae7a5512deb6fef5f03d8a449f69174287c3ab3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 9 Aug 2018 17:40:38 +0200 Subject: [PATCH 007/100] Skip spec before doing any requests Skipping a spec in the middle of it, particularly after doing some requests, caused Capybara to keep using the same driver in the following spec. Since the current spec uses the JavaScript driver, the next test would also use the JavaScript driver, causing apparently random failures if that test was supposed to use the Rack driver. --- spec/shared/features/nested_imageable.rb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/spec/shared/features/nested_imageable.rb b/spec/shared/features/nested_imageable.rb index c8bdb9556..f508366fc 100644 --- a/spec/shared/features/nested_imageable.rb +++ b/spec/shared/features/nested_imageable.rb @@ -175,15 +175,14 @@ shared_examples "nested imageable" do |imageable_factory_name, path, end scenario "Should show successful notice when resource filled correctly without any nested images", :js do - login_as user - visit send(path, arguments) - - send(fill_resource_method_name) if fill_resource_method_name - click_on submit_button - if has_many_images skip "no need to test, there are no attributes for the parent resource" else + login_as user + visit send(path, arguments) + + send(fill_resource_method_name) if fill_resource_method_name + click_on submit_button expect(page).to have_content imageable_success_notice end end From 7fb6f6a7a6ba8380f3bba9235d3e038eb68121f7 Mon Sep 17 00:00:00 2001 From: voodoorai2000 Date: Tue, 9 Oct 2018 20:38:06 +0200 Subject: [PATCH 008/100] Add all language names --- config/locales/ar/i18n.yml | 4 ++++ config/locales/ast/i18n.yml | 4 ++++ config/locales/ca/i18n.yml | 4 ++++ config/locales/de-DE/i18n.yml | 4 ++++ config/locales/en-GB/i18n.yml | 4 ++++ config/locales/en-US/i18n.yml | 4 ++++ config/locales/en/i18n.yml | 2 +- config/locales/es-AR/i18n.yml | 4 ++++ config/locales/es-BO/i18n.yml | 4 ++++ config/locales/es-CL/i18n.yml | 4 ++++ config/locales/es-CO/i18n.yml | 4 ++++ config/locales/es-CR/i18n.yml | 4 ++++ config/locales/es-DO/i18n.yml | 4 ++++ config/locales/es-EC/i18n.yml | 4 ++++ config/locales/es-GT/i18n.yml | 4 ++++ config/locales/es-HN/i18n.yml | 4 ++++ config/locales/es-MX/i18n.yml | 4 ++++ config/locales/es-NI/i18n.yml | 4 ++++ config/locales/es-PA/i18n.yml | 4 ++++ config/locales/es-PE/i18n.yml | 4 ++++ config/locales/es-PR/i18n.yml | 4 ++++ config/locales/es-PY/i18n.yml | 4 ++++ config/locales/es-SV/i18n.yml | 4 ++++ config/locales/es-UY/i18n.yml | 4 ++++ config/locales/es-VE/i18n.yml | 4 ++++ config/locales/es/i18n.yml | 2 +- config/locales/eu-ES/i18n.yml | 4 ++++ config/locales/fa-IR/i18n.yml | 4 ++++ config/locales/gl/i18n.yml | 4 ++++ config/locales/id-ID/i18n.yml | 4 ++++ config/locales/it/i18n.yml | 4 ++++ config/locales/pap-PAP/i18n.yml | 4 ++++ config/locales/pl-PL/i18n.yml | 4 ++++ config/locales/ru/i18n.yml | 4 ++++ config/locales/sl-SI/i18n.yml | 4 ++++ config/locales/so-SO/i18n.yml | 4 ++++ config/locales/sq-AL/i18n.yml | 4 ++++ config/locales/sv-FI/i18n.yml | 4 ++++ config/locales/sv-SE/i18n.yml | 4 ++++ config/locales/tr-TR/i18n.yml | 4 ++++ config/locales/zh-CN/i18n.yml | 4 ++++ config/locales/zh-TW/i18n.yml | 4 ++++ 42 files changed, 162 insertions(+), 2 deletions(-) create mode 100644 config/locales/ar/i18n.yml create mode 100644 config/locales/ast/i18n.yml create mode 100644 config/locales/ca/i18n.yml create mode 100644 config/locales/de-DE/i18n.yml create mode 100644 config/locales/en-GB/i18n.yml create mode 100644 config/locales/en-US/i18n.yml create mode 100644 config/locales/es-AR/i18n.yml create mode 100644 config/locales/es-BO/i18n.yml create mode 100644 config/locales/es-CL/i18n.yml create mode 100644 config/locales/es-CO/i18n.yml create mode 100644 config/locales/es-CR/i18n.yml create mode 100644 config/locales/es-DO/i18n.yml create mode 100644 config/locales/es-EC/i18n.yml create mode 100644 config/locales/es-GT/i18n.yml create mode 100644 config/locales/es-HN/i18n.yml create mode 100644 config/locales/es-MX/i18n.yml create mode 100644 config/locales/es-NI/i18n.yml create mode 100644 config/locales/es-PA/i18n.yml create mode 100644 config/locales/es-PE/i18n.yml create mode 100644 config/locales/es-PR/i18n.yml create mode 100644 config/locales/es-PY/i18n.yml create mode 100644 config/locales/es-SV/i18n.yml create mode 100644 config/locales/es-UY/i18n.yml create mode 100644 config/locales/es-VE/i18n.yml create mode 100644 config/locales/eu-ES/i18n.yml create mode 100644 config/locales/fa-IR/i18n.yml create mode 100644 config/locales/gl/i18n.yml create mode 100644 config/locales/id-ID/i18n.yml create mode 100644 config/locales/it/i18n.yml create mode 100644 config/locales/pap-PAP/i18n.yml create mode 100644 config/locales/pl-PL/i18n.yml create mode 100644 config/locales/ru/i18n.yml create mode 100644 config/locales/sl-SI/i18n.yml create mode 100644 config/locales/so-SO/i18n.yml create mode 100644 config/locales/sq-AL/i18n.yml create mode 100644 config/locales/sv-FI/i18n.yml create mode 100644 config/locales/sv-SE/i18n.yml create mode 100644 config/locales/tr-TR/i18n.yml create mode 100644 config/locales/zh-CN/i18n.yml create mode 100644 config/locales/zh-TW/i18n.yml diff --git a/config/locales/ar/i18n.yml b/config/locales/ar/i18n.yml new file mode 100644 index 000000000..3ddf182df --- /dev/null +++ b/config/locales/ar/i18n.yml @@ -0,0 +1,4 @@ +ar: + i18n: + language: + name: 'عربى' \ No newline at end of file diff --git a/config/locales/ast/i18n.yml b/config/locales/ast/i18n.yml new file mode 100644 index 000000000..55656fa59 --- /dev/null +++ b/config/locales/ast/i18n.yml @@ -0,0 +1,4 @@ +ast: + i18n: + language: + name: 'Asturianu' \ No newline at end of file diff --git a/config/locales/ca/i18n.yml b/config/locales/ca/i18n.yml new file mode 100644 index 000000000..861a5dc9a --- /dev/null +++ b/config/locales/ca/i18n.yml @@ -0,0 +1,4 @@ +ca: + i18n: + language: + name: 'Català' \ No newline at end of file diff --git a/config/locales/de-DE/i18n.yml b/config/locales/de-DE/i18n.yml new file mode 100644 index 000000000..2af5e0763 --- /dev/null +++ b/config/locales/de-DE/i18n.yml @@ -0,0 +1,4 @@ +de-DE: + i18n: + language: + name: 'Deutsch' \ No newline at end of file diff --git a/config/locales/en-GB/i18n.yml b/config/locales/en-GB/i18n.yml new file mode 100644 index 000000000..c1cc60d89 --- /dev/null +++ b/config/locales/en-GB/i18n.yml @@ -0,0 +1,4 @@ +en-GB: + i18n: + language: + name: 'English (Great Britain)' \ No newline at end of file diff --git a/config/locales/en-US/i18n.yml b/config/locales/en-US/i18n.yml new file mode 100644 index 000000000..969fa4bdc --- /dev/null +++ b/config/locales/en-US/i18n.yml @@ -0,0 +1,4 @@ +en-US: + i18n: + language: + name: 'English (USA)' \ No newline at end of file diff --git a/config/locales/en/i18n.yml b/config/locales/en/i18n.yml index 65fdd3ed5..9819987f0 100644 --- a/config/locales/en/i18n.yml +++ b/config/locales/en/i18n.yml @@ -1,4 +1,4 @@ en: i18n: language: - name: "English" \ No newline at end of file + name: "English" diff --git a/config/locales/es-AR/i18n.yml b/config/locales/es-AR/i18n.yml new file mode 100644 index 000000000..ae2527c33 --- /dev/null +++ b/config/locales/es-AR/i18n.yml @@ -0,0 +1,4 @@ +es-AR: + i18n: + language: + name: 'Español (Argentina)' \ No newline at end of file diff --git a/config/locales/es-BO/i18n.yml b/config/locales/es-BO/i18n.yml new file mode 100644 index 000000000..a45000aa0 --- /dev/null +++ b/config/locales/es-BO/i18n.yml @@ -0,0 +1,4 @@ +es-BO: + i18n: + language: + name: 'Español (Bolivia)' \ No newline at end of file diff --git a/config/locales/es-CL/i18n.yml b/config/locales/es-CL/i18n.yml new file mode 100644 index 000000000..55cf34f10 --- /dev/null +++ b/config/locales/es-CL/i18n.yml @@ -0,0 +1,4 @@ +es-CL: + i18n: + language: + name: 'Español (Chile)' \ No newline at end of file diff --git a/config/locales/es-CO/i18n.yml b/config/locales/es-CO/i18n.yml new file mode 100644 index 000000000..1c461914c --- /dev/null +++ b/config/locales/es-CO/i18n.yml @@ -0,0 +1,4 @@ +es-CO: + i18n: + language: + name: 'Español (Colombia)' \ No newline at end of file diff --git a/config/locales/es-CR/i18n.yml b/config/locales/es-CR/i18n.yml new file mode 100644 index 000000000..cc18dcb6f --- /dev/null +++ b/config/locales/es-CR/i18n.yml @@ -0,0 +1,4 @@ +es-CR: + i18n: + language: + name: 'Español (Costa Rica)' \ No newline at end of file diff --git a/config/locales/es-DO/i18n.yml b/config/locales/es-DO/i18n.yml new file mode 100644 index 000000000..086e4012b --- /dev/null +++ b/config/locales/es-DO/i18n.yml @@ -0,0 +1,4 @@ +es-DO: + i18n: + language: + name: 'Español (República Dominicana)' \ No newline at end of file diff --git a/config/locales/es-EC/i18n.yml b/config/locales/es-EC/i18n.yml new file mode 100644 index 000000000..3ea21b4a5 --- /dev/null +++ b/config/locales/es-EC/i18n.yml @@ -0,0 +1,4 @@ +es-EC: + i18n: + language: + name: 'Español (Ecuador)' \ No newline at end of file diff --git a/config/locales/es-GT/i18n.yml b/config/locales/es-GT/i18n.yml new file mode 100644 index 000000000..da24c274e --- /dev/null +++ b/config/locales/es-GT/i18n.yml @@ -0,0 +1,4 @@ +es-GT: + i18n: + language: + name: 'Español (Guatemala)' \ No newline at end of file diff --git a/config/locales/es-HN/i18n.yml b/config/locales/es-HN/i18n.yml new file mode 100644 index 000000000..d4bee499f --- /dev/null +++ b/config/locales/es-HN/i18n.yml @@ -0,0 +1,4 @@ +es-HN: + i18n: + language: + name: 'Español (Honduras)' \ No newline at end of file diff --git a/config/locales/es-MX/i18n.yml b/config/locales/es-MX/i18n.yml new file mode 100644 index 000000000..3aa608ae6 --- /dev/null +++ b/config/locales/es-MX/i18n.yml @@ -0,0 +1,4 @@ +es-MX: + i18n: + language: + name: 'Español (México)' \ No newline at end of file diff --git a/config/locales/es-NI/i18n.yml b/config/locales/es-NI/i18n.yml new file mode 100644 index 000000000..98fa17e47 --- /dev/null +++ b/config/locales/es-NI/i18n.yml @@ -0,0 +1,4 @@ +es-NI: + i18n: + language: + name: 'Español (Nicaragua)' \ No newline at end of file diff --git a/config/locales/es-PA/i18n.yml b/config/locales/es-PA/i18n.yml new file mode 100644 index 000000000..80dc474bd --- /dev/null +++ b/config/locales/es-PA/i18n.yml @@ -0,0 +1,4 @@ +es-PA: + i18n: + language: + name: 'Español (Panama)' \ No newline at end of file diff --git a/config/locales/es-PE/i18n.yml b/config/locales/es-PE/i18n.yml new file mode 100644 index 000000000..4bf9d1dd2 --- /dev/null +++ b/config/locales/es-PE/i18n.yml @@ -0,0 +1,4 @@ +es-PE: + i18n: + language: + name: 'Español (Perú)' \ No newline at end of file diff --git a/config/locales/es-PR/i18n.yml b/config/locales/es-PR/i18n.yml new file mode 100644 index 000000000..ea482c197 --- /dev/null +++ b/config/locales/es-PR/i18n.yml @@ -0,0 +1,4 @@ +es-PR: + i18n: + language: + name: 'Español (Puerto Rico)' \ No newline at end of file diff --git a/config/locales/es-PY/i18n.yml b/config/locales/es-PY/i18n.yml new file mode 100644 index 000000000..0099f2d36 --- /dev/null +++ b/config/locales/es-PY/i18n.yml @@ -0,0 +1,4 @@ +es-PY: + i18n: + language: + name: 'Español (Paraguay)' \ No newline at end of file diff --git a/config/locales/es-SV/i18n.yml b/config/locales/es-SV/i18n.yml new file mode 100644 index 000000000..fc778aa12 --- /dev/null +++ b/config/locales/es-SV/i18n.yml @@ -0,0 +1,4 @@ +es-SV: + i18n: + language: + name: 'Español (El Salvador)' \ No newline at end of file diff --git a/config/locales/es-UY/i18n.yml b/config/locales/es-UY/i18n.yml new file mode 100644 index 000000000..ed33b23fd --- /dev/null +++ b/config/locales/es-UY/i18n.yml @@ -0,0 +1,4 @@ +es-UY: + i18n: + language: + name: 'Español (Uruguay)' \ No newline at end of file diff --git a/config/locales/es-VE/i18n.yml b/config/locales/es-VE/i18n.yml new file mode 100644 index 000000000..28e014bd7 --- /dev/null +++ b/config/locales/es-VE/i18n.yml @@ -0,0 +1,4 @@ +es-VE: + i18n: + language: + name: 'Español (Venezuela)' \ No newline at end of file diff --git a/config/locales/es/i18n.yml b/config/locales/es/i18n.yml index 8df5d7ec1..753f87696 100644 --- a/config/locales/es/i18n.yml +++ b/config/locales/es/i18n.yml @@ -1,4 +1,4 @@ es: i18n: language: - name: "Español" \ No newline at end of file + name: "Español" diff --git a/config/locales/eu-ES/i18n.yml b/config/locales/eu-ES/i18n.yml new file mode 100644 index 000000000..eebc98b27 --- /dev/null +++ b/config/locales/eu-ES/i18n.yml @@ -0,0 +1,4 @@ +eu-ES: + i18n: + language: + name: 'Euskara' \ No newline at end of file diff --git a/config/locales/fa-IR/i18n.yml b/config/locales/fa-IR/i18n.yml new file mode 100644 index 000000000..49e627973 --- /dev/null +++ b/config/locales/fa-IR/i18n.yml @@ -0,0 +1,4 @@ +fa-IR: + i18n: + language: + name: 'فارسى' \ No newline at end of file diff --git a/config/locales/gl/i18n.yml b/config/locales/gl/i18n.yml new file mode 100644 index 000000000..217a86a2c --- /dev/null +++ b/config/locales/gl/i18n.yml @@ -0,0 +1,4 @@ +gl: + i18n: + language: + name: 'Galego' \ No newline at end of file diff --git a/config/locales/id-ID/i18n.yml b/config/locales/id-ID/i18n.yml new file mode 100644 index 000000000..b4bd139e7 --- /dev/null +++ b/config/locales/id-ID/i18n.yml @@ -0,0 +1,4 @@ +id-ID: + i18n: + language: + name: 'Bahasa Indonesia' \ No newline at end of file diff --git a/config/locales/it/i18n.yml b/config/locales/it/i18n.yml new file mode 100644 index 000000000..2078dbbf0 --- /dev/null +++ b/config/locales/it/i18n.yml @@ -0,0 +1,4 @@ +it: + i18n: + language: + name: 'Italiano' \ No newline at end of file diff --git a/config/locales/pap-PAP/i18n.yml b/config/locales/pap-PAP/i18n.yml new file mode 100644 index 000000000..0a4c6f962 --- /dev/null +++ b/config/locales/pap-PAP/i18n.yml @@ -0,0 +1,4 @@ +pap-PAP: + i18n: + language: + name: 'Papiamentu' \ No newline at end of file diff --git a/config/locales/pl-PL/i18n.yml b/config/locales/pl-PL/i18n.yml new file mode 100644 index 000000000..f71f91592 --- /dev/null +++ b/config/locales/pl-PL/i18n.yml @@ -0,0 +1,4 @@ +pl-PL: + i18n: + language: + name: 'Polski' \ No newline at end of file diff --git a/config/locales/ru/i18n.yml b/config/locales/ru/i18n.yml new file mode 100644 index 000000000..0600c1bbb --- /dev/null +++ b/config/locales/ru/i18n.yml @@ -0,0 +1,4 @@ +ru: + i18n: + language: + name: 'Pусский' \ No newline at end of file diff --git a/config/locales/sl-SI/i18n.yml b/config/locales/sl-SI/i18n.yml new file mode 100644 index 000000000..0e53ad26f --- /dev/null +++ b/config/locales/sl-SI/i18n.yml @@ -0,0 +1,4 @@ +sl-SI: + i18n: + language: + name: 'Slovenščina' \ No newline at end of file diff --git a/config/locales/so-SO/i18n.yml b/config/locales/so-SO/i18n.yml new file mode 100644 index 000000000..419402def --- /dev/null +++ b/config/locales/so-SO/i18n.yml @@ -0,0 +1,4 @@ +so-SO: + i18n: + language: + name: 'Af Soomaali' \ No newline at end of file diff --git a/config/locales/sq-AL/i18n.yml b/config/locales/sq-AL/i18n.yml new file mode 100644 index 000000000..162c1a5f0 --- /dev/null +++ b/config/locales/sq-AL/i18n.yml @@ -0,0 +1,4 @@ +sq-AL: + i18n: + language: + name: 'Shqiptar' \ No newline at end of file diff --git a/config/locales/sv-FI/i18n.yml b/config/locales/sv-FI/i18n.yml new file mode 100644 index 000000000..33b42d312 --- /dev/null +++ b/config/locales/sv-FI/i18n.yml @@ -0,0 +1,4 @@ +sv-FI: + i18n: + language: + name: 'Suomi' \ No newline at end of file diff --git a/config/locales/sv-SE/i18n.yml b/config/locales/sv-SE/i18n.yml new file mode 100644 index 000000000..ae8ac30f7 --- /dev/null +++ b/config/locales/sv-SE/i18n.yml @@ -0,0 +1,4 @@ +sv-SE: + i18n: + language: + name: 'Svenska' \ No newline at end of file diff --git a/config/locales/tr-TR/i18n.yml b/config/locales/tr-TR/i18n.yml new file mode 100644 index 000000000..98c54d32d --- /dev/null +++ b/config/locales/tr-TR/i18n.yml @@ -0,0 +1,4 @@ +tr-TR: + i18n: + language: + name: 'Türkçe' \ No newline at end of file diff --git a/config/locales/zh-CN/i18n.yml b/config/locales/zh-CN/i18n.yml new file mode 100644 index 000000000..34f453051 --- /dev/null +++ b/config/locales/zh-CN/i18n.yml @@ -0,0 +1,4 @@ +zh-CN: + i18n: + language: + name: "中文" \ No newline at end of file diff --git a/config/locales/zh-TW/i18n.yml b/config/locales/zh-TW/i18n.yml new file mode 100644 index 000000000..bae5aeb9c --- /dev/null +++ b/config/locales/zh-TW/i18n.yml @@ -0,0 +1,4 @@ +zh-TW: + i18n: + language: + name: "文言" \ No newline at end of file From d8fa3227630f7ff56d85102efad72665b137e25e Mon Sep 17 00:00:00 2001 From: voodoorai2000 Date: Tue, 9 Oct 2018 20:41:28 +0200 Subject: [PATCH 009/100] Remove obsolete language name translations --- config/locales/de/general.yml | 1 - config/locales/es-AR/general.yml | 1 - config/locales/es-BO/general.yml | 1 - config/locales/es-CL/general.yml | 1 - config/locales/es-CO/general.yml | 1 - config/locales/es-CR/general.yml | 1 - config/locales/es-DO/general.yml | 1 - config/locales/es-EC/general.yml | 1 - config/locales/es-GT/general.yml | 1 - config/locales/es-HN/general.yml | 1 - config/locales/es-MX/general.yml | 1 - config/locales/es-NI/general.yml | 1 - config/locales/es-PA/general.yml | 1 - config/locales/es-PE/general.yml | 1 - config/locales/es-PR/general.yml | 1 - config/locales/es-PY/general.yml | 1 - config/locales/es-SV/general.yml | 1 - config/locales/es-UY/general.yml | 1 - config/locales/es-VE/general.yml | 1 - config/locales/gl/general.yml | 1 - config/locales/id-ID/general.yml | 1 - config/locales/sv/general.yml | 1 - config/locales/zh-TW/general.yml | 1 - 23 files changed, 23 deletions(-) diff --git a/config/locales/de/general.yml b/config/locales/de/general.yml index 18aefa5a3..ece8dde6f 100644 --- a/config/locales/de/general.yml +++ b/config/locales/de/general.yml @@ -249,7 +249,6 @@ de: text_sign_in: login text_sign_up: registrieren title: Wie kann ich dieses Dokument kommentieren? - locale: Deutsch notifications: index: empty_notifications: Sie haben keine neuen Benachrichtigungen. diff --git a/config/locales/es-AR/general.yml b/config/locales/es-AR/general.yml index 52e3d3f5a..a273d80a9 100644 --- a/config/locales/es-AR/general.yml +++ b/config/locales/es-AR/general.yml @@ -239,7 +239,6 @@ es-AR: text_sign_in: iniciar sesión text_sign_up: registrarte title: '¿Cómo puedo comentar este documento?' - locale: Español notifications: index: empty_notifications: No tienes notificaciones nuevas. diff --git a/config/locales/es-BO/general.yml b/config/locales/es-BO/general.yml index 18d071571..5647ceaaa 100644 --- a/config/locales/es-BO/general.yml +++ b/config/locales/es-BO/general.yml @@ -224,7 +224,6 @@ es-BO: text_sign_in: iniciar sesión text_sign_up: registrarte title: '¿Cómo puedo comentar este documento?' - locale: Español notifications: index: empty_notifications: No tienes notificaciones nuevas. diff --git a/config/locales/es-CL/general.yml b/config/locales/es-CL/general.yml index f1935bf05..ed47e2aeb 100644 --- a/config/locales/es-CL/general.yml +++ b/config/locales/es-CL/general.yml @@ -224,7 +224,6 @@ es-CL: text_sign_in: iniciar sesión text_sign_up: registrarte title: '¿Cómo puedo comentar este documento?' - locale: Español notifications: index: empty_notifications: No tienes notificaciones nuevas. diff --git a/config/locales/es-CO/general.yml b/config/locales/es-CO/general.yml index c64952b5a..923b364db 100644 --- a/config/locales/es-CO/general.yml +++ b/config/locales/es-CO/general.yml @@ -224,7 +224,6 @@ es-CO: text_sign_in: iniciar sesión text_sign_up: registrarte title: '¿Cómo puedo comentar este documento?' - locale: Español notifications: index: empty_notifications: No tienes notificaciones nuevas. diff --git a/config/locales/es-CR/general.yml b/config/locales/es-CR/general.yml index f3d97769a..5f7edebe5 100644 --- a/config/locales/es-CR/general.yml +++ b/config/locales/es-CR/general.yml @@ -224,7 +224,6 @@ es-CR: text_sign_in: iniciar sesión text_sign_up: registrarte title: '¿Cómo puedo comentar este documento?' - locale: Español notifications: index: empty_notifications: No tienes notificaciones nuevas. diff --git a/config/locales/es-DO/general.yml b/config/locales/es-DO/general.yml index 153019861..4a76f381d 100644 --- a/config/locales/es-DO/general.yml +++ b/config/locales/es-DO/general.yml @@ -224,7 +224,6 @@ es-DO: text_sign_in: iniciar sesión text_sign_up: registrarte title: '¿Cómo puedo comentar este documento?' - locale: Español notifications: index: empty_notifications: No tienes notificaciones nuevas. diff --git a/config/locales/es-EC/general.yml b/config/locales/es-EC/general.yml index 10fe78a68..19c3dbba5 100644 --- a/config/locales/es-EC/general.yml +++ b/config/locales/es-EC/general.yml @@ -224,7 +224,6 @@ es-EC: text_sign_in: iniciar sesión text_sign_up: registrarte title: '¿Cómo puedo comentar este documento?' - locale: Español notifications: index: empty_notifications: No tienes notificaciones nuevas. diff --git a/config/locales/es-GT/general.yml b/config/locales/es-GT/general.yml index 08e4f87ad..4fc8f3d2a 100644 --- a/config/locales/es-GT/general.yml +++ b/config/locales/es-GT/general.yml @@ -224,7 +224,6 @@ es-GT: text_sign_in: iniciar sesión text_sign_up: registrarte title: '¿Cómo puedo comentar este documento?' - locale: Español notifications: index: empty_notifications: No tienes notificaciones nuevas. diff --git a/config/locales/es-HN/general.yml b/config/locales/es-HN/general.yml index 600d9faeb..4b1ac3360 100644 --- a/config/locales/es-HN/general.yml +++ b/config/locales/es-HN/general.yml @@ -224,7 +224,6 @@ es-HN: text_sign_in: iniciar sesión text_sign_up: registrarte title: '¿Cómo puedo comentar este documento?' - locale: Español notifications: index: empty_notifications: No tienes notificaciones nuevas. diff --git a/config/locales/es-MX/general.yml b/config/locales/es-MX/general.yml index 99e2cdf43..a6d384a8d 100644 --- a/config/locales/es-MX/general.yml +++ b/config/locales/es-MX/general.yml @@ -224,7 +224,6 @@ es-MX: text_sign_in: iniciar sesión text_sign_up: registrarte title: '¿Cómo puedo comentar este documento?' - locale: Español notifications: index: empty_notifications: No tienes notificaciones nuevas. diff --git a/config/locales/es-NI/general.yml b/config/locales/es-NI/general.yml index d3f4ba84e..dc3866308 100644 --- a/config/locales/es-NI/general.yml +++ b/config/locales/es-NI/general.yml @@ -224,7 +224,6 @@ es-NI: text_sign_in: iniciar sesión text_sign_up: registrarte title: '¿Cómo puedo comentar este documento?' - locale: Español notifications: index: empty_notifications: No tienes notificaciones nuevas. diff --git a/config/locales/es-PA/general.yml b/config/locales/es-PA/general.yml index 024fb7832..684bf9f73 100644 --- a/config/locales/es-PA/general.yml +++ b/config/locales/es-PA/general.yml @@ -224,7 +224,6 @@ es-PA: text_sign_in: iniciar sesión text_sign_up: registrarte title: '¿Cómo puedo comentar este documento?' - locale: Español notifications: index: empty_notifications: No tienes notificaciones nuevas. diff --git a/config/locales/es-PE/general.yml b/config/locales/es-PE/general.yml index dc716181d..de335bd27 100644 --- a/config/locales/es-PE/general.yml +++ b/config/locales/es-PE/general.yml @@ -224,7 +224,6 @@ es-PE: text_sign_in: iniciar sesión text_sign_up: registrarte title: '¿Cómo puedo comentar este documento?' - locale: Español notifications: index: empty_notifications: No tienes notificaciones nuevas. diff --git a/config/locales/es-PR/general.yml b/config/locales/es-PR/general.yml index 4d695ea53..41f15c564 100644 --- a/config/locales/es-PR/general.yml +++ b/config/locales/es-PR/general.yml @@ -224,7 +224,6 @@ es-PR: text_sign_in: iniciar sesión text_sign_up: registrarte title: '¿Cómo puedo comentar este documento?' - locale: Español notifications: index: empty_notifications: No tienes notificaciones nuevas. diff --git a/config/locales/es-PY/general.yml b/config/locales/es-PY/general.yml index 2d1a16880..9fbb170af 100644 --- a/config/locales/es-PY/general.yml +++ b/config/locales/es-PY/general.yml @@ -224,7 +224,6 @@ es-PY: text_sign_in: iniciar sesión text_sign_up: registrarte title: '¿Cómo puedo comentar este documento?' - locale: Español notifications: index: empty_notifications: No tienes notificaciones nuevas. diff --git a/config/locales/es-SV/general.yml b/config/locales/es-SV/general.yml index 93424e354..967d6d919 100644 --- a/config/locales/es-SV/general.yml +++ b/config/locales/es-SV/general.yml @@ -224,7 +224,6 @@ es-SV: text_sign_in: iniciar sesión text_sign_up: registrarte title: '¿Cómo puedo comentar este documento?' - locale: Español notifications: index: empty_notifications: No tienes notificaciones nuevas. diff --git a/config/locales/es-UY/general.yml b/config/locales/es-UY/general.yml index d6dfb7b7c..2bcbf58ba 100644 --- a/config/locales/es-UY/general.yml +++ b/config/locales/es-UY/general.yml @@ -224,7 +224,6 @@ es-UY: text_sign_in: iniciar sesión text_sign_up: registrarte title: '¿Cómo puedo comentar este documento?' - locale: Español notifications: index: empty_notifications: No tienes notificaciones nuevas. diff --git a/config/locales/es-VE/general.yml b/config/locales/es-VE/general.yml index fd872346f..8443149bb 100644 --- a/config/locales/es-VE/general.yml +++ b/config/locales/es-VE/general.yml @@ -236,7 +236,6 @@ es-VE: text_sign_in: iniciar sesión text_sign_up: registrarte title: '¿Cómo puedo comentar este documento?' - locale: Español notifications: index: empty_notifications: No tienes notificaciones nuevas. diff --git a/config/locales/gl/general.yml b/config/locales/gl/general.yml index e1d00b556..2171e8ecc 100644 --- a/config/locales/gl/general.yml +++ b/config/locales/gl/general.yml @@ -249,7 +249,6 @@ gl: text_sign_in: iniciar sesión text_sign_up: rexístrate title: Como podo comentar este documento? - locale: Galego notifications: index: empty_notifications: Non tes notificacións novas. diff --git a/config/locales/id-ID/general.yml b/config/locales/id-ID/general.yml index 95dc6ee22..a4e343b44 100644 --- a/config/locales/id-ID/general.yml +++ b/config/locales/id-ID/general.yml @@ -229,7 +229,6 @@ id: text_sign_in: masuk text_sign_up: daftar title: Bagaimana saya dapat mengomentari dokumen ini? - locale: Bahasa Inggris notifications: index: empty_notifications: Anda tidak memiliki pemberitahuan baru. diff --git a/config/locales/sv/general.yml b/config/locales/sv/general.yml index 3e91a8b7a..a207a28f7 100644 --- a/config/locales/sv/general.yml +++ b/config/locales/sv/general.yml @@ -249,7 +249,6 @@ sv: text_sign_in: logga in text_sign_up: registrera dig title: Hur kommenterar jag det här dokumentet? - locale: Svenska notifications: index: empty_notifications: Du har inga nya aviseringar. diff --git a/config/locales/zh-TW/general.yml b/config/locales/zh-TW/general.yml index 80aef4fb8..4115536e4 100644 --- a/config/locales/zh-TW/general.yml +++ b/config/locales/zh-TW/general.yml @@ -241,7 +241,6 @@ zh-TW: text_sign_in: 登錄 text_sign_up: 登記 title: 我怎樣能對此文檔作評論？ - locale: 英文 notifications: index: empty_notifications: 您沒有新通知。 From f2fe230a1531270aaf098e637fcdedaee42c6afa Mon Sep 17 00:00:00 2001 From: voodoorai2000 Date: Tue, 9 Oct 2018 22:01:52 +0200 Subject: [PATCH 010/100] Add all available locales Only addding those with significant number of translations --- config/application.rb | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/config/application.rb b/config/application.rb index e851bc345..f78d971bf 100644 --- a/config/application.rb +++ b/config/application.rb @@ -20,8 +20,26 @@ module Consul # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] config.i18n.default_locale = :en - config.i18n.available_locales = [:en, :es, :fr, :nl, 'pt-BR'] config.i18n.fallbacks = {'fr' => 'es', 'pt-br' => 'es', 'nl' => 'en'} + available_locales = [ + "ar", + "de", + "en", + "es", + "fa", + "fr", + "gl", + "he", + "it", + "nl", + "pl", + "pt-BR", + "sq", + "sv", + "val", + "zh-CN", + "zh-TW"] + config.i18n.available_locales = available_locales config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')] config.i18n.load_path += Dir[Rails.root.join('config', 'locales', 'custom', '**', '*.{rb,yml}')] From 3b8bb5038d7a86ff33dd482ecc6eeb08dc0b7838 Mon Sep 17 00:00:00 2001 From: voodoorai2000 Date: Tue, 9 Oct 2018 22:04:53 +0200 Subject: [PATCH 011/100] Add fallback i18n locales MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All other languages will fallback to the default locale Rails also, seems to pick up dialect fallbacks, for locales with this format: es-CO, es-PE, etc, which will fallback to "es", so that is great 😌 --- config/application.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/config/application.rb b/config/application.rb index f78d971bf..1428a628e 100644 --- a/config/application.rb +++ b/config/application.rb @@ -20,7 +20,6 @@ module Consul # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] config.i18n.default_locale = :en - config.i18n.fallbacks = {'fr' => 'es', 'pt-br' => 'es', 'nl' => 'en'} available_locales = [ "ar", "de", @@ -40,6 +39,14 @@ module Consul "zh-CN", "zh-TW"] config.i18n.available_locales = available_locales + config.i18n.fallbacks = { + 'ast' => 'es', + 'ca' => 'es', + 'fr' => 'es', + 'gl' => 'es', + 'it' => 'es', + 'pt-BR' => 'es' + } config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')] config.i18n.load_path += Dir[Rails.root.join('config', 'locales', 'custom', '**', '*.{rb,yml}')] From e771440d18e3a4e68d1e24147af6d428446acdd9 Mon Sep 17 00:00:00 2001 From: voodoorai2000 Date: Tue, 16 Oct 2018 21:13:18 +0200 Subject: [PATCH 012/100] Remove duplicate language names --- config/locales/de-DE/i18n.yml | 4 ---- config/locales/fa-IR/i18n.yml | 4 ---- config/locales/pl-PL/i18n.yml | 4 ---- config/locales/sq-AL/i18n.yml | 4 ---- config/locales/sv-SE/i18n.yml | 4 ---- 5 files changed, 20 deletions(-) delete mode 100644 config/locales/de-DE/i18n.yml delete mode 100644 config/locales/fa-IR/i18n.yml delete mode 100644 config/locales/pl-PL/i18n.yml delete mode 100644 config/locales/sq-AL/i18n.yml delete mode 100644 config/locales/sv-SE/i18n.yml diff --git a/config/locales/de-DE/i18n.yml b/config/locales/de-DE/i18n.yml deleted file mode 100644 index 2af5e0763..000000000 --- a/config/locales/de-DE/i18n.yml +++ /dev/null @@ -1,4 +0,0 @@ -de-DE: - i18n: - language: - name: 'Deutsch' \ No newline at end of file diff --git a/config/locales/fa-IR/i18n.yml b/config/locales/fa-IR/i18n.yml deleted file mode 100644 index 49e627973..000000000 --- a/config/locales/fa-IR/i18n.yml +++ /dev/null @@ -1,4 +0,0 @@ -fa-IR: - i18n: - language: - name: 'فارسى' \ No newline at end of file diff --git a/config/locales/pl-PL/i18n.yml b/config/locales/pl-PL/i18n.yml deleted file mode 100644 index f71f91592..000000000 --- a/config/locales/pl-PL/i18n.yml +++ /dev/null @@ -1,4 +0,0 @@ -pl-PL: - i18n: - language: - name: 'Polski' \ No newline at end of file diff --git a/config/locales/sq-AL/i18n.yml b/config/locales/sq-AL/i18n.yml deleted file mode 100644 index 162c1a5f0..000000000 --- a/config/locales/sq-AL/i18n.yml +++ /dev/null @@ -1,4 +0,0 @@ -sq-AL: - i18n: - language: - name: 'Shqiptar' \ No newline at end of file diff --git a/config/locales/sv-SE/i18n.yml b/config/locales/sv-SE/i18n.yml deleted file mode 100644 index ae8ac30f7..000000000 --- a/config/locales/sv-SE/i18n.yml +++ /dev/null @@ -1,4 +0,0 @@ -sv-SE: - i18n: - language: - name: 'Svenska' \ No newline at end of file From 8eb399150e823f2a7db85843a3c69f087894de54 Mon Sep 17 00:00:00 2001 From: voodoorai2000 Date: Tue, 16 Oct 2018 21:14:39 +0200 Subject: [PATCH 013/100] Remove fallback rules for locales not yet added --- config/application.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/config/application.rb b/config/application.rb index 1428a628e..ad39ae88f 100644 --- a/config/application.rb +++ b/config/application.rb @@ -40,8 +40,6 @@ module Consul "zh-TW"] config.i18n.available_locales = available_locales config.i18n.fallbacks = { - 'ast' => 'es', - 'ca' => 'es', 'fr' => 'es', 'gl' => 'es', 'it' => 'es', From 3976b2f4f248ac5d4f35aafe29a31d46e0c20b2f Mon Sep 17 00:00:00 2001 From: voodoorai2000 Date: Wed, 10 Oct 2018 11:33:48 +0200 Subject: [PATCH 014/100] Fix pluralization spec when using different default locale This spec was failing due to using :es as the default_locale in application.rb[1], but using :en as the default_locale in the test environment[2] The fallback rules where getting a little confused and not including the default locale, for the test environment, in the fallback rules With this commit we are making sure that rule is created, as it would in a production environment that uses the default_locale in application.rb [1] https://github.com/AyuntamientoMadrid/consul/blob/master/config/application.rb#L22 [2] https://github.com/AyuntamientoMadrid/consul/blob/master/spec/rails_helper.rb#L15 --- spec/i18n_spec.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb index 7fb59edde..e1d60e2fc 100644 --- a/spec/i18n_spec.rb +++ b/spec/i18n_spec.rb @@ -44,6 +44,7 @@ describe 'I18n' do I18n.enforce_available_locales = false I18n.locale = :zz + I18n.fallbacks[:zz] << I18n.default_locale expect(I18n.t("test_plural", count: 0)).to eq("No comments") expect(I18n.t("test_plural", count: 1)).to eq("1 comment") From dbf41421ed9debde35d6ff47b06d6291202e2812 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 28 Sep 2018 17:55:01 +0200 Subject: [PATCH 015/100] Removes guide feature --- app/assets/stylesheets/participation.scss | 92 ------------------- app/controllers/guides_controller.rb | 8 -- app/helpers/guides_helper.rb | 19 ---- .../information_texts/_tabs.html.erb | 6 +- app/views/budgets/index.html.erb | 2 +- app/views/guides/new.html.erb | 58 ------------ app/views/proposals/index.html.erb | 4 +- config/i18n-tasks.yml | 1 - config/locales/en/admin.yml | 3 +- config/locales/en/guides.yml | 18 ---- config/locales/es/admin.yml | 3 +- config/locales/es/guides.yml | 18 ---- config/routes.rb | 1 - config/routes/guide.rb | 1 - db/dev_seeds/settings.rb | 1 - db/seeds.rb | 1 - .../information_texts_spec.rb | 5 +- spec/features/guides_spec.rb | 66 ------------- 18 files changed, 9 insertions(+), 298 deletions(-) delete mode 100644 app/controllers/guides_controller.rb delete mode 100644 app/helpers/guides_helper.rb delete mode 100644 app/views/guides/new.html.erb delete mode 100644 config/locales/en/guides.yml delete mode 100644 config/locales/es/guides.yml delete mode 100644 config/routes/guide.rb delete mode 100644 spec/features/guides_spec.rb diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index cafbb52be..bb600ff83 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -9,7 +9,6 @@ // 07. Proposals successful // 08. Polls // 09. Polls results and stats -// 10. Guides // // 01. Votes and supports @@ -2095,94 +2094,3 @@ line-height: rem-calc(60); } } - -// 10. Guides -// ---------------------- - -.guides { - - h2 { - margin: $line-height 0 $line-height * 2; - } - - .guide-budget, - .guide-proposal { - border-radius: rem-calc(3); - margin: $line-height 0; - padding: $line-height; - position: relative; - - .button { - color: $text; - font-weight: bold; - } - - &::before { - border-radius: 100%; - color: #fff; - font-family: "icons" !important; - height: rem-calc(80); - left: 50%; - line-height: rem-calc(80); - margin-left: rem-calc(-40); - position: absolute; - text-align: center; - top: -40px; - width: rem-calc(80); - z-index: 99; - } - } - - .guide-budget { - border: 1px solid $budget; - - &::before { - background: $budget; - content: '\53'; - font-size: rem-calc(40); - } - - .button { - background: #f8f5f9; - border: 1px solid $budget; - } - } - - .guide-proposal { - border: 1px solid $proposals; - - &::before { - background: $proposals; - content: '\68'; - font-size: rem-calc(40); - } - - .button { - background: #fffaf4; - border: 1px solid $proposals; - } - } - - ul { - - @include breakpoint(medium) { - min-height: $line-height * 14; - } - - li { - margin-bottom: $line-height; - padding-left: $line-height; - position: relative; - - &::before { - color: #37af65; - content: '\56'; - font-family: "icons" !important; - font-size: $small-font-size; - left: 0; - position: absolute; - top: 1px; - } - } - } -} diff --git a/app/controllers/guides_controller.rb b/app/controllers/guides_controller.rb deleted file mode 100644 index 0a03955e9..000000000 --- a/app/controllers/guides_controller.rb +++ /dev/null @@ -1,8 +0,0 @@ -class GuidesController < ApplicationController - - skip_authorization_check - - def new - end - -end \ No newline at end of file diff --git a/app/helpers/guides_helper.rb b/app/helpers/guides_helper.rb deleted file mode 100644 index dd504d7d6..000000000 --- a/app/helpers/guides_helper.rb +++ /dev/null @@ -1,19 +0,0 @@ -module GuidesHelper - - def new_proposal_guide - if feature?('guides') && Budget.current&.accepting? - new_guide_path - else - new_proposal_path - end - end - - def new_budget_investment_guide - if feature?('guides') - new_guide_path - else - new_budget_investment_path(current_budget) - end - end - -end diff --git a/app/views/admin/site_customization/information_texts/_tabs.html.erb b/app/views/admin/site_customization/information_texts/_tabs.html.erb index a28fb8f17..0b6cd61fe 100644 --- a/app/views/admin/site_customization/information_texts/_tabs.html.erb +++ b/app/views/admin/site_customization/information_texts/_tabs.html.erb @@ -1,11 +1,11 @@
    - <% [:debates, :community, :proposals, :polls, :layouts, :mailers, :management, :guides, :welcome].each do |tab| %> + <% [:debates, :community, :proposals, :polls, :layouts, :mailers, :management, :welcome].each do |tab| %>
  • - <% if tab.to_s == @tab %> + <% if tab.to_s == @tab %> <%= link_to t("admin.menu.site_customization.information_texts_menu.#{tab}"), admin_site_customization_information_texts_path(tab: tab), :class => 'is-active' %> <% else %> <%= link_to t("admin.menu.site_customization.information_texts_menu.#{tab}"), admin_site_customization_information_texts_path(tab: tab) %> - <% end %> + <% end %>
    • <% end %>
diff --git a/app/views/budgets/index.html.erb b/app/views/budgets/index.html.erb index 9d73bf571..729975469 100644 --- a/app/views/budgets/index.html.erb +++ b/app/views/budgets/index.html.erb @@ -33,7 +33,7 @@ <% if current_user %> <% if current_user.level_two_or_three_verified? %> <%= link_to t("budgets.investments.index.sidebar.create"), - new_budget_investment_guide, + new_budget_investment_path(@budget), class: "button margin-top expanded" %> <% else %>
diff --git a/app/views/guides/new.html.erb b/app/views/guides/new.html.erb deleted file mode 100644 index 314941ca4..000000000 --- a/app/views/guides/new.html.erb +++ /dev/null @@ -1,58 +0,0 @@ -
-
-
-

<%= t("guides.title", org: setting['org_name']) %>

-

<%= t("guides.subtitle") %>

-
-
- -
- -
-
-

- <%= t("guides.budget_investment.title") %> -

- -
    -
  • <%= t("guides.budget_investment.feature_1_html") %>
    • -
  • <%= t("guides.budget_investment.feature_2_html") %>
    • -
  • <%= t("guides.budget_investment.feature_3_html") %>
    • -
  • <%= t("guides.budget_investment.feature_4_html") %>
    • -
- <% if current_budget %> -
- <%= link_to t("guides.budget_investment.new_button"), - new_budget_investment_path(current_budget), - class: "button expanded" %> -
- <% end %> -
-
- -
-
-

- <%= t("guides.proposal.title") %> -

- -
    -
  • <%= t("guides.proposal.feature_1_html") %>
    • -
  • - <%= t("guides.proposal.feature_2_html", - votes: setting["votes_for_proposal_success"], - org: setting['org_name']) %> -
    • -
  • <%= t("guides.proposal.feature_3_html") %>
    • -
  • <%= t("guides.proposal.feature_4_html") %>
    • -
- -
- <%= link_to t("guides.proposal.new_button"), - new_proposal_path, - class: "button expanded" %> -
-
-
-
-
diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb index 2217513f8..0e19f0795 100644 --- a/app/views/proposals/index.html.erb +++ b/app/views/proposals/index.html.erb @@ -76,7 +76,7 @@ <% if @proposals.any? %>
<%= link_to t("proposals.index.start_proposal"), - new_proposal_guide, + new_proposal_path, class: 'button expanded' %>
<% end %> @@ -109,7 +109,7 @@