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.

Sign up for GitHub

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

Jump to bottom

💫 Modify text for 'add image gallery' button for flatpages #4339

Merged
merged 1 commit into from
Oct 21, 2024
Merged

💫 Modify text for 'add image gallery' button for flatpages #4339

merged 1 commit into from
Oct 21, 2024

Conversation

justinefricou
Copy link
Contributor

@justinefricou justinefricou commented Oct 17, 2024 •
edited
Loading

Description

Related Issue

Checklist

  • I have followed the guidelines in our Contributing document
  • My code respects the Definition of done available in the Development section of the documentation
  • I have performed a self-review of my code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have added tests that prove my fix is effective or that my feature works.
  • New and existing unit tests pass locally with my changes
  • I added an entry in the changelog file
  • My commits are all using prefix convention (emoji + tag name) and references associated issues
  • I added a label to the PR corresponding to the perimeter of my contribution
  • The title of my PR mentionned the issue associated

@codecov Codecov
Copy link

codecov bot commented Oct 17, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.41%. Comparing base (7d721f0) to head (7c0d3f3).
Report is 6 commits behind head on master.

Additional details and impacted files 
@@           Coverage Diff           @@
##           master    #4339   +/-   ##
=======================================
  Coverage   98.41%   98.41%           
=======================================
  Files         267      267           
  Lines       20928    20928           
=======================================
  Hits        20596    20596           
  Misses        332      332

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@cypress Cypress
Copy link

cypress bot commented Oct 17, 2024 •
edited
Loading

Geotrek-admin    Run #10138

Run Properties:  status check passed Passed #10138  •  git commit c5f04ae66a ℹ️: Merge 7c0d3f3451c3bcd05e83bd0d13a050307d5aa720 into 474f8b901f53c45f9b23a49bbe3f...
Project Geotrek-admin
Run status status check passed Passed #10138
Run duration 02m 09s
Commit git commit c5f04ae66a ℹ️: Merge 7c0d3f3451c3bcd05e83bd0d13a050307d5aa720 into 474f8b901f53c45f9b23a49bbe3f...
Committer Justine Fricou
View all properties for this run ↗︎
Test results
Tests that failed  Failures 0
Tests that were flaky  Flaky 0
Tests that did not run due to a developer annotating a test with .skip  Pending 0
Tests that did not run due to a failure in a mocha hook  Skipped 0
Tests that passed  Passing 22

submarcos
submarcos reviewed Oct 17, 2024
View reviewed changes
Copy link
Member

@submarcos submarcos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fix and improve french translation

dtrucs
dtrucs reviewed Oct 18, 2024
View reviewed changes
geotrek/flatpages/locale/fr/LC_MESSAGES/django.po Outdated
Comment on lines 107 to 119
msgid "Trek"
msgstr ""

#, fuzzy
#| msgid "HTML content"
msgid "Touristic content"
msgstr "Contenu HTML"

msgid "Touristic event"
msgstr ""

msgid "Outdoor Site"
msgstr ""
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's something I don't understand.
Today, the translations are correct without adding "Trek, Touristic event, etc" to these .po files.
I assumed this was defined elsewhere (it seems legitimate because these locales are literally everywhere in this project).

Don't hesitate to tell me i'm wrong. :D

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The locales are generated by Django application, they were probably new in this app (flatpages folder) even though they already were in other apps, and so were already found on the front

@justinefricou justinefricou force-pushed the modify_text_for_flatpages_image_galleries branch from 02cc851 to 44b467b Compare October 18, 2024 16:15
@justinefricou justinefricou marked this pull request as ready for review October 21, 2024 10:09
@justinefricou
Modify text/translations for flatpages:
7c0d3f3 
* Modify text for 'add image gallery' button
* Add new translations
* Fix existing translations
@justinefricou justinefricou force-pushed the modify_text_for_flatpages_image_galleries branch from 44b467b to 7c0d3f3 Compare October 21, 2024 12:03
@babastienne babastienne requested a review from Chatewgne October 21, 2024 12:13
@justinefricou justinefricou merged commit c7d7831 into master Oct 21, 2024
24 checks passed
@justinefricou justinefricou deleted the modify_text_for_flatpages_image_galleries branch October 21, 2024 14:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dtrucs dtrucs dtrucs left review comments

@Chatewgne Chatewgne Chatewgne approved these changes

@submarcos submarcos Awaiting requested review from submarcos

Assignees
No one assigned
Labels
💫 Improvements
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@justinefricou @dtrucs @submarcos @Chatewgne