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

Fix the capitalization of: Current folder #1697

Merged
merged 3 commits into from
Nov 6, 2023
Merged

Fix the capitalization of: Current folder #1697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b67e38
Fix the capitalization of: Current folder
whabanks Nov 2, 2023
f7f6df1
Merge branch 'main' into fix/current-folder-case
whabanks Nov 3, 2023
4edec9b
Merge branch 'main' into fix/current-folder-case
jzbahrai Nov 6, 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
2 changes: 1 addition & 1 deletion app/main/views/templates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ def choose_template(service_id, template_type="all", template_folder_id=None):
allow_adding_copy_of_template=(current_service.all_templates or len(current_user.service_ids) > 1),
)

option_hints = {template_folder_id if template_folder_id is not None else "__NONE__": _l("current folder")}
option_hints = {template_folder_id if template_folder_id is not None else "__NONE__": _l("Current folder")}

if request.method == "POST" and templates_and_folders_form.validate_on_submit():
if not current_user.has_permissions("manage_templates"):
Expand Down
2 changes: 1 addition & 1 deletion app/translations/csv/fr.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1770,4 +1770,4 @@
"Sent by email","Envoyé par courriel"
"Sent Time","Heure d’envoi"
"Job","Tâche"
"current folder","dossier actuel"
"Current folder","Dossier actuel"
4 changes: 2 additions & 2 deletions tests/app/main/views/test_template_folders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1023,7 +1023,7 @@ def test_should_show_radios_and_buttons_for_move_destination_if_correct_permissi
FOLDER_TWO_ID,
]
assert [normalize_spaces(x) for x in radio_div.select("label")] == [
"Templates current folder",
"Templates Current folder",
"folder_one",
"folder_one_one",
"folder_one_two",
Expand Down Expand Up @@ -1159,7 +1159,7 @@ def test_move_folder_form_shows_current_folder_hint_when_in_a_folder(

assert len(move_form_labels) == 3
assert normalize_spaces(move_form_labels[0].text) == "Templates"
assert normalize_spaces(move_form_labels[1].text) == "parent_folder current folder"
assert normalize_spaces(move_form_labels[1].text) == "parent_folder Current folder"
assert normalize_spaces(move_form_labels[2].text) == "child_folder"


Expand Down