Merge pull request #268 from epimorphics/issue/233-welsh-localisation…

…-further-refinements Additional Welsh localization refinements
epimorphics · Oct 5, 2020 · 4c941c3 · 4c941c3
2 parents 61e1230 + 59e864a
commit 4c941c3
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changes to the UKHPI app by version and date
 
+## 1.5.10 - 2020-10-05 (Ian)
+
+- Some additional Welsh language refinements, in particular date abbreviations
+
 ## 1.5.9 - 2020-10-02 (Ian)
 
 - Additional fixes to the Welsh language localisation, including some

diff --git a/app/assets/stylesheets/_lr-common.scss b/app/assets/stylesheets/_lr-common.scss
@@ -107,9 +107,6 @@ input[type=radio] {
 .o-form-control {
   line-height: 3rem;
 
-  .o-form-control--label {
-  }
-
   .o-form-control--input {
     margin-right: 0.8rem;
   }

diff --git a/app/javascript/lang/d3-timeformat-cy.json b/app/javascript/lang/d3-timeformat-cy.json
@@ -40,16 +40,16 @@
   ],
   "shortMonths": [
     "Ion",
-    "Chw",
+    "Chwef",
     "Maw",
     "Ebr",
     "Mai",
     "Meh",
     "Gor",
     "Awst",
-    "Med",
+    "Medi",
     "Hyd",
     "Tach",
-    "Rha"
+    "Rhag"
   ]
 }
diff --git a/app/javascript/lang/element-ui-cy.js b/app/javascript/lang/element-ui-cy.js
@@ -41,17 +41,17 @@ export default {
       },
       months: {
         jan: 'Ion',
-        feb: 'Chw',
+        feb: 'Chwef',
         mar: 'Maw',
         apr: 'Ebr',
         may: 'Mai',
         jun: 'Meh',
         jul: 'Gor',
         aug: 'Awst',
-        sep: 'Med',
+        sep: 'Medi',
         oct: 'Hyd',
         nov: 'Tach',
-        dec: 'Rha'
+        dec: 'Rhag'
       }
     }
   }

diff --git a/app/lib/version.rb b/app/lib/version.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Version
-  MAJOR = '1'
-  MINOR = '5'
-  REVISION = '9'
+  MAJOR = 1
+  MINOR = 5
+  REVISION = 10
   VERSION = "#{MAJOR}.#{MINOR}.#{REVISION}"
 end
diff --git a/app/views/landing/_index_cy.html.haml b/app/views/landing/_index_cy.html.haml
@@ -69,10 +69,10 @@
     Cymorth a chefnogaeth
   %p
     Ceir
-    = link_to('canllaw defnyddwyr', '/app/doc/ukhpi-user-guide')
+    = link_to('canllaw defnyddwyr', doc_ukhpi_user_guide_path(lang: 'cy')
     ar gyfer y gwasanaeth hwn, a gallwch
     = succeed('.') do
-      = link_to('ddarllen rhagor am ddata cysylltiedig â Mynegai Prisiau Tai y DU', '/app/doc/ukhpi')
+      = link_to('ddarllen rhagor am ddata cysylltiedig â Mynegai Prisiau Tai y DU', ukhpi_doc_path(lang: 'cy')
     I gael rhagor o gymorth,
     = succeed '.' do
       = mail_to('[email protected]', 'anfonwch ebost atom')

diff --git a/app/views/landing/_index_en.html.haml b/app/views/landing/_index_en.html.haml
@@ -75,10 +75,10 @@
   %h2.heading-medium Help and support
   %p
     There is a
-    = link_to('user guide', '/app/doc/ukhpi-user-guide')
+    = link_to('user guide', doc_ukhpi_user_guide_path)
     for this service, and you can
     = succeed('.') do
-      = link_to('read more about UKHPI linked-data', '/app/doc/ukhpi')
+      = link_to('read more about UKHPI linked-data', ukhpi_doc_path)
     For further assistance, please
     = mail_to('[email protected]', 'send us an email')
 

diff --git a/config/locales/cy.yml b/config/locales/cy.yml
@@ -236,17 +236,17 @@ cy:
     abbr_month_names:
     -
     - Ion
-    - Chw
+    - Chwef
     - Maw
     - Ebr
     - Mai
     - Meh
     - Gor
     - Awst
-    - Med
+    - Medi
     - Hyd
     - Tach
-    - Rha
+    - Rhag
     day_names:
     - Dydd Sul
     - Dydd Llun