diff --git a/com.twin.app.shoptime/resources/de/strings.json b/com.twin.app.shoptime/resources/de/strings.json
index 6fa5b451..f57844ef 100644
--- a/com.twin.app.shoptime/resources/de/strings.json
+++ b/com.twin.app.shoptime/resources/de/strings.json
@@ -131,7 +131,8 @@
"view order details": "Mehr Details sehen",
"You have not any recently viewed pages": "Sie haben keine kürzlich angesehene Seiten.",
"No Alerts Yet": "Keine Benachrichtigungen vorhanden",
- "Reminder Notification turned 'OFF'": "Erinnerung-Benachrichtigung ist ausgeschaltet.",
+ "Reminder Notification turned OFF": "Erinnerung-Benachrichtigung ist ausgeschaltet. \n Wählen Sie Ja aus, um Erinnerungen einzuschalten.",
+ "Reminder Notification turned ON": "Erinnerung-Benachrichtigung ist {onoff}",
"Phone": "Telefon",
"Email": "Email",
"URL": "URL",
@@ -150,6 +151,7 @@
"Shows": "SHOWS",
"SHOWS": "SHOWS",
"Items": "Artikel",
+ "ITEMS": "Artikel",
"Theme Menu": "(need for transfer) Theme Menu",
"Your coupon download is complete.": "(need for transfer) Your coupon download is complete.",
"Puschase over": "Kaufen Sie über",
diff --git a/com.twin.app.shoptime/resources/en/GB/strings.json b/com.twin.app.shoptime/resources/en/GB/strings.json
index aab8fa21..9686f0d3 100644
--- a/com.twin.app.shoptime/resources/en/GB/strings.json
+++ b/com.twin.app.shoptime/resources/en/GB/strings.json
@@ -131,7 +131,8 @@
"view order details": "view order details",
"You have not any recently viewed pages": "You have not any recently viewed pages",
"No Alerts Yet": "No Alerts Yet",
- "Reminder Notification turned 'OFF'": "Reminder Notification turned 'OFF'",
+ "Reminder Notification turned OFF": "Reminder Notification turned \"OFF\"",
+ "Reminder Notification turned ON": "Reminder Notification turned \"ON\"",
"Phone": "Phone",
"Email": "Email",
"URL": "URL",
@@ -150,6 +151,7 @@
"Shows": "Shows",
"SHOWS": "SHOWS",
"Items": "Items",
+ "ITEMS": "ITEMS",
"Theme Menu": "Theme Menu",
"Your coupon download is complete.": "Your coupon download is complete.",
"Puschase over": "Puschase over",
diff --git a/com.twin.app.shoptime/resources/ru/strings.json b/com.twin.app.shoptime/resources/ru/strings.json
index e8fbfdf6..4d332e63 100644
--- a/com.twin.app.shoptime/resources/ru/strings.json
+++ b/com.twin.app.shoptime/resources/ru/strings.json
@@ -131,7 +131,9 @@
"view order details": "Смотреть детали",
"You have not any recently viewed pages": "Нет информации в категории История просмотров",
"No Alerts Yet": "Нет установленных напоминаний",
- "Reminder Notification turned 'OFF'": "Функция Напоминания выключена. Нажмите клавишу Да для включения функции.",
+ "Reminder Notification turned OFF": "Функция Напоминания выключена. Нажмите клавишу Да для включения функции.",
+ "Reminder Notification turned ON": "Напоминания {onoff}",
+ "Reminder Notification turned 'OFF'": "",
"Phone": "Телефон",
"Email": "Имейл-адрес",
"URL": "Сайт",
@@ -150,6 +152,7 @@
"Shows": "ШОУ",
"SHOWS": "ШОУ",
"Items": "Товар",
+ "ITEMS": "Товар",
"Theme Menu": "(need for transfer) Theme Menu",
"Your coupon download is complete.": "(need for transfer) Your coupon download is complete.",
"Puschase over": "Покупка на сумму свыше",
diff --git a/com.twin.app.shoptime/src/components/TButton/TButton.jsx b/com.twin.app.shoptime/src/components/TButton/TButton.jsx
index c87e2108..9bbf0bed 100644
--- a/com.twin.app.shoptime/src/components/TButton/TButton.jsx
+++ b/com.twin.app.shoptime/src/components/TButton/TButton.jsx
@@ -9,6 +9,7 @@ import { Marquee, MarqueeController } from "@enact/ui/Marquee";
import IcProfile from "../../../assets/images/icons/ic-profile@3x.png";
import CustomImage from "../CustomImage/CustomImage";
import css from "./TButton.module.less";
+import { $L } from "../../utils/helperMethods";
const SIZES = {
small: "small",
@@ -114,7 +115,7 @@ function TButtonBase({
>
{withMarquee ? (
) : (
@@ -125,7 +126,7 @@ function TButtonBase({
fallbackSrc={IcProfile}
/>
)}
- {children}
+ {$L(children)}
)}
diff --git a/com.twin.app.shoptime/src/components/TButtonTab/TButtonTab.jsx b/com.twin.app.shoptime/src/components/TButtonTab/TButtonTab.jsx
index 127a87ce..42e591ab 100644
--- a/com.twin.app.shoptime/src/components/TButtonTab/TButtonTab.jsx
+++ b/com.twin.app.shoptime/src/components/TButtonTab/TButtonTab.jsx
@@ -7,6 +7,7 @@ import SpotlightContainerDecorator from "@enact/spotlight/SpotlightContainerDeco
import useScrollReset from "../../hooks/useScrollReset";
import css from "./TButtonTab.module.less";
import TButtonTabItem from "./TButtonTabItem";
+import { $L } from "../../utils/helperMethods";
const Container = SpotlightContainerDecorator(
{ enterTo: "last-focused" },
@@ -79,7 +80,7 @@ export default function TButtonTab({
onFocus={handleScrollReset}
onBlur={handleStopScrolling}
>
- {item}
+ {$L(item)}
);
})}
diff --git a/com.twin.app.shoptime/src/components/THeader/THeader.jsx b/com.twin.app.shoptime/src/components/THeader/THeader.jsx
index e2fcb5b1..be2aa230 100644
--- a/com.twin.app.shoptime/src/components/THeader/THeader.jsx
+++ b/com.twin.app.shoptime/src/components/THeader/THeader.jsx
@@ -9,6 +9,7 @@ import SpotlightContainerDecorator, {
import Spottable from "@enact/spotlight/Spottable";
import css from "./THeader.module.less";
+import { $L } from "../../utils/helperMethods";
const Container = SpotlightContainerDecorator(
{ enterTo: "last-focused" },
@@ -63,7 +64,7 @@ export default function THeader({
className={css.title}
marqueeDisabled={marqueeDisabled}
>
- {title}
+ {$L(title)}
{children}
diff --git a/com.twin.app.shoptime/src/views/DetailPanel/DetailPanel.module.less b/com.twin.app.shoptime/src/views/DetailPanel/DetailPanel.module.less
index 844a5c8a..ca94a989 100644
--- a/com.twin.app.shoptime/src/views/DetailPanel/DetailPanel.module.less
+++ b/com.twin.app.shoptime/src/views/DetailPanel/DetailPanel.module.less
@@ -12,6 +12,7 @@
.elip(@clamp: 1);
padding-left: 12px !important;
text-transform: none !important;
+ letter-spacing: 0 !important;
}
display: flex;
width: 100%;
diff --git a/com.twin.app.shoptime/src/views/DetailPanel/YouMayLike/YouMayLike.module.less b/com.twin.app.shoptime/src/views/DetailPanel/YouMayLike/YouMayLike.module.less
index a78f0fca..2b23a323 100644
--- a/com.twin.app.shoptime/src/views/DetailPanel/YouMayLike/YouMayLike.module.less
+++ b/com.twin.app.shoptime/src/views/DetailPanel/YouMayLike/YouMayLike.module.less
@@ -31,9 +31,11 @@
.button {
.flex();
- .size(@w: 324px,@h: 78px);
+ min-width: 324px;
+ height: 78px;
font-weight: bold;
font-size: 30px;
+ padding: 0 30px;
.position(@position: absolute, @top: -41px, @left: 60px);
border-radius: 12px;
diff --git a/com.twin.app.shoptime/src/views/DetailPanel/components/ProductTag.module.less b/com.twin.app.shoptime/src/views/DetailPanel/components/ProductTag.module.less
index 9967f5d3..48eadde1 100644
--- a/com.twin.app.shoptime/src/views/DetailPanel/components/ProductTag.module.less
+++ b/com.twin.app.shoptime/src/views/DetailPanel/components/ProductTag.module.less
@@ -15,12 +15,16 @@
.ProductBadge {
margin-left: auto;
height: 42px;
+ > span {
+ height: 42px;
+ line-height: 42px;
+ padding: 0 10px;
+ }
.flex(@justifyCenter:flex-start);
.specialValue {
.tag-default(@backgroundColor:@PRIMARY_COLOR_RED, @fontColor:@COLOR_WHITE);
.size(@w: 66px, @h: 42px);
- line-height: 42px;
}
.freeShipping {
@@ -30,33 +34,26 @@
background-color: rgba(199, 8, 80, 0.1);
color: @PRIMARY_COLOR_RED;
text-align: center;
- line-height: 42px;
font-weight: bold;
font-size: 24px;
- .size(@w: 120px, @h: 42px);
}
.bigSale {
.tag-default(@backgroundColor:@COLOR_WHITE, @fontColor:@PRIMARY_COLOR_RED);
- .size(@w: 110px, @h: 42px);
.border-solid(@size:3px,@color:@PRIMARY_COLOR_RED);
line-height: 36px;
}
.shoptimePrice {
.tag-default(@backgroundColor:#4f172c, @fontColor:@COLOR_WHITE);
- .size(@w: 200px, @h: 42px);
- line-height: 42px;
}
.coupon {
background: #7a808d;
border-radius: 4px;
- .size(@w: 120px, @h: 42px);
color: @COLOR_WHITE;
margin-left: 6px;
text-align: center;
- line-height: 42px;
font-weight: bold;
font-size: 24px;
}
diff --git a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyInfo/MyInfo.module.less b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyInfo/MyInfo.module.less
index 2264148e..cce70fbf 100644
--- a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyInfo/MyInfo.module.less
+++ b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyInfo/MyInfo.module.less
@@ -78,6 +78,8 @@
top: 0;
right: 0;
font-size: 24px;
+ max-width: none;
+ margin-right: 0;
}
}
diff --git a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyInfo/MyInfoTabContents/CouponTab/CouponTab.jsx b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyInfo/MyInfoTabContents/CouponTab/CouponTab.jsx
index 6fa90b36..fbad87ba 100644
--- a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyInfo/MyInfoTabContents/CouponTab/CouponTab.jsx
+++ b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/MyInfo/MyInfoTabContents/CouponTab/CouponTab.jsx
@@ -28,9 +28,9 @@ export default function CouponTab() {
{$L("COUPON")}
{couponDatas && couponDatas.length > 0 && (
- {`(${couponDatas[0].total} items)`}
+
+ {`(${couponDatas[0].total})`} {$L("ITEMS")}
+
)}
diff --git a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/Reminders/Reminders.jsx b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/Reminders/Reminders.jsx
index 531ed5d6..a9affe32 100644
--- a/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/Reminders/Reminders.jsx
+++ b/com.twin.app.shoptime/src/views/MyPagePanel/MyPageSub/Reminders/Reminders.jsx
@@ -346,12 +346,7 @@ export default function Reminders({ title, cbScrollTo }) {
hasButton
button1Text={$L("OK")}
hasText
- text={
-
- {$L("Reminder Notification turned ")}
- '{$L("OFF")}'
-
- }
+ text={{$L("Reminder Notification turned OFF")}
}
onClose={handleCancel}
/>
)}
@@ -363,12 +358,7 @@ export default function Reminders({ title, cbScrollTo }) {
hasButton
button1Text={$L("OK")}
hasText
- text={
-
- {$L("Reminder Notification turned ")}
- '{$L("ON")}'
-
- }
+ text={{$L("Reminder Notification turned ON")}
}
onClose={handleCancel}
/>
)}