From f7fc9f8493cd5f51dea0f0c5e423f36226a2ff2d Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sat, 7 May 2022 17:21:02 +0200 Subject: [PATCH] fix localization --- HMI/README.md | 2 +- HMI/US/landscape/nspanel_US_L.HMI | Bin 11234328 -> 11234328 bytes HMI/US/landscape/nspanel_US_L.tft | Bin 10158224 -> 10158224 bytes HMI/US/portrait/nspanel_US_P.HMI | Bin 11259818 -> 11259818 bytes HMI/US/portrait/nspanel_US_P.tft | Bin 10186416 -> 10186416 bytes HMI/nspanel.HMI | Bin 11234328 -> 11234328 bytes HMI/nspanel.tft | Bin 10158160 -> 10158160 bytes apps/nspanel-lovelace-ui/luibackend/pages.py | 6 +++--- 8 files changed, 4 insertions(+), 4 deletions(-) diff --git a/HMI/README.md b/HMI/README.md index 772241d8..45ca008c 100644 --- a/HMI/README.md +++ b/HMI/README.md @@ -111,7 +111,7 @@ The following message can be used to update the content on the cardEntities Page ### popupShutter Page -`entityUpdateDetail~*ignored*~*sliderPos*` +`entityUpdateDetail~*ignored*~*sliderPos*~2ndrow~textPosition` `entityUpdateDetail~1~77` diff --git a/HMI/US/landscape/nspanel_US_L.HMI b/HMI/US/landscape/nspanel_US_L.HMI index 7b6039afdc59478d16bf1d8cdb307369d2342168..c267209d0fbf154cb7c18920ccfbc029740530fd 100644 GIT binary patch delta 884 zcmcJ}+f$5j0LJnC?fY(TR}Q;xEjg?Xjwv0jXxS}M4oPd#!C5&Zlta!%u@Py#>96^ybpBxLAy6gM*iu#^v4Z4Wbdf6R5o}9T+$kK zhD4rB9MZk!&p*0LF*9lts$=C3k1IdyAJGwqc(^eGGm(Hn;70%jD8yP6VI9_^7$w+% zjo5_ED8&|(VJpfJ#5RPm9XqfS6{tiNs<8{Zu?Ksx5BqTd2T_As9KvB7!BN!V80v8x zCvXxCXv8U;#u=PN6VBm0F5n_A;WDnE87;VqYiLCquHy#6Xva<5LI-Z+4mxocU5MZw q40Pi@dLR+S13bhdJjN6Bq7P5;4A0Sz7kG(R7{F@`n*NbDV?z_uU3H$lvb^?vCkj~$FG7;FEZO%plr=lyMWno??E5<7U^=`PGiF?z zUE<(kT>1|*99|!Pgu~~#JTu?sZ|^dismlw>>+_>Q+WXR)AV^F62%@1NJ+0+WkQ)RO z5;-APqA>K+W`(0c&{7col^$-d_*z^Yi^OA*fOJBH$)H0r7KwapZ%U;i`TwmRPo+B2 ziOysuQ>iYW%EI5Pet$`RsLZS_39^$#pEDbV$J<)F(v9v!=|N9=(VIT>r62tnz(58u zm>~>h82@@B7|AF`Glne2GLCF=7|#SIlFK9}Gli*4V>)@{GlQATBF1dyFqZ=6F`oq# zvXCMcQOshNu#{yiX9XpcvXWJ-W({SmWgY9;z(zK)nJsK(8{65zPIj@IJ?v#4)oEsyM+(PH~zuoaG$nxj;1+xx{7ST;VF$sNp&{sO2Vg)N_jj4K#9_ kCYrg!UG8z82R!5vk9opVp7ER)yyO+Hd6R5weVg6*7b0TZ!~g&Q diff --git a/HMI/US/landscape/nspanel_US_L.tft b/HMI/US/landscape/nspanel_US_L.tft index 97b6162305abf5010417522e36290b5894351bb6..7d54a539855af4f6d321addde73c36d46c85ab05 100644 GIT binary patch delta 392 zcmY+&=~j#Z0D$3dG$>nWQkGI9`&dF|T9l~}z;CI=mI*b&W+ zI_9_*C!BQ3X|2vU>zwm0xag8LmtAqyHSMmup~FqL+;+!Zo$g7y?}3LN>GD{&C!Tud zxfgo8^h&SS-ssbBz@Q;-@y>h0Mttzms82ro;;W2r#*F`(sL56)V?hw)<>W?2ii02# qiTrK6FP=#K|C2@ke)VuVI}!RG`Vq>8CPP!x>Fm$)&S;n4<9`5Hl$0?5 delta 392 zcmY+&Syzk!0D$3dG$>gUg-~PHSSp&zp0bm&X5U-J5+W^9Jlc?nYSQm;jz8tjZO-vI z$Bm2Uy?9goKclHopNLs9M9ntGT$!@WlWo2Q7FuMnC2}m4YnkQp?=PB`h5 z)6S@KR=o!2oOi)Rmt5B9imR@CjZ@+mB>=x~L`ktLOL3A6l!GNdN!< diff --git a/HMI/US/portrait/nspanel_US_P.HMI b/HMI/US/portrait/nspanel_US_P.HMI index ccc256665ecfe24ceec95c77ad8a5bc3f66b50ad..1201cf53d352a1fd11be08c762c28b7c9a58ed88 100644 GIT binary patch delta 888 zcmc)DNl#Nz0EXdnF1KFYSqFN{phZ!^p=D4&aTaH3Rh$K7bYM`N00p#`qjh3vFIqqa zsv=Ss#$eK&D-(Z%3&WZPF~*P>SH8xL|G+PK7T@ZP4ZX9)(BqN~p)^N=(8T+~s3wK= zRdYx=KCMkir*Jn`h<`TVHbq985Yn2`yJfD`Zgc43W0D;2v(-!eOEmnc!)^rahJ=O$ z=&)f%+-?}(ep)VLR`1OJ5LL64UCmK*)jTy{B`Sw9KRCm`^vR|l!T6xt{9K~t=S04j zB|0Pifa%o=vj3jRfLScp20gwcBqIf>Sb&9aAq|VL80lDorC5dxWMVm1U?o<;4G*%A zjU41+HP#>x`6$4j{yG$5JvLw?HeoZiU@Nwv2-~p(JFyG9u?Ksx55@4phy6H!gDAlv z9L5nG#W5Vm37kYJ%5Vy&QH}~!q6*ch!5N&zIh;o=>QIjcT);&%;u0?73a;WBn$V0E zT*nQxq7Ci1iCggFHUj8?!X4a25chB&5AYC=(1|W|qX!{`VWAg~@dOd{p&tWyif4F^ cK@4FSQM|xQyut`xV-#;NhFIL=d)w;&4eLT58vp8A*ew>v774L4@jm8ezQYOWNjU-Y`eWzpOgO~3>ns4&CV zYtgjTKZZ@)JhbUQJeB^^A_HWg43b;rHffdmx8T8bb$RJmyLZyA_vVchcj{Zb2`;^7 zuY1uMg6#;!4(!A(*bs)@*n@CHAQJy}QP_w5IDlvzgdH)6#UaEY9*1!R2{?*GB;gp6 zaU3Z)fmEd7Bu?Qp&fqN4k%3HPAsac!#W|eE1zf}>T*ejTAs+=OL=mpy8j5ipB`8H1 z%29zExQSc1jXSuDd$^AWc!)|=p&B)C;1M397ImnH6AfrY6PnS2R+R=fh=!6Rr zUFe1z&+r^C@De?Eg@DA_s0Uz-RpYa8= M@OT%UUw;?<1+uAr_y7O^ diff --git a/HMI/US/portrait/nspanel_US_P.tft b/HMI/US/portrait/nspanel_US_P.tft index 7d212f8d57043dee09d7f62e118910fb1cda1255..0985445915959bbb127972f9a32ab7eeacb2e6c4 100644 GIT binary patch delta 375 zcmWN>*;b4J007{BG$>n^$V7{gB9mQ<(q0Iu?AzFPWy{zrd}Pfw%5vXz7tZk@bL|m& zgwF9_eBb21spw>ASi}rjqGp<9wrn}(m}{Q-7Ra^GB8x4NXQ^fKEf-T@g_Q~wDOO^Y zxYbInQKsBl>r_}Tq0$B$ZL--GTWzylm1;F=?NF!QP7NA0Y1X1un|2*`*=>(bd+oDd zmjk->=ylK`haGX$F~^;7(kZ7UopIJV=Us5oC6`@s)iu}Ma8sXtx7>EeUH1&QFXe%U z9(nAEr=A%!WY}{ryu>T7jdB0o zS#E`uR#|P0wbm(Dp;DFgHrS}zCYx-EG_&-8ijg_ruh^4b927&PRqci#KpqhTXH`Rt2PV}CNKFh5xk1VJJvH&#^=1eLL0 o#o2~1Q<&`vGl^L3P&&*+$D?1P+32_E_sMklBl$BvmipcDA2I`&Z2$lO diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index 801db59e4107615c799453085f2896225b5e87ef..866fefef32c82ff521e889a02d2a844928c2207e 100644 GIT binary patch delta 970 zcmd7MNl#N@6vpxU-uAYzFrk2!dvR985h)0zLY)V+GAJTWC^&0DajFBTC@OzgWFc_C6?yd0?pd0<`ijUw)ev9)w$;pX+d8S3tRU(vbuTzM=>aVJ3 z47)5&i=rz1K1)b=@^hN%l_8Vt*OlxRf;Sb45_fBr&l}W#J5g>zS3&_r5r4bzFpZP_ zS=w7+{r&3w$M9#H(Ppy;ZFT__7FeOdX4>rb!k_=iBfkb^igd_SnI_Zaa5+LcWyVWA z*>8;nyx+`tt?{8sb>~H1f6qvdq!buhq_@u~SBqRjlB5?#nedp7Vm&U**5uiA{Q>? zAs@3)fI_%Y1P^AT7$xvx4(4JW=3@aCVi6W&36`Q1%di|itUwvcQGrUV#41!_HL9@& zHCT&vSdR_Zh+1sIX4Ih`Td)<|upK+F6T7e*d*DX{8nGAq(1iUsfP*-M!wBFAj^Y@O zqZutYfs;6eR-DEev_YaBXA#6XgwTOboW})R#3gj08pwZ<_fI)QX2_v3Q)bC* zIZWE6%?%3z(|b3Xt*#2V=)fnk%I|vBNr1f36n7edGKH=rXe2%D8zJl;lm90 z5x`8$LJ^8F8*@;CxtNFfSb&9CgvD5bQj{TxrC5e?EXNA0#47y#a}6r67VEGcmDqrd z*n|)^V+*#T3fr(9)!2cZsKGAm#vX*R7q!@j{fOWI4&o3F;|S_-6vt4H<2ZpRPT~|! zqXCULgCpS|+^0YD%%RsaA1 diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index e0ffdc3ce9f3530104501868a55c23d6d8743b42..568a20ba51759fa2b264e3a024151b35000b119e 100644 GIT binary patch delta 375 zcmWN>=~j#Z007W$G|^(0rYOr0VoHdqNZHq{m31spvS!WFV&tkUStlQ!!#Vx)3_XZ* zyn^q?z0=vh@##ob%nW(r^360$fkH)!%{Iqe^USxvLW`7GtW-joa!V{#q0%zTt*}zk zDyvmlW36?nt+zo+janPk*<`aV>TR`6T7yPSw%eiEPAyvPvfCbe?X%wj2OV9Xg$H);Z^0a8br3mtApHmus%;*5ig=H{EjE9e3T+=e`FXdgQSu`aSi` zb1w`SG-TLIS+9(EjW=~j#Z007W$G+JZ{Wr~EcYqHm5N%no;S{OS;k;oF2!KJd5j6Qk}=Xj0Y!k^CZ z3VlEBoy<g}-8F1t0@qtRab?03LHha7gqQO6v2!bzu` zcE(xfoOi)Rmt5AQS&LRzT$ORnbvN8}%WZeubx)gi_dU>|(?gGRd92$LPxW}_xffpQ z^~!5~`VDv^>#cX*yXJ35v&4^Lojrs8>mkMKbVNIAzRHRFTASlW!j183s mK`NF`L?;K5srtc8n2Y?3j7P%AugLGenQ-ENdpy5u^xrg_V3ckE diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py index 469467d0..b397e847 100644 --- a/apps/nspanel-lovelace-ui/luibackend/pages.py +++ b/apps/nspanel-lovelace-ui/luibackend/pages.py @@ -402,16 +402,16 @@ class LuiPagesGen(object): color = "enable" else: color = "disable" + color_translation = "Color" brightness_translation = get_translation(self._locale, "brightness") color_temp_translation = get_translation(self._locale, "color_temperature") - color_translation = "Color" - self._send_mqtt_msg(f"entityUpdateDetail~{get_icon_id('lightbulb')}~{icon_color}~{switch_val}~{brightness}~{color_temp}~{color}") + self._send_mqtt_msg(f"entityUpdateDetail~{get_icon_id('lightbulb')}~{icon_color}~{switch_val}~{brightness}~{color_temp}~{color}~{color_translation}~{color_temp_translation}~{brightness_translation}") def generate_shutter_detail_page(self, entity): entity = self._ha_api.get_entity(entity) pos = int(entity.attributes.get("current_position", 50)) pos_translation = get_translation(self._locale, "position") - self._send_mqtt_msg(f"entityUpdateDetail~{pos}~{pos_translation}") + self._send_mqtt_msg(f"entityUpdateDetail~{pos}~~{pos_translation}") def send_message_page(self, id, heading, msg, b1, b2): self._send_mqtt_msg(f"pageType~popupNotify")