[SCM] kodi-pvr-hts/master: make lifetime settings translatable fixes #200

tiber-guest at users.alioth.debian.org tiber-guest at users.alioth.debian.org
Fri Nov 4 23:23:39 UTC 2016


The following commit has been merged in the master branch:
commit 0f440d383326099a371ec81835b7b6e07af774ce
Author: Glenn-1990 <g_christiaensen at msn.com>
Date:   Mon Mar 14 23:59:25 2016 +0100

    make lifetime settings translatable fixes #200

diff --git a/pvr.hts/resources/language/resource.language.en_gb/strings.po b/pvr.hts/resources/language/resource.language.en_gb/strings.po
index 46a2b3f..1891143 100644
--- a/pvr.hts/resources/language/resource.language.en_gb/strings.po
+++ b/pvr.hts/resources/language/resource.language.en_gb/strings.po
@@ -200,69 +200,104 @@ msgctxt "#30361"
 msgid "Record max once per day"
 msgstr ""
 
-#empty strings from id 30362 to 30364
+#empty strings from id 30362 to 30372
 
 #. Recording lifetime representation
 #: src/Tvheadend.cpp
-msgctxt "#30365"
+msgctxt "#30373"
+msgid "Until space needed"
+msgstr ""
+
+#. Recording lifetime representation
+#: src/Tvheadend.cpp
+msgctxt "#30374"
+msgid "Forever"
+msgstr ""
+
+#. Recording lifetime representation
+#: src/Tvheadend.cpp
+msgctxt "#30375"
 msgid "1 day"
 msgstr ""
 
 #. Recording lifetime representation
 #: src/Tvheadend.cpp
-msgctxt "#30366"
-msgid "%d days"
+msgctxt "#30376"
+msgid "3 days"
+msgstr ""
+
+#. Recording lifetime representation
+#: src/Tvheadend.cpp
+msgctxt "#30377"
+msgid "5 days"
 msgstr ""
 
 #. Recording lifetime representation
 #: src/Tvheadend.cpp
-msgctxt "#30367"
+msgctxt "#30378"
 msgid "1 week"
 msgstr ""
 
 #. Recording lifetime representation
 #: src/Tvheadend.cpp
-msgctxt "#30368"
-msgid "%d weeks"
+msgctxt "#30379"
+msgid "2 weeks"
 msgstr ""
 
 #. Recording lifetime representation
 #: src/Tvheadend.cpp
-msgctxt "#30369"
+msgctxt "#30380"
+msgid "3 weeks"
+msgstr ""
+
+#. Recording lifetime representation
+#: src/Tvheadend.cpp
+msgctxt "#30381"
 msgid "1 month"
 msgstr ""
 
 #. Recording lifetime representation
 #: src/Tvheadend.cpp
-msgctxt "#30370"
-msgid "%d months"
+msgctxt "#30382"
+msgid "2 months"
 msgstr ""
 
 #. Recording lifetime representation
 #: src/Tvheadend.cpp
-msgctxt "#30371"
-msgid "1 year"
+msgctxt "#30383"
+msgid "3 months"
 msgstr ""
 
 #. Recording lifetime representation
 #: src/Tvheadend.cpp
-msgctxt "#30372"
-msgid "%d years"
+msgctxt "#30384"
+msgid "6 months"
 msgstr ""
 
 #. Recording lifetime representation
 #: src/Tvheadend.cpp
-msgctxt "#30373"
-msgid "Until space needed"
+msgctxt "#30385"
+msgid "1 year"
 msgstr ""
 
 #. Recording lifetime representation
 #: src/Tvheadend.cpp
-msgctxt "#30374"
-msgid "Forever"
+msgctxt "#30386"
+msgid "2 years"
+msgstr ""
+
+#. Recording lifetime representation
+#: src/Tvheadend.cpp
+msgctxt "#30387"
+msgid "3 years"
+msgstr ""
+
+#. Recording lifetime representation (for setting dialog only)
+msgctxt "#30388"
+msgid "Until space needed (tvh 4.1+)"
 msgstr ""
 
-#empty strings from id 30375 to 30399
+#empty strings from id 30389 to 30399
 
 msgctxt "#30400"
 msgid "Predictive tuning"
diff --git a/pvr.hts/resources/settings.xml b/pvr.hts/resources/settings.xml
index a680619..9b36243 100644
--- a/pvr.hts/resources/settings.xml
+++ b/pvr.hts/resources/settings.xml
@@ -27,7 +27,7 @@
     
     <setting label="30058" type="lsep"/>
     <setting id="dvr_priority" type="enum" label="30055" lvalues="30351|30352|30353|30354|30355" default="2"/>
-    <setting id="dvr_lifetime" type="enum" label="30056" values="1 day|3 days|5 days|1 week|2 weeks|3 weeks|1 month|2 months|3 months|6 months|1 year|2 years|3 years|Until space needed (tvh 4.1+)|Forever" default="8"/>
+    <setting id="dvr_lifetime" type="enum" label="30056" lvalues="30375|30376|30377|30378|30379|30380|30381|30382|30383|30384|30385|30386|30387|30388|30374" default="8"/>
     <setting id="dvr_dubdetect" type="enum" label="30057" lvalues="30356|30357|30358|30359|30360|30361" default="0"/>
   </category>
   
diff --git a/src/Tvheadend.cpp b/src/Tvheadend.cpp
index 3f9de8d..bdbb6d0 100644
--- a/src/Tvheadend.cpp
+++ b/src/Tvheadend.cpp
@@ -23,8 +23,6 @@
 #include <ctime>
 #include <memory>
 
-#include "p8-platform/util/StringUtils.h"
-
 #include "Tvheadend.h"
 #include "tvheadend/utilities/Utilities.h"
 #include "tvheadend/utilities/Logger.h"
@@ -679,19 +677,19 @@ PVR_ERROR CTvheadend::GetTimerTypes ( PVR_TIMER_TYPE types[], int *size )
   /* PVR_Timer.iLifetime values and presentation.*/
   std::vector< std::pair<int, std::string> > lifetimeValues;
 
-  lifetimeValues.push_back(std::make_pair(DVR_RET_1DAY,    XBMC->GetLocalizedString(30365)));
-  lifetimeValues.push_back(std::make_pair(DVR_RET_3DAY,    StringUtils::Format(XBMC->GetLocalizedString(30366), 3)));
-  lifetimeValues.push_back(std::make_pair(DVR_RET_5DAY,    StringUtils::Format(XBMC->GetLocalizedString(30366), 5)));
-  lifetimeValues.push_back(std::make_pair(DVR_RET_1WEEK,   XBMC->GetLocalizedString(30367)));
-  lifetimeValues.push_back(std::make_pair(DVR_RET_2WEEK,   StringUtils::Format(XBMC->GetLocalizedString(30368), 2)));
-  lifetimeValues.push_back(std::make_pair(DVR_RET_3WEEK,   StringUtils::Format(XBMC->GetLocalizedString(30368), 3)));
-  lifetimeValues.push_back(std::make_pair(DVR_RET_1MONTH,  XBMC->GetLocalizedString(30369)));
-  lifetimeValues.push_back(std::make_pair(DVR_RET_2MONTH,  StringUtils::Format(XBMC->GetLocalizedString(30370), 2)));
-  lifetimeValues.push_back(std::make_pair(DVR_RET_3MONTH,  StringUtils::Format(XBMC->GetLocalizedString(30370), 3)));
-  lifetimeValues.push_back(std::make_pair(DVR_RET_6MONTH,  StringUtils::Format(XBMC->GetLocalizedString(30370), 6)));
-  lifetimeValues.push_back(std::make_pair(DVR_RET_1YEAR,   XBMC->GetLocalizedString(30371)));
-  lifetimeValues.push_back(std::make_pair(DVR_RET_2YEARS,  StringUtils::Format(XBMC->GetLocalizedString(30372), 2)));
-  lifetimeValues.push_back(std::make_pair(DVR_RET_3YEARS,  StringUtils::Format(XBMC->GetLocalizedString(30372), 3)));
+  lifetimeValues.push_back(std::make_pair(DVR_RET_1DAY,    XBMC->GetLocalizedString(30375)));
+  lifetimeValues.push_back(std::make_pair(DVR_RET_3DAY,    XBMC->GetLocalizedString(30376)));
+  lifetimeValues.push_back(std::make_pair(DVR_RET_5DAY,    XBMC->GetLocalizedString(30377)));
+  lifetimeValues.push_back(std::make_pair(DVR_RET_1WEEK,   XBMC->GetLocalizedString(30378)));
+  lifetimeValues.push_back(std::make_pair(DVR_RET_2WEEK,   XBMC->GetLocalizedString(30379)));
+  lifetimeValues.push_back(std::make_pair(DVR_RET_3WEEK,   XBMC->GetLocalizedString(30380)));
+  lifetimeValues.push_back(std::make_pair(DVR_RET_1MONTH,  XBMC->GetLocalizedString(30381)));
+  lifetimeValues.push_back(std::make_pair(DVR_RET_2MONTH,  XBMC->GetLocalizedString(30382)));
+  lifetimeValues.push_back(std::make_pair(DVR_RET_3MONTH,  XBMC->GetLocalizedString(30383)));
+  lifetimeValues.push_back(std::make_pair(DVR_RET_6MONTH,  XBMC->GetLocalizedString(30384)));
+  lifetimeValues.push_back(std::make_pair(DVR_RET_1YEAR,   XBMC->GetLocalizedString(30385)));
+  lifetimeValues.push_back(std::make_pair(DVR_RET_2YEARS,  XBMC->GetLocalizedString(30386)));
+  lifetimeValues.push_back(std::make_pair(DVR_RET_3YEARS,  XBMC->GetLocalizedString(30387)));
   if (m_conn.GetProtocol() >= 25)
     lifetimeValues.push_back(std::make_pair(DVR_RET_SPACE,   XBMC->GetLocalizedString(30373)));
   lifetimeValues.push_back(std::make_pair(DVR_RET_FOREVER, XBMC->GetLocalizedString(30374)));

-- 
kodi-pvr-hts packaging



More information about the pkg-multimedia-commits mailing list