Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/theme/components/InstagramFeed.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<SfSection
title-heading="Share Your Look"
:title-heading="$t('Share Your Look')"
subtitle-heading="#YOURLOOK"
class="title"
>
Expand Down
4 changes: 2 additions & 2 deletions packages/theme/components/MobileStoreBanner.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<template>
<SfBanner
image="/homepage/bannerD.png"
subtitle="Fashon to take away"
title="Download our application to your mobile"
:subtitle="$t('Fashion to take away')"
:title="$t('Download our application to your mobile')"
class="sf-banner--left desktop-only banner-app"
>
<template #call-to-action>
Expand Down
8 changes: 4 additions & 4 deletions packages/theme/components/MyAccount/ProfileUpdateForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<SfInput
v-model="form.firstname"
name="firstName"
label="First Name"
:label="$t('First Name')"
required
:valid="!errors[0]"
:error-message="errors[0]"
Expand All @@ -27,7 +27,7 @@
<SfInput
v-model="form.lastname"
name="lastName"
label="Last Name"
:label="$t('Last Name')"
required
:valid="!errors[0]"
:error-message="errors[0]"
Expand All @@ -43,7 +43,7 @@
v-model="form.email"
type="email"
name="email"
label="Your e-mail"
:label="$t('Your e-mail')"
required
:valid="!errors[0]"
:error-message="errors[0]"
Expand All @@ -61,7 +61,7 @@
v-model="currentPassword"
type="password"
name="currentPassword"
label="Current Password"
:label="$t('Current Password')"
required
class="form__element"
style="margin-top: 10px"
Expand Down
38 changes: 37 additions & 1 deletion packages/theme/lang/de.js
Original file line number Diff line number Diff line change
Expand Up @@ -186,5 +186,41 @@ export default {
"You have submitted no reviews": "Sie haben keine Bewertungen abgegeben",
"The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later.":"Die Kontoanmeldung war falsch oder Ihr Konto wurde vorübergehend deaktiviert. Bitte warten Sie und versuchen Sie es später erneut.",
"A customer with the same email address already exists in an associated website.": "Ein Kunde mit derselben E-Mail-Adresse existiert bereits auf einer verknüpften Website.",
"Invalid email": "Ungültige E-Mail"
"Invalid email": "Ungültige E-Mail",
"SUMMER COLLECTION {year}": "SUMMER COLLECTION {year}",
"Colorful summer dresses are already in store": "Bunte Sommerkleider sind bereits im Store",
"Learn more": "Mehr erfahren",
"Dresses": "Kleider",
"Cocktail & Party": "Cocktail & Party",
"Linen Dresses": "Leinenkleider",
"T-Shirts": "T-Shirts",
"The office life": "Das Büroleben",
"Find stunning women's cocktail dresses and party dresses. Stand out in lace and metallic cocktail dresses from all your favorite brands.": "Finden Sie atemberaubende Cocktailkleider für Damen und Cocktailkleider für Party-D…c von all Ihren Lieblingsmarken.",
"Shop now": "Jetzt einkaufen",
"The Office Life": "The Office Life",
"Summer Sandals": "Sommersandalen",
"Eco Sandals": "Öko-Sandalen",
"Subscribe to Newsletters": "Newsletter abonnieren",
"Be aware of upcoming sales and events. Receive gifts and special offers!": "Informieren Sie sich über bevorstehende Verkäufe und Veranstaltungen. Erhalten Sie Geschenke und Sonderangebote",
"Fashion to take away": "Mode zum Mitnehmen",
"Download our application to your mobile": "Laden Sie unsere Anwendung auf Ihr Handy herunter",
"Share Your Look": "Teilen Sie Ihren Look",
"My Account": "Mein Konto",
"My profile": "Mein Profil",
"Personal Details": "Persönliche Daten",
"Addresses details": "Adressendetails",
"My newsletter": "Mein Newsletter",
"Log out": "Ausloggen",
"My reviews": "Meine Bewertungen",
"Order history": "Bestellverlauf",
"Order details": "Bestelldetails",
"My wishlist": "Meine Wunschliste",
"Password change": "Passwortänderung",
"Personal data": "Persönliche Daten",
"Your e-mail": "Deine E-Mail",
"Current Password": "Jetziges Passwortd",
"You are not authorized, please log in.": "Sie sind nicht autorisiert, bitte melden Sie sich an.",
"Go To Product": "Zum Produkt",
"Returns":"Rücklauf",
"My orders": "Meine Bestellungen",
};
40 changes: 39 additions & 1 deletion packages/theme/lang/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -181,5 +181,43 @@ export default {
'You have submitted no reviews': 'You have submitted no reviews',
"The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later.":"The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later.",
"A customer with the same email address already exists in an associated website.": "A customer with the same email address already exists in an associated website.",
"Invalid email": "Invalid email"
"Invalid email": "Invalid email",
"SUMMER COLLECTION {year}": "SUMMER COLLECTION {year}",
"Colorful summer dresses are already in store": "Colorful summer dresses are already in store",
"Learn more": "Learn more",
"Dresses": "Dresses",
"Cocktail & Party": "Cocktail & Party",
"Linen Dresses": "Linen Dresses",
"T-Shirts": "T-Shirts",
"The office life": "The office life",
"Find stunning women's cocktail dresses and party dresses. Stand out in lace and metallic cocktail dresses from all your favorite brands.": "Find stunning women's cocktail dresses and party dresses. Stand out in lace and metallic cocktail dresses from all your favorite brands.",
"Shop now": "Shop now",
"The Office Life": "The Office Life",
"Summer Sandals": "Summer Sandals",
"Eco Sandals": "Eco Sandals",
"Subscribe to Newsletters": "Subscribe to Newsletters",
"Be aware of upcoming sales and events. Receive gifts and special offers!": "Be aware of upcoming sales and events. Receive gifts and special offers",
"Fashion to take away": "Fashion to take away",
"Download our application to your mobile": "Download our application to your mobile",
"Share Your Look": "Share Your Look",
"My Account": "My Account",
"My profile": "My profile",
"Personal Details": "Personal Details",
"Addresses details": "Addresses details",
"My newsletter": "My newsletter",
"Log out": "Log out",
"My reviews": "My reviews",
"Order history": "Order history",
"Order details": "Order details",
"My wishlist": "My wishlist",
"Password change": "Password change",
"Personal data": "Personal data",
"Your e-mail": "Your e-mail",
"Current Password": "Current Password",
"You are not authorized, please log in.": "You are not authorized, please log in.",
"Go To Product": "Go To Product",
"Change to list view": "Change to list view",
"Change to grid view": "Change to grid view",
"Returns":"Returns",
"My orders": "My orders",
};
50 changes: 26 additions & 24 deletions packages/theme/pages/Home.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@

<LazyHydrate when-visible>
<SfCallToAction
title="Subscribe to Newsletters"
button-text="Subscribe"
description="Be aware of upcoming sales and events. Receive gifts and special offers!"
:title="$t('Subscribe to Newsletters')"
:button-text="$t('Subscribe')"
:description="$t('Be aware of upcoming sales and events. Receive gifts and special offers!')"
image="https://cdn.shopify.com/s/files/1/0407/1902/4288/files/newsletter_1240x202.jpg?v=1616496568"
class="call-to-action"
/>
Expand Down Expand Up @@ -74,6 +74,7 @@ import {
computed,
defineComponent,
ref,
useContext,
} from '@nuxtjs/composition-api';
import { onSSR } from '@vue-storefront/core';
import LazyHydrate from 'vue-lazy-hydration';
Expand All @@ -97,6 +98,8 @@ export default defineComponent({
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
setup() {
const { addTags } = useCache();
const { app } = useContext();
const year = new Date().getFullYear();

const {
products: newProductsResult,
Expand All @@ -105,9 +108,9 @@ export default defineComponent({
} = useProduct('newProducts');
const heroes = ref([
{
title: 'Colorful summer dresses are already in store',
subtitle: 'SUMMER COLLECTION 2021',
buttonText: 'Learn more',
title: app.i18n.t('Colorful summer dresses are already in store'),
subtitle: app.i18n.t('SUMMER COLLECTION {year}', { year }),
buttonText: app.i18n.t('Learn more'),
background: '#eceff1',
image: {
mobile:
Expand All @@ -118,9 +121,9 @@ export default defineComponent({
link: '/c/women/women-clothing-shirts',
},
{
title: 'Colorful summer dresses are already in store',
subtitle: 'SUMMER COLLECTION 2021',
buttonText: 'Learn more',
title: app.i18n.t('Colorful summer dresses are already in store'),
subtitle: app.i18n.t('SUMMER COLLECTION {year}', { year }),
buttonText: app.i18n.t('Learn more'),
background: '#fce4ec',
image: {
mobile:
Expand All @@ -131,9 +134,9 @@ export default defineComponent({
link: '/c/women/women-clothing-dresses',
},
{
title: 'Colorful summer dresses are already in store',
subtitle: 'SUMMER COLLECTION 2021',
buttonText: 'Learn more',
title: app.i18n.t('Colorful summer dresses are already in store'),
subtitle: app.i18n.t('SUMMER COLLECTION {year}', { year }),
buttonText: app.i18n.t('Learn more'),
background: '#efebe9',
image: {
mobile:
Expand All @@ -149,8 +152,8 @@ export default defineComponent({
const banners = ref([
{
slot: 'banner-A',
subtitle: 'Dresses',
title: 'Cocktail & Party',
subtitle: app.i18n.t('Dresses'),
title: app.i18n.t('Cocktail & Party'),
description:
'Find stunning women\'s cocktail dresses and party dresses. Stand out in lace and metallic cocktail dresses from all your favorite brands.',
buttonText: 'Shop now',
Expand All @@ -165,11 +168,10 @@ export default defineComponent({
},
{
slot: 'banner-B',
subtitle: 'Dresses',
title: 'Linen Dresses',
description:
'Find stunning women\'s cocktail dresses and party dresses. Stand out in lace and metallic cocktail dresses from all your favorite brands.',
buttonText: 'Shop now',
subtitle: app.i18n.t('Dresses'),
title: app.i18n.t('Linen Dresses'),
description: app.i18n.t('Find stunning women\'s cocktail dresses and party dresses. Stand out in lace and metallic cocktail dresses from all your favorite brands.'),
buttonText: app.i18n.t('Shop now'),
image: {
mobile:
'https://cdn.shopify.com/s/files/1/0407/1902/4288/files/bannerE_328x343.jpg',
Expand All @@ -181,8 +183,8 @@ export default defineComponent({
},
{
slot: 'banner-C',
subtitle: 'T-Shirts',
title: 'The Office Life',
subtitle: app.i18n.t('T-Shirts'),
title: app.i18n.t('The Office Life'),
image: {
mobile:
'https://cdn.shopify.com/s/files/1/0407/1902/4288/files/bannerC_328x343.jpg',
Expand All @@ -194,8 +196,8 @@ export default defineComponent({
},
{
slot: 'banner-D',
subtitle: 'Summer Sandals',
title: 'Eco Sandals',
subtitle: app.i18n.t('Summer Sandals'),
title: app.i18n.t('Eco Sandals'),
image: {
mobile:
'https://cdn.shopify.com/s/files/1/0407/1902/4288/files/bannerG_328x343.jpg',
Expand All @@ -220,7 +222,7 @@ export default defineComponent({
});

addTags([
{ prefix: CacheTagPrefix.View, value: 'home' }
{ prefix: CacheTagPrefix.View, value: 'home' },
]);
});

Expand Down
30 changes: 15 additions & 15 deletions packages/theme/pages/MyAccount.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,40 +6,40 @@
/>
<SfContentPages
v-e2e="'my-account-content-pages'"
title="My Account"
:title="$t('My Account')"
:active="activePage"
class="my-account"
@click:change="changeActivePage"
>
<SfContentCategory title="Personal Details">
<SfContentPage title="My profile">
<SfContentCategory :title="$t('Personal Details')">
<SfContentPage :title="$t('My profile')">
<MyProfile />
</SfContentPage>

<SfContentPage title="Addresses details">
<SfContentPage :title="$t('Addresses details')">
<AddressesDetails />
</SfContentPage>

<SfContentPage title="My newsletter">
<SfContentPage :title="$t('My newsletter')">
<MyNewsletter />
</SfContentPage>

<SfContentPage title="My wishlist">
<SfContentPage :title="$t('My wishlist')">
<MyWishlist />
</SfContentPage>
</SfContentCategory>

<SfContentCategory title="Order details">
<SfContentPage title="Order history">
<SfContentCategory :title="$t('Order details')">
<SfContentPage :title="$t('Order history')">
<OrderHistory />
</SfContentPage>

<SfContentPage title="My reviews">
<SfContentPage :title="$t('My reviews')">
<MyReviews />
</SfContentPage>
</SfContentCategory>

<SfContentPage title="Log out" />
<SfContentPage :title="$t('Log out')" />
</SfContentPages>
</div>
</template>
Expand Down Expand Up @@ -85,15 +85,15 @@ export default defineComponent({
const route = useRoute();
const router = useRouter();
const { logout } = useUser();
const { localePath } = useContext();
const { localePath, app } = useContext();
const isMobile = computed(() => mapMobileObserver().isMobile.get());
const breadcrumbs = ref([
{
text: 'Home',
text: app.i18n.t('Home'),
route: { link: '#' },
},
{
text: 'My Account',
text: app.i18n.t('My Account'),
route: { link: '#' },
},
]);
Expand All @@ -103,13 +103,13 @@ export default defineComponent({
if (pageName) {
return (pageName.charAt(0).toUpperCase() + pageName.slice(1)).replace('-', ' ');
} if (!isMobile.value) {
return 'My profile';
return app.i18n.t('My profile');
}
return '';
});

const changeActivePage = async (title) => {
if (title === 'Log out') {
if (title === app.i18n.t('Log out')) {
await logout();
await router.push(`${localePath({ name: 'home' })}`);

Expand Down
6 changes: 3 additions & 3 deletions packages/theme/pages/MyAccount/AddressesDetails.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class="tab-orphan"
>
<SfTab
:title="isNewAddress ? 'Add the address' : 'Update the address'"
:title="isNewAddress ? $t('Add the address') : $t('Update the address')"
>
<p class="message">
{{ $t('Contact details updated') }}
Expand All @@ -27,7 +27,7 @@
:open-tab="1"
class="tab-orphan"
>
<SfTab title="Addresses details">
<SfTab :title="$t('Addresses details')">
<p class="message">
{{ $t('Manage addresses') }}
</p>
Expand Down Expand Up @@ -118,7 +118,7 @@ export default defineComponent({
const route = useRoute();
const { app } = useContext();
const activeAddress = computed(
() => userAddresses.value.filter((address) => address?.id == route.value.query.id).pop(),
() => userAddresses.value.filter((address) => address?.id === route.value.query.id).pop(),
);

const isNewAddress = computed(() => !activeAddress.value);
Expand Down
Loading