Closed paalkr closed 5 years ago
I added a new tab Other to the settings screen where you can set the min/max setpoint. settings.js.txt en_US.json.txt main.js.txt nl_NL.json.txt
Added on option to hide the block title, so the data value can take up more space.
blocks['567_1'] = {} //utetemperatur
blocks['567_1']['title'] = 'Utetemperatur'
blocks['567_1']['width'] = 2;
blocks['567_1']['hide_title'] = true;
blocks['567_1']['last_update'] = true;
/* Outdoor temp font size */
.block_567_1 .title { font-size: 23px; !important; }
Translation files are updating, could you fix the conflicts?
Sure, I will, but unfortunately I'm not too familiar with how to solve conflicts for pull requests. The lang/nn_NO.json is invalid and should not be part of the source tree. Invalid as it's for "Nynorsk" not "Bokmål", which is the official written language in Norway.
I propose to keep both files: nb_NO.json for bokmal and nn_NO.json for nynorsk. Someone has to make the translation to nynorsk, but probably bokmal is the most easy to use as starting point.
I've recreated the project on lokalise.co to make the translation files. If you want to contribute to the translations please create an account on lokalise.co and send me the email address you used. I'll then add you to the translation contributors.
OK, keeping both is OK with me. We then need to support both Bokmål (default) and Nynorsk language options in settings and for calendar lang etc.
What do I need to do to solve the conflict, so that the other commits can get merged? I will sign up for lokalise.co for future contributions to translation.
Git/github also is pretty new for me ...
Can you remove the first commit from this PR? Only the changes to main.js and settings.js are needed.
Probably otherwise you have to add a new commit to your local branch, with the two languages files from the current beta. I think I've included all your improvement to nb_NO already.
Can you also add the changes to settings.js and main.js as proposed by Hansie.nl?
Maybe that's even easier: make a new PR bases on settings.js and main.js from Hansie.nl. Close this PR.
OK, so I reverted the commit. Let's see about these other changes. I don't think I can create a new PR before this one is closed, by you...?
If you merge and close this PR, I will proceed adding the other changes in a new PR. I think that is the easiest with my limited git skills.
Thx
I have now as you suggested opened a new PR to add the missing parts into the settings.js. https://github.com/Dashticz/dashticz_v2/pull/442