Merge pull request #1857 from tvdeyen/urlname-translation

Update Urlname translation

.github/workflows/ci.yml

@@ -42,7 +42,7 @@ jobs:
           MYSQL_PASSWORD: password
           MYSQL_DATABASE: alchemy_cms_dummy_test
           MYSQL_ROOT_PASSWORD: password
-        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=5
     steps:
       - uses: actions/checkout@v1
       - name: Set up Ruby
@@ -89,15 +89,12 @@ jobs:
       - name: Prepare database
         run: |
           bundle exec rake alchemy:spec:prepare
-      - name: Install code climate test reporter
-        run: |
-          curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-          chmod +x ./cc-test-reporter
-          ./cc-test-reporter before-build
-      - name: Test with RSpec
-        run: |
-          bundle exec rspec
-          ./cc-test-reporter after-build --exit-code $?
+      - name: Run tests & publish code coverage
+        uses: paambaati/[email protected]
+        env:
+          CC_TEST_REPORTER_ID: bca4349e32f97919210ac8a450b04904b90683fcdd57d65a22c0f5065482bc22
+        with:
+          coverageCommand: bundle exec rspec
       - uses: actions/upload-artifact@master
         if: failure()
         with:

app/views/alchemy/admin/pages/_form.html.erb

@@ -18,7 +18,7 @@
   </div>
 
   <%= f.input :name, autofocus: true %>
-  <%= f.input :urlname, as: 'string', input_html: {value: @page.slug} %>
+  <%= f.input :urlname, as: 'string', input_html: {value: @page.slug}, label: Alchemy::Page.human_attribute_name(:slug) %>
   <%= f.input :title,
     input_html: {'data-alchemy-char-counter' => 60} %>
 

app/views/alchemy/admin/pages/info.html.erb

@@ -18,7 +18,7 @@
     <label><%= Alchemy::Page.human_attribute_name(:urlname) %></label>
     <p><%= @page.urlname %></p>
   <% else %>
-    <label><%= Alchemy::LegacyPageUrl.human_attribute_name(:urlname) %></label>
+    <label><%= Alchemy::Page.human_attribute_name(:urlname) %></label>
     <p><%= "/#{@page.urlname}" %></p>
   <% end %>
   </div>

config/locales/alchemy.en.yml

@@ -573,7 +573,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?"
@@ -670,9 +669,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:
@@ -780,7 +779,7 @@ en:
         locale: Localization
         code: ISO Code
       alchemy/legacy_page_url:
-        urlname: "URL path"
+        urlname: "URL-Path"
       alchemy/node:
         name: "Name"
         title: "Title"
@@ -805,7 +804,8 @@ en:
         tag_list: Tags
         title: "Title"
         updated_at: "Updated at"
-        urlname: "Urlname"
+        urlname: "URL-Path"
+        slug: "Slug"
         visible: "visible in navigation"
       alchemy/picture:
         image_file_name: "Filename"

spec/features/admin/legacy_page_url_management_spec.rb

@@ -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