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

OD-573 [Feature] Added translation to Widget-MenuDefault #27

Merged
merged 12 commits into from
May 16, 2022

Conversation

OleksandrLavrynenko
Copy link
Contributor

@sofiiakvasnevska

OD-573 https://weboo.atlassian.net/browse/OD-573

Description

Added user translations in component MenuDefault

Backward compatibility

This change is fully backward compatible.

Reviewers

@upplabs-alex-levchenko

@OleksandrLavrynenko OleksandrLavrynenko changed the title OD-573 [ADD] added transtation to MenuDefault translation OD-573 [Feature] added transtation to MenuDefault translation Sep 29, 2021
@OleksandrLavrynenko OleksandrLavrynenko changed the title OD-573 [Feature] added transtation to MenuDefault translation OD-573 [Feature] added transtation to Widget-MenuDefault Sep 29, 2021
@OleksandrLavrynenko OleksandrLavrynenko changed the title OD-573 [Feature] added transtation to Widget-MenuDefault OD-573 [Feature] Added transtation to Widget-MenuDefault Sep 29, 2021
.eslintrc Outdated
{
"extends": "fliplet",
"globals": {
"Modernizr": "readonly"
Copy link
Contributor

Choose a reason for hiding this comment

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

If you update the eslint config to the latest version you won't need to set any global variable. Please check all other menu components too.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I fixed it in all components

js/menu.js Outdated Show resolved Hide resolved
Co-authored-by: Tony Wu <tonytlwu@users.noreply.github.com>
Copy link
Contributor

@tonytlwu tonytlwu left a comment

Choose a reason for hiding this comment

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

@romanyosyfiv @inna-bieshulia Translation looks ready. This can be tested once API is ready.

@tonytlwu tonytlwu changed the title OD-573 [Feature] Added transtation to Widget-MenuDefault OD-573 [Feature] Added translation to Widget-MenuDefault Nov 15, 2021
@inna-bieshulia inna-bieshulia merged commit 31dd10e into Fliplet:master May 16, 2022
@@ -2,7 +2,11 @@
<div class="fl-viewport-header {{#if location}}fl-viewport-header-left{{/if}}">
{{#if location}} {{#if canGoBack}}
<span class="nav-left fl-menu-back focus-outline" data-fl-navigate-back tabindex="0">
<<<<<<< HEAD
Copy link
Contributor

@squallstar squallstar May 25, 2022

Choose a reason for hiding this comment

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

@OleksandrLavrynenko you merged a git conflict here.

@@ -20,7 +24,11 @@
</span>
{{else}} {{#if canGoBack}}
<span class="nav-left fl-menu-back focus-outline" data-fl-navigate-back tabindex="0">
<<<<<<< HEAD
Copy link
Contributor

@squallstar squallstar May 25, 2022

Choose a reason for hiding this comment

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

@OleksandrLavrynenko you merged a git conflict here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants