Skip to content

Commit

Permalink
Merge pull request #49 from vtex-apps/fix/scope-messages
Browse files Browse the repository at this point in the history
Scope Messages
  • Loading branch information
tlgimenes committed Apr 25, 2019
2 parents 44f437a + dc86efd commit ffc2e98
Show file tree
Hide file tree
Showing 9 changed files with 45 additions and 41 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## [2.9.0] - 2019-04-25
### Changed
- Scope messages by domain

## [2.8.5] - 2019-04-11
### Fixed
- Fixed bug where the width would be limited by the Container's width.
Expand Down
2 changes: 1 addition & 1 deletion manifest.json
@@ -1,7 +1,7 @@
{
"vendor": "vtex",
"name": "telemarketing",
"version": "2.8.5",
"version": "2.9.0",
"title": "VTEX Telemarketing",
"defaultLocale": "pt-BR",
"description": "The VTEX telemarketing app",
Expand Down
16 changes: 8 additions & 8 deletions messages/context.json
@@ -1,10 +1,10 @@
{
"telemarketing.attendant": "telemarketing.attendant",
"telemarketing.client": "telemarketing.client",
"telemarketing-login.message": "telemarketing-login.message",
"telemarketing-login.button": "telemarketing-login.button",
"telemarketing-logout.button": "telemarketing-logout.button",
"telemarketing-logout.document-label": "telemarketing-logout.document-label",
"telemarketing-logout.phone-label": "telemarketing-logout.phone-label",
"telemarketing-logout.button-orders": "telemarketing-logout.button-orders"
"store/telemarketing.attendant": "store/telemarketing.attendant",
"store/telemarketing.client": "store/telemarketing.client",
"store/telemarketing-login.message": "store/telemarketing-login.message",
"store/telemarketing-login.button": "store/telemarketing-login.button",
"store/telemarketing-logout.button": "store/telemarketing-logout.button",
"store/telemarketing-logout.document-label": "store/telemarketing-logout.document-label",
"store/telemarketing-logout.phone-label": "store/telemarketing-logout.phone-label",
"store/telemarketing-logout.button-orders": "store/telemarketing-logout.button-orders"
}
16 changes: 8 additions & 8 deletions messages/en.json
@@ -1,10 +1,10 @@
{
"telemarketing.attendant": "Attendant",
"telemarketing.client": "Client",
"telemarketing-login.message": "Login as",
"telemarketing-login.button": "Login",
"telemarketing-logout.button": "Logout",
"telemarketing-logout.document-label": "Document",
"telemarketing-logout.phone-label": "Phone",
"telemarketing-logout.button-orders": "Orders"
"store/telemarketing.attendant": "Attendant",
"store/telemarketing.client": "Client",
"store/telemarketing-login.message": "Login as",
"store/telemarketing-login.button": "Login",
"store/telemarketing-logout.button": "Logout",
"store/telemarketing-logout.document-label": "Document",
"store/telemarketing-logout.phone-label": "Phone",
"store/telemarketing-logout.button-orders": "Orders"
}
16 changes: 8 additions & 8 deletions messages/es.json
@@ -1,10 +1,10 @@
{
"telemarketing.attendant": "Asistente",
"telemarketing.client": "Cliente",
"telemarketing-login.message": "Ingresá como cliente",
"telemarketing-login.button": "Ingresá",
"telemarketing-logout.button": "Salir",
"telemarketing-logout.document-label": "Documento",
"telemarketing-logout.phone-label": "Teléphono",
"telemarketing-logout.button-orders": "Pedidos"
"store/telemarketing.attendant": "Asistente",
"store/telemarketing.client": "Cliente",
"store/telemarketing-login.message": "Ingresá como cliente",
"store/telemarketing-login.button": "Ingresá",
"store/telemarketing-logout.button": "Salir",
"store/telemarketing-logout.document-label": "Documento",
"store/telemarketing-logout.phone-label": "Teléphono",
"store/telemarketing-logout.button-orders": "Pedidos"
}
16 changes: 8 additions & 8 deletions messages/pt.json
@@ -1,10 +1,10 @@
{
"telemarketing.attendant": "Atendente",
"telemarketing.client": "Cliente",
"telemarketing-login.message": "Entrar como cliente",
"telemarketing-login.button": "Entrar",
"telemarketing-logout.button": "Sair",
"telemarketing-logout.document-label": "Documento",
"telemarketing-logout.phone-label": "Telefone",
"telemarketing-logout.button-orders": "Pedidos"
"store/telemarketing.attendant": "Atendente",
"store/telemarketing.client": "Cliente",
"store/telemarketing-login.message": "Entrar como cliente",
"store/telemarketing-login.button": "Entrar",
"store/telemarketing-logout.button": "Sair",
"store/telemarketing-logout.document-label": "Documento",
"store/telemarketing-logout.phone-label": "Telefone",
"store/telemarketing-logout.button-orders": "Pedidos"
}
6 changes: 3 additions & 3 deletions react/components/LoginAsCustomer.tsx
Expand Up @@ -40,7 +40,7 @@ const LoginAsCustomer = (props: Props) => {
<div className="flex items-center c-on-base--inverted">
<IconProfile />
<div className="ml2">
{translate('telemarketing-login.message', intl)}
{translate('store/telemarketing-login.message', intl)}
</div>
</div>
),
Expand Down Expand Up @@ -72,7 +72,7 @@ const LoginAsCustomer = (props: Props) => {
<div className="bg-base w-100 ph5 pb5 pt7">
<div className={`${styles.loginForm} c-disabled`}>
<div className={`${styles.loginFormMessage} t-small tl mb3`}>
{translate('telemarketing-login.message', intl)}
{translate('store/telemarketing-login.message', intl)}
</div>
<div className={`${styles.emailInput} mb5`}>
<Input
Expand All @@ -87,7 +87,7 @@ const LoginAsCustomer = (props: Props) => {
onClick={() => onSetSession(emailInput)}
isLoading={loading}
>
{translate('telemarketing-login.button', intl)}
{translate('store/telemarketing-login.button', intl)}
</Button>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions react/components/LogoutCustomerSession.tsx
Expand Up @@ -88,30 +88,30 @@ const LogoutCustomerSession = (props: Props) => {

<div className="w-100 flex flex-wrap t-small">
<div className="tl pb5 pr2">
{translate('telemarketing-logout.document-label', intl)}
{translate('store/telemarketing-logout.document-label', intl)}
</div>
<div className="pb5 pl2 c-muted-3">{client.document}</div>
</div>

<div className="w-100 flex flex-wrap t-small">
<div className="tl pb5 pr2">
{translate('telemarketing-logout.phone-label', intl)}
{translate('store/telemarketing-logout.phone-label', intl)}
</div>
<div className="pb5 pl2 c-muted-3">{client.phone}</div>
</div>
</div>
<div className="flex justify-around mt5">
<Link page="store.account">
<Button size="regular">
{translate('telemarketing-logout.button-orders', intl)}
{translate('store/telemarketing-logout.button-orders', intl)}
</Button>
</Link>
<Button
size="regular"
onClick={() => onDepersonify()}
isLoading={loading}
>
{translate('telemarketing-logout.button', intl)}
{translate('store/telemarketing-logout.button', intl)}
</Button>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion react/components/Telemarketing.tsx
Expand Up @@ -63,7 +63,7 @@ const Telemarketing = (props: Props) => {
</span>
) : (
<Fragment>
{translate('telemarketing.attendant', intl)}
{translate('store/telemarketing.attendant', intl)}
<span>{`: ${attendantEmail}`}</span>
</Fragment>
)}
Expand Down

0 comments on commit ffc2e98

Please sign in to comment.