From 7e64cf28a36160229dfbf88352def38edfa8fc5b Mon Sep 17 00:00:00 2001 From: Jacob Herper Date: Thu, 26 Sep 2019 11:55:38 +0100 Subject: [PATCH 1/9] German translation corrected --- src/locales/de.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/locales/de.json b/src/locales/de.json index 2b61a67..9e1453e 100644 --- a/src/locales/de.json +++ b/src/locales/de.json @@ -1,30 +1,30 @@ { "English": "Englisch", - "German": "Deutsche", + "German": "Deutsch", "Submit": "Einreichen", "Change Language": "Sprache ändern", - "Search your device": "Suchen Sie Ihr Gerät", + "Search your device": "Gerät suchen", "No results": "Keine Ergebnisse", "Model": "Modell", "Vendor": "Verkäufer", "Variant": "Variante", "Name": "Name", - "Release Version": "Veröffentlichungsversion", - "Basic": "Basic", - "Advanced": "Fortgeschritten", - "Build": "Bauen", + "Release Version": "Release Version", + "Basic": "Anfänger", + "Advanced": "Fortgeschrittener", + "Build": "Erstellen", "Cancel": "Abbrechen", - "Add package(s)": "Paket (e) hinzufügen", - "Edit UCI defaults": "Bearbeiten Sie die UCI-Standardeinstellungen", - "Version": "Ausführung", + "Add package(s)": "Paket(e) hinzufügen", + "Edit UCI defaults": "UCI-Standardeinstellungen bearbeiten", + "Version": "Version", "Please confirm that you want to perform this action": "Bitte bestätigen Sie, dass Sie diese Aktion ausführen möchten", - "Building image requires computation resources, so we would request you to check if this selection is what you want": "Das Erstellen eines Image erfordert Rechenressourcen. Wir bitten Sie daher, zu prüfen, ob diese Auswahl Ihren Wünschen entspricht", - "warning432": "Geräte mit ≤4MB Flash und / oder ≤32MB RAM funktionieren, sind jedoch sehr eingeschränkt (normalerweise können sie keine zusätzlichen Pakete installieren oder ausführen), da sie über wenig RAM und Flash-Speicher verfügen. Berücksichtigen Sie dies, wenn Sie ein Gerät zum Kaufen auswählen oder wenn Sie OpenWrt auf Ihrem Gerät flashen, da es als unterstützt aufgeführt ist Zusätzliche Pakete können nicht installiert oder ausgeführt werden, da sie über wenig RAM und wenig Flash-Speicher verfügen. Berücksichtigen Sie dies, wenn Sie ein Gerät zum Kaufen auswählen oder wenn Sie sich entscheiden, OpenWrt auf Ihrem Gerät zu flashen, da es als unterstützt aufgeführt ist.", - "OpenWrt Firmware Selector": "OpenWrt Firmware Selector", + "Building image requires computation resources, so we would request you to check if this selection is what you want": "Das Erstellen eines Images erfordert Rechenressourcen. Wir bitten Sie daher zu prüfen, ob diese Auswahl Ihren Wünschen entspricht", + "warning432": "Geräte mit ≤4MB Flash und / oder ≤32MB RAM funktionieren, sind jedoch sehr eingeschränkt (Sie können meist keine zusätzlichen Pakete installieren oder ausführen), da sie über wenig RAM und Flash-Speicher verfügen. Berücksichtigen Sie dies, wenn Sie ein Gerät auswählen oder wenn Sie OpenWrt auf Ihrem Gerät flashen, da es als unterstützt aufgeführt wird. Zusätzliche Pakete können nicht installiert oder ausgeführt werden, da sie über wenig RAM und wenig Flash-Speicher verfügen.", + "OpenWrt Firmware Selector": "OpenWrt Firmware Auswahl", "Download OpenWrt firmware for your device!": "Laden Sie die OpenWrt-Firmware für Ihr Gerät herunter!", "Target": "Ziel", - "Dismiss": "Entlassen", - "There is an error with the packages you selected": "Bei den ausgewählten Paketen ist ein Fehler aufgetreten", - "Downloads": "Herunterladen", - "Please use the input below to download firmware for your device!": "Bitte benutzen Sie den unten stehenden Eingang, um die Firmware für Ihr Gerät herunterzuladen!" + "Dismiss": "Ablehnen", + "There is an error with the packages you selected": "Es liegt ein Fehler mit dem ausgewählten Paket vor.", + "Downloads": "Downloads", + "Please use the input below to download firmware for your device!": "Bitte nutzen Sie das untenstehende Feld, um die Firmware für Ihr Gerät herunterzuladen!" } From 627d6e289a18994000e05d6c3f92cda873a7a861 Mon Sep 17 00:00:00 2001 From: unpredictable-error Date: Thu, 26 Sep 2019 22:10:35 +0300 Subject: [PATCH 2/9] 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 3/9] 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 4/9] 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 5/9] 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 6/9] 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 7/9] 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 8/9] 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 9/9] 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!" +}