From bbe14f438601d876530af9c614228a4ec6951246 Mon Sep 17 00:00:00 2001 From: "Kausha.Shah" Date: Thu, 26 Sep 2019 15:58:58 +0530 Subject: [PATCH 01/14] added spanish translation --- src/i18n.js | 4 ++++ src/locales/sp.json | 30 ++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 src/locales/sp.json diff --git a/src/i18n.js b/src/i18n.js index 393dd03..bc85dc5 100644 --- a/src/i18n.js +++ b/src/i18n.js @@ -3,6 +3,7 @@ import { initReactI18next } from 'react-i18next'; import LanguageDetector from 'i18next-browser-languagedetector'; import translationEN from './locales/en.json'; import translationDE from './locales/de.json'; +import translationSP from './locales/sp.json'; import Config from './config'; const resources = { @@ -12,6 +13,9 @@ const resources = { de: { translation: translationDE, }, + sp: { + translation: translationSP + } }; i18n diff --git a/src/locales/sp.json b/src/locales/sp.json new file mode 100644 index 0000000..9f402a1 --- /dev/null +++ b/src/locales/sp.json @@ -0,0 +1,30 @@ +{ + "English": "Inglés", + "German": "Alemán", + "Submit": "Enviar", + "Change Language": "Cambiar idioma", + "Search your device": "Busca tu dispositivo", + "No results": "No hay resultados", + "Model": "Modelo", + "Vendor": "Vendedor", + "Variant": "Variante", + "Name": "Nombre", + "Release Version": "Versión de lanzamiento", + "Basic": "Básico", + "Advanced": "Avanzado", + "Build": "Construir", + "Cancel": "Cancelar", + "Add package(s)": "Agregar paquete (s)", + "Edit UCI defaults": "Editar valores predeterminados de UCI", + "Version": "Versión", + "Please confirm that you want to perform this action": "Confirme que desea realizar esta acción.", + "Building image requires computation resources, so we would request you to check if this selection is what you want": "La creación de imágenes requiere recursos de cálculo, por lo que le solicitamos que verifique si esta selección es lo que desea", + "warning432": "Los dispositivos con ≤4MB Flash y / o ≤32MB RAM están funcionando, pero son muy limitados (generalmente no pueden instalar o ejecutar paquetes adicionales) porque tienen poca RAM y memoria flash. Tenga esto en cuenta al elegir un dispositivo para comprar o al instalar OpenWrt en su dispositivo porque está listado como compatible. No se pueden instalar ni ejecutar paquetes adicionales porque tienen poca RAM y poca memoria flash. Tenga esto en cuenta al elegir un dispositivo para comprar, o cuando elija flashear OpenWrt en su dispositivo porque está listado como compatible.", + "OpenWrt Firmware Selector": "Selector de firmware OpenWrt", + "Download OpenWrt firmware for your device!": "¡Descargue el firmware OpenWrt para su dispositivo!", + "Target": "Objetivo", + "Dismiss": "Descartar", + "There is an error with the packages you selected": "Hay un error con los paquetes que seleccionó", + "Downloads": "Descargas", + "Please use the input below to download firmware for your device!": "¡Utilice la entrada a continuación para descargar el firmware de su dispositivo!" +} From 627d6e289a18994000e05d6c3f92cda873a7a861 Mon Sep 17 00:00:00 2001 From: unpredictable-error Date: Thu, 26 Sep 2019 22:10:35 +0300 Subject: [PATCH 02/14] added russian language --- src/locales/en.json | 1 + src/locales/ru.json | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 src/locales/ru.json diff --git a/src/locales/en.json b/src/locales/en.json index a5d215e..8fd42f7 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -1,6 +1,7 @@ { "English": "English", "German": "German", + "Russian": "Russian", "Submit": "Submit", "Change Language": "Change Language", "Search your device": "Search your device", diff --git a/src/locales/ru.json b/src/locales/ru.json new file mode 100644 index 0000000..0eee1fe --- /dev/null +++ b/src/locales/ru.json @@ -0,0 +1,31 @@ +{ + "English": "Английский", + "German": "Немецкий", + "Russian ": "Русский ", + "Submit": "Подтвердить", + "Change Language": "Сменить язык", + "Search your device": "Найдите своё устройство", + "No results": "Нет результатов", + "Model": "Модель", + "Vendor": "Vendor", + "Variant": "Variant", + "Name": "Название", + "Release Version": "Актуальная версия", + "Basic": "Базовые", + "Advanced": "Расширенные", + "Build": "Создать", + "Cancel": "Отменить", + "Add package(s)": "Добавить пакет(ы)", + "Edit UCI defaults": "Изменить настройки UCI", + "Version": "Версия", + "Please confirm that you want to perform this action": "Пожалуйста, подтвердите действие", + "Building image requires computation resources, so we would request you to check if this selection is what you want": "Создание образа требует затраты ресурсов. Пожалуйста, убедитесь что вы согласны с этим. ", + "warning432": "Стабильная работа гарантируется при наличии <4 мегабайт флеш-памяти и/или <32 мегабайт оперативной памяти.", + "OpenWrt Firmware Selector": "Установщик прошивок OpenWrt", + "Download OpenWrt firmware for your device!": "Установите прошивку для своего OpenWrt маршрутизатора!", + "Target": "Цель", + "Dismiss": "Отклонено", + "There is an error with the packages you selected": "Что-то не так с выбранными пакетами.", + "Downloads": "Загрузки", + "Please use the input below to download firmware for your device!": "Пожалуйста, воспользуйтесь формой ниже чтобы установить прошивку!" +} From a1733a1b728720910f1900b18a292c5489b5781d Mon Sep 17 00:00:00 2001 From: unpredictable-error Date: Thu, 26 Sep 2019 22:23:19 +0300 Subject: [PATCH 03/14] mapped in i18n.js --- src/i18n.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/i18n.js b/src/i18n.js index 393dd03..b3f1104 100644 --- a/src/i18n.js +++ b/src/i18n.js @@ -3,6 +3,7 @@ import { initReactI18next } from 'react-i18next'; import LanguageDetector from 'i18next-browser-languagedetector'; import translationEN from './locales/en.json'; import translationDE from './locales/de.json'; +import translationRU from './locales/ru.json'; import Config from './config'; const resources = { @@ -12,6 +13,8 @@ const resources = { de: { translation: translationDE, }, + ru: { + translation: translationRU, }; i18n From fa5f3e68f2690b2f40390478b175a43595750ed2 Mon Sep 17 00:00:00 2001 From: Sudhanshu Gautam Date: Fri, 27 Sep 2019 01:22:31 +0530 Subject: [PATCH 04/14] Setup CD using Github Actions Now auto deployment of latest commits on master will take place. --- .github/workflows/main.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..c50b901 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,20 @@ +name: CD using Github Actions + +on: + push: + branches: + - master +jobs: + build-and-deploy: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@master + + - name: Build and Deploy + uses: JamesIves/github-pages-deploy-action@master + env: + ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }} + BRANCH: gh-pages + FOLDER: build + BUILD_SCRIPT: npm install && npm run build From 03cf34c61239c1ef3ecfb241b10393fcee80b83b Mon Sep 17 00:00:00 2001 From: unpredictable-error Date: Thu, 26 Sep 2019 22:54:55 +0300 Subject: [PATCH 05/14] setted in header --- src/components/header.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/components/header.js b/src/components/header.js index 796395a..575a077 100644 --- a/src/components/header.js +++ b/src/components/header.js @@ -87,6 +87,11 @@ export default function Header() { control={} label={t('German')} /> + } + label={t('Russian')} + /> From e7d8f7a6dee08292e492d2a8c7a933438eb9cda2 Mon Sep 17 00:00:00 2001 From: Sudhanshu Gautam Date: Fri, 27 Sep 2019 01:57:18 +0530 Subject: [PATCH 06/14] fix CD --- .github/workflows/main.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c50b901..649afc5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,16 +5,15 @@ on: branches: - master jobs: - build-and-deploy: + build: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@master - - - name: Build and Deploy - uses: JamesIves/github-pages-deploy-action@master - env: - ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }} - BRANCH: gh-pages - FOLDER: build - BUILD_SCRIPT: npm install && npm run build + - uses: actions/checkout@master + - name: Use Node.js 10.x + uses: actions/setup-node@v1 + with: + version: 10.x + - name: Build + run: | + npm install + npm run build --if-present From df126040e96385ec57f18a69d793bf28ef7f0d1b Mon Sep 17 00:00:00 2001 From: Sudhanshu Gautam Date: Fri, 27 Sep 2019 02:08:02 +0530 Subject: [PATCH 07/14] fix CD --- .github/workflows/main.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 649afc5..5d9beeb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,15 +5,16 @@ on: branches: - master jobs: - build: + build-and-deploy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@master - - name: Use Node.js 10.x - uses: actions/setup-node@v1 - with: - version: 10.x - - name: Build - run: | - npm install - npm run build --if-present + - name: Checkout + uses: actions/checkout@master + + - name: Build and Deploy + uses: JamesIves/github-pages-deploy-action@master + env: + ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }} + BRANCH: gh-pages + FOLDER: build + BUILD_SCRIPT: yarn && yarn build From 5dde0935a89951258e109f8c29e04d36690e0c3d Mon Sep 17 00:00:00 2001 From: Sudhanshu Gautam Date: Fri, 27 Sep 2019 02:11:43 +0530 Subject: [PATCH 08/14] fix a small bug introduced by previous PR Signed-off-by: Sudhanshu Gautam --- src/i18n.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n.js b/src/i18n.js index b3f1104..348f9cd 100644 --- a/src/i18n.js +++ b/src/i18n.js @@ -14,7 +14,8 @@ const resources = { translation: translationDE, }, ru: { - translation: translationRU, + translation: translationRU, + }, }; i18n From 861df0b6e113932bd91a20bf36e50c2d4295af8f Mon Sep 17 00:00:00 2001 From: Adriano Pereira Junior Date: Thu, 26 Sep 2019 21:54:57 -0300 Subject: [PATCH 09/14] Brazilian Portuguese added. --- src/components/header.js | 7 ++++++- src/i18n.js | 4 ++++ src/locales/pt_br.json | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 src/locales/pt_br.json diff --git a/src/components/header.js b/src/components/header.js index 575a077..c48c936 100644 --- a/src/components/header.js +++ b/src/components/header.js @@ -87,11 +87,16 @@ export default function Header() { control={} label={t('German')} /> - } label={t('Russian')} /> + } + label={t('Brazilian Portuguese')} + /> diff --git a/src/i18n.js b/src/i18n.js index 348f9cd..52e7756 100644 --- a/src/i18n.js +++ b/src/i18n.js @@ -4,6 +4,7 @@ import LanguageDetector from 'i18next-browser-languagedetector'; import translationEN from './locales/en.json'; import translationDE from './locales/de.json'; import translationRU from './locales/ru.json'; +import translationPTBR from './locales/pt_br.json'; import Config from './config'; const resources = { @@ -16,6 +17,9 @@ const resources = { ru: { translation: translationRU, }, + pt_br: { + translation: translationPTBR, + }, }; i18n diff --git a/src/locales/pt_br.json b/src/locales/pt_br.json new file mode 100644 index 0000000..085b4a3 --- /dev/null +++ b/src/locales/pt_br.json @@ -0,0 +1,32 @@ +{ + "English": "Inglês", + "German": "Alemão", + "Russian": "Russo", + "Brazilian Portuguese": "Português Brasileiro", + "Submit": "Enviar", + "Change Language": "Escolher Idioma", + "Search your device": "Procure seu dispositivo", + "No results": "Sem resultados", + "Model": "Modelo", + "Vendor": "Vendor", + "Variant": "Variant", + "Name": "Nome", + "Release Version": "Versão de Lançamento", + "Basic": "Básico", + "Advanced": "Avançado", + "Build": "Construir", + "Cancel": "Cancelar", + "Add package(s)": "Adicionar pacote(s)", + "Edit UCI defaults": "Editar padrões UCI", + "Version": "Versão", + "Please confirm that you want to perform this action": "Por favor, confirme se você realmente deseja fazer isso", + "Building image requires computation resources, so we would request you to check if this selection is what you want": "Construir imagens exige recursos computacionais, então confirme se esta seleção é realmente o que você quer", + "warning432": "Dispositivos com 4MB de memória flash ou menos e/ou 32MB de RAM ou menos vão suportar o programa, mas serão bem limitados (normalmente não será possível o uso/instalação de pacotes adicionais) por causa da baixa quantidade de RAM e armazenamento interno. Considere isso na compra do dispositivo, ou quando decidir instalar OpenWrt no seu dispositivo pois é listado como suportado.", + "OpenWrt Firmware Selector": "Seletor de Firmware do OpenWrt", + "Download OpenWrt firmware for your device!": "Baixe o firmware OpenWrt para seu dispositvo!", + "Target": "Alvo", + "Dismiss": "Dispensar", + "There is an error with the packages you selected": "Existe um erro com os pacotes que você selecionou", + "Downloads": "Downloads", + "Please use the input below to download firmware for your device!": "Por favor, utilize o campo abaixo para baixar o firmware para seu dispositivo!" +} From f3187cc4390ffbc032bef7545826609941499e98 Mon Sep 17 00:00:00 2001 From: "Kausha.Shah" Date: Fri, 27 Sep 2019 13:00:12 +0530 Subject: [PATCH 10/14] namingConvention change --- src/i18n.js | 6 +++--- src/locales/{sp.json => es.json} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename src/locales/{sp.json => es.json} (100%) diff --git a/src/i18n.js b/src/i18n.js index bc85dc5..6ec9d38 100644 --- a/src/i18n.js +++ b/src/i18n.js @@ -3,7 +3,7 @@ import { initReactI18next } from 'react-i18next'; import LanguageDetector from 'i18next-browser-languagedetector'; import translationEN from './locales/en.json'; import translationDE from './locales/de.json'; -import translationSP from './locales/sp.json'; +import translationES from './locales/es.json'; import Config from './config'; const resources = { @@ -13,8 +13,8 @@ const resources = { de: { translation: translationDE, }, - sp: { - translation: translationSP + es: { + translation: translationES } }; diff --git a/src/locales/sp.json b/src/locales/es.json similarity index 100% rename from src/locales/sp.json rename to src/locales/es.json From 4b6cdd159aa6af3df8e4f15b7b8cbdf398a00745 Mon Sep 17 00:00:00 2001 From: Kausha Shah Date: Fri, 27 Sep 2019 14:49:30 +0530 Subject: [PATCH 11/14] Update src/locales/es.json spanish translation updated Co-Authored-By: Gonzalo de la Cruz --- src/locales/es.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/es.json b/src/locales/es.json index 9f402a1..fc64872 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -6,7 +6,7 @@ "Search your device": "Busca tu dispositivo", "No results": "No hay resultados", "Model": "Modelo", - "Vendor": "Vendedor", + "Vendor": "Fabricante", "Variant": "Variante", "Name": "Nombre", "Release Version": "Versión de lanzamiento", From 8f2fd72bae4939c49a106d2eb3deb104dc9b5b50 Mon Sep 17 00:00:00 2001 From: Kausha Shah Date: Fri, 27 Sep 2019 14:49:45 +0530 Subject: [PATCH 12/14] Update src/locales/es.json spanish translation updated Co-Authored-By: Gonzalo de la Cruz --- src/locales/es.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/es.json b/src/locales/es.json index fc64872..ef2490d 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -19,7 +19,7 @@ "Version": "Versión", "Please confirm that you want to perform this action": "Confirme que desea realizar esta acción.", "Building image requires computation resources, so we would request you to check if this selection is what you want": "La creación de imágenes requiere recursos de cálculo, por lo que le solicitamos que verifique si esta selección es lo que desea", - "warning432": "Los dispositivos con ≤4MB Flash y / o ≤32MB RAM están funcionando, pero son muy limitados (generalmente no pueden instalar o ejecutar paquetes adicionales) porque tienen poca RAM y memoria flash. Tenga esto en cuenta al elegir un dispositivo para comprar o al instalar OpenWrt en su dispositivo porque está listado como compatible. No se pueden instalar ni ejecutar paquetes adicionales porque tienen poca RAM y poca memoria flash. Tenga esto en cuenta al elegir un dispositivo para comprar, o cuando elija flashear OpenWrt en su dispositivo porque está listado como compatible.", + "warning432": "Los dispositivos con ≤4MB Flash y / o ≤32MB RAM funcionan pero están limitados (generalmente no pueden instalar o ejecutar paquetes adicionales) porque tienen poca RAM y memoria flash. Tenga esto en cuenta al elegir qué dispositivo comprar o al instalar OpenWrt en su dispositivo porque está listado como compatible.", "OpenWrt Firmware Selector": "Selector de firmware OpenWrt", "Download OpenWrt firmware for your device!": "¡Descargue el firmware OpenWrt para su dispositivo!", "Target": "Objetivo", From 144bc8715c95fb73f761c5550870fd5d34622fad Mon Sep 17 00:00:00 2001 From: Kausha Shah Date: Fri, 27 Sep 2019 14:49:54 +0530 Subject: [PATCH 13/14] Update src/locales/es.json spanish translation updated Co-Authored-By: Gonzalo de la Cruz --- src/locales/es.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/es.json b/src/locales/es.json index ef2490d..56bbe4c 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -24,7 +24,7 @@ "Download OpenWrt firmware for your device!": "¡Descargue el firmware OpenWrt para su dispositivo!", "Target": "Objetivo", "Dismiss": "Descartar", - "There is an error with the packages you selected": "Hay un error con los paquetes que seleccionó", + "There is an error with the packages you selected": "Hay un error con los paquetes seleccionados", "Downloads": "Descargas", "Please use the input below to download firmware for your device!": "¡Utilice la entrada a continuación para descargar el firmware de su dispositivo!" } From aa00df41e2471890d30a11074506f0b4aebd5081 Mon Sep 17 00:00:00 2001 From: Kausha Shah Date: Fri, 27 Sep 2019 14:50:02 +0530 Subject: [PATCH 14/14] Update src/locales/es.json spanish translation updated Co-Authored-By: Gonzalo de la Cruz --- src/locales/es.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/es.json b/src/locales/es.json index 56bbe4c..f92e3d2 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -26,5 +26,5 @@ "Dismiss": "Descartar", "There is an error with the packages you selected": "Hay un error con los paquetes seleccionados", "Downloads": "Descargas", - "Please use the input below to download firmware for your device!": "¡Utilice la entrada a continuación para descargar el firmware de su dispositivo!" + "Please use the input below to download firmware for your device!": "¡Utilice el siguiente campo para descargar el firmware de su dispositivo!" }