The branch, frodo has been updated
via f6c28b55a3c21b6bd9a4bfedeb32668f4c6254ea (commit)
via 1042fbd73eb0609f7b285552e8b56ee3bc9125e2 (commit)
from 898a5c184e217a3d126ebd1477030dae0dbd02ca (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=f6c28b55a3c21b6bd9a4bfedeb32668f4c6254ea
commit f6c28b55a3c21b6bd9a4bfedeb32668f4c6254ea
Author: beenje <[email protected]>
Date: Mon Dec 16 23:14:24 2013 +0100
[plugin.audio.dradio] updated to version 1.3.1
diff --git a/plugin.audio.dradio/addon.xml b/plugin.audio.dradio/addon.xml
index ebf0dcc..e7aa1ac 100644
--- a/plugin.audio.dradio/addon.xml
+++ b/plugin.audio.dradio/addon.xml
@@ -2,7 +2,7 @@
<addon
id="plugin.audio.dradio"
name="dradio.de"
- version="1.3.0"
+ version="1.3.1"
provider-name="escoand">
<requires>
<import addon="xbmc.python" version="2.1.0" />
diff --git a/plugin.audio.dradio/changelog.txt
b/plugin.audio.dradio/changelog.txt
index dce72a1..a40bcc4 100644
--- a/plugin.audio.dradio/changelog.txt
+++ b/plugin.audio.dradio/changelog.txt
@@ -1,2 +1,5 @@
+[B]1.3.1[/B]
+Fixed: Stations dont match Labels and Icons
+
[B]1.3.0[/B]
Fixed: Plugin broken due Site Relaunch
diff --git a/plugin.audio.dradio/default.py b/plugin.audio.dradio/default.py
index 7d1ba6e..cdb741f 100644
--- a/plugin.audio.dradio/default.py
+++ b/plugin.audio.dradio/default.py
@@ -34,9 +34,9 @@ Addon = xbmcaddon.Addon("plugin.audio.dradio")
icons = {
0: join(Addon.getAddonInfo('path'), 'icon.png'),
- 1: join(Addon.getAddonInfo('path'), 'resources', 'media', 'dlf.png'),
- 3: join(Addon.getAddonInfo('path'), 'resources', 'media',
'dkultur.png'),
- 4: join(Addon.getAddonInfo('path'), 'resources', 'media',
'dwissen.png'),
+ 1: join(Addon.getAddonInfo('path'), 'resources', 'media', 'drw.png'),
+ 3: join(Addon.getAddonInfo('path'), 'resources', 'media', 'drk.png'),
+ 4: join(Addon.getAddonInfo('path'), 'resources', 'media', 'dlf.png'),
}
@@ -61,9 +61,9 @@ def CONFIG():
playlist = (hosturl + baseurl + playlist).replace('//',
'/').replace(':/', '://')
article = (hosturl + baseurl + article).replace('//',
'/').replace(':/', '://')
streams = {
- 1:
streams.getElementsByTagName('streamDLR')[0].getAttribute('value'),
- 3:
streams.getElementsByTagName('streamDLF')[0].getAttribute('value'),
- 4:
streams.getElementsByTagName('streamDLW')[0].getAttribute('value'),
+ 1:
streams.getElementsByTagName('streamDLW')[0].getAttribute('value'),
+ 3:
streams.getElementsByTagName('streamDLR')[0].getAttribute('value'),
+ 4:
streams.getElementsByTagName('streamDLF')[0].getAttribute('value'),
}
@@ -75,17 +75,17 @@ def INDEX():
'mode': 0,
'station': 0,
})
- addDir(Addon.getLocalizedString(30002), icons[1], {
+ addDir(Addon.getLocalizedString(30002), icons[4], {
'mode': 0,
- 'station': 1,
+ 'station': 4,
})
addDir(Addon.getLocalizedString(30003), icons[3], {
'mode': 0,
'station': 3,
})
- addDir(Addon.getLocalizedString(30004), icons[4], {
+ addDir(Addon.getLocalizedString(30004), icons[1], {
'mode': 0,
- 'station': 4,
+ 'station': 1,
})
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=1042fbd73eb0609f7b285552e8b56ee3bc9125e2
commit 1042fbd73eb0609f7b285552e8b56ee3bc9125e2
Author: beenje <[email protected]>
Date: Mon Dec 16 23:14:03 2013 +0100
[plugin.video.nolife] updated to version 2.17.1
diff --git a/plugin.video.nolife/addon.xml b/plugin.video.nolife/addon.xml
index 4bebd69..f2e2dfe 100644
--- a/plugin.video.nolife/addon.xml
+++ b/plugin.video.nolife/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.nolife"
name="Nolife Online"
- version="2.16.6"
+ version="2.17.1"
provider-name="gormux">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
@@ -16,6 +16,11 @@
<minversion>29000</minversion>
<language>fr</language>
<summary>Nolife Online XBMC Plugin</summary>
+ <license>GNU GENERAL PUBLIC LICENSE. Version 3, June 1997</license>
+ <forum>http://forum.nolife-tv.com/showthread.php?t=11012</forum>
+
<website>http://wiki.xbmc.org/index.php?title=Add-on:Nolife_Online</website>
+ <source>http://dev.gormotte.info/plugin.video.nolife</source>
+ <email>[email protected]</email>
<description lang="fr">Un plugin pour accéder au contenu de Nolife Online.
Les modes accès libre et payant sont proposés par le plugin. Pour obtenir un
compte payant rendez-vous sur le site http://www.nolife-tv.com
Abonnez-vous :)
diff --git a/plugin.video.nolife/default.py b/plugin.video.nolife/default.py
index df5c725..c81d1e0 100644
--- a/plugin.video.nolife/default.py
+++ b/plugin.video.nolife/default.py
@@ -147,13 +147,13 @@ def login():
if re.compile('pas valide').findall(str(res)):
xbmc.log(msg=pluginLogHeader + "Invalid username,
aborting",level=xbmc.LOGFATAL)
err = xbmcgui.Dialog()
- err.ok(unicode(language(35002)), unicode(language(34001)),
unicode(language(34002)))
+ err.ok(unicode(language(30023)), unicode(language(30017)),
unicode(language(30018)))
settings.setSetting('loginok', "")
raise loginExpcetion()
elif re.compile('votre quota').findall(str(res)):
xbmc.log(msg=pluginLogHeader + "User account
locked",level=xbmc.LOGSEVERE)
err = xbmcgui.Dialog()
- err.ok(unicode(language(35001)), unicode(language(34003)),
unicode(language(34004)), unicode(language(34005)))
+ err.ok(unicode(language(30022)), unicode(language(30019)),
unicode(language(30020)), unicode(language(30021)))
settings.setSetting('loginok', "")
raise loginExpcetion()
else:
@@ -165,9 +165,9 @@ def initialIndex():
Create the initial menu with the right identification values for the
add-on to know which option have been selected
"""
- add_dir(unicode(language(33016)), 'http://mobile.nolife-tv.com',
MODE_LAST_SHOWS, '')
- add_dir(unicode(language(33017)), 'http://mobile.nolife-tv.com',
MODE_CATEGORIES, '')
- add_dir(unicode(language(33018)), 'http://mobile.nolife-tv.com',
MODE_SEARCH, '')
+ add_dir(unicode(language(30014)), 'http://mobile.nolife-tv.com',
MODE_LAST_SHOWS, '')
+ add_dir(unicode(language(30015)), 'http://mobile.nolife-tv.com',
MODE_CATEGORIES, '')
+ add_dir(unicode(language(30016)), 'http://mobile.nolife-tv.com',
MODE_SEARCH, '')
def getlastVideos():
"""Get last uploaded videos
diff --git a/plugin.video.nolife/resources/language/english/strings.xml
b/plugin.video.nolife/resources/language/english/strings.xml
index d38b9cb..0c2d538 100644
--- a/plugin.video.nolife/resources/language/english/strings.xml
+++ b/plugin.video.nolife/resources/language/english/strings.xml
@@ -1,33 +1,33 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<strings>
<!-- Parameters -->
- <string id="32001">Authentication</string>
- <string id="32010">Use a Nolife account</string>
- <string id="32011">Username</string>
- <string id="32012">Password</string>
- <string id="32013">See previews</string>
- <string id="33001">Appearance</string>
- <string id="33011">Order by</string>
- <string id="33012">Show all videos</string>
- <string id="33013">Number of videos to show</string>
- <string id="33014">Quality</string>
- <string id="33015">Show already seen videos</string>
- <string id="33020">Number of shows in last shows</string>
- <string id="33021">Autorefresh directories</string>
+ <string id="30001">Authentication</string>
+ <string id="30002">Use a Nolife account</string>
+ <string id="30003">Username</string>
+ <string id="30004">Password</string>
+ <string id="30005">See previews</string>
+ <string id="30006">Appearance</string>
+ <string id="30007">Order by</string>
+ <string id="30008">Show all videos</string>
+ <string id="30009">Number of videos to show</string>
+ <string id="30010">Quality</string>
+ <string id="30011">Show already seen videos</string>
+ <string id="30012">Number of shows in last shows</string>
+ <string id="30013">Autorefresh directories</string>
<!-- List of shows messages -->
- <string id="33016">Last shows</string>
- <string id="33017">Shows</string>
- <string id="33018">Search</string>
+ <string id="30014">Last shows</string>
+ <string id="30015">Shows</string>
+ <string id="30016">Search</string>
<!-- Error messages -->
- <string id="34001">Invalid user name.</string>
- <string id="34002">Please check your login informations in addon's'
parameter menu.</string>
- <string id="34003">There have been too many authentication errors.</string>
- <string id="34004">You should wait 15 minutes before any new login
attempts.</string>
- <string id="34005">Please check your login informations.</string>
+ <string id="30017">Invalid user name.</string>
+ <string id="30018">Please check your login informations in addon's'
parameter menu.</string>
+ <string id="30019">There have been too many authentication errors.</string>
+ <string id="30020">You should wait 15 minutes before any new login
attempts.</string>
+ <string id="30021">Please check your login informations.</string>
<!-- Common messages -->
- <string id="35001">Message</string>
- <string id="35002">Error</string>
+ <string id="30022">Message</string>
+ <string id="30023">Error</string>
</strings>
diff --git a/plugin.video.nolife/resources/language/french/strings.xml
b/plugin.video.nolife/resources/language/french/strings.xml
index dac2b55..e5a5ea6 100644
--- a/plugin.video.nolife/resources/language/french/strings.xml
+++ b/plugin.video.nolife/resources/language/french/strings.xml
@@ -1,33 +1,33 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<strings>
<!-- Paramètres -->
- <string id="32001">Authentification</string>
- <string id="32010">Utiliser un compte Nolife</string>
- <string id="32011">Nom d'utilisateur</string>
- <string id="32012">Mot de passe</string>
- <string id="32013">Voir les extraits des émissions</string>
- <string id="33001">Apparence</string>
- <string id="33011">Classement</string>
- <string id="33012">Afficher toutes les émissions</string>
- <string id="33013">Nombre d'émissions à afficher</string>
- <string id="33014">Qualité vidéo</string>
- <string id="33015">Afficher les émissions déjà vues</string>
- <string id="33020">Nombre d'émissions dans les récentes</string>
- <string id="33021">Rafraichir automatiquement les dossiers</string>
+ <string id="30001">Authentification</string>
+ <string id="30002">Utiliser un compte Nolife</string>
+ <string id="30003">Nom d'utilisateur</string>
+ <string id="30004">Mot de passe</string>
+ <string id="30005">Voir les extraits des émissions</string>
+ <string id="30006">Apparence</string>
+ <string id="30007">Classement</string>
+ <string id="30008">Afficher toutes les émissions</string>
+ <string id="30009">Nombre d'émissions à afficher</string>
+ <string id="30010">Qualité vidéo</string>
+ <string id="30011">Afficher les émissions déjà vues</string>
+ <string id="30012">Nombre d'émissions dans les récentes</string>
+ <string id="30013">Rafraichir automatiquement les dossiers</string>
<!-- Messages dans la liste -->
- <string id="33016">Dernières émissions</string>
- <string id="33017">Ãmissions</string>
- <string id="33018">Recherche</string>
+ <string id="30014">Dernières émissions</string>
+ <string id="30015">Ãmissions</string>
+ <string id="30016">Recherche</string>
<!-- Messages d'erreur -->
- <string id="34001">Nom d'utilisateur ou mot de passe invalide.</string>
- <string id="34002">Veuillez vérifier les informations de connexion. Ces
informations ce trouvent dans les paramètres de l'addon.</string>
- <string id="34003">Trop d'erreurs d'authentification.</string>
- <string id="34004">Veuillez patienter 15 minutes avant de
rééssayer.</string>
- <string id="34005">Vérifiez également vos informations de
connexion.</string>
+ <string id="30017">Nom d'utilisateur ou mot de passe invalide.</string>
+ <string id="30018">Veuillez vérifier les informations de connexion. Ces
informations ce trouvent dans les paramètres de l'addon.</string>
+ <string id="30019">Trop d'erreurs d'authentification.</string>
+ <string id="30020">Veuillez patienter 15 minutes avant de
rééssayer.</string>
+ <string id="30021">Vérifiez également vos informations de
connexion.</string>
<!-- Messages généraux -->
- <string id="35001">Message</string>
- <string id="35002">Erreur</string>
+ <string id="30022">Message</string>
+ <string id="30023">Erreur</string>
</strings>
diff --git a/plugin.video.nolife/resources/settings.xml
b/plugin.video.nolife/resources/settings.xml
index 338a356..7930cea 100644
--- a/plugin.video.nolife/resources/settings.xml
+++ b/plugin.video.nolife/resources/settings.xml
@@ -2,21 +2,21 @@
<settings>
<!-- Authentication -->
- <category label="32001">
- <setting id="authenticate" type="bool" label="32010" default="false" />
- <setting id="username" type="text" label="32011" enable="eq(-1,true)"
default="" />
- <setting id="password" type="text" option="hidden" label="32012"
default="" enable="eq(-2,true)"/>
- <setting id="extracts" type="bool" option="hidden" label="32013"
default="" enable="eq(-3,false)"/>
+ <category label="30001">
+ <setting id="authenticate" type="bool" label="30002" default="false" />
+ <setting id="username" type="text" label="30003" enable="eq(-1,true)"
default="" />
+ <setting id="password" type="text" option="hidden" label="30004"
default="" enable="eq(-2,true)"/>
+ <setting id="extracts" type="bool" option="hidden" label="30005"
default="" enable="eq(-3,false)"/>
</category>
<!-- Affichage -->
- <category label="33001">
- <setting id="type" type="enum" label="33011" values="theme|type"
default="theme"/>
- <setting id="showall" type="bool" label="33012" default="false"/>
- <setting id="show_n" subsetting="true" type="slider" label="33013"
default="30" range="10,10,100" enable="!eq(-1,true)" option="int"/>
- <setting id="showseen" type="bool" label="33015" default="true"/>
- <setting id="showlast" subsetting="true" type="slider" label="33020"
default="30" range="5,5,60" option="int"/>
- <setting id="autorefresh" type="bool" label="33021" default="true"/>
- <setting id="quality" type="enum" label="33014"
values="LQ|HQ|TV|720p|1080p" default="TV"/>
+ <category label="30006">
+ <setting id="type" type="enum" label="30007" values="theme|type"
default="theme"/>
+ <setting id="showall" type="bool" label="30008" default="false"/>
+ <setting id="show_n" subsetting="true" type="slider" label="30009"
default="30" range="10,10,100" enable="!eq(-1,true)" option="int"/>
+ <setting id="showseen" type="bool" label="30011" default="true"/>
+ <setting id="showlast" subsetting="true" type="slider" label="30012"
default="30" range="5,5,60" option="int"/>
+ <setting id="autorefresh" type="bool" label="30013" default="true"/>
+ <setting id="quality" type="enum" label="30010"
values="LQ|HQ|TV|720p|1080p" default="TV"/>
</category>
</settings>
-----------------------------------------------------------------------
Summary of changes:
plugin.audio.dradio/addon.xml | 2 +-
plugin.audio.dradio/changelog.txt | 3 +
plugin.audio.dradio/default.py | 20 ++++----
.../resources/media/{dkultur.png => drk.png} | Bin 9790 -> 9790 bytes
.../resources/media/{dwissen.png => drw.png} | Bin 7773 -> 7773 bytes
plugin.video.nolife/addon.xml | 7 +++-
plugin.video.nolife/default.py | 10 ++--
.../resources/language/english/strings.xml | 46 ++++++++++----------
.../resources/language/french/strings.xml | 46 ++++++++++----------
plugin.video.nolife/resources/settings.xml | 26 ++++++------
10 files changed, 84 insertions(+), 76 deletions(-)
rename plugin.audio.dradio/resources/media/{dkultur.png => drk.png} (100%)
rename plugin.audio.dradio/resources/media/{dwissen.png => drw.png} (100%)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
