jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-25 18:26:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix blank_before_percent (#19397)

Browse Source 
* Fix blank_before_percent

* types n stuff
This commit is contained in:
karwosts 2024-01-14 12:23:42 -08:00 committed by GitHub
parent 7c389a6cf0
commit 5aa5ce8b5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/entity/compute_state_display.ts
View File

@ -113,7 +113,7 @@ export const computeStateDisplayFromEntityAttributes = (
const unit = attributes.unit_of_measurement; const unit = attributes.unit_of_measurement;
if (unit) { if (unit) {
return `${value}${blankBeforeUnit(unit)}${unit}`; return `${value}${blankBeforeUnit(unit, locale)}${unit}`;
} }
return value; return value;

2
src/common/translations/blank_before_percent.ts
View File

@ -4,7 +4,7 @@ import { FrontendLocaleData } from "../../data/translation";
export const blankBeforePercent = ( export const blankBeforePercent = (
localeOptions: FrontendLocaleData localeOptions: FrontendLocaleData
): string => { ): string => {
switch (localeOptions?.language) { switch (localeOptions.language) {
case "cz": case "cz":
case "de": case "de":
case "fi": case "fi":

2
src/common/translations/blank_before_unit.ts
View File

@ -3,7 +3,7 @@ import { blankBeforePercent } from "./blank_before_percent";
export const blankBeforeUnit = ( export const blankBeforeUnit = (
unit: string, unit: string,
localeOptions?: FrontendLocaleData localeOptions: FrontendLocaleData | undefined
): string => { ): string => {
if (unit === "°") { if (unit === "°") {
return ""; return "";

4
src/components/ha-big-number.ts
View File

@ -32,7 +32,9 @@ export class HaBigNumber extends LitElement {
const temperatureDecimal = formatted.replace(integer, ""); const temperatureDecimal = formatted.replace(integer, "");
const formattedValue = `${this.value}${ const formattedValue = `${this.value}${
this.unit ? `${blankBeforeUnit(this.unit)}${this.unit}` : "" this.unit
? `${blankBeforeUnit(this.unit, this.hass?.locale)}${this.unit}`
: ""
}`; }`;
const unitBottom = this.unitPosition === "bottom"; const unitBottom = this.unitPosition === "bottom";

4
src/components/ha-control-number-buttons.ts
View File

@ -136,7 +136,9 @@ export class HaControlNumberButton extends LitElement {
this.value != null this.value != null
? formatNumber(this.value, this.locale, this.formatOptions) ? formatNumber(this.value, this.locale, this.formatOptions)
: ""; : "";
const unit = this.unit ? `${blankBeforeUnit(this.unit)}${this.unit}` : ""; const unit = this.unit
? `${blankBeforeUnit(this.unit, this.locale)}${this.unit}`
: "";
return html` return html`
<div class="container"> <div class="container">

2
src/state-control/climate/ha-state-control-climate-temperature.ts
View File

@ -261,7 +261,7 @@ export class HaStateControlClimateTemperature extends LitElement {
this.hass.locale, this.hass.locale,
formatOptions formatOptions
); );
return html`${formatted}${blankBeforeUnit(unit)}${unit}`; return html`${formatted}${blankBeforeUnit(unit, this.hass.locale)}${unit}`;
} }
private _renderCurrent(temperature: number, style: "normal" | "big") { private _renderCurrent(temperature: number, style: "normal" | "big") {