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.

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

Additional Welsh localization refinements #268

Merged
merged 4 commits into from
Oct 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 0 additions & 3 deletions app/assets/stylesheets/_lr-common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
6 changes: 3 additions & 3 deletions app/javascript/lang/d3-timeformat-cy.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,16 @@
],
"shortMonths": [
"Ion",
"Chw",
"Chwef",
"Maw",
"Ebr",
"Mai",
"Meh",
"Gor",
"Awst",
"Med",
"Medi",
"Hyd",
"Tach",
"Rha"
"Rhag"
]
}
6 changes: 3 additions & 3 deletions app/javascript/lang/element-ui-cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions app/lib/version.rb
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions app/views/landing/_index_cy.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
4 changes: 2 additions & 2 deletions app/views/landing/_index_en.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
6 changes: 3 additions & 3 deletions config/locales/cy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down