[Rating Flags] fixed issue with condition in german ratings

beatmasterRS · Dec 31, 2020 · 788da94 · 788da94
1 parent 5fa1553
commit 788da94
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/1080i/Includes.xml b/1080i/Includes.xml
@@ -106,7 +106,7 @@
         </control>
     </include>
 
-    <variable name="RatingFlagVar33">
+    <variable name="RatingFlagVarInfo">
         <value condition="String.Contains(ListItem.mpaa,US:G) | String.Contains(ListItem.mpaa,USA:G) | String.Contains(ListItem.mpaa,Rated G)">flags2/rating/info/mpaa_g_certificate_us.png</value>
         <value condition="String.Contains(ListItem.mpaa,PG-13)">flags2/rating/info/mpaa_pg-13_certificate_us.png</value>
         <value condition="String.Contains(ListItem.mpaa,Rated PG) | String.IsEqual(ListItem.Mpaa,PG)">flags2/rating/info/mpaa_pg_certificate_us.png</value>
@@ -118,11 +118,11 @@
         <value condition="String.Contains(ListItem.mpaa,UK:12)">flags2/rating/info/BBFC_12_Certificate_UK.png</value>
         <value condition="String.Contains(ListItem.mpaa,UK:15)">flags2/rating/info/BBFC_15_Certificate_UK.png</value>
         <value condition="String.Contains(ListItem.mpaa,UK:18)">flags2/rating/info/BBFC_18_Certificate_UK.png</value>
-        <value condition="String.Contains(ListItem.mpaa,Germany:0) | String.Contains(ListItem.mpaa,ab 0) | String.IsEqual(ListItem.mpaa,0) | String.Contains(ListItem.mpaa,FSK 0) | String.Contains(ListItem.mpaa,Rated 0)">flags2/rating/info/FSK-0.png</value>
-        <value condition="String.Contains(ListItem.mpaa,Germany:16) | String.Contains(ListItem.mpaa,ab 16) | String.IsEqual(ListItem.mpaa,16) | String.Contains(ListItem.mpaa,FSK 16) | String.Contains(ListItem.mpaa,Rated 16)">flags2/rating/info/FSK-16.png</value>
-        <value condition="String.Contains(ListItem.mpaa,Germany:6)| String.Contains(ListItem.mpaa,ab 6) | String.IsEqual(ListItem.mpaa,6) | String.Contains(ListItem.mpaa,Rated 6)">flags2/rating/info/FSK-6.png</value>
-        <value condition="String.Contains(ListItem.mpaa,Germany:12) | String.Contains(ListItem.mpaa,ab 12) | String.IsEqual(ListItem.mpaa,12) | String.Contains(ListItem.mpaa,FSK 12) | String.Contains(ListItem.mpaa,Rated 12)">flags2/rating/info/FSK-12.png</value>
-        <value condition="String.Contains(ListItem.mpaa,Germany:18) | String.Contains(ListItem.mpaa,ab 18) | String.IsEqual(ListItem.mpaa,18) | String.Contains(ListItem.mpaa,FSK 18) | String.Contains(ListItem.mpaa,Rated 18)">flags2/rating/info/FSK-18.png</value>
+        <value condition="String.Contains(ListItem.mpaa,Germany:0) | String.Contains(ListItem.mpaa,ab 0) | String.Contains(ListItem.mpaa,FSK0) | String.Contains(ListItem.mpaa,FSK 0) | String.Contains(ListItem.mpaa,Rated 0)">flags2/rating/info/FSK-0.png</value>
+        <value condition="String.Contains(ListItem.mpaa,Germany:16) | String.Contains(ListItem.mpaa,ab 16) | String.Contains(ListItem.mpaa,FSK16) | String.Contains(ListItem.mpaa,FSK 16) | String.Contains(ListItem.mpaa,Rated 16)">flags2/rating/info/FSK-16.png</value>
+        <value condition="String.Contains(ListItem.mpaa,Germany:6)| String.Contains(ListItem.mpaa,ab 6) | String.Contains(ListItem.mpaa,FSK6) | String.Contains(ListItem.mpaa,Rated 6)">flags2/rating/info/FSK-6.png</value>
+        <value condition="String.Contains(ListItem.mpaa,Germany:12) | String.Contains(ListItem.mpaa,ab 12) | String.Contains(ListItem.mpaa,FSK12) | String.Contains(ListItem.mpaa,FSK 12) | String.Contains(ListItem.mpaa,Rated 12)">flags2/rating/info/FSK-12.png</value>
+        <value condition="String.Contains(ListItem.mpaa,Germany:18) | String.Contains(ListItem.mpaa,ab 18) | String.Contains(ListItem.mpaa,FSK18) | String.Contains(ListItem.mpaa,FSK 18) | String.Contains(ListItem.mpaa,Rated 18)">flags2/rating/info/FSK-18.png</value>
         <value condition="String.Contains(ListItem.mpaa,besorolás alatt)">flags2/rating/info/HU_BA.png</value>
         <value condition="String.Contains(ListItem.mpaa,korhatárra való tekintett nélkül megtekintetheto)">flags2/rating/info/HU_KN.png</value>
         <value condition="String.Contains(ListItem.mpaa,12 éven aluliak számára a megtekintése nagykorú felügyelete mellett ajánlott)">flags2/rating/info/HU_12.png</value>
@@ -158,10 +158,10 @@
         <value condition="String.Contains(ListItem.mpaa,UK:12)">flags/mpaa/BBFC_12_Certificate_UK.png</value>
         <value condition="String.Contains(ListItem.mpaa,UK:15)">flags/mpaa/BBFC_15_Certificate_UK.png</value>
         <value condition="String.Contains(ListItem.mpaa,UK:18)">flags/mpaa/BBFC_18_Certificate_UK.png</value>
-        <value condition="String.Contains(ListItem.mpaa,Germany:16) | String.Contains(ListItem.mpaa,ab 16) | String.IsEqual(ListItem.mpaa,16) | String.Contains(ListItem.mpaa,FSK 16) | String.Contains(ListItem.mpaa,Rated 16)">flags/mpaa/FSK-16.png</value>
-        <value condition="String.Contains(ListItem.mpaa,Germany:6)| String.Contains(ListItem.mpaa,ab 6) | String.IsEqual(ListItem.mpaa,6) | String.Contains(ListItem.mpaa,FSK 16) | String.Contains(ListItem.mpaa,Rated 6)">flags/mpaa/FSK-6.png</value>
-        <value condition="String.Contains(ListItem.mpaa,Germany:12) | String.Contains(ListItem.mpaa,ab 12) | String.IsEqual(ListItem.mpaa,12) | String.Contains(ListItem.mpaa,FSK 12) | String.Contains(ListItem.mpaa,Rated 12)">flags/mpaa/FSK-12.png</value>
-        <value condition="String.Contains(ListItem.mpaa,Germany:18) | String.Contains(ListItem.mpaa,ab 18) | String.IsEqual(ListItem.mpaa,18) | String.Contains(ListItem.mpaa,FSK 18) | String.Contains(ListItem.mpaa,Rated 18)">flags/mpaa/FSK-18.png</value>
+        <value condition="String.Contains(ListItem.mpaa,Germany:16) | String.Contains(ListItem.mpaa,ab 16) | String.Contains(ListItem.mpaa,FSK16) | String.Contains(ListItem.mpaa,FSK 16) | String.Contains(ListItem.mpaa,Rated 16)">flags/mpaa/FSK-16.png</value>
+        <value condition="String.Contains(ListItem.mpaa,Germany:6)| String.Contains(ListItem.mpaa,ab 6) | String.Contains(ListItem.mpaa,FSK6) | String.Contains(ListItem.mpaa,FSK 16) | String.Contains(ListItem.mpaa,Rated 6)">flags/mpaa/FSK-6.png</value>
+        <value condition="String.Contains(ListItem.mpaa,Germany:12) | String.Contains(ListItem.mpaa,ab 12) | String.Contains(ListItem.mpaa,FSK12) | String.Contains(ListItem.mpaa,FSK 12) | String.Contains(ListItem.mpaa,Rated 12)">flags/mpaa/FSK-12.png</value>
+        <value condition="String.Contains(ListItem.mpaa,Germany:18) | String.Contains(ListItem.mpaa,ab 18) | String.Contains(ListItem.mpaa,FSK18) | String.Contains(ListItem.mpaa,FSK 18) | String.Contains(ListItem.mpaa,Rated 18)">flags/mpaa/FSK-18.png</value>
         <value condition="String.Contains(ListItem.mpaa,Germany)|String.Contains(ListItem.mpaa,FSK)| String.Contains(ListItem.mpaa,o.A)| String.Contains(ListItem.mpaa,Rated 0)">flags/mpaa/FSK-0.png</value>
         <value condition="String.Contains(ListItem.mpaa,US:G) | String.Contains(ListItem.mpaa,USA:G) | String.Contains(ListItem.mpaa,Rated G)">flags/mpaa/g.png</value>
         <value condition="String.Contains(ListItem.mpaa,PG-13)">flags/mpaa/pg-13.png</value>
@@ -202,10 +202,10 @@
         <value condition="String.Contains(Container(9500).ListItem.mpaa,UK:12)">flags/mpaa/BBFC_12_Certificate_UK.png</value>
         <value condition="String.Contains(Container(9500).ListItem.mpaa,UK:15)">flags/mpaa/BBFC_15_Certificate_UK.png</value>
         <value condition="String.Contains(Container(9500).ListItem.mpaa,UK:18)">flags/mpaa/BBFC_18_Certificate_UK.png</value>
-        <value condition="String.Contains(Container(9500).ListItem.mpaa,Germany:16) | String.Contains(Container(9500).ListItem.mpaa,ab 16) | String.IsEqual(ListItem.mpaa,16) | String.Contains(Container(9500).ListItem.mpaa,FSK 16) | String.Contains(Container(9500).ListItem.mpaa,Rated 16)">flags/mpaa/FSK-16.png</value>
-        <value condition="String.Contains(Container(9500).ListItem.mpaa,Germany:6)| String.Contains(Container(9500).ListItem.mpaa,ab 6) | String.IsEqual(ListItem.mpaa,6) | String.Contains(Container(9500).ListItem.mpaa,FSK 16) | String.Contains(Container(9500).ListItem.mpaa,Rated 6)">flags/mpaa/FSK-6.png</value>
-        <value condition="String.Contains(Container(9500).ListItem.mpaa,Germany:12) | String.Contains(Container(9500).ListItem.mpaa,ab 12) | String.IsEqual(ListItem.mpaa,12) | String.Contains(Container(9500).ListItem.mpaa,FSK 12) | String.Contains(Container(9500).ListItem.mpaa,Rated 12)">flags/mpaa/FSK-12.png</value>
-        <value condition="String.Contains(Container(9500).ListItem.mpaa,Germany:18) | String.Contains(Container(9500).ListItem.mpaa,ab 18) | String.IsEqual(ListItem.mpaa,18) | String.Contains(Container(9500).ListItem.mpaa,FSK 18) | String.Contains(Container(9500).ListItem.mpaa,Rated 18)">flags/mpaa/FSK-18.png</value>
+        <value condition="String.Contains(Container(9500).ListItem.mpaa,Germany:16) | String.Contains(Container(9500).ListItem.mpaa,ab 16) | String.Contains(ListItem.mpaa,FSK16) | String.Contains(Container(9500).ListItem.mpaa,FSK 16) | String.Contains(Container(9500).ListItem.mpaa,Rated 16)">flags/mpaa/FSK-16.png</value>
+        <value condition="String.Contains(Container(9500).ListItem.mpaa,Germany:6)| String.Contains(Container(9500).ListItem.mpaa,ab 6) | String.Contains(ListItem.mpaa,FSK6) | String.Contains(Container(9500).ListItem.mpaa,FSK 16) | String.Contains(Container(9500).ListItem.mpaa,Rated 6)">flags/mpaa/FSK-6.png</value>
+        <value condition="String.Contains(Container(9500).ListItem.mpaa,Germany:12) | String.Contains(Container(9500).ListItem.mpaa,ab 12) | String.Contains(ListItem.mpaa,FSK12) | String.Contains(Container(9500).ListItem.mpaa,FSK 12) | String.Contains(Container(9500).ListItem.mpaa,Rated 12)">flags/mpaa/FSK-12.png</value>
+        <value condition="String.Contains(Container(9500).ListItem.mpaa,Germany:18) | String.Contains(Container(9500).ListItem.mpaa,ab 18) | String.Contains(ListItem.mpaa,FSK18) | String.Contains(Container(9500).ListItem.mpaa,FSK 18) | String.Contains(Container(9500).ListItem.mpaa,Rated 18)">flags/mpaa/FSK-18.png</value>
         <value condition="String.Contains(Container(9500).ListItem.mpaa,Germany)|String.Contains(Container(9500).ListItem.mpaa,FSK)| String.Contains(Container(9500).ListItem.mpaa,o.A)| String.Contains(Container(9500).ListItem.mpaa,Rated 0)">flags/mpaa/FSK-0.png</value>
         <value condition="String.Contains(Container(9500).ListItem.mpaa,US:G) | String.Contains(Container(9500).ListItem.mpaa,USA:G) | String.Contains(Container(9500).ListItem.mpaa,Rated G)">flags/mpaa/g.png</value>
         <value condition="String.Contains(Container(9500).ListItem.mpaa,PG-13)">flags/mpaa/pg-13.png</value>

diff --git a/1080i/Includes_DialogVideoInfo.xml b/1080i/Includes_DialogVideoInfo.xml
@@ -646,7 +646,7 @@
                         <bottom>260</bottom>
                         <right>5</right>
                         <aspectratio align="right" aligny="bottom">keep</aspectratio>
-                        <texture colordiffuse="Dark1" fallback="flags2/mpaa/NR.png">$VAR[RatingFlagVar33]</texture>
+                        <texture colordiffuse="Dark1" fallback="flags2/mpaa/NR.png">$VAR[RatingFlagVarInfo]</texture>
                         <visible>!Skin.HasSetting(show.studiologos) + !Skin.HasSetting(show.clearart)</visible>
                     </control>
                 </control>