Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Language strings testing search replace #316

Merged
merged 15 commits into from
Jun 21, 2021
Merged

Language strings testing search replace #316

merged 15 commits into from
Jun 21, 2021

Conversation

Nanomani
Copy link
Contributor

For testing only

Cleaning strings.po : DE, EN, FR

@Nanomani
Copy link
Contributor Author

Nanomani commented Jun 20, 2021

"script.skinshortcuts" don't like if I replace 37663 by 31156...
I don't understand why ?

1

If I reverse only 31156 by 37663 all is good

2

3

@beatmasterRS
Copy link
Owner

Have you forced a rebuild of the skin shortcuts config?

@Nanomani
Copy link
Contributor Author

Yes :)
I delete "script-skinshortcuts-includes.xml" to be sure

@Nanomani
Copy link
Contributor Author

Rollback of all 31xxx to 37xxx in powermenu.DATA.xml :

  • 31156 => 37663
  • 31232 => 37703
  • 31360 => 37814
  • 31364 => 37818

@Nanomani
Copy link
Contributor Author

Nanomani commented Jun 21, 2021

Definitely no revert ID string in powermenu.DATA.xml is necessary...
I don't know why. Anyway It can usefull you test all of this. :)

Files changed : 142 :D

ZIP : https://github.com/Nanomani/skin.arctic.zephyr.mod/archive/refs/heads/language-strings-testing-search-replace.zip

EDIT : when this will be okay for you. I will post a new PR just to re-order all ID strings from less number to the bigger number in all files strings.po

@beatmasterRS
Copy link
Owner

beatmasterRS commented Jun 21, 2021

Have you take a look at the script-skinshortcuts-includes.xml file? In this file there have to be the strings.

@beatmasterRS
Copy link
Owner

EDIT : when this will be okay for you. I will post a new PR just to re-order all ID strings from less number to the bigger number in all files strings.po

thats okay :)

@beatmasterRS
Copy link
Owner

What i just wanted to say is, you can check in script-skinshortcuts-includes.xml file, if there are the correct new string id's or the old ones. There must be a reason for this... :)

@beatmasterRS
Copy link
Owner

Maybe you could provide the files in an other PR, where there is the issue with the skinshortcuts power menu? So i could test better.

@beatmasterRS
Copy link
Owner

Just testing with all your changes and id's:

31156
31232
31360
31364

and all works fine for me. Also in script-skinshortcuts-includes.xml there are the correct id's e.g.:

`<item id="11">
			<property name="id">$NUMBER[11]</property>
			<property name="mainmenuid">20</property>
			<label>$LOCALIZE[31156]</label>
			<label2>Power Menu Shortcut</label2>
			<icon>special://skin/extras/icons/addtile.png</icon>
			<thumb />
			<property name="labelID">31156</property>
			<property name="defaultID">31156</property>
			<visible>[System.Loggedon] + String.IsEqual(Container(300).ListItem.Property(submenuVisibility),powermenu)</visible>
			<onclick condition="Window.IsActive(DialogButtonMenu.xml)">Close</onclick>
			<onclick>ActivateWindowAndFocus(skinsettings,9108,2)</onclick>
			<property name="path">ActivateWindowAndFocus(skinsettings,9108,2)</property>
			<property name="list">9108</property>
			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
			<property name="group">powermenu</property>
			<property name="isSubmenu">True</property>
		</item>`

@Nanomani
Copy link
Contributor Author

Nanomani commented Jun 21, 2021

After changing strings in skinshortcuts files, make sure to foirce a rebuilt of the skinshortcuts (power)menu. You can change an item or reset to skin defaults to force that :)

I have already done all of this :)

What i just wanted to say is, you can check in script-skinshortcuts-includes.xml file, if there are the correct new string id's or the old ones. There must be a reason for this... :)

you are completely right :). script-skinshortcuts-includes.xml are regenerate with all old ID in powermenu.DATA.xml :

37663 , 37703 , 37814 , 37818
o_O

EDIT :

If I delete

  • ..\Kodi\userdata\addon_data\ powermenu.DATA.xml
  • ..\Kodi\addons\skin.arctic.zephyr.mod\1080i\ script-skinshortcuts-includes.xml

All works fine

@beatmasterRS
Copy link
Owner

beatmasterRS commented Jun 21, 2021

Try to reset the power menu to skin defaults. When in powermenu.DATA.xml all strings are the new ones, then there is an issue with skinshortcuts with rebuilding power menu

@Nanomani
Copy link
Contributor Author

Just testing with all your changes and id's:

31156
31232
31360
31364

and all works fine for me. Also in script-skinshortcuts-includes.xml there are the correct id's e.g.:

If you restart Kodi, It is always fine ?

@beatmasterRS
Copy link
Owner

Also aftrer restarting kodi all is fine for me :)

If you reset to skin defaults, you should see instant after reset that on the left side, the items have to be back to standard config:

screenshot00012

screenshot00013

screenshot00015

@Nanomani
Copy link
Contributor Author

Okay I got it. thanks :D

If I all understand. My PR is good :)
but a fix is necessary for "skinshortcuts" with rebuilding power menu ?

@beatmasterRS
Copy link
Owner

What I noticed: After the addon version is increased, SkinShortcuts automatically makes a rebuilt of the menus. So everything should work fine :)

@beatmasterRS
Copy link
Owner

But I think we will test it again intensively when you have everything ready :) With github,we can easily switch between versions/PR's :)

@Nanomani
Copy link
Contributor Author

Nanomani commented Jun 21, 2021

But I think we will test it again intensively when you have everything ready :) With github,we can easily switch between versions/PR's :)

I have finish :

  • All strings ID are clean now everywhere.
  • All strings ID unnecessary are delete
  • msgctxt "#31000" to msgctxt "#31536" are used

the last things to do is a new PR just to re-order all ID strings from less number to the bigger number in all files strings.po.
You want this before merge ? I m right ?

@beatmasterRS
Copy link
Owner

Yes, good is, if we have a finished PR, where we can test all changes at once :)

Thanks a lot :)

@beatmasterRS beatmasterRS added Fix Fix for an issue Improvement Improvement of skin-sections or skin-code Kodi 19 Kodi 19 Language Language strings modified or added Review labels Jun 21, 2021
@beatmasterRS
Copy link
Owner

beatmasterRS commented Jun 21, 2021

Thanks for your hard work! :) I have to test ...

@Nanomani
Copy link
Contributor Author

Thanks for your hard work! :) I have to test ...

This PR was a big baby :D Sure take all time necessary. I must test too ...

@beatmasterRS
Copy link
Owner

beatmasterRS commented Jun 21, 2021

includes_labels.xml,

line 1375 <value condition="Control.HasFocus(7) + String.IsEmpty(ListItem.UserRating)">$LOCALIZE[31532]</value>

points to "Use thumbnail instead of fanart",

line 1326

<value condition="Control.HasFocus(9007) + String.IsEmpty(ListItem.UserRating)">$LOCALIZE[31532]</value>

but i think that was my fault in a previous version. In master branch it also points to "Use thumbnail instead of fanart" :D

@Nanomani
Copy link
Contributor Author

Nanomani commented Jun 21, 2021

In the lastest master it is always this with old strings "38512" :)

<value condition="Control.HasFocus(9007) + String.IsEmpty(ListItem.UserRating)">$LOCALIZE[38512]</value>

<value condition="Control.HasFocus(7) + String.IsEmpty(ListItem.UserRating)">$LOCALIZE[38512]</value>

and in "Custom_DialogSettings.xml" too :D

line 76

                <control type="radiobutton" id="103">
                    <include>DefContextButtonGradientSelect</include>
                    <label>38512</label>
                    <selected>!Skin.HasSetting(hidebutton.video.rating)</selected>
                    <onclick>Skin.ToggleSetting(hidebutton.video.rating)</onclick>
                    <visible>Window.IsVisible(DialogVideoInfo.xml)</visible>
                </control>

Line 195

                <control type="radiobutton" id="123">
                    <include>DefContextButtonGradientSelect</include>
                    <label>38512</label>
                    <selected>!Skin.HasSetting(hidebutton.music.rating)</selected>
                    <onclick>Skin.ToggleSetting(hidebutton.music.rating)</onclick>
                    <visible>Window.IsVisible(DialogMusicInfo.xml)</visible>
                </control>

@beatmasterRS
Copy link
Owner

I will have a look at it, when I'm back from work :D

@beatmasterRS
Copy link
Owner

I havent found any other issues :) merge?

@Nanomani
Copy link
Contributor Author

Nanomani commented Jun 21, 2021

I havent found any other issues :)

Me too :)

merge?

Lets go, yes :D

@beatmasterRS
Copy link
Owner

:D

@beatmasterRS beatmasterRS merged commit 26a78dd into beatmasterRS:master Jun 21, 2021
@Nanomani Nanomani deleted the language-strings-testing-search-replace branch June 23, 2021 08:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Fix for an issue Improvement Improvement of skin-sections or skin-code Kodi 19 Kodi 19 Language Language strings modified or added Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants