Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Update translations and remove admin checkbox on users page

Don73847901c657
diff --git a/manager/src/web/shared/locales/cn/or.json b/manager/src/web/shared/locales/cn/or.json
index f01dd2d81..24bd646e1 100644
--- a/manager/src/web/shared/locales/cn/or.json
+++ b/manager/src/web/shared/locales/cn/or.json
@@ -107,6 +107,8 @@
"ending": "结束",
"timeframe": "时间轴",
"addAttribute": "添加参数",
+ "selectAttributes": "选择参数",
+ "selectAttribute": "选择参数",
"clearTable": "Clear",
"addAssetAttribute": "添加资源参数",
"add": "添加",
diff --git a/manager/src/web/shared/locales/de/or.json b/manager/src/web/shared/locales/de/or.json
index 531013a9e..ab2b0fbd5 100644
--- a/manager/src/web/shared/locales/de/or.json
+++ b/manager/src/web/shared/locales/de/or.json
@@ -117,7 +117,8 @@
"ending": "Ende",
"timeframe": "Zeitfenster",
"addAttribute": "Attribut hinzufügen",
- "selectAttributes": "Attribut wählen",
+ "selectAttributes": "Attribute wählen",
+ "selectAttribute": "Attribut wählen",
"clearTable": "Leere",
"export": "exportieren",
"addAssetAttribute": "Asset Attribute hinzufügen",
diff --git a/manager/src/web/shared/locales/en/or.json b/manager/src/web/shared/locales/en/or.json
index 956ed4cb7..1d0fe0dcd 100644
--- a/manager/src/web/shared/locales/en/or.json
+++ b/manager/src/web/shared/locales/en/or.json
@@ -118,6 +118,7 @@
"timeframe": "Timeframe",
"addAttribute": "Add attribute",
"selectAttributes": "Select attributes",
+ "selectAttribute": "Select attribute",
"clearTable": "Clear",
"export": "export",
"addAssetAttribute": "Add asset attribute",
diff --git a/manager/src/web/shared/locales/es/or.json b/manager/src/web/shared/locales/es/or.json
index 9b2b96ce7..95fe9d649 100644
--- a/manager/src/web/shared/locales/es/or.json
+++ b/manager/src/web/shared/locales/es/or.json
@@ -107,6 +107,8 @@
"ending": "Final",
"timeframe": "Periodo de tiempo",
"addAttribute": "Agregar atributo",
+ "selectAttributes": "Seleccione atributos",
+ "selectAttribute": "Seleccione atributo",
"clearTable": "Clara",
"addAssetAttribute": "Adicionar atributo de ativo",
"add": "Añadir",
diff --git a/manager/src/web/shared/locales/fr/or.json b/manager/src/web/shared/locales/fr/or.json
index dfb708afd..08311527f 100644
--- a/manager/src/web/shared/locales/fr/or.json
+++ b/manager/src/web/shared/locales/fr/or.json
@@ -107,6 +107,8 @@
"ending": "Se terminant",
"timeframe": "Plage de temps",
"addAttribute": "Ajouter un attribut",
+ "selectAttributes": "Sélectionnez attributs",
+ "selectAttribute": "Sélectionnez attribut",
"clearTable": "Effacer",
"addAssetAttribute": "Ajouter un attribut de ressource",
"add": "Ajouter",
diff --git a/manager/src/web/shared/locales/it/or.json b/manager/src/web/shared/locales/it/or.json
index 3c6b48b6e..202adefa1 100644
--- a/manager/src/web/shared/locales/it/or.json
+++ b/manager/src/web/shared/locales/it/or.json
@@ -107,6 +107,8 @@
"ending": "Fine",
"timeframe": "Lasso di tempo",
"addAttribute": "Aggiungi attributo",
+ "selectAttributes": "Seleziona attributi",
+ "selectAttribute": "Seleziona attributo",
"clearTable": "Chiara",
"addAssetAttribute": "Aggiungere l'attributo di asset",
"add": "Aggiungi",
diff --git a/manager/src/web/shared/locales/nl/or.json b/manager/src/web/shared/locales/nl/or.json
index b8c326402..29f962b1c 100644
--- a/manager/src/web/shared/locales/nl/or.json
+++ b/manager/src/web/shared/locales/nl/or.json
@@ -117,7 +117,8 @@
"ending": "Einde",
"timeframe": "Tijdvak",
"addAttribute": "Attribuut toevoegen",
- "selectAttributes": "Selecteer attributen",
+ "selectAttributes": "Kies attributen",
+ "selectAttribute": "Kies attribuut",
"clearTable": "Wissen",
"export": "export",
"addAssetAttribute": "Voeg asset attribuut toe",
diff --git a/manager/src/web/shared/locales/pt/or.json b/manager/src/web/shared/locales/pt/or.json
index 5f5590640..8135bcbb0 100644
--- a/manager/src/web/shared/locales/pt/or.json
+++ b/manager/src/web/shared/locales/pt/or.json
@@ -107,6 +107,8 @@
"ending": "Término",
"timeframe": "Prazo",
"addAttribute": "Adicionar atributo",
+ "selectAttributes": "Selecionar atributos",
+ "selectAttribute": "Selecionar atributo",
"clearTable": "Limpar",
"addAssetAttribute": "Adicionar atributo de ativo",
"add": "Adicionar",
diff --git a/ui/app/manager/src/pages/page-users.ts b/ui/app/manager/src/pages/page-users.ts
index c1a387fee..7ed8e1f6c 100644
--- a/ui/app/manager/src/pages/page-users.ts
+++ b/ui/app/manager/src/pages/page-users.ts
@@ -796,13 +796,6 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {
@or-mwc-input-changed="${(e: OrInputChangedEvent) => user.enabled = e.detail.value}"
style="height: 56px;"></or-mwc-input>
- <!-- is admin -->
- <or-mwc-input ?readonly="${true}"
- .label="${i18next.t("fullAccessLabel")}"
- .type="${InputType.CHECKBOX}"
- .value="${user.enabled}"
- style="height: 56px;"></or-mwc-input>
-
<!-- composite roles -->
<or-mwc-input
?readonly="${readonly}"
diff --git a/ui/component/or-attribute-card/src/index.ts b/ui/component/or-attribute-card/src/index.ts
index dabc896e9..7081dcb4c 100644
--- a/ui/component/or-attribute-card/src/index.ts
+++ b/ui/component/or-attribute-card/src/index.ts
@@ -335,7 +335,7 @@ export class OrAttributeCard extends LitElement {
<div class="panel panel-empty">
<div class="panel-content-wrapper">
<div class="panel-content">
- <or-mwc-input class="button" .type="${InputType.BUTTON}" label="${i18next.t("addAttribute")}" icon="plus" @click="${() => this._openDialog("editAttribute")}"></or-mwc-input>
+ <or-mwc-input class="button" .type="${InputType.BUTTON}" label="${i18next.t("selectAttribute")}" icon="plus" @click="${() => this._openDialog("editAttribute")}"></or-mwc-input>
</div>
</div>
</div>
@@ -348,7 +348,7 @@ export class OrAttributeCard extends LitElement {
<div class="panel-content-wrapper">
<div class="panel-content">
<span>${i18next.t("couldNotRetrieveAttribute")}</span>
- <or-mwc-input class="button" .type="${InputType.BUTTON}" label="${i18next.t("addAttribute")}" icon="plus" @click="${() => this._openDialog("editAttribute")}"></or-mwc-input>
+ <or-mwc-input class="button" .type="${InputType.BUTTON}" label="${i18next.t("selectAttribute")}" icon="plus" @click="${() => this._openDialog("editAttribute")}"></or-mwc-input>
</div>
</div>
</div>
@@ -486,7 +486,8 @@ export class OrAttributeCard extends LitElement {
});
break;
default:
- dialog = new OrAttributePicker();
+ dialog = new OrAttributePicker()
+ .setHeading(i18next.t("selectAttribute"));
dialog.addEventListener(OrAttributePickerPickedEvent.NAME, async (ev: OrAttributePickerPickedEvent) => {
// handle selected attrs
diff --git a/ui/component/or-chart/src/index.ts b/ui/component/or-chart/src/index.ts
index 0ead3b686..91f5d5946 100644
--- a/ui/component/or-chart/src/index.ts
+++ b/ui/component/or-chart/src/index.ts
@@ -599,7 +599,7 @@ export class OrChart extends translate(i18next)(LitElement) {
`
})}
</div>
- <or-mwc-input class="button" .type="${InputType.BUTTON}" ?disabled="${disabled}" label="${i18next.t("addAttribute")}" icon="plus" @click="${() => this._openDialog()}"></or-mwc-input>
+ <or-mwc-input class="button" .type="${InputType.BUTTON}" ?disabled="${disabled}" label="${i18next.t("selectAttributes")}" icon="plus" @click="${() => this._openDialog()}"></or-mwc-input>
</div>
</div>
`;