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.

Sign up for GitHub

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

Jump to bottom

i18n: Settings #114

Merged
merged 6 commits into from
Feb 1, 2022
Merged

i18n: Settings #114

merged 6 commits into from
Feb 1, 2022

Conversation

amanuela97
Copy link
Contributor

@amanuela97 amanuela97 commented Jan 28, 2022 •
edited by razbakov
Loading

@amanuela97 amanuela97 added the i18n Internationalization label Jan 28, 2022
razbakov
razbakov requested changes Jan 28, 2022
View reviewed changes
Copy link
Contributor

@razbakov razbakov left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work! Just few details to improve.

locales/en.yml Outdated Show resolved Hide resolved
locales/en.yml Outdated Show resolved Hide resolved
pages/settings.vue Outdated Show resolved Hide resolved
@razbakov razbakov marked this pull request as draft January 28, 2022 20:02
@razbakov razbakov marked this pull request as ready for review January 28, 2022 20:02
@razbakov razbakov added wip On the way to be completed, but not yet and removed wip On the way to be completed, but not yet labels Jan 28, 2022
razbakov
razbakov requested changes Jan 29, 2022
View reviewed changes
locales/en.yml Show resolved Hide resolved
locales/en.yml Show resolved Hide resolved
use/accounts.js Outdated Show resolved Hide resolved
razbakov
razbakov reviewed Jan 29, 2022
View reviewed changes
use/profiles.js Outdated Show resolved Hide resolved
razbakov
razbakov reviewed Jan 29, 2022
View reviewed changes
use/accounts.js Outdated Show resolved Hide resolved
@razbakov razbakov changed the base branch from main to beta January 31, 2022 14:03
@razbakov
Copy link
Contributor

razbakov commented Feb 1, 2022

@amanuela97 can you please rebase on beta and resolve conflicts?

razbakov
razbakov requested changes Feb 1, 2022
View reviewed changes
pages/settings.vue Outdated Show resolved Hide resolved
razbakov
razbakov requested changes Feb 1, 2022
View reviewed changes
use/profiles.js Outdated Show resolved Hide resolved
Base automatically changed from beta to main February 1, 2022 14:17
@amanuela97 amanuela97 force-pushed the settings branch 2 times, most recently from 70af977 to 3a64d09 Compare February 1, 2022 14:50
@razbakov
Copy link
Contributor

razbakov commented Feb 1, 2022

PR should be to beta branch

@razbakov razbakov changed the base branch from main to beta February 1, 2022 15:40
razbakov
razbakov requested changes Feb 1, 2022
View reviewed changes
Copy link
Contributor

@razbakov razbakov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Few more things 😅

use/common.js Outdated Show resolved Hide resolved
use/common.js Outdated Show resolved Hide resolved
use/profiles.js Outdated Show resolved Hide resolved
use/profiles.js Outdated Show resolved Hide resolved
use/profiles.js Outdated Show resolved Hide resolved
razbakov
razbakov requested changes Feb 1, 2022
View reviewed changes
Copy link
Contributor

@razbakov razbakov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! 99%

locales/en.yml Outdated Show resolved Hide resolved
razbakov
razbakov requested changes Feb 1, 2022
View reviewed changes
use/profiles.js Outdated Show resolved Hide resolved
nelson2411
nelson2411 approved these changes Feb 1, 2022
View reviewed changes
Copy link
Contributor

@nelson2411 nelson2411 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well done!

@amanuela97 amanuela97 merged commit c3721e0 into beta Feb 1, 2022
@amanuela97 amanuela97 deleted the settings branch February 1, 2022 19:41
razbakov pushed a commit that referenced this pull request Feb 3, 2022
@amanuela97 @razbakov
i18n: Settings (#114)
58df4a4 
* fix: translation for /settings

* fix: tips, before, label grouped by fieldName

* fix: changes made to translation for settings page

* fix: restructured translation keys

* fix: date keys capitalized

* fix: Capitalize saturday and sunday
@razbakov razbakov mentioned this pull request Feb 6, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@razbakov razbakov razbakov approved these changes

@nelson2411 nelson2411 nelson2411 approved these changes

@larrycoal larrycoal Awaiting requested review from larrycoal

@Stefanacef Stefanacef Awaiting requested review from Stefanacef

Assignees

@amanuela97 amanuela97

Labels
i18n Internationalization
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

i18n: Settings
3 participants
@amanuela97 @razbakov @nelson2411