Skip to content

Commit

Permalink
Fix: add missing translations for export dropdown in proposals admin (#…
Browse files Browse the repository at this point in the history
…582)

* fix: add missing translations for export dropdown in proposals admin

* fix: trying add necessary libu2f-udev dependance for google-chrome-stable install

* fix: add command to block updates of chrome

* fix: add command to unisntall old version of chrome

* test: update failing test

* chore:update config file after i18n test

* ci: add check of chrome version

* ci: last try to resolve chrome version

* ci: last attempt fix

* ci: back to previous code

* ci: try remove downgrade of chrome

* ci: back to code with downgrade

* add missing dependency for chrome custom install

---------

Co-authored-by: moustachu <[email protected]>
  • Loading branch information
Stef-Rousset and moustachu authored Sep 2, 2024
1 parent 0b2bee4 commit f96f4a1
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 1 deletion.
7 changes: 7 additions & 0 deletions .github/workflows/ci_cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ jobs:
ruby-version: ${{ env.RUBY_VERSION }}
bundler-cache: true
- run: |
sudo apt install libu2f-udev
wget --no-verbose -O /tmp/chrome.deb https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${{env.CHROME_VERSION}}-1_amd64.deb
sudo dpkg -i /tmp/chrome.deb
rm /tmp/chrome.deb
Expand Down Expand Up @@ -161,6 +162,12 @@ jobs:
with:
ruby-version: ${{ env.RUBY_VERSION }}
bundler-cache: true
- run: |
sudo apt install libu2f-udev
wget --no-verbose -O /tmp/chrome.deb https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${{env.CHROME_VERSION}}-1_amd64.deb
sudo dpkg -i /tmp/chrome.deb
rm /tmp/chrome.deb
name: Install Chrome version ${{ env.CHROME_VERSION }}
- uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}
Expand Down
3 changes: 3 additions & 0 deletions config/i18n-tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ ignore_unused:
- faker.*
- activemodel.attributes.osp_authorization_handler.*
- activemodel.attributes.participatory_process.private_space
- decidim.admin.exports.export_as
- decidim.amendments.emendation.announcement.evaluating
- decidim.authorization_handlers.osp_authorization_handler.{explanation, name}
- decidim.authorization_handlers.osp_authorization_handler.fields.*
Expand All @@ -135,6 +136,8 @@ ignore_unused:
- decidim.meetings.meeting.not_allowed
- decidim.meetings.directory.meetings.index.all
- decidim.meetings.meetings.{create, update}.{invalid, success}
- decidim.proposals.admin.exports.awesome_private_proposals
- decidim.proposals.admin.exports.proposal_comments
- decidim.scopes.global
- decidim.scopes.picker.*
- decidim.system.organizations.omniauth_settings.{france_connect, france_connect_profile, france_connect_uid}.*
Expand Down
5 changes: 5 additions & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ en:
decidim:
admin:
exports:
export_as: "%{name} as %{export_format}"
notice: Your export is currently in progress. You'll receive an email when it's complete.
participatory_space_private_users:
create:
Expand Down Expand Up @@ -130,6 +131,10 @@ en:
show:
local_area: Organization area
proposals:
admin:
exports:
awesome_private_proposals: Proposals with private fields
proposal_comments: Comments
collaborative_drafts:
new:
add_file: Add file
Expand Down
5 changes: 5 additions & 0 deletions config/locales/fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ fr:
decidim:
admin:
exports:
export_as: "%{name} au format %{export_format}"
notice: Votre exportation est en cours. Vous recevrez un e-mail quand elle sera terminée.
menu:
admin_accountability: Admin accountability
Expand Down Expand Up @@ -132,6 +133,10 @@ fr:
show:
local_area: Espace d'organisation
proposals:
admin:
exports:
awesome_private_proposals: Propositions avec champs privés
proposal_comments: Commentaires
collaborative_drafts:
new:
add_file: Ajouter le fichier
Expand Down
2 changes: 1 addition & 1 deletion spec/jobs/export_job_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module Admin
let!(:admin) { create(:user, :admin, organization: organization) }
let!(:admin_of_the_process) { create(:user, organization: organization) }
let!(:participatory_process) { create(:participatory_process, organization: organization) }
let(:proposal) { create(:proposal) }
let(:proposal) { create(:extended_proposal) }
let(:collection) { [proposal] } # Use an array with the instance_double
let(:export_manifest) do
instance_double(
Expand Down

0 comments on commit f96f4a1

Please sign in to comment.