Fixed a couple of strings

Also, removed hardcoded test position. Lastly: Git Flow! Yeeeeee
frakbot · Jun 30, 2013 · 469096b · 469096b
1 parent a36a90f
commit 469096b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
@@ -17,7 +17,7 @@
     <string name="temp_freezing"><![CDATA[<font color="#d28aff">Porca troia.</font> E\' tipo il polo nord.]]></string>
     <string name="temp_cold"><![CDATA[Fa <font color="#cde2ff">freddo</font> come in un cazzo di frigo.]]></string>
     <string name="temp_hot"><![CDATA[È <font color="#f25e5e">caldo</font> come un forno del cazzo.]]></string>
-    <string name="temp_warm"><![CDATA[Goditi i cazzo di uccellini che <font color="#00d500">cantano.</font>]]></string>
+    <string name="temp_warm"><![CDATA[Goditi i cazzo di uccellini che <font color="#00d500">cantano</font> e cagate simili.]]></string>
     <string name="temp_wtf"><![CDATA[Cazzo, sul serio, al momento è la tua chance migliore, io non ne ho idea.]]></string>
 
     <string name="cdesc_weathericon">Meteo attuale</string>

diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -19,8 +19,8 @@
     <string name="temp_freezing"><![CDATA[<font color="#d28aff">WTF.</font> Fucking north pole.]]></string>
     <string name="temp_cold"><![CDATA[<font color="#cde2ff">Cold</font> like a fucking fridge.]]></string>
     <string name="temp_hot"><![CDATA[<font color="#f25e5e">Hot</font> as in a fucking oven.]]></string>
-    <string name="temp_warm"><![CDATA[Enjoy the fucking <font color="#00d500">singing</font> birds.]]></string>
-    <string name="temp_wtf"><![CDATA[No, seriously, right now that\'s your best chance, I have no fucking idea.]]></string>
+    <string name="temp_warm"><![CDATA[Enjoy the fucking birds <font color="#00d500">singing</font> and shit.]]></string>
+    <string name="temp_wtf"><![CDATA[No, seriously, that\'s your best chance right now, I have no fucking idea.]]></string>
 
     <string name="cdesc_weathericon">Current weather</string>
 </resources>
diff --git a/src/net/frakbot/FWeather/UpdaterService.java b/src/net/frakbot/FWeather/UpdaterService.java
@@ -331,7 +331,7 @@ private Weather getWeather() {
         }
 
         // Get the city name, if possible
-        String cityName = "Palermo,IT";//getCityName(location);
+        String cityName = getCityName(location);
 
         Weather weather;
         String json;