Merge pull request #86 from vtex-apps/fix/scope-messages

Scope Messages
vtex-apps · Apr 25, 2019 · e42b8d8 · e42b8d8
2 parents 903208e + c77c886
commit e42b8d8
Show file tree

Hide file tree

Showing 9 changed files with 64 additions and 60 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.16.0] - 2019-04-24
+### Changed
+- Scope messages by domain
+
 ## [2.15.0] - 2019-04-24
 ### Added
 - Adds support for `notification` on `header-row`.

diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
   "vendor": "vtex",
   "name": "store-header",
-  "version": "2.15.0",
+  "version": "2.16.0",
   "title": "VTEX Store Header",
   "defaultLocale": "pt-BR",
   "description": "The VTEX Store Header component",

diff --git a/messages/context.json b/messages/context.json
@@ -1,14 +1,14 @@
 {
-  "editor.header.title": "editor.header.title",
-  "editor.header.description": "editor.header.description",
-  "editor.header.logo.title": "editor.header.logo.title",
-  "editor.header.logo.image": "editor.header.logo.image",
-  "editor.header.link.url": "editor.header.link.url",
-  "editor.header.show.searchbar.title": "editor.header.show.searchbar.title",
-  "editor.header.show.login.title": "editor.header.show.login.title",
-  "header.search-placeholder": "header.search-placeholder",
-  "header.search-emptyPlaceholder": "header.search-emptyPlaceholder",
-  "header.topMenu.minicart.icon.label": "header.topMenu.minicart.icon.label",
-  "header.topMenu.login.icon.label": "header.topMenu.login.icon.label",
-  "header.search-cancel": "header.search-cancel"
+  "admin/editor.header.title": "admin/editor.header.title",
+  "admin/editor.header.description": "admin/editor.header.description",
+  "admin/editor.header.logo.title": "admin/editor.header.logo.title",
+  "admin/editor.header.logo.image": "admin/editor.header.logo.image",
+  "admin/editor.header.link.url": "admin/editor.header.link.url",
+  "admin/editor.header.show.searchbar.title": "admin/editor.header.show.searchbar.title",
+  "admin/editor.header.show.login.title": "admin/editor.header.show.login.title",
+  "store/header.search-placeholder": "store/header.search-placeholder",
+  "store/header.search-emptyPlaceholder": "store/header.search-emptyPlaceholder",
+  "store/header.topMenu.minicart.icon.label": "store/header.topMenu.minicart.icon.label",
+  "store/header.topMenu.login.icon.label": "store/header.topMenu.login.icon.label",
+  "store/header.search-cancel": "store/header.search-cancel"
 }
diff --git a/messages/en.json b/messages/en.json
@@ -1,14 +1,14 @@
 {
-  "editor.header.title": "Header",
-  "editor.header.description": "Header component",
-  "editor.header.logo.title": "Logo",
-  "editor.header.logo.image": "Logo image",
-  "editor.header.link.url": "Logo link",
-  "editor.header.show.searchbar.title": "Show SearchBar",
-  "editor.header.show.login.title": "Show Login",
-  "header.search-placeholder": "Search for products, brands...",
-  "header.search-emptyPlaceholder": "No matches found",
-  "header.topMenu.minicart.icon.label": "My Cart",
-  "header.topMenu.login.icon.label": "Sign in",
-  "header.search-cancel": "Cancel"
+  "admin/editor.header.title": "Header",
+  "admin/editor.header.description": "Header component",
+  "admin/editor.header.logo.title": "Logo",
+  "admin/editor.header.logo.image": "Logo image",
+  "admin/editor.header.link.url": "Logo link",
+  "admin/editor.header.show.searchbar.title": "Show SearchBar",
+  "admin/editor.header.show.login.title": "Show Login",
+  "store/header.search-placeholder": "Search for products, brands...",
+  "store/header.search-emptyPlaceholder": "No matches found",
+  "store/header.topMenu.minicart.icon.label": "My Cart",
+  "store/header.topMenu.login.icon.label": "Sign in",
+  "store/header.search-cancel": "Cancel"
 }
diff --git a/messages/es.json b/messages/es.json
@@ -1,14 +1,14 @@
 {
-  "editor.header.title": "Cabecera",
-  "editor.header.description": "Componente de cabecera",
-  "editor.header.logo.title": "Logotipo",
-  "editor.header.logo.image": "Imagen del logotipo",
-  "editor.header.link.url": "Link del logotipo",
-  "editor.header.show.searchbar.title": "Mostrar Busca",
-  "editor.header.show.login.title": "Mostrar Login",
-  "header.search-placeholder": "Búsqueda por productos, marcas...",
-  "header.search-emptyPlaceholder": "Ningún resultado encontrado",
-  "header.topMenu.minicart.icon.label": "Mi Cesta",
-  "header.topMenu.login.icon.label": "Entrar",
-  "header.search-cancel": "Cancelar"
+  "admin/editor.header.title": "Cabecera",
+  "admin/editor.header.description": "Componente de cabecera",
+  "admin/editor.header.logo.title": "Logotipo",
+  "admin/editor.header.logo.image": "Imagen del logotipo",
+  "admin/editor.header.link.url": "Link del logotipo",
+  "admin/editor.header.show.searchbar.title": "Mostrar Busca",
+  "admin/editor.header.show.login.title": "Mostrar Login",
+  "store/header.search-placeholder": "Búsqueda por productos, marcas...",
+  "store/header.search-emptyPlaceholder": "Ningún resultado encontrado",
+  "store/header.topMenu.minicart.icon.label": "Mi Cesta",
+  "store/header.topMenu.login.icon.label": "Entrar",
+  "store/header.search-cancel": "Cancelar"
 }
diff --git a/messages/pt.json b/messages/pt.json
@@ -1,14 +1,14 @@
 {
-  "editor.header.title": "Cabeçalho",
-  "editor.header.description": "Componente de cabeçalho",
-  "editor.header.logo.title": "Logo",
-  "editor.header.logo.image": "Imagem da Logo",
-  "editor.header.link.url": "Link da Logo",
-  "editor.header.show.searchbar.title": "Mostrar Busca",
-  "editor.header.show.login.title": "Mostrar Login",
-  "header.search-placeholder": "Busque por produtos, marcas...",
-  "header.search-emptyPlaceholder": "Nenhum resultado encontrado",
-  "header.topMenu.minicart.icon.label": "Meu Carrinho",
-  "header.topMenu.login.icon.label": "Entrar",
-  "header.search-cancel": "Cancelar"
+  "admin/editor.header.title": "Cabeçalho",
+  "admin/editor.header.description": "Componente de cabeçalho",
+  "admin/editor.header.logo.title": "Logo",
+  "admin/editor.header.logo.image": "Imagem da Logo",
+  "admin/editor.header.link.url": "Link da Logo",
+  "admin/editor.header.show.searchbar.title": "Mostrar Busca",
+  "admin/editor.header.show.login.title": "Mostrar Login",
+  "store/header.search-placeholder": "Busque por produtos, marcas...",
+  "store/header.search-emptyPlaceholder": "Nenhum resultado encontrado",
+  "store/header.topMenu.minicart.icon.label": "Meu Carrinho",
+  "store/header.topMenu.login.icon.label": "Entrar",
+  "store/header.search-cancel": "Cancelar"
 }
diff --git a/react/legacy/components/Actions.js b/react/legacy/components/Actions.js
@@ -66,7 +66,7 @@ const Actions = ({
               iconClasses={iconClasses}
               labelClasses={labelClasses}
               iconLabel={
-                <FormattedMessage id="header.topMenu.login.icon.label" />
+                <FormattedMessage id="store/header.topMenu.login.icon.label" />
               }
             />
           )}
@@ -77,7 +77,7 @@ const Actions = ({
               iconClasses={iconClasses}
               labelClasses={labelClasses}
               iconLabel={
-                <FormattedMessage id="header.topMenu.minicart.icon.label" />
+                <FormattedMessage id="store/header.topMenu.minicart.icon.label" />
               }
             />
           )}

diff --git a/react/legacy/components/SearchBar.js b/react/legacy/components/SearchBar.js
@@ -25,9 +25,9 @@ const SearchBar = ({ onCancel, iconClasses, mobile }) => {
       <div className="w-75">
         <Adopt
           mapper={{
-            placeholder: <FormattedMessage id="header.search-placeholder" />,
+            placeholder: <FormattedMessage id="store/header.search-placeholder" />,
             emptyPlaceholder: (
-              <FormattedMessage id="header.search-emptyPlaceholder" />
+              <FormattedMessage id="store/header.search-emptyPlaceholder" />
             ),
           }}
         >
@@ -47,7 +47,7 @@ const SearchBar = ({ onCancel, iconClasses, mobile }) => {
         <div className="w-25 pa2-m pt2-s">
           <Button size="small" variation="tertiary" onClick={onCancel}>
             <span className={cancelClassNames}>
-              <FormattedMessage id="header.search-cancel" />
+              <FormattedMessage id="store/header.search-cancel" />
             </span>
           </Button>
         </div>

diff --git a/react/legacy/index.js b/react/legacy/index.js
@@ -107,29 +107,29 @@ Header.defaultProps = {
 }
 
 Header.schema = {
-  title: 'editor.header.title',
-  description: 'editor.header.description',
+  title: 'admin/editor.header.title',
+  description: 'admin/editor.header.description',
   type: 'object',
   properties: {
     logoUrl: {
       type: 'string',
-      title: 'editor.header.logo.image',
+      title: 'admin/editor.header.logo.image',
       widget: {
         'ui:widget': 'image-uploader',
       },
     },
     linkUrl: {
       type: 'string',
-      title: 'editor.header.link.url',
+      title: 'admin/editor.header.link.url',
     },
     showSearchBar: {
-      title: 'editor.header.show.searchbar.title',
+      title: 'admin/editor.header.show.searchbar.title',
       type: 'boolean',
       default: true,
       isLayout: true,
     },
     showLogin: {
-      title: 'editor.header.show.login.title',
+      title: 'admin/editor.header.show.login.title',
       type: 'boolean',
       default: true,
       isLayout: true,