Skip to content

Commit 7b1d4c9

Browse files
TheLastCicadaTheLastCicada
authored
Merge pull request #182 from Chia-Network/develop
Release 1.1.13
2 parents b2f4a65 + 2346890 commit 7b1d4c9

File tree

10 files changed

+184
-29
lines changed

10 files changed

+184
-29
lines changed

‎.github/workflows/build-installers.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ jobs:
5353
- name: Notarize
5454
run: |
5555
DMG_FILE=$(find ${{ github.workspace }}/dist/ -type f -name '*.dmg')
56-
npm install -g notarize-cli
57-
notarize-cli \
58-
--file="$DMG_FILE" \
59-
--bundle-id net.chia.climate-explorer-ui \
60-
--username "${{ secrets.APPLE_NOTARIZE_USERNAME }}" \
61-
--password "${{ secrets.APPLE_NOTARIZE_PASSWORD }}"
56+
xcrun notarytool submit \
57+
--wait \
58+
--apple-id "${{ secrets.APPLE_NOTARIZE_USERNAME }}" \
59+
--password "${{ secrets.APPLE_NOTARIZE_PASSWORD }}" \
60+
--team-id "${{ secrets.APPLE_TEAM_ID }}" \
61+
"$DMG_FILE"
6262
6363
- name: Upload Mac Installer
6464
uses: actions/upload-artifact@v3

‎package-lock.json

+21-21
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "climateexplorerui",
3-
"version": "1.1.12",
3+
"version": "1.1.13",
44
"private": true,
55
"author": "Chia Network Inc. <[email protected]>",
66
"description": "User interface for the Chia Climate Explorer application",

‎src/App.js

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { AppNavigator } from './navigation';
1313
import theme from './theme';
1414

1515
import { IndeterminateProgressOverlay } from './components';
16+
import { LocaleChangeListener } from './components/blocks/LocaleChangeListener';
1617

1718
const App = () => {
1819
const dispatch = useDispatch();
@@ -46,6 +47,7 @@ const App = () => {
4647
defaultLocale="en"
4748
messages={translationTokens.default}
4849
>
50+
<LocaleChangeListener />
4951
<AppNavigator />
5052
</IntlProvider>
5153
</ThemeProvider>

‎src/components/blocks/LocaleChangeListener.js

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
import React, { useEffect } from 'react';
2+
import { useDispatch } from 'react-redux';
3+
import { setLocale } from '../../store/actions/appActions';
4+
5+
const LocaleChangeListener = () => {
6+
const dispatch = useDispatch();
7+
8+
useEffect(() => {
9+
// Function to handle the message event
10+
const handleMessage = event => {
11+
if (event?.data?.changeLocale) {
12+
dispatch(setLocale(event?.data?.changeLocale));
13+
}
14+
};
15+
16+
// Add the event listener
17+
window.addEventListener('message', handleMessage, false);
18+
19+
// Return a function that will be called when the component unmounts
20+
return () => {
21+
// Remove the event listener
22+
window.removeEventListener('message', handleMessage, false);
23+
};
24+
}, []);
25+
26+
return <></>;
27+
};
28+
29+
export { LocaleChangeListener };

‎src/translations/index.js

+17-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,28 @@
11
import * as en from './tokens/en-US.json';
2+
import * as es from './tokens/es.json';
3+
import * as fr from './tokens/fr.json';
4+
import * as de from './tokens/de.json';
5+
import * as cn from './tokens/zh-cn.json';
26

37
const LANGUAGE_CODES = Object.freeze({
48
ENGLISH: 'en-US',
9+
PAK: 'pk-PK',
10+
SPANISH: 'es-ES',
11+
FRENCH: 'fr-FR',
12+
GERMAN: 'de-DE',
13+
CHINESE: 'cn',
514
});
615

716
const loadLocaleData = locale => {
817
switch (locale) {
9-
case LANGUAGE_CODES.ENGLISH_US:
18+
case LANGUAGE_CODES.SPANISH:
19+
return es;
20+
case LANGUAGE_CODES.FRENCH:
21+
return fr;
22+
case LANGUAGE_CODES.GERMAN:
23+
return de;
24+
case LANGUAGE_CODES.CHINESE:
25+
return cn;
1026
case LANGUAGE_CODES.ENGLISH:
1127
default:
1228
return en;

‎src/translations/tokens/de.json

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"climate-explorer": "Klimaforscher",
3+
"hello-world": "Willkommen im Climate Explorer",
4+
"ok": "OK",
5+
"search": "Suchen",
6+
"select": "Wählen",
7+
"filters": "Filter",
8+
"network-error": "Netzwerkfehler",
9+
"there-is-a-connection-error": "Es gibt einen Verbindungsfehler",
10+
"something-went-wrong": "Hoppla! Etwas ist schiefgelaufen",
11+
"success": "Erfolg",
12+
"no-explorer-data": "Es sind keine Explorer -Daten verfügbar.",
13+
"explorer-data-not-loaded": "Explorer -Daten konnten nicht geladen werden.",
14+
"actions": "Aktionen",
15+
"carbon-token-explorer": "Carbon Token Explorer",
16+
"detailed-view": "Detaillierte Ansicht",
17+
"cancel": "Stornieren",
18+
"connect-to-cw": "Verbinden",
19+
"connect": "Verbinden",
20+
"server-address": "Serveradresse",
21+
"api-key": "API-Schlüssel",
22+
"import-home-org": "Home importieren",
23+
"connect-to-remote": "Verbindung zu Fern eine Verbindung hergestellt",
24+
"update-home-org": "Home Update",
25+
"add-valid-server-address": "Gültige Serveradresse hinzufügen",
26+
"import": "Verbinden"
27+
}

‎src/translations/tokens/es.json

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"climate-explorer": "Explorador climático",
3+
"hello-world": "Bienvenido a Climate Explorer",
4+
"ok": "De acuerdo",
5+
"search": "Buscar",
6+
"select": "Seleccionar",
7+
"filters": "Filtros",
8+
"network-error": "Error de red",
9+
"there-is-a-connection-error": "Hay un error de conexión",
10+
"something-went-wrong": "Huy! Algo salió mal",
11+
"success": "Éxito",
12+
"no-explorer-data": "No hay datos de Explorer disponibles.",
13+
"explorer-data-not-loaded": "Los datos del explorador no se pudieron cargar.",
14+
"actions": "Comportamiento",
15+
"carbon-token-explorer": "Explorador de tokens de carbono",
16+
"detailed-view": "Vista detallada",
17+
"cancel": "Cancelar",
18+
"connect-to-cw": "Conectar",
19+
"connect": "Conectar",
20+
"server-address": "Dirección del servidor",
21+
"api-key": "Clave API",
22+
"import-home-org": "Importar en casa",
23+
"connect-to-remote": "Conectarse a remoto",
24+
"update-home-org": "Actualización de inicio",
25+
"add-valid-server-address": "Agregar dirección de servidor válida",
26+
"import": "Conectar"
27+
}

‎src/translations/tokens/fr.json

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"climate-explorer": "Explorateur de climat",
3+
"hello-world": "Bienvenue à Climate Explorer",
4+
"ok": "D'accord",
5+
"search": "Recherche",
6+
"select": "Sélectionner",
7+
"filters": "Filtres",
8+
"network-error": "Erreur de réseau",
9+
"there-is-a-connection-error": "Il y a une erreur de connexion",
10+
"something-went-wrong": "Oups, quelque chose s'est mal passé",
11+
"success": "Succès",
12+
"no-explorer-data": "Aucune donnée d'explorateur n'est disponible.",
13+
"explorer-data-not-loaded": "Les données de l'explorateur n'ont pas pu être chargées.",
14+
"actions": "Actions",
15+
"carbon-token-explorer": "Explorateur de jeton de carbone",
16+
"detailed-view": "Vue détaillée",
17+
"cancel": "Annuler",
18+
"connect-to-cw": "Connecter",
19+
"connect": "Connecter",
20+
"server-address": "Adresse du serveur",
21+
"api-key": "Clé API",
22+
"import-home-org": "Importer à la maison",
23+
"connect-to-remote": "Connectez-vous à la distance",
24+
"update-home-org": "Mise à jour domestique",
25+
"add-valid-server-address": "Ajouter l'adresse du serveur valide",
26+
"import": "Connecter"
27+
}

‎src/translations/tokens/zh-cn.json

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"climate-explorer": "气候探险家",
3+
"hello-world": "欢迎来到气候探险家",
4+
"ok": "好的",
5+
"search": "搜索",
6+
"select": "选择",
7+
"filters": "过滤器",
8+
"network-error": "网络错误",
9+
"there-is-a-connection-error": "有连接错误",
10+
"something-went-wrong": "哎呀！出事了",
11+
"success": "成功",
12+
"no-explorer-data": "没有可用的探险家数据。",
13+
"explorer-data-not-loaded": "无法加载资源管理器数据。",
14+
"actions": "动作",
15+
"carbon-token-explorer": "碳令牌探险家",
16+
"detailed-view": "详细的视图",
17+
"cancel": "取消",
18+
"connect-to-cw": "连接",
19+
"connect": "连接",
20+
"server-address": "服务器地址",
21+
"api-key": "API键",
22+
"import-home-org": "进口房屋",
23+
"connect-to-remote": "连接到遥控器",
24+
"update-home-org": "家庭更新",
25+
"add-valid-server-address": "添加有效的服务器地址",
26+
"import": "连接"
27+
}

0 commit comments

Comments
 (0)