Skip to content

Comments

Update Ukrainian language#360

Merged
LukeTowers merged 4 commits intowintercms:developfrom
WebVPF:develop
Nov 30, 2021
Merged

Update Ukrainian language#360
LukeTowers merged 4 commits intowintercms:developfrom
WebVPF:develop

Conversation

@WebVPF
Copy link
Contributor

@WebVPF WebVPF commented Nov 29, 2021

No description provided.

@WebVPF
Copy link
Contributor Author

WebVPF commented Nov 29, 2021

Commit fix lang key - I think it was a typo. I decided to fix it right away.

@arvislacis
Copy link
Contributor

arvislacis commented Nov 29, 2021

@WebVPF Maybe you could also regenerate https://github.com/wintercms/winter/blob/develop/modules/system/assets/js/lang/lang.uk.js with php artisan winter:util compile lang and add it to this pull request.

@WebVPF
Copy link
Contributor Author

WebVPF commented Nov 29, 2021 •
edited
Loading

@arvislacis
I did not write this commit on the server, but simply forked the repository in VSCode, made the edit and sent the commit. Therefore, I can not run console commands in php. And to be honest, I didn't know what else can be compiled for js.

@arvislacis
Copy link
Contributor

arvislacis commented Nov 29, 2021

@arvislacis как я понял, вы русский язык знаете? Можно я на русском вам отвечу. Я этот коммит писал не на сервере, а просто форкнул репозиторий в VSCode, сделал правку и отправил коммит. Поэтому не могу запустить консольные команды на php. И если честно, то я и не знал что ещё и для js можно компилировать.

Ok, no problem. :) I am sure JS files will be recompiled sooner or later (by maintainers or when there will another language update). Strings in modules/system/lang/uk/client.php are used in front-end by JavaScript components and filters so recompilation is needed because at the end assets/js/lang/lang.uk.js file is used for displaying translations to user, not modules/system/lang/uk/client.php.

@LukeTowers LukeTowers added this to the v1.1.8 milestone Nov 30, 2021
@LukeTowers LukeTowers added Status: Completed maintenance PRs that fix bugs, are translation changes or make only minor changes labels Nov 30, 2021
@LukeTowers LukeTowers merged commit 5c8f25e into wintercms:develop Nov 30, 2021
LukeTowers added a commit that referenced this pull request Nov 30, 2021
@LukeTowers
Fixes typo in list of available encodings for importing
b60c802 
Refs #360. Credit to @WebVPF for spotting
LukeTowers added a commit that referenced this pull request Dec 9, 2021
@LukeTowers
Merge branch 'develop' into wip/1.2
8c75a83 
* develop: (90 commits)
  Define signature for "defineProperties" method
  Add definition of "componentDetails" method
  Update `system` french lang files (#366)
  Update `backend` french lang file (#364)
  Update `cms` french lang file (#365)
  Fix clear color picker function, allow empty value
  Trigger "change" event on color picker when value changes
  Use better cursors for readonly color picker
  Adjust "force" option for plugin:remove
  Require explicit confirmations for CLI deletions
  Add PHP 8.1 option, drop other details field
  Add md_line Twig filter to expose Markdown::parseLine() (#370)
  Don't use the Cache facade in the service provider registration process.
  Fix return type hints for CMS Page and Controller (#362)
  Fixes typo in list of available encodings for importing
  Improved Ukrainian translation (#360)
  Constrain PHP version >= 7.2.9 and 8.0.x (#361)
  Improve Latvian translation (#358)
  Docs UI Fix paths to screenshots of diagrams (#359)
  Coerce Inspector set values to string
  ...

# Conflicts:
#	composer.json
#	modules/backend/composer.json
#	modules/cms/composer.json
#	modules/system/composer.json
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

maintenance PRs that fix bugs, are translation changes or make only minor changes

Projects

None yet

Milestone

v1.1.8

Development

Successfully merging this pull request may close these issues.

3 participants

@WebVPF @arvislacis @LukeTowers