Skip to content

Commit

Permalink
Update urlname translation to URL-Path
Browse files Browse the repository at this point in the history
That's what this part of the URL is called according to RFC 1738
  • Loading branch information
tvdeyen committed Jun 2, 2020
1 parent 40ce6ae commit 68c7e02
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion app/views/alchemy/admin/pages/info.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<p><%= @page.layout_display_name %></p>
</div>
<div class="value">
<label><%= Alchemy::LegacyPageUrl.human_attribute_name(:urlname) %></label>
<label><%= Alchemy::Page.human_attribute_name(:urlname) %></label>
<p><%= "/#{@page.urlname}" %></p>
</div>
<div class="value">
Expand Down
11 changes: 5 additions & 6 deletions config/locales/alchemy.en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,6 @@ en:
button_label: Upload image(s)
upload_success: "Picture %{name} uploaded successfully"
upload_failure: "Error while uploading %{name}: %{error}"
url_name: "URL-Name"
visible: "visible"
want_to_create_new_language: "Do you want to create a new empty language tree?"
want_to_make_copy_of_existing_language: "Do you want to copy an existing language tree?"
Expand Down Expand Up @@ -675,9 +674,9 @@ en:
page_layout:
blank: "^Please choose a page layout."
urlname:
too_short: "^The pages urlname is too short (minimum of 3 characters)."
taken: "^URL-Name already taken."
exclusion: "^URL-Name reserved."
too_short: "^URL-Path is too short (minimum of 3 characters)."
taken: "^URL-Path already taken."
exclusion: "^URL-Path reserved."
alchemy/picture:
attributes:
image_file:
Expand Down Expand Up @@ -799,7 +798,7 @@ en:
locale: Localization
code: ISO Code
alchemy/legacy_page_url:
urlname: "URL path"
urlname: "URL-Path"
alchemy/node:
menu_type: Menu Type
name: "Name"
Expand All @@ -825,7 +824,7 @@ en:
tag_list: Tags
title: "Title"
updated_at: "Updated at"
urlname: "Urlname"
urlname: "URL-Path"
slug: "Slug"
visible: "visible in navigation"
alchemy/picture:
Expand Down
2 changes: 1 addition & 1 deletion spec/features/admin/legacy_page_url_management_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def open_page_properties
fill_in "legacy_page_url_urlname", with: "invalid url name"
click_button "Add"
within "#new_legacy_page_url" do
expect(page).to have_content("URL path is invalid")
expect(page).to have_content("URL-Path is invalid")
end
end
end
Expand Down

0 comments on commit 68c7e02

Please sign in to comment.