Add support for Kodi 19 Beta 1

XBMCil · Dec 2, 2020 · 75d3ab7 · 75d3ab7
1 parent 505aad4
commit 75d3ab7
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 35 deletions.
diff --git a/addon.xml b/addon.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="service.subtitles.ktuvit" name="Ktuvit.me" version="2.2.1" provider-name="CaTz">
   <requires>
-    <import addon="xbmc.python" version="2.25.0"/>
-    <import addon="script.module.requests" version="2.22.0"/>
-    <import addon="script.module.beautifulsoup4" version="4.6.2"/>
+    <import addon="xbmc.python" version="3.0.0"/>
+    <import addon="script.module.beautifulsoup4" version="4.8.2"/>
   </requires>
   <extension point="xbmc.subtitle.module" library="service.py"/>
   <extension point="xbmc.addon.metadata">
-    <summary lang="en">Ktuvit.me</summary>
-    <description lang="en">Search and Download subtitles from ktuvit.me.</description>
+    <summary lang="en_GB">Ktuvit.me</summary>
+    <description lang="en_GB">Search and Download subtitles from ktuvit.me.</description>
     <source>https://github.com/XBMCil/service.subtitles.ktuvit</source>
-    <language>en</language>
     <license>GNU GENERAL PUBLIC LICENSE. Version 2, June 1991</license>
+    <assets>
+        <icon>icon.png</icon>
+        <clearlogo>logo.png</clearlogo>
+    </assets>
   </extension>
 </addon>
diff --git a/resources/language/English/strings.po → ...nguage/resource.language.en_gb/strings.po b/resources/language/English/strings.po → ...nguage/resource.language.en_gb/strings.po
@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: XBMC Translation Team\n"
-"Language-Team: English (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/en/)\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: English (United States) (http://www.transifex.com/projects/p/kodi-main/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
+"Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #English

diff --git a/resources/language/resource.language.en_us/strings.po b/resources/language/resource.language.en_us/strings.po
@@ -0,0 +1,43 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: English (United States) (http://www.transifex.com/projects/p/kodi-main/language/en_GB/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_US\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#English
+
+msgctxt "#32001"
+msgid "Error searching for subtitles"
+msgstr ""
+
+msgctxt "#32002"
+msgid "Email"
+msgstr ""
+
+msgctxt "#32003"
+msgid "Encoded Password"
+msgstr ""
+
+msgctxt "#32004"
+msgid "Login Details"
+msgstr ""
+
+msgctxt "#32005"
+msgid "Check login details"
+msgstr ""
+
+msgctxt "#32006"
+msgid "Wrong email or password"
+msgstr ""
+
+msgctxt "#32007"
+msgid "Logged in successfully"
+msgstr ""
diff --git a/resources/language/Hebrew/strings.po → ...nguage/resource.language.he_il/strings.po b/resources/language/Hebrew/strings.po → ...nguage/resource.language.he_il/strings.po
@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC Main Translation Project (Frodo)\n"
-"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n"
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: A. Dambledore\n"
-"Language-Team: English (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/en/)\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/kodi-main/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
+"Language: he_IL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #Hebrew

diff --git a/resources/lib/SUBUtilities.py b/resources/lib/SUBUtilities.py
@@ -11,16 +11,9 @@
 import xbmcaddon
 from bs4 import BeautifulSoup
 
-try:
-    # Python 3 - Kodi 19
-    from http.cookiejar import LWPCookieJar
-    from urllib.request import Request, build_opener, HTTPCookieProcessor
-    from urllib.parse import urlencode
-except ImportError:
-    # Python 2 - Kodi 18 and below
-    from cookielib import LWPCookieJar
-    from urllib2 import Request, build_opener, HTTPCookieProcessor
-    from urllib import urlencode
+from http.cookiejar import LWPCookieJar
+from urllib.request import Request, build_opener, HTTPCookieProcessor
+from urllib.parse import urlencode
 
 __addon__ = xbmcaddon.Addon()
 __version__ = __addon__.getAddonInfo('version')  # Module version

diff --git a/resources/lib/__init__.py b/resources/lib/__init__.py
diff --git a/service.py b/service.py
@@ -9,14 +9,7 @@
 import xbmcplugin
 import xbmcvfs
 
-try:
-    # Python 3 - Kodi 19
-    from urllib.parse import urlparse, unquote
-    from urllib.request import Request
-except ImportError:
-    # Python 2 - Kodi 18 and below
-    from urlparse import urlparse, unquote
-    from urllib2 import Request
+from urllib.parse import unquote
 
 __addon__ = xbmcaddon.Addon()
 __author__ = __addon__.getAddonInfo('author')