Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add missing translations (en); and enforce coverage. #3184

Open
wants to merge 33 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
3802374
Add spec for detecting missed translations
CloCkWeRX Dec 9, 2022
c51dd50
Translations
CloCkWeRX Dec 9, 2022
e325d7a
Skip images. Later, may want to add js checking for any i18n usage there
CloCkWeRX Dec 9, 2022
eec7bac
Fix button translations
CloCkWeRX Dec 9, 2022
9250a17
Fix buttons
CloCkWeRX Dec 9, 2022
9f47081
Add missing translations, auto generated. May want to duplicate the c…
CloCkWeRX Dec 9, 2022
5370dc9
[CodeFactor] Apply fixes
code-factor Dec 9, 2022
974a101
Update en.yml
CloCkWeRX Dec 9, 2022
d1b25ef
Update config/locales/en.yml
CloCkWeRX Dec 9, 2022
6e36525
Update config/locales/en.yml
CloCkWeRX Dec 9, 2022
6719024
Update en.yml
CloCkWeRX Dec 9, 2022
a14cc80
Add rails-i18n
CloCkWeRX Dec 9, 2022
70726e7
Fix translations
CloCkWeRX Dec 9, 2022
03c65ad
Codefactor
CloCkWeRX Dec 9, 2022
54169fe
Adjust translates
CloCkWeRX Dec 10, 2022
8512a19
Remove unused keys
CloCkWeRX Dec 10, 2022
1e30aa7
Remove old keys
CloCkWeRX Dec 10, 2022
fa15889
Disable normalisation test for now
CloCkWeRX Dec 10, 2022
d0185c4
Remove dead translations
CloCkWeRX Dec 10, 2022
9265cad
Remove more unused translations
CloCkWeRX Dec 10, 2022
ef427a7
Remove more unused
CloCkWeRX Dec 10, 2022
a839d68
Remove more unused
CloCkWeRX Dec 10, 2022
7598f84
Remove unused
CloCkWeRX Dec 10, 2022
60a9d54
Remove unused
CloCkWeRX Dec 10, 2022
2853f72
Remove unused
CloCkWeRX Dec 10, 2022
051bfd5
Remove unused keys
CloCkWeRX Dec 10, 2022
497f14c
Remove unused keys
CloCkWeRX Dec 10, 2022
fbd8406
Remove model singular forms, we don't use them
CloCkWeRX Dec 10, 2022
32268e3
Merge branch 'dev' into issue/2745-translations
CloCkWeRX Dec 10, 2022
8934e30
Remove japanese local, as it is largely untranslated
CloCkWeRX Dec 10, 2022
ca92416
Update app/views/layouts/_menu.haml
CloCkWeRX Dec 10, 2022
177ca58
Drop pointless translations
CloCkWeRX Dec 10, 2022
e6563d0
Merge branch 'dev' into issue/2745-translations
CloCkWeRX Mar 13, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ gem 'faraday'
gem 'faraday_middleware'

gem 'rack-cors'
gem 'rails-i18n'

group :production do
gem 'bonsai-elasticsearch-rails' # Integration with Bonsa-Elasticsearch on heroku
Expand Down
1 change: 1 addition & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -721,6 +721,7 @@ DEPENDENCIES
rails (~> 7.0.4)
rails-assets-leaflet.markercluster!
rails-controller-testing
rails-i18n
rails_12factor
rake (>= 10.0.0)
responders
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/index.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
%li= link_to "Roles", admin_roles_path, class: 'nav-link'
%li= link_to "Forums", forums_path, class: 'nav-link'
%li= link_to "CMS", comfy_admin_cms_path, class: 'nav-link'
%li= link_to t('.garden_types'), garden_types_path, class: 'nav-link'
%li= link_to t('layouts.header.garden_types'), garden_types_path, class: 'nav-link'

.col-md-4
.card
Expand Down
4 changes: 2 additions & 2 deletions app/views/admin/roles/index.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
- if can? :edit, role
= link_to edit_admin_role_path(role), class: 'btn btn-default btn-xs' do
= edit_icon
= t('.edit')
= t('buttons.edit')
- if can?(:destroy, role) && ! role.members.any?
= link_to admin_role_path(role), method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-default btn-xs text-danger' do
= delete_icon
= t('.delete')
= t('buttons.delete')
4 changes: 2 additions & 2 deletions app/views/crops/_alternate_names.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
- if can? :edit, an
= link_to edit_alternate_name_path(an), class: 'dropdown-item' do
= edit_icon
= t('.edit')
= t('buttons.edit')
- if can? :destroy, an
= link_to an, method: :delete, data: { confirm: 'Are you sure?' }, class: 'dropdown-item' do
= delete_icon
= t('.delete')
= t('buttons.delete')
- else
.badge= an.name

Expand Down
4 changes: 2 additions & 2 deletions app/views/crops/_scientific_names.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
.dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "planting-actions-button"}
= link_to edit_scientific_name_path(sn), class: 'dropdown-item' do
= edit_icon
= t('.edit')
= t('buttons.edit')
.dropdown-divider
= link_to sn, method: :delete, data: { confirm: 'Are you sure?' }, class: 'dropdown-item text-danger' do
= delete_icon
= t('.delete')
= t('buttons.delete')
- else
.badge= sn.name

Expand Down
2 changes: 1 addition & 1 deletion app/views/crops/_wrangle.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
.dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "crop-actions-button"}
= link_to edit_crop_path(crop), class: 'dropdown-item' do
= edit_icon
= t('.edit')
= t('buttons.edit')

= link_to crop_openfarm_path(crop), method: :post, class: 'dropdown-item' do
= icon 'far', 'update'
Expand Down
44 changes: 22 additions & 22 deletions app/views/layouts/_menu.haml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
%li.nav-item.dropdown
%a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", href: "#", role: "button"}
= image_tag "icons/gardener.svg", class: 'img img-icon'
= t('.record')
= t('layouts.header.record')
.dropdown-menu
= link_to new_planting_path, class: 'dropdown-item' do
= image_icon('planting-add')
Expand All @@ -27,36 +27,36 @@

- cache("everyone-menu", expires_in: 1.week) do
%li.nav-item.dropdown
%a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", href: "#", role: "button"}= t('.crops')
%a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", href: "#", role: "button"}= Crop.model_name.human(count: 2).titleize
CloCkWeRX marked this conversation as resolved.
Show resolved Hide resolved
CloCkWeRX marked this conversation as resolved.
Show resolved Hide resolved
.dropdown-menu
= link_to crops_path, class: 'dropdown-item' do
= t('.browse_crops')
= t('layouts.header.browse_crops')
= link_to seeds_path, class: 'dropdown-item' do
= seed_icon
= t('.seeds')
= t('layouts.header.seeds')
= link_to plantings_path, class: 'dropdown-item' do
= planting_icon
= t('.plantings')
= t('layouts.header.plantings')
= link_to harvests_path, class: 'dropdown-item' do
= harvest_icon
= t('.harvests')
= t('layouts.header.harvests')
%li.nav-item.dropdown
%a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", href: "#", role: "button"}= t('.community')
%a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", href: "#", role: "button"}= t('layouts.header.community')
CloCkWeRX marked this conversation as resolved.
Show resolved Hide resolved
CloCkWeRX marked this conversation as resolved.
Show resolved Hide resolved
.dropdown-menu{"aria-labelledby" => "navbarDropdown"}
= link_to t('.community_map'), places_path, class: 'dropdown-item'
= link_to t('.browse_members'), members_path, class: 'dropdown-item'
= link_to t('.posts'), posts_path, class: 'dropdown-item'
= link_to t('.forums'), forums_path, class: 'dropdown-item'
= link_to t('layouts.header.community_map'), places_path, class: 'dropdown-item'
= link_to t('layouts.header.browse_members'), members_path, class: 'dropdown-item'
= link_to Post.model_name.human(count: 2).titleize, posts_path, class: 'dropdown-item'
= link_to t('layouts.header.forums'), forums_path, class: 'dropdown-item'

- if member_signed_in?
- if current_member.role?(:crop_wrangler) || current_member.role?(:admin)
%li.nav-item.dropdown
%a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", href: "#", role: "button"}= t('.admin')
%a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", href: "#", role: "button"}= t('layouts.header.admin')
CloCkWeRX marked this conversation as resolved.
Show resolved Hide resolved
CloCkWeRX marked this conversation as resolved.
Show resolved Hide resolved
.dropdown-menu{"aria-labelledby" => "navbarDropdown"}
- if current_member.role?(:crop_wrangler)
= link_to t('.crop_wrangling'), wrangle_crops_path, class: 'dropdown-item'
= link_to t('layouts.header.crop_wrangling'), wrangle_crops_path, class: 'dropdown-item'
- if current_member.role?(:admin)
= link_to t('.admin'), admin_path, class: 'dropdown-item'
= link_to t('layouts.header.admin'), admin_path, class: 'dropdown-item'

%li.nav-item.dropdown
%a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", href: "#", role: "button"}
Expand All @@ -66,25 +66,25 @@
%span.badge.badge-info= current_member.unread_count
.dropdown-menu{"aria-labelledby" => "navbarDropdown"}
= link_to member_path(current_member), class: 'dropdown-item' do
= t('.profile')
= t('layouts.header.profile')
= link_to member_gardens_path(current_member), class: 'dropdown-item' do
= t('.gardens')
= Garden.model_name.human(count: 2).titleize
= link_to member_plantings_path(current_member), class: 'dropdown-item' do
= t('.plantings')
= Planting.model_name.human(count: 2).titleize
= link_to member_harvests_path(current_member), class: 'dropdown-item' do
= t('.harvest')
= Harvest.model_name.human(count: 2).titleize
= link_to member_seeds_path(current_member), class: 'dropdown-item' do
= t('.seeds')
= link_to t('.posts'), member_posts_path(current_member), class: 'dropdown-item'
= Seed.model_name.human(count: 2).titleize
= link_to Post.model_name.human(count: 2).titleize, member_posts_path(current_member), class: 'dropdown-item'

- if current_member.unread_count.positive?
.dropdown-divider
%strong
= link_to(conversations_path, class: 'dropdown-item') do
= t('.inbox')
= t('layouts.header.inbox')
%span.badge.badge-info= current_member.unread_count
- else
= link_to t('.inbox'), conversations_path, class: 'dropdown-item'
= link_to t('layouts.header.inbox'), conversations_path, class: 'dropdown-item'
.dropdown-divider
= link_to t('.sign_out'), destroy_member_session_path, method: :delete, class: 'dropdown-item'

Expand Down
3 changes: 2 additions & 1 deletion config/i18n-tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ search:

## Paths to search in, passed to File.find
paths:
- app/
- app/views/
- app/controllers/

## Root for resolving relative keys (default)
# relative_roots:
Expand Down
Loading