Skip to content

Commit

Permalink
Merge pull request #13 from MyEtherWallet/fix/after-localizations
Browse files Browse the repository at this point in the history
Fix/after localizations
  • Loading branch information
olgakup authored Nov 6, 2024
2 parents 2e09c38 + bf5135e commit 57ac575
Show file tree
Hide file tree
Showing 16 changed files with 1,720 additions and 872 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/crowdin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: crowdin/github-action@v2
with:
upload_sources: true
upload_translations: false
upload_translations: true
download_translations: true
download_sources: true
localization_branch_name: l10n_crowdin_translations
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@myetherwallet/vue-common-components",
"version": "1.2.8",
"version": "1.3.0",
"type": "module",
"files": [
"dist"
Expand Down Expand Up @@ -34,7 +34,7 @@
"@vueuse/core": "^10.11.0",
"autoprefixer": "^10.4.19",
"postcss": "^8.4.38",
"tailwindcss": "^3.4.6",
"tailwindcss": "^3.4.13",
"typescript": "^5.2.2",
"vite": "^5.3.1",
"vue": "^3.4.34",
Expand Down
264 changes: 156 additions & 108 deletions src/App.vue

Large diffs are not rendered by default.

Binary file added src/assets/lottie/lottie-xs.webp
Binary file not shown.
453 changes: 344 additions & 109 deletions src/libs/layouts/MewFooter.vue

Large diffs are not rendered by default.

367 changes: 265 additions & 102 deletions src/libs/layouts/MewHeader.vue

Large diffs are not rendered by default.

344 changes: 250 additions & 94 deletions src/libs/layouts/MewMobileMenu.vue

Large diffs are not rendered by default.

1,078 changes: 657 additions & 421 deletions src/libs/layouts/MewSubscribe.vue

Large diffs are not rendered by default.

36 changes: 23 additions & 13 deletions src/libs/layouts/MewSwitchDataTracking.vue
Original file line number Diff line number Diff line change
@@ -1,18 +1,27 @@
<template>
<div class="flex align-center jusify-start">
<Switch :id="id" v-model="userConsentVal" :aria-label="t('switch')"
:class="[userConsentVal ? 'bg-primary' : 'bg-info', 'hoverOpacityHasBG relative inline-flex h-6 w-11 items-center rounded-full']">
<span :class="userConsentVal ? 'translate-x-6' : 'translate-x-1'"
class="inline-block h-4 w-4 transform rounded-full bg-white transition" />
<Switch
:id="id"
v-model="userConsentVal"
:aria-label="t('switch')"
:class="[
userConsentVal ? 'bg-primary' : 'bg-info',
'hoverOpacityHasBG relative inline-flex h-6 w-11 items-center rounded-full',
]"
>
<span
:class="userConsentVal ? 'translate-x-6' : 'translate-x-1'"
class="inline-block h-4 w-4 transform rounded-full bg-white transition"
/>
</Switch>
<p class="text8 pl-2">{{ t('data_tracking') }} {{ consentString }}</p>
<p class="text8 pl-2">{{ t("data_tracking") }} {{ consentString }}</p>
</div>
</template>

<script setup lang="ts">
import { computed } from "vue";
import { Switch } from "@headlessui/vue";
import messages from '@/locales/data-tracking/index'
import messages from "@/locales/data-tracking/index";
const props = defineProps({
id: {
Expand All @@ -25,16 +34,15 @@ const props = defineProps({
},
useI18n: {
required: true,
type: Function
}
type: Function,
},
});
const { t } = props.useI18n({
locale: 'en',
messages: {
...messages
}
})
...messages,
},
});
const emit = defineEmits<{
(e: "update:consent", newval: boolean): void;
}>();
Expand All @@ -43,7 +51,9 @@ const userConsentVal = computed({
set: (value) => emit("update:consent", value),
});
const consentString = computed(() => (userConsentVal.value ? t('on') : t('off')));
const consentString = computed(() =>
userConsentVal.value ? t("on") : t("off")
);
</script>
<style>
@import "../../style.css";
Expand Down
4 changes: 2 additions & 2 deletions src/locales/footer/ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"team": "",
"privacy": "개인정보보호",
"terms": "약관",
"security_policy": "Security Policy",
"security_policy": "보안 정책",
"bug_bounty": "버그 바운티",
"mobile_app": "MEW 모바일 앱",
"portfolio_manager": "MEW 포트폴리오 관리자",
Expand All @@ -18,7 +18,7 @@
"customer_support": "고객지원",
"faq": "FAQ",
"blog": "블로그",
"press_kit": "Press Kit",
"press_kit": "보도 자료",
"advertise_with_us": "저희와 함께 광고하세요",
"join_community": "MEW 커뮤니티에 가입하세요",
"donate": {
Expand Down
4 changes: 2 additions & 2 deletions src/locales/footer/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"team": "团队介绍",
"privacy": "隐私条款",
"terms": "服务条款",
"security_policy": "Security Policy",
"security_policy": "安全政策",
"bug_bounty": "漏洞悬赏",
"mobile_app": "MEW移动应用程序",
"portfolio_manager": "MEW投资组合管理器",
Expand All @@ -18,7 +18,7 @@
"customer_support": "客户服务",
"faq": "常见问题",
"blog": "博客",
"press_kit": "Press Kit",
"press_kit": "媒体包",
"advertise_with_us": "投放广告",
"join_community": "加入 MEW 社区",
"donate": {
Expand Down
2 changes: 1 addition & 1 deletion src/locales/header/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@
"title": "ethVM",
"description": "Обозреватель блокчейна"
},
"access_wallet": "Доступ к моему кошельку"
"access_wallet": "Доступ к кошельку"
}
8 changes: 4 additions & 4 deletions src/locales/subscribe/es.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"step1": {
"title": "Mejora tu dominio de las criptomonedas",
"description": "Mejora tus conocimientos con consejos de seguridad, información sobre el sector, noticias y mucho más.",
"enter_email": "Introduce tu correo electrónico",
"title": "Hazte mejor en cripto",
"description": "Mejora tus conocimientos con consejos de seguridad, noticias y más.",
"enter_email": "Ingresa tu correo",
"sign_me_up": "¡Apúntame!",
"email_error": "El correo electrónico no es válido",
"email_required": "Se requiere el correo electrónico",
Expand All @@ -18,7 +18,7 @@
},
"step3": {
"title": "¡Bienvenido al Universo MEW!",
"description1": "Estamos emocionados de tenerte aquí en la cadena con nosotros. Mantente atento a tu bandeja de entrada para recibir las últimas noticias sobre criptomonedas, tokens de moda, consejos de seguridad y mucho más.",
"description1": "Mantente atento a tu bandeja de entrada para recibir las últimas noticias sobre criptomonedas, tokens de moda, consejos de seguridad y mucho más.",
"description2": "¡Avanza y mantente a la vanguardia en el Universo MEW!",
"finish": "Terminar",
"whats_next": "¿Qué sigue?",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/subscribe/ko.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"step1": {
"title": "암호화폐 투자 실력을 향상하세요",
"title": "암호화폐 실력을 향상하세요",
"description": "보안 팁, 업계 인사이트, 뉴스 등을 통해 실력을 높여보세요!",
"enter_email": "이메일 입력",
"sign_me_up": "가입하세요!",
Expand Down
16 changes: 8 additions & 8 deletions src/locales/subscribe/ru.json
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
{
"step1": {
"title": "Научитесь пользоваться криптовалютой",
"description": "Повышайте свои навыки с помощью советов по безопасности, отраслевой аналитики, новостей и многого другого!",
"enter_email": "Введите свой адрес электронной почты",
"sign_me_up": "Зарегистрируйте меня!",
"title": "Станьте профи в крипте",
"description": "Повышайте навыки с советами по безопасности, аналитикой, и новостями!",
"enter_email": "Введите email",
"sign_me_up": "Подписаться!",
"email_error": "адрес электронной почты недействителен",
"email_required": "требуется адрес электронной почты",
"unsubscribe": "Мы уважаем вашу конфиденциальность. Отменить подписку можно в любое время.",
"no_thanks": "Нет, спасибо, больше не показывайте это.",
"i_know": "Я уже все знаю о криптовалюте."
},
"step2": {
"title": "Расскажите нам, что вас интересует.",
"title": "Что вас интересует?",
"crypto_kb": "Знания о криптовалюте, лучшие практики и общие советы.",
"market": "Популярные токены, токены наиболее изменившиеся в цене и события на блокчейне.",
"market": "Популярные токены, обзор рынка, и новости блокчейна.",
"product_updates": "Обновления продукта"
},
"step3": {
"title": "Добро пожаловать во Вселенную MEW!",
"description1": "Мы рады видеть вас здесь, на блокчейне, с нами. Следите за своей почтой, чтобы быть в курсе последних новостей о криптовалютах, трендовых токенах, советов по безопасности и многого другого!",
"description2": "Двигайтесь вперед — и оставайтесь впереди — во Вселенной MEW!",
"description1": "Рады видеть вас на блокчейне! Следите за почтой, чтобы узнавать новости, тренды, советы по безопасности и многое другое!",
"description2": "Раскройте потенциал своего будущего со Вселенной MEW",
"finish": "Завершить",
"whats_next": "Что дальше:",
"create_wallet": "Создать кошелек",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1259,10 +1259,10 @@ supports-preserve-symlinks-flag@^1.0.0:
resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"
integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==

tailwindcss@^3.4.6:
version "3.4.7"
resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.7.tgz#6092f18767f5933f59375b9afe558e592fc77201"
integrity sha512-rxWZbe87YJb4OcSopb7up2Ba4U82BoiSGUdoDr3Ydrg9ckxFS/YWsvhN323GMcddgU65QRy7JndC7ahhInhvlQ==
tailwindcss@^3.4.13:
version "3.4.14"
resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.14.tgz#6dd23a7f54ec197b19159e91e3bb1e55e7aa73ac"
integrity sha512-IcSvOcTRcUtQQ7ILQL5quRDg7Xs93PdJEk1ZLbhhvJc7uj/OAhYOnruEiwnGgBvUtaUAJ8/mhSw1o8L2jCiENA==
dependencies:
"@alloc/quick-lru" "^5.2.0"
arg "^5.0.2"
Expand Down

0 comments on commit 57ac575

Please sign in to comment.