diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ea4bd39f..abc3eff67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,12 @@ # Changelog Fab-manager +- Prepaid packs of hours for the machines +- Tests for OpenAPI user trainings +- Norwegian language - Fix a bug: unable to filter by multiple user IDs in OpenAPI - Fix a bug: do not display two empty categories in the plan creation form - Fix a bug: do not return to the home page when clicking on previous in the machine description page - Fix a bug: public list of plans fails to render if a group has no plans -- Tests for OpenAPI user trainings - [TODO DEPLOY] `rails db:seed` - [TODO DEPLOY] `rails fablab:maintenance:rebuild_stylesheet` @@ -273,6 +275,7 @@ - Fix a bug: unable to create a coupon on stripe - Fix a bug: no notifications for refunds generated on wallet credit - Fix a bug: in staging environments, emails are not sent +- Fix a bug: unable to configure the app to use a german locale - Fix a security issue: updated carrierwave to 2.1.1 to fix [CVE-2021-21305](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-21305) - [TODO DEPLOY] `rails fablab:maintenance:rebuild_stylesheet` - [TODO DEPLOY] `rails fablab:stripe:set_product_id` @@ -284,8 +287,6 @@ - [TODO DEPLOY] `\curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/scripts/mount-payment-schedules.sh | bash` - [TODO DEPLOY] -> (only dev) `bundle install` -- Fix a bug: unable to configure the app to use a german locale - ## v4.6.6 2021 February 02 - Full German translation (thanks to [@korrupt](https://crowdin.com/profile/korrupt)) - OpenAPI endpoints to create/update/show/delete machines diff --git a/config/initializers/locale.rb b/config/initializers/locale.rb index 07b6b4f88..48de3f109 100644 --- a/config/initializers/locale.rb +++ b/config/initializers/locale.rb @@ -5,6 +5,7 @@ I18n.config.available_locales += %i[de de-AT de-CH de-DE en en-AU en-CA en-GB en-IE en-IN en-NZ en-US en-ZA fr fa-CA fr-CH fr-CM fr-FR es es-419 es-AR es-CL es-CO es-CR es-DO es-EC es-ES es-MX es-PA es-PE es-US es-VE + nb pt pt-BR zu] # we allow the Zulu locale (zu) as it is used for In-Context translation diff --git a/config/locales/rails.no.yml b/config/locales/rails.no.yml new file mode 100644 index 000000000..c8c99c900 --- /dev/null +++ b/config/locales/rails.no.yml @@ -0,0 +1,221 @@ +--- +nb: + activerecord: + errors: + messages: + record_invalid: 'Det oppstod feil: %{errors}' + restrict_dependent_destroy: + has_one: Kan ikke slette registreringen, fordi 1 %{record} avhenger av denne. + has_many: Kan ikke slette registreringen, fordi %{record} avhenger av denne. + date: + abbr_day_names: + - søn + - man + - tir + - ons + - tor + - fre + - lør + abbr_month_names: + - + - jan + - feb + - mar + - apr + - mai + - jun + - jul + - aug + - sep + - okt + - nov + - des + day_names: + - søndag + - mandag + - tirsdag + - onsdag + - torsdag + - fredag + - lørdag + formats: + default: "%d.%m.%Y" + long: "%e. %B %Y" + short: "%e. %b" + month_names: + - + - januar + - februar + - mars + - april + - mai + - juni + - juli + - august + - september + - oktober + - november + - desember + order: + - :day + - :month + - :year + datetime: + distance_in_words: + about_x_hours: + one: rundt 1 time + other: rundt %{count} timer + about_x_months: + one: rundt 1 måned + other: rundt %{count} måneder + about_x_years: + one: rundt 1 år + other: rundt %{count} år + almost_x_years: + one: nesten 1 år + other: nesten %{count} år + half_a_minute: et halvt minutt + less_than_x_seconds: + one: mindre enn 1 sekund + other: mindre enn %{count} sekunder + less_than_x_minutes: + one: mindre enn 1 minutt + other: mindre enn %{count} minutter + over_x_years: + one: over 1 år + other: over %{count} år + x_seconds: + one: 1 sekund + other: "%{count} sekunder" + x_minutes: + one: 1 minutt + other: "%{count} minutter" + x_days: + one: 1 dag + other: "%{count} dager" + x_months: + one: 1 måned + other: "%{count} måneder" + x_years: + one: 1 år + other: "%{count} år" + prompts: + second: sekund + minute: minutt + hour: time + day: dag + month: måned + year: år + errors: + format: "%{attribute} %{message}" + messages: + accepted: må være akseptert + blank: kan ikke være tom + confirmation: er ikke lik %{attribute} + empty: kan ikke være tom + equal_to: må være lik %{count} + even: må være partall + exclusion: er reservert + greater_than: må være større enn %{count} + greater_than_or_equal_to: må være større enn eller lik %{count} + inclusion: er ikke inkludert i listen + invalid: er ugyldig + less_than: må være mindre enn %{count} + less_than_or_equal_to: må være mindre enn eller lik %{count} + model_invalid: 'Det oppstod feil: %{errors}' + not_a_number: er ikke et tall + not_an_integer: er ikke et heltall + odd: må være oddetall + other_than: kan ikke være nøyaktig %{count} + present: må være tom + required: må eksistere + taken: er allerede i bruk + too_long: + one: er for lang (maksimalt 1 tegn) + other: er for lang (maksimalt %{count} tegn) + too_short: + one: er for kort (minst 1 tegn) + other: er for kort (minst %{count} tegn) + wrong_length: + one: har feil lengde (må være 1 tegn) + other: har feil lengde (må være %{count} tegn) + template: + body: 'Det oppstod problemer med følgende felt:' + header: + one: Kunne ikke lagre %{model} på grunn av én feil. + other: Kunne ikke lagre %{model} på grunn av %{count} feil. + helpers: + select: + prompt: Vennligst velg + submit: + create: Lag %{model} + submit: Lagre %{model} + update: Oppdater %{model} + number: + currency: + format: + delimiter: " " + format: "%n %u" + precision: 2 + separator: "," + significant: false + strip_insignificant_zeros: false + unit: kr + format: + delimiter: " " + precision: 2 + separator: "," + significant: false + strip_insignificant_zeros: true + human: + decimal_units: + format: "%n %u" + units: + billion: + one: milliard + other: milliarder + million: + one: million + other: millioner + quadrillion: + one: billiard + other: billiarder + thousand: tusen + trillion: + one: billion + other: billioner + unit: '' + format: + delimiter: " " + precision: 1 + significant: false + strip_insignificant_zeros: true + storage_units: + format: "%n %u" + units: + byte: + one: Byte + other: Bytes + gb: GB + kb: kB + mb: MB + tb: TB + percentage: + format: + delimiter: '' + format: "%n%" + precision: + format: + delimiter: '' + support: + array: + last_word_connector: " og " + two_words_connector: " og " + words_connector: ", " + time: + am: '' + formats: + default: "%A, %e. %B %Y, %H:%M" + long: "%A, %e. %B %Y, %H:%M" + short: "%e. %B, %H:%M" + pm: '' diff --git a/doc/environment.md b/doc/environment.md index 288a07ec2..a2d1a6794 100644 --- a/doc/environment.md +++ b/doc/environment.md @@ -159,7 +159,7 @@ Please, be aware that **the configured locale will imply the CURRENCY symbol use _Eg.: configuring **es-ES** will set the currency symbol to **€** but **es-MX** will set **$** as currency symbol, so setting the `RAILS_LOCALE` to simple **es** (without country indication) will probably not do what you expect._ Available values: `en, en-AU-CA, en-GB, en-IE, en-IN, en-NZ, en-US, en-ZA, fr, fa-CA, fr-CH, fr-CM, fr-FR, es, es-419, es-AR, es-CL, es-CO, es-CR, es-DO, - es-EC, es-ES, es-MX, es-MX, es-PA, es-PE, es-US, es-VE, pt, pt-BR, zu`. + es-EC, es-ES, es-MX, es-MX, es-PA, es-PE, es-US, es-VE, no, pt, pt-BR, zu`. Default is **en**. If your locale is not present in that list or any locale doesn't have your exact expectations, please open a pull request to share your modifications with the community and obtain a rebuilt docker image.