Ticket #5768: mythweather-2.diff

mythweather/i18n/translate.pro

@@ -1 @@
-SOURCES += ../mythweather/weather.cpp 
+SOURCES += ../mythweather/weather.cpp
+SOURCES += ../mythweather/weatherScreen.cpp
 SOURCES += ./strings.h
 SOURCES += ./themestrings.h
 

mythweather/mythweather/weatherScreen.cpp

@@ -109 +109 @@
     emit screenReady(this);
 }
 
+QString WeatherScreen::getTemperatureUnit()
+{
+    if (m_units == ENG_UNITS)
+        return QString::fromUtf8("°") + "F";
+    else
+        return QString::fromUtf8("°") + "C";
+}
+
 void WeatherScreen::prepareScreen()
 {
     QMap<QString, QString>::iterator itr = m_dataValueMap.begin();
@@ -185 +193 @@
         return value + (m_units == ENG_UNITS ? " mi" : " km");
 
     if (key == "appt")
-        return value == "NA" ? value : value + (m_units == ENG_UNITS ? "°F" : "°C");
+        return value == "NA" ? value : value + getTemperatureUnit();
 
     if (key == "temp")
     {
        if ( (value == "NA") || (value == "N/A") )
           return value;
        else
-          return value + (m_units == ENG_UNITS ? "°F" : "°C");
+          return value + getTemperatureUnit();
     }
 
     if (key == "wind_gust" || key == "wind_spdgst" || key == "wind_speed")
@@ -216 +224 @@
        if ( (value == "NA") || (value == "N/A") )
           return value;
        else
-          return value + (m_units == ENG_UNITS ? "°F" : "°C");
+          return value + getTemperatureUnit();
     }
 
+    /*The days of the week will be translated if the script sends elements from
+     the enum DaysOfWeek.*/
+    if (key.startsWith("date-"))
+    {
+        bool isNumber;
+        value.toInt( &isNumber);
+
+        if (isNumber)
+        {
+            int dayOfWeek = value.toInt();
+
+            switch (dayOfWeek)
+            {
+                case DAY_SUNDAY :
+                    return tr("Sunday");
+                    break;
+                case DAY_MONDAY :
+                    return tr("Monday");
+                    break;
+                case DAY_TUESDAY :
+                    return tr("Tuesday");
+                    break;
+                case DAY_WENDESDAY :
+                    return tr("Wednesday");
+                    break;
+                case DAY_THURSDAY :
+                    return tr("Thursday");
+                    break;
+                case DAY_FRIDAY :
+                    return tr("Friday");
+                    break;
+                case DAY_SATURDAY :
+                    return tr("Saturday");
+                    break;
+            }
+        }
+    }
+
     return value;
 }
 
@@ -237 +283 @@
        if ( (value == "NA") || (value == "N/A") )
           return value;
        else
-          return value + (m_units == ENG_UNITS ? "°F" : "°C");
+          return value + getTemperatureUnit();
     }
 
     return value;

mythweather/mythweather/weatherScreen.h

@@ -16 +16 @@
 
 class Weather;
 
+enum DaysOfWeek {
+    DAY_SUNDAY, DAY_MONDAY, DAY_TUESDAY, DAY_WENDESDAY, DAY_THURSDAY,
+    DAY_FRIDAY, DAY_SATURDAY
+};
+
 /** \class WeatherScreen
  *  \brief Weather screen
  */
@@ -60 +65 @@
     virtual QString prepareDataItem(const QString &key, const QString &value);
     virtual void prepareWidget(MythUIType *widget);
     virtual void prepareScreen();
+    virtual QString getTemperatureUnit();
 
   private:
     QMap<QString, QString> m_dataValueMap;

mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl

@@ -18 +18 @@
 our ($opt_v, $opt_t, $opt_T, $opt_l, $opt_u, $opt_d); 
 
 my $name = 'BBC-3day-XML';
-my $version = 0.1;
+my $version = 0.2;
 my $author = 'Stuart Morgan';
 my $email = 'stuart@tase.co.uk';
 my $updateTimeout = 360*60; # 6 Hours
@@ -114 +114 @@
 
     my $day = $item_title;
     $day =~ s/^(.*?):.*/$1/;
+
+    if ($day eq 'Sunday') {
+        $day = '0';
+    }
+    elsif ($day eq 'Monday') {
+        $day = '1';
+    }
+    elsif ($day eq 'Tuesday') {
+        $day = '2';
+    }
+    elsif ($day eq 'Wednesday') {
+        $day = '3';
+    }
+    elsif ($day eq 'Thursday') {
+        $day = '4';
+    }
+    elsif ($day eq 'Friday') {
+        $day = '5';
+    }
+    elsif ($day eq 'Saturday') {
+        $day = '6';
+    }
+
     printf "date-" . $i . "::" . $day . "\n";
 
     my $weather_string = $item_title;