Browse Source

Improvement/new datakey types (#2291)

* Add support import label

* Add translate tooltip
pull/2963/head
Vladyslav 7 years ago
committed by Igor Kulikov
parent
commit
aa7c946cb8
  1. 6
      ui/src/app/components/datasource-entity.tpl.html
  2. 1
      ui/src/app/locale/locale.constant-en_US.json
  3. 1
      ui/src/app/locale/locale.constant-ru_RU.json
  4. 1
      ui/src/app/locale/locale.constant-uk_UA.json

6
ui/src/app/components/datasource-entity.tpl.html

@ -44,7 +44,7 @@
<ng-md-icon size="16" icon="alpha-a-circle-outline"></ng-md-icon> <ng-md-icon size="16" icon="alpha-a-circle-outline"></ng-md-icon>
</span> </span>
<span ng-show="item.type==types.dataKeyType.entityField"> <span ng-show="item.type==types.dataKeyType.entityField">
<md-tooltip>{{'datakey.entityField' | translate }}</md-tooltip> <md-tooltip>{{'datakey.entity-field' | translate }}</md-tooltip>
<ng-md-icon size="16" icon="alpha-e-circle-outline"></ng-md-icon> <ng-md-icon size="16" icon="alpha-e-circle-outline"></ng-md-icon>
</span> </span>
<span ng-show="item.type==types.dataKeyType.timeseries"> <span ng-show="item.type==types.dataKeyType.timeseries">
@ -65,7 +65,7 @@
<ng-md-icon size="16" icon="alpha-a-circle-outline" ng-click="createKey($event, types.dataKeyType.attribute, '#datakey_chips')"></ng-md-icon> <ng-md-icon size="16" icon="alpha-a-circle-outline" ng-click="createKey($event, types.dataKeyType.attribute, '#datakey_chips')"></ng-md-icon>
</span> </span>
<span ng-show="widgetType == types.widgetType.latest.value"> <span ng-show="widgetType == types.widgetType.latest.value">
<md-tooltip>{{'datakey.entityField' | translate }}</md-tooltip> <md-tooltip>{{'datakey.entity-field' | translate }}</md-tooltip>
<ng-md-icon size="16" icon="alpha-e-circle-outline" ng-click="createKey($event, types.dataKeyType.entityField, '#datakey_chips')"></ng-md-icon> <ng-md-icon size="16" icon="alpha-e-circle-outline" ng-click="createKey($event, types.dataKeyType.entityField, '#datakey_chips')"></ng-md-icon>
</span> </span>
<span> <span>
@ -91,7 +91,7 @@
<ng-md-icon size="20" icon="alpha-a-circle-outline"></ng-md-icon> <ng-md-icon size="20" icon="alpha-a-circle-outline"></ng-md-icon>
</span> </span>
<span ng-show="$chip.type==types.dataKeyType.entityField"> <span ng-show="$chip.type==types.dataKeyType.entityField">
<md-tooltip>{{'datakey.entityField' | translate }}</md-tooltip> <md-tooltip>{{'datakey.entity-field' | translate }}</md-tooltip>
<ng-md-icon size="20" icon="alpha-e-circle-outline"></ng-md-icon> <ng-md-icon size="20" icon="alpha-e-circle-outline"></ng-md-icon>
</span> </span>
<span ng-show="$chip.type==types.dataKeyType.timeseries"> <span ng-show="$chip.type==types.dataKeyType.timeseries">

1
ui/src/app/locale/locale.constant-en_US.json

@ -583,6 +583,7 @@
"configuration": "Data key configuration", "configuration": "Data key configuration",
"timeseries": "Timeseries", "timeseries": "Timeseries",
"attributes": "Attributes", "attributes": "Attributes",
"entity-field": "Entity field",
"alarm": "Alarm fields", "alarm": "Alarm fields",
"timeseries-required": "Entity timeseries are required.", "timeseries-required": "Entity timeseries are required.",
"timeseries-or-attributes-required": "Entity timeseries/attributes are required.", "timeseries-or-attributes-required": "Entity timeseries/attributes are required.",

1
ui/src/app/locale/locale.constant-ru_RU.json

@ -583,6 +583,7 @@
"configuration": "Конфигурация ключа данных", "configuration": "Конфигурация ключа данных",
"timeseries": "Телеметрия", "timeseries": "Телеметрия",
"attributes": "Атрибуты", "attributes": "Атрибуты",
"entity-field": "Поле объекта",
"alarm": "Параметры оповещения", "alarm": "Параметры оповещения",
"timeseries-required": "Телеметрия объекта обязательна.", "timeseries-required": "Телеметрия объекта обязательна.",
"timeseries-or-attributes-required": "Телеметрия/атрибуты обязательны.", "timeseries-or-attributes-required": "Телеметрия/атрибуты обязательны.",

1
ui/src/app/locale/locale.constant-uk_UA.json

@ -699,6 +699,7 @@
"configuration": "Конфігурація ключа даних", "configuration": "Конфігурація ключа даних",
"timeseries": "Телеметрія", "timeseries": "Телеметрія",
"attributes": "Атрибути", "attributes": "Атрибути",
"entity-field": "Поле сутності",
"alarm": "Поля сигнала тривоги", "alarm": "Поля сигнала тривоги",
"timeseries-required": "Необхідно вказати Телеметрія.", "timeseries-required": "Необхідно вказати Телеметрія.",
"timeseries-or-attributes-required": "Необхідно вказати телеметрію/атрибути.", "timeseries-or-attributes-required": "Необхідно вказати телеметрію/атрибути.",

Loading…
Cancel
Save