Skip to content

Commit

Permalink
Extend translations and add new theme
Browse files Browse the repository at this point in the history
  • Loading branch information
@jockesoft
jockesoft committed Apr 19, 2021
1 parent 1f0f454 commit c8a5ac8
Show file tree
Hide file tree
Showing 4 changed files with 87 additions and 24 deletions.
72 changes: 50 additions & 22 deletions src/charger-card.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ class ChargerCard extends LitElement {
{
entity_id: this.getEntityId(cconst.ENTITIES.sessionEnergy),
unit: 'kWh',
subtitle: 'Session Energy',
subtitle: localize('charger_status.sessionEnergy'),
},
{
calcValue: this.usedChargerLimit,
Expand All @@ -317,7 +317,7 @@ class ChargerCard extends LitElement {
{
entity_id: this.getEntityId(cconst.ENTITIES.sessionEnergy),
unit: 'kWh',
subtitle: 'Session Energy',
subtitle: localize('charger_status.sessionEnergy'),
},
{
entity_id: this.getEntityId(cconst.ENTITIES.basicSchedule),
Expand Down Expand Up @@ -370,7 +370,7 @@ class ChargerCard extends LitElement {
{
entity_id: this.getEntityId(cconst.ENTITIES.sessionEnergy),
unit: 'kWh',
subtitle: 'Session Energy',
subtitle: localize('charger_status.sessionEnergy'),
},
{
calcValue: this.usedChargerLimit,
Expand All @@ -389,7 +389,7 @@ class ChargerCard extends LitElement {
{
entity_id: this.getEntityId(cconst.ENTITIES.sessionEnergy),
unit: 'kWh',
subtitle: 'Session Energy',
subtitle: localize('charger_status.sessionEnergy'),
},
{
calcValue: this.usedChargerLimit,
Expand All @@ -403,7 +403,7 @@ class ChargerCard extends LitElement {
{
entity_id: this.getEntityId(cconst.ENTITIES.sessionEnergy),
unit: 'kWh',
subtitle: 'Session Energy',
subtitle: localize('charger_status.sessionEnergy'),
},
{
calcValue: this.usedChargerLimit,
Expand Down Expand Up @@ -656,7 +656,10 @@ class ChargerCard extends LitElement {
const { state } = this.entity;
const { reasonForNoCurrent } = this.getEntities();
const localizedStatus = localize(`status.${state}`) || state;
let subStatusText = this.getEntityState(reasonForNoCurrent) || '';
let subStatusText =
localize(
`charger_substatus.${this.getEntityState(reasonForNoCurrent)}`
) || '';

return html`
<div
Expand Down Expand Up @@ -699,14 +702,15 @@ class ChargerCard extends LitElement {
costPerKwh,
} = this.getEntities();
let updateAvailableState = this.getEntityState(updateAvailable) || 'off';
let localizedClickForConfig = localize('common.click_for_config');

return html`
<div class="wrap-collabsible">
<input id="collapsible" class="toggle" type="checkbox" />
<label for="collapsible" class="lbl-toggle">
<div class="tooltip-right">
<ha-icon icon="mdi:cog"></ha-icon>
<span class="tooltiptext-right">Click for config</span>
<span class="tooltiptext-right">${localizedClickForConfig}</span>
</div>
</label>
<div class="collapsible-content">
Expand Down Expand Up @@ -764,31 +768,47 @@ class ChargerCard extends LitElement {
energyLifetime,
} = this.getEntities();

let localizedClickForStatus = localize('common.click_for_info');

return html`
<div class="wrap-collabsible-info">
<input id="collapsible-info" class="toggle-info" type="checkbox" />
<label for="collapsible-info" class="lbl-toggle-info">
<div class="tooltip-right">
<ha-icon icon="mdi:information"></ha-icon>
<span class="tooltiptext-right">Click for info</span>
<span class="tooltiptext-right">${localizedClickForStatus}</span>
</div>
</label>
<div class="collapsible-content-info">
<div class="content-inner-info">
${this.renderCollapsibleItems(isOnline, 'Online')}
${this.renderCollapsibleItems(voltage, 'Voltage', true)}
${this.renderCollapsibleItems(totalPower, 'Power')}
${this.renderCollapsibleItems(inCurrent, 'Charger Current', true)}
${this.renderCollapsibleItems(isOnline, localize('common.online'))}
${this.renderCollapsibleItems(
voltage,
localize('common.voltage'),
true
)}
${this.renderCollapsibleItems(totalPower, localize('common.power'))}
${this.renderCollapsibleItems(
inCurrent,
localize('common.charger_current'),
true
)}
${this.renderCollapsibleItems(
circuitCurrent,
'Circuit Current',
localize('common.circuit_current'),
true
)}
${this.renderCollapsibleItems(energyPerHour, 'Energy per hour')}
${this.renderCollapsibleItems(sessionEnergy, 'Session Energy')}
${this.renderCollapsibleItems(
energyPerHour,
localize('common.energy_per_hour')
)}
${this.renderCollapsibleItems(
sessionEnergy,
localize('charger_status.sessionEnergy')
)}
${this.renderCollapsibleItems(
energyLifetime,
'Lifetime Energy',
localize('common.lifetime_energy'),
true
)}
</div>
Expand All @@ -810,14 +830,15 @@ class ChargerCard extends LitElement {
dynamicCircuitCurrent,
offlineCircuitCurrent,
} = this.getEntities();
let localizedClickForLimits = localize('common.click_for_limits');

return html`
<div class="wrap-collabsible-lim">
<input id="collapsible-lim" class="toggle-lim" type="checkbox" />
<label for="collapsible-lim" class="lbl-toggle-lim">
<div class="tooltip-right">
<ha-icon icon="mdi:speedometer"></ha-icon>
<span class="tooltiptext-right">Click for limits</span>
<span class="tooltiptext-right">${localizedClickForLimits}</span>
</div>
</label>
<div class="collapsible-content-lim">
Expand Down Expand Up @@ -968,22 +989,22 @@ class ChargerCard extends LitElement {

renderInfoItemsLeft() {
const { isOnline } = this.getEntities();
return html` ${this.renderInfoItem(isOnline, 'Online')} `;
return html` ${this.renderInfoItem(isOnline, localize('common.online'))} `;
}

renderInfoItemsRight() {
const { totalPower, voltage } = this.getEntities();
return html`
${this.renderInfoItem(voltage, 'Voltage', true)}
${this.renderInfoItem(totalPower, 'Power')}
${this.renderInfoItem(voltage, localize('common.voltage'), true)}
${this.renderInfoItem(totalPower, localize('common.power'))}
`;
}

renderInfoItemsCompact() {
const { totalPower, voltage } = this.getEntities();
return html`
${this.renderInfoItem(voltage, 'Voltage', true)}
${this.renderInfoItem(totalPower, 'Power', true)}
${this.renderInfoItem(voltage, localize('common.voltage'), true)}
${this.renderInfoItem(totalPower, localize('common.power'), true)}
`;
}

Expand Down Expand Up @@ -1225,6 +1246,13 @@ class ChargerCard extends LitElement {
this.style.setProperty('--custom-icon-color', 'black');
break;
}
case 'theme_transp_white': {
this.style.setProperty('--custom-card-background-color', 'transparent');
this.style.setProperty('--custom-text-color', 'white');
this.style.setProperty('--custom-primary-color', 'white');
this.style.setProperty('--custom-icon-color', 'white');
break;
}
case 'theme_lightgrey_blue': {
this.style.setProperty('--custom-card-background-color', 'lightgrey');
this.style.setProperty('--custom-text-color', 'var(--primary-color)');
Expand Down
1 change: 1 addition & 0 deletions src/const.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ export const CUSTOM_CARD_THEMES = [
{ name: 'theme_default', desc: 'Default (HA)' },
{ name: 'theme_transp_blue', desc: 'Transparent Blue' },
{ name: 'theme_transp_black', desc: 'Transparent Black' },
{ name: 'theme_transp_white', desc: 'Transparent White' },
{ name: 'theme_lightgrey_blue', desc: 'LightGrey Blue' },
];

Expand Down
19 changes: 18 additions & 1 deletion src/translations/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,17 @@
"stop": "Stop",
"override": "Override schedule",
"reboot": "Reboot charger",
"not_available": "Charger not available"
"not_available": "Charger not available",
"click_for_info": "Click for Info",
"click_for_config": "Click for Config",
"click_for_limits": "Click for Limits",
"online": "Online",
"voltage": "Voltage",
"power": "Power",
"charger_current": "Changer Current",
"energy_per_hour": "Energy per Hour",
"lifetime_energy": "Lifetime Energy",
"circuit_current": "Circuit Energy"
},
"error": {
"missing_entity": "Specifying entity is required!"
Expand Down Expand Up @@ -48,5 +58,12 @@
"show_toolbar_aria_label_on": "Toggle display toolbar on",
"show_toolbar_aria_label_off": "Toggle display toolbar off",
"code_only_note": "Note: Custom actions and data table (stats) options are available exclusively using Code Editor manually."
},
"charger_status": {
"sessionEnergy": "Session Energy"
},
"charger_substatus": {
"not_requesting_current": "Not Requesting Current",
"ok": "Ok"
}
}
19 changes: 18 additions & 1 deletion src/translations/nb.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,17 @@
"stop": "Stopp",
"override": "Overstyr plan",
"reboot": "Reboot lader",
"not_available": "Lader utilgjengelig"
"not_available": "Lader utilgjengelig",
"click_for_info": "Click for Info",
"click_for_config": "Click for Config",
"click_for_limits": "Click for Limits",
"online": "Online",
"voltage": "Voltage",
"power": "Power",
"charger_current": "Changer Current",
"energy_per_hour": "Energy per Hour",
"lifetime_energy": "Lifetime Energy",
"circuit_current": "Circuit Energy"
},
"error": {
"missing_entity": "Du må angi en entity!"
Expand Down Expand Up @@ -48,5 +58,12 @@
"show_toolbar_aria_label_on": "Toggle display toolbar on",
"show_toolbar_aria_label_off": "Toggle display toolbar off",
"code_only_note": "Merk: Egendefinerte actions og data tabell (stats) er kun tilgjengelig ved å benytte Code Editor manuelt."
},
"charger_status": {
"sessionEnergy": "Session Energy"
},
"charger_substatus": {
"not_requesting_current": "Not Requesting Current",
"ok": "Ok"
}
}

0 comments on commit c8a5ac8

Please sign in to comment.