Skip to content

Commit

Permalink
Migrate config from index_m to jsonConfig (#654)
Browse files Browse the repository at this point in the history
* Remove old unused files

* Migrate config from index_m to jsonConfig

* Try to fix merge conflict

* Try to fix merge conflict

* Try to fix merge conflict again

* Better design for user/API key
  • Loading branch information
Jey-Cee authored Oct 16, 2024
1 parent 4c5c1a3 commit 3fa696e
Show file tree
Hide file tree
Showing 19 changed files with 232 additions and 535 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ tmp
admin/i18n/flat.txt
admin/i18n/*/flat.txt
iob_npm.done


# ioBroker dev-server
.dev-server/
3 changes: 2 additions & 1 deletion admin/i18n/de/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"\"Legacy\" structure": "\"Legacy\"-Struktur",
"Auto setup": "Automatisches Setup",
"Bridge Address": "Bridge-Adresse",
"Help bridge address": "Es wird automatisch nach einer Bridge gesucht, dieser Vorgang dauert etwa 5-10 Sekunden. Der Adapter muss dafür gestartet sein.",
"Bridge User": "Bridge-Benutzer",
"Bridge port": "Bridge-Port",
"Cannot find bridge": "Kann keine Bridge finden",
Expand All @@ -11,7 +12,7 @@
"Find Bridge": "Bridge suchen",
"Ignore groups": "Gruppen ignorieren",
"Ignore scenes": "Szenen ignorieren",
"Instruction": "Bitte Link-Knopf der Bridge drücken! <br />Sie haben 30 Sekunden.",
"Instruction": "Bitte drücken Sie den Link-Button der Brücke, bevor Sie einen neuen Benutzer anlegen!",
"Minimal polling interval is 2 seconds": "Das minimale Abfrageintervall beträgt 2 Sekunden",
"Native turn off/on behaviour": "Natives Ein- und Ausschaltverhalten",
"Ok": "Ok",
Expand Down
3 changes: 2 additions & 1 deletion admin/i18n/en/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"\"Legacy\" structure": "\"Legacy\" structure",
"Auto setup": "Auto setup",
"Bridge Address": "Bridge Address",
"Help bridge address": "It will automatically search for a bridge, this process takes about 5-10 seconds. The adapter must be started for this.",
"Bridge User": "Bridge User",
"Bridge port": "Bridge port",
"Cannot find bridge": "Cannot find bridge",
Expand All @@ -11,7 +12,7 @@
"Find Bridge": "Find Bridge",
"Ignore groups": "Ignore groups",
"Ignore scenes": "Ignore scenes",
"Instruction": "Please press link button now! <br />You have 30 seconds.",
"Instruction": "Please press the link button of the bridge before create a new user!",
"Minimal polling interval is 2 seconds": "Minimal polling interval is 2 seconds",
"Native turn off/on behaviour": "Native turn off/on behaviour",
"Ok": "Ok",
Expand Down
2 changes: 1 addition & 1 deletion admin/i18n/es/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"Find Bridge": "Find Bridge",
"Ignore groups": "Ignorar grupos",
"Ignore scenes": "Ignorar escenas",
"Instruction": "Please press link button now! <br />You have 30 seconds.",
"Instruction": "Pulse el botón de enlace del puente antes de crear un nuevo usuario.",
"Minimal polling interval is 2 seconds": "El intervalo mínimo de sondeo es de 2 segundos.",
"Native turn off/on behaviour": "Comportamiento nativo de apagado / encendido",
"Ok": "Ok",
Expand Down
2 changes: 1 addition & 1 deletion admin/i18n/fr/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"Find Bridge": "Find Bridge",
"Ignore groups": "Ignorer les groupes",
"Ignore scenes": "Ignorer les scènes",
"Instruction": "Please press link button now! <br />You have 30 seconds.",
"Instruction": "Veuillez appuyer sur le bouton de liaison du pont avant de créer un nouvel utilisateur !",
"Minimal polling interval is 2 seconds": "L'intervalle d'interrogation minimal est de 2 secondes",
"Native turn off/on behaviour": "Comportement natif d'activation / désactivation",
"Ok": "Ok",
Expand Down
2 changes: 1 addition & 1 deletion admin/i18n/it/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"Find Bridge": "Find Bridge",
"Ignore groups": "Ignora gruppi",
"Ignore scenes": "Ignora le scene",
"Instruction": "Please press link button now! <br />You have 30 seconds.",
"Instruction": "Prima di creare un nuovo utente, premere il pulsante di collegamento del ponte!",
"Minimal polling interval is 2 seconds": "L'intervallo di polling minimo è di 2 secondi",
"Native turn off/on behaviour": "Disattivazione / attivazione nativa del comportamento",
"Ok": "Ok",
Expand Down
2 changes: 1 addition & 1 deletion admin/i18n/nl/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"Find Bridge": "Find Bridge",
"Ignore groups": "Negeer groepen",
"Ignore scenes": "Negeer scènes",
"Instruction": "Please press link button now! <br />You have 30 seconds.",
"Instruction": "Druk op de linkknop van de brug voordat je een nieuwe gebruiker aanmaakt!",
"Minimal polling interval is 2 seconds": "Minimaal polling-interval is 2 seconden",
"Native turn off/on behaviour": "Eigen in- / uitschakelgedrag",
"Ok": "Ok",
Expand Down
2 changes: 1 addition & 1 deletion admin/i18n/pl/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"Find Bridge": "Find Bridge",
"Ignore groups": "Ignoruj ​​grupy",
"Ignore scenes": "Ignoruj sceny",
"Instruction": "Please press link button now! <br />You have 30 seconds.",
"Instruction": "Przed utworzeniem nowego użytkownika należy nacisnąć przycisk łącza mostu!",
"Minimal polling interval is 2 seconds": "Minimalny interwał odpytywania wynosi 2 sekundy",
"Native turn off/on behaviour": "Natywne zachowanie wyłączania / włączania",
"Ok": "Ok",
Expand Down
2 changes: 1 addition & 1 deletion admin/i18n/pt/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"Find Bridge": "Procurar Bridge",
"Ignore groups": "Ignorar grupos",
"Ignore scenes": "Ignorar cenas",
"Instruction": "Please press link button now! <br />You have 30 seconds.",
"Instruction": "Por favor, prima o botão de ligação da ponte antes de criar um novo utilizador!",
"Minimal polling interval is 2 seconds": "O intervalo mínimo de pesquisa é de 2 segundos",
"Native turn off/on behaviour": "Comportamento de ativação / desativação nativo",
"Ok": "Ok",
Expand Down
2 changes: 1 addition & 1 deletion admin/i18n/ru/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"Find Bridge": "Найти HUE bridge",
"Ignore groups": "Игнорировать группы",
"Ignore scenes": "Игнорировать сцены",
"Instruction": "Нажмите ссылку снизу кнопки в течении следующих 30 секунд.",
"Instruction": "Перед созданием нового пользователя нажмите кнопку ссылки на мост!",
"Minimal polling interval is 2 seconds": "Минимальный интервал опроса составляет 2 секунды",
"Native turn off/on behaviour": "Родное поведение включения / выключения",
"Ok": "Ok",
Expand Down
2 changes: 1 addition & 1 deletion admin/i18n/zh-cn/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"Find Bridge": "找桥",
"Ignore groups": "忽略组",
"Ignore scenes": "忽略场景",
"Instruction": "请立即按下链接按钮! ",
"Instruction": "在创建新用户之前,请按下网桥的链接按钮!",
"Minimal polling interval is 2 seconds": "最小轮询间隔为2秒",
"Native turn off/on behaviour": "本机关闭/打开行为",
"Ok": "确定",
Expand Down
211 changes: 0 additions & 211 deletions admin/index.html

This file was deleted.

Loading

0 comments on commit 3fa696e

Please sign in to comment.