Skip to content

Commit

Permalink
Merge branch 'master' into mamico/translate_type_in_foldercontents
Browse files Browse the repository at this point in the history
  • Loading branch information
mamico committed Jul 13, 2022
2 parents 72c0933 + baed57f commit dcf604e
Show file tree
Hide file tree
Showing 22 changed files with 43 additions and 165 deletions.
10 changes: 0 additions & 10 deletions .tx/config

This file was deleted.

5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,16 @@
### Feature

- Use type info instead of id type as icon title in the folder contents. @mamico
- Remove transifex configuration for Volto translations @erral

### Bugfix

- Fixed a11y of Maps block (#3467) @iRohitSingh

### Internal

- mock all loadable libraries. @mamico

### Documentation

- Remove sphinx_sitemap configuration because Volto's docs are now imported into the main docs, making this setting unnecessary. @stevepiercy
Expand Down
4 changes: 3 additions & 1 deletion cypress/tests/core/blocks/blocks.js
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,9 @@ describe('Blocks Tests', () => {
'be.visible',
);

cy.get('.celled.fixed.table tr:first-child() th:nth-child(2)').click();
cy.get('.celled.fixed.table tr:first-child() th:nth-child(2)').click({
waitForAnimations: false,
});

// without the second click the test fails. so this makes the test green.
cy.get('.celled.fixed.table tr:first-child() th:nth-child(2)').click();
Expand Down
78 changes: 1 addition & 77 deletions docs/source/recipes/i18n.md
Original file line number Diff line number Diff line change
Expand Up @@ -212,80 +212,4 @@ Thus the `customizations` folder is excluded from the i18n build.
The Volto project welcomes all speakers from the world to include any language, which is not supported yet.
You can contribute to translate Volto into severals languages at [Transifex](https://www.transifex.com/plone/signin/?next=/plone/plone5/volto-pot/).
When you done your translation resource at Transifex, you need to add the locales files into Volto project, for that you need use [transifex-client](https://docs.transifex.com/client/introduction) tool and [install it](https://docs.transifex.com/client/installing-the-client).
### Update language from Transifex
To get translate the latest translation changes, you have to do the following steps:
1. You can pull the latest changes for a specific language, for example `de` from Transifex for *Volto project*, by this command:
```sh
tx pull -f -l de
```
This will generate the following output:
```sh
tx INFO: Pulling translations for resource plone5.volto-pot (source: locales/volto.pot)
tx INFO: -> de: locales/de/LC_MESSAGES/volto.po
tx INFO: Done.
```
Also can pull the latest changes for all languages available from Transifex for *Volto project*, by this command:
```sh
tx pull -f --all
```
2. You need updated the json file for the language updated from Transifex for *Volto project*, by this command:
```sh
yarn i18n
```
This command generate again the ``locales/de.json`` file updated, it is needed for Volto app.
3. Please, update the ``CHANGELOG.md`` file, make commits and push the changes via pull request at the repository.
**Tip:** For more information about each command, use ``tx <command> --help``. As an example, to learn more about the ``tx pull`` command, run ``tx pull --help``.
### Add new language from Transifex
1. You should check what languages are available in Transifex to translate for the [Volto project](https://www.transifex.com/plone/signin/?next=/plone/plone5/volto-pot/). If the language to be translated does not exist, please [request it](https://docs.transifex.com/projects/adding-and-removing-project-languages).
2. You can pull the new language for example *Portuguese (Brazil)* aka **'pt_BR'** from Transifex for *Volto project*, by this command:
```sh
tx pull -f -l pt_BR
```
3. You new to modify the ``src/server.jsx`` file and add in the *'import section'* as the follow:
```js
import ptBrLocale from '~/../locales/pt_BR.json';
```
Also you need define the new locale into *'locales const'* as the follow:
```js
pt: ptBrLocale,
```
4. You new to modify the ``src/constants/Languages.js`` file and add a new line at *'module.exports'* section as the follow:
```js
pt_BR: 'Português (Brasil)',
```
5. You need create the json file for the language created from Transifex for *Volto project*, by this command:
```sh
yarn i18n
```
This command generate the ``locales/pt_BR.json`` file, it is needed for Volto app.
6. Please, update the ``CHANGELOG.md`` file, make commits and push the changes via pull request at the repository.
If your language's po file is not available in Volto, [open an issue in GitHub](https://github.com/plone/volto/issues) so we can create it for you, and after that you can start contributing your translations!
6 changes: 1 addition & 5 deletions locales/ca/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ msgstr "Alfabèticament"

#: components/manage/Blocks/Image/schema
#: components/manage/Blocks/LeadImage/LeadImageSidebar
#: components/manage/Blocks/Maps/schema
# defaultMessage: Alt text
msgid "Alt text"
msgstr "Text alternatiu (alt)"
Expand Down Expand Up @@ -878,11 +879,6 @@ msgstr "Email enviat"
msgid "Embed code error, please follow the instructions and try again."
msgstr "Error d'inserció del codi, seguiu les instruccions i torneu-ho a provar."

#: components/manage/Blocks/Maps/View
# defaultMessage: Embeded Google Maps
msgid "Embeded Google Maps"
msgstr "Google Maps incrustat"

#: components/manage/Widgets/ObjectListWidget
# defaultMessage: Empty object list
msgid "Empty object list"
Expand Down
6 changes: 1 addition & 5 deletions locales/de/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ msgstr "alphabetisch"

#: components/manage/Blocks/Image/schema
#: components/manage/Blocks/LeadImage/LeadImageSidebar
#: components/manage/Blocks/Maps/schema
# defaultMessage: Alt text
msgid "Alt text"
msgstr "Alternative Text"
Expand Down Expand Up @@ -884,11 +885,6 @@ msgstr "E-Mail versendet"
msgid "Embed code error, please follow the instructions and try again."
msgstr "Fehler beim Einbinden des Google Maps Codes. Bitte lesen Sie die Anweisungen und stellen Sie sicher dass Sie den korrekten Code verwenden."

#: components/manage/Blocks/Maps/View
# defaultMessage: Embeded Google Maps
msgid "Embeded Google Maps"
msgstr "Eingebettete Google Maps Karte"

#: components/manage/Widgets/ObjectListWidget
# defaultMessage: Empty object list
msgid "Empty object list"
Expand Down
6 changes: 1 addition & 5 deletions locales/en/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ msgstr ""

#: components/manage/Blocks/Image/schema
#: components/manage/Blocks/LeadImage/LeadImageSidebar
#: components/manage/Blocks/Maps/schema
# defaultMessage: Alt text
msgid "Alt text"
msgstr ""
Expand Down Expand Up @@ -869,11 +870,6 @@ msgstr ""
msgid "Embed code error, please follow the instructions and try again."
msgstr ""

#: components/manage/Blocks/Maps/View
# defaultMessage: Embeded Google Maps
msgid "Embeded Google Maps"
msgstr ""

#: components/manage/Widgets/ObjectListWidget
# defaultMessage: Empty object list
msgid "Empty object list"
Expand Down
6 changes: 1 addition & 5 deletions locales/es/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ msgstr "Alfabéticamente"

#: components/manage/Blocks/Image/schema
#: components/manage/Blocks/LeadImage/LeadImageSidebar
#: components/manage/Blocks/Maps/schema
# defaultMessage: Alt text
msgid "Alt text"
msgstr "Texto alternativo"
Expand Down Expand Up @@ -879,11 +880,6 @@ msgstr "Correo electrónico enviado"
msgid "Embed code error, please follow the instructions and try again."
msgstr "Ha habido un error el código de encapsulación, siga las instrucciones e inténtelo de nuevo."

#: components/manage/Blocks/Maps/View
# defaultMessage: Embeded Google Maps
msgid "Embeded Google Maps"
msgstr "Insertar Google Maps"

#: components/manage/Widgets/ObjectListWidget
# defaultMessage: Empty object list
msgid "Empty object list"
Expand Down
6 changes: 1 addition & 5 deletions locales/eu/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ msgstr "Alfabetikoki"

#: components/manage/Blocks/Image/schema
#: components/manage/Blocks/LeadImage/LeadImageSidebar
#: components/manage/Blocks/Maps/schema
# defaultMessage: Alt text
msgid "Alt text"
msgstr "Ordezko testua (alt)"
Expand Down Expand Up @@ -876,11 +877,6 @@ msgstr "Eposta ondo bidali da"
msgid "Embed code error, please follow the instructions and try again."
msgstr "Itsatsitako kodearen errorea, jarraitu argibideak eta saiatu berriz."

#: components/manage/Blocks/Maps/View
# defaultMessage: Embeded Google Maps
msgid "Embeded Google Maps"
msgstr "Itsatsitako Google Maps"

#: components/manage/Widgets/ObjectListWidget
# defaultMessage: Empty object list
msgid "Empty object list"
Expand Down
6 changes: 1 addition & 5 deletions locales/fr/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ msgstr ""

#: components/manage/Blocks/Image/schema
#: components/manage/Blocks/LeadImage/LeadImageSidebar
#: components/manage/Blocks/Maps/schema
# defaultMessage: Alt text
msgid "Alt text"
msgstr "Texte pour la balise alt"
Expand Down Expand Up @@ -886,11 +887,6 @@ msgstr "E-mail envoyé"
msgid "Embed code error, please follow the instructions and try again."
msgstr "Erreur dans le code intégré, veuillez suivre les instructions et essayez de nouveau."

#: components/manage/Blocks/Maps/View
# defaultMessage: Embeded Google Maps
msgid "Embeded Google Maps"
msgstr "Carte Google intégrée"

#: components/manage/Widgets/ObjectListWidget
# defaultMessage: Empty object list
msgid "Empty object list"
Expand Down
6 changes: 1 addition & 5 deletions locales/it/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ msgstr "Alfabetico"

#: components/manage/Blocks/Image/schema
#: components/manage/Blocks/LeadImage/LeadImageSidebar
#: components/manage/Blocks/Maps/schema
# defaultMessage: Alt text
msgid "Alt text"
msgstr "Testo alternativo"
Expand Down Expand Up @@ -869,11 +870,6 @@ msgstr "Email inviata"
msgid "Embed code error, please follow the instructions and try again."
msgstr "Errore del codice incorporato, per favore segui le istruzioni e riprova."

#: components/manage/Blocks/Maps/View
# defaultMessage: Embeded Google Maps
msgid "Embeded Google Maps"
msgstr "Google Maps incorporata"

#: components/manage/Widgets/ObjectListWidget
# defaultMessage: Empty object list
msgid "Empty object list"
Expand Down
6 changes: 1 addition & 5 deletions locales/ja/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ msgstr "アルファベット順"

#: components/manage/Blocks/Image/schema
#: components/manage/Blocks/LeadImage/LeadImageSidebar
#: components/manage/Blocks/Maps/schema
# defaultMessage: Alt text
msgid "Alt text"
msgstr "代替テキスト"
Expand Down Expand Up @@ -877,11 +878,6 @@ msgstr "メール送信"
msgid "Embed code error, please follow the instructions and try again."
msgstr "Embedコードがエラーです。説明を読んで再度実行してください。"

#: components/manage/Blocks/Maps/View
# defaultMessage: Embeded Google Maps
msgid "Embeded Google Maps"
msgstr "埋め込まれたGoogle Maps"

#: components/manage/Widgets/ObjectListWidget
# defaultMessage: Empty object list
msgid "Empty object list"
Expand Down
6 changes: 1 addition & 5 deletions locales/nl/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ msgstr ""

#: components/manage/Blocks/Image/schema
#: components/manage/Blocks/LeadImage/LeadImageSidebar
#: components/manage/Blocks/Maps/schema
# defaultMessage: Alt text
msgid "Alt text"
msgstr ""
Expand Down Expand Up @@ -888,11 +889,6 @@ msgstr ""
msgid "Embed code error, please follow the instructions and try again."
msgstr ""

#: components/manage/Blocks/Maps/View
# defaultMessage: Embeded Google Maps
msgid "Embeded Google Maps"
msgstr ""

#: components/manage/Widgets/ObjectListWidget
# defaultMessage: Empty object list
msgid "Empty object list"
Expand Down
6 changes: 1 addition & 5 deletions locales/pt/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ msgstr ""

#: components/manage/Blocks/Image/schema
#: components/manage/Blocks/LeadImage/LeadImageSidebar
#: components/manage/Blocks/Maps/schema
# defaultMessage: Alt text
msgid "Alt text"
msgstr "Texto alternativo"
Expand Down Expand Up @@ -877,11 +878,6 @@ msgstr "Email enviado"
msgid "Embed code error, please follow the instructions and try again."
msgstr ""

#: components/manage/Blocks/Maps/View
# defaultMessage: Embeded Google Maps
msgid "Embeded Google Maps"
msgstr ""

#: components/manage/Widgets/ObjectListWidget
# defaultMessage: Empty object list
msgid "Empty object list"
Expand Down
6 changes: 1 addition & 5 deletions locales/pt_BR/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ msgstr "Alfabeticamente"

#: components/manage/Blocks/Image/schema
#: components/manage/Blocks/LeadImage/LeadImageSidebar
#: components/manage/Blocks/Maps/schema
# defaultMessage: Alt text
msgid "Alt text"
msgstr "Descrição Alt"
Expand Down Expand Up @@ -879,11 +880,6 @@ msgstr "E-mail enviado"
msgid "Embed code error, please follow the instructions and try again."
msgstr "Erro de código Embed, siga as instruções e tente novamente."

#: components/manage/Blocks/Maps/View
# defaultMessage: Embeded Google Maps
msgid "Embeded Google Maps"
msgstr "Google Maps Embed"

#: components/manage/Widgets/ObjectListWidget
# defaultMessage: Empty object list
msgid "Empty object list"
Expand Down
6 changes: 1 addition & 5 deletions locales/ro/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ msgstr "Alfabetic"

#: components/manage/Blocks/Image/schema
#: components/manage/Blocks/LeadImage/LeadImageSidebar
#: components/manage/Blocks/Maps/schema
# defaultMessage: Alt text
msgid "Alt text"
msgstr "Text alternativ"
Expand Down Expand Up @@ -869,11 +870,6 @@ msgstr "E-mail trimis"
msgid "Embed code error, please follow the instructions and try again."
msgstr "Eroare de cod integrat, urmați instrucțiunile și încercați din nou."

#: components/manage/Blocks/Maps/View
# defaultMessage: Embeded Google Maps
msgid "Embeded Google Maps"
msgstr "Harti Google integrate"

#: components/manage/Widgets/ObjectListWidget
# defaultMessage: Empty object list
msgid "Empty object list"
Expand Down
8 changes: 2 additions & 6 deletions locales/volto.pot
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Plone\n"
"POT-Creation-Date: 2022-06-17T07:47:08.199Z\n"
"POT-Creation-Date: 2022-07-11T16:43:32.082Z\n"
"Last-Translator: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
"Language-Team: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -191,6 +191,7 @@ msgstr ""

#: components/manage/Blocks/Image/schema
#: components/manage/Blocks/LeadImage/LeadImageSidebar
#: components/manage/Blocks/Maps/schema
# defaultMessage: Alt text
msgid "Alt text"
msgstr ""
Expand Down Expand Up @@ -871,11 +872,6 @@ msgstr ""
msgid "Embed code error, please follow the instructions and try again."
msgstr ""

#: components/manage/Blocks/Maps/View
# defaultMessage: Embeded Google Maps
msgid "Embeded Google Maps"
msgstr ""

#: components/manage/Widgets/ObjectListWidget
# defaultMessage: Empty object list
msgid "Empty object list"
Expand Down
Loading

0 comments on commit dcf604e

Please sign in to comment.