fix build

Update italian translation

CHANGELOG

@@ -1,3 +1,6 @@
+v 2.5.0
+  - unread count is now displayed in a favicon badge when supported
+
 v 2.4.0
   - users were not able to change password or delete account
   - fix api key generation
@@ -51,4 +54,4 @@ v2.0.0
   - The backend has been completely rewritten using Dropwizard instead of TomEE, resulting in a lot less memory consumption and better overall performances.
     See the README on how to build CommaFeed from now on.
   - CommaFeed should no longer fetch the same feed multiple times in a row  
-  - Users can use their username or email to log in  
+  - Users can use their username or email to log in  

README.md

@@ -17,8 +17,8 @@ Browser extensions: [Chrome](https://github.com/Athou/commafeed-chrome) - [Firef
 ### The very short version (download precompiled package)
 
     mkdir commafeed && cd commafeed
-    wget https://github.com/Athou/commafeed/releases/download/2.3.0/commafeed.jar
-    wget https://raw.githubusercontent.com/Athou/commafeed/2.3.0/config.yml.example -O config.yml
+    wget https://github.com/Athou/commafeed/releases/download/2.4.0/commafeed.jar
+    wget https://raw.githubusercontent.com/Athou/commafeed/2.4.0/config.yml.example -O config.yml
     vi config.yml
     java -Djava.net.preferIPv4Stack=true -jar commafeed.jar server config.yml 
 

bower.json

@@ -28,7 +28,8 @@
     "devicejs": "0.2.4",
     "readabilicons": "arc90/readability-readabilicons#34c55561c5b8ec6e90714b50237c06b13cb9d59c",
     "zocial-less": "1.0.0",
-	"swagger-ui": "2.1.0"
+    "swagger-ui": "2.1.0",
+    "tinycon": "0.6.5"
   },
   "resolutions": {
     "angular": "1.3.14",

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.commafeed</groupId>
 	<artifactId>commafeed</artifactId>
-	<version>2.4.0</version>
+	<version>2.5.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>CommaFeed</name>
 
@@ -157,7 +157,7 @@
 			<plugin>
 				<groupId>com.github.eirslett</groupId>
 				<artifactId>frontend-maven-plugin</artifactId>
-				<version>0.0.25</version>
+				<version>1.6</version>
 				<executions>
 					<execution>
 						<id>install node and npm</id>
@@ -166,7 +166,7 @@
 						</goals>
 						<phase>compile</phase>
 						<configuration>
-							<nodeVersion>v0.10.39</nodeVersion>
+							<nodeVersion>v6.11.4</nodeVersion>
 							<npmVersion>3.10.6</npmVersion>
 						</configuration>
 					</execution>

src/main/app/i18n/ar.js

@@ -175,7 +175,8 @@
       "font_size" : "increase/decrease font size of the current entry ",
       "go_to_all" : "go to the All view ",
       "go_to_starred" : "go to the Starred view ",
-      "feed_search" : "navigate to a subscription by entering the subscription name"
+      "feed_search" : "navigate to a subscription by entering the subscription name",
+      "refresh": "refresh"
     }
   }
-}
+}

src/main/app/i18n/en.js

@@ -177,7 +177,8 @@
       "font_size" : "increase/decrease font size of the current entry",
       "go_to_all" : "go to the All view",
       "go_to_starred" : "go to the Starred view",
-      "feed_search" : "navigate to a subscription by entering the subscription name"
+      "feed_search" : "navigate to a subscription by entering the subscription name",
+      "refresh": "refresh"
     }
   }
-}
+}

src/main/app/i18n/it.js

@@ -41,7 +41,7 @@
     "refresh" : "Aggiorna",
     "refresh_all" : "Forza l'aggiornamento di tutti i feed",
     "sort_by_asc_desc" : "Ordina per data crescente/decrescente",
-    "sort_by_abc_zyx" : "Sort Alphabetically",
+    "sort_by_abc_zyx" : "Ordina alfabeticamente",
     "titles_only" : "Solo i titoli",
     "expanded_view" : "Espandi",
     "mark_all_as_read" : "Segna tutti come già letti",
@@ -57,8 +57,8 @@
     "donate" : "Dona"
   },
   "view" : {
-    "entry_source" : "da",
-    "entry_author" : "di",
+    "entry_source" : "da ",
+    "entry_author" : "di ",
     "error_while_loading_feed" : "Si è verificato un errore durante il caricamento del feed",
     "keep_unread" : "Mantieni come da leggere",
     "no_unread_items" : "non contiene elementi da leggere",
@@ -82,9 +82,9 @@
     },
     "appearance" : "Aspetto",
     "scroll_speed" : "Velocità di scorrimento quando navighi tra i feed (in millisecondi)",
-    "scroll_speed_help" : "Imposta su 0 per disabilitare",
+    "scroll_speed_help" : "imposta su 0 per disabilitare",
     "theme" : "Tema",
-    "submit_your_theme" : "Sottoponi il tuo tema",
+    "submit_your_theme" : "Inserisci il tuo tema",
     "custom_css" : "CSS personalizzato"
   },
   "details" : {
@@ -130,7 +130,7 @@
       "line1" : "CommaFeed è basato su JAX-RS e AngularJS. Pertanto è disponibile una REST API.",
       "link_to_documentation" : "Link alla documentazione."
     },
-    "keyboard_shortcuts" : "Scorciatoie da tastiera", 
+    "keyboard_shortcuts" : "Scorciatoie da tastiera",
     "version" : "Versione di CommaFeed",
     "line1_prefix" : "CommaFeed è un progetto open source. Trovi i sorgenti su ",
     "line1_suffix" : ".",
@@ -148,12 +148,12 @@
       "subscribe_bookmarklet" : "Aggiungi la sottoscrizione ai segnalibri (clicca)",
       "subscribe_bookmarklet_asc" : "Prima i vecchi",
       "subscribe_bookmarklet_desc" : "Prima i recenti",
-      "next_unread_bookmarklet" : "Bookmarklet al prossimo elemento da leggere (trascinalo nella barra dei segnalibri)"
+      "next_unread_bookmarklet" : "Segnalibro al prossimo elemento da leggere (trascinalo nella barra dei segnalibri)"
     },
     "translation" : {
       "value" : "Traduzioni",
       "message" : "Abbiamo bisogno del tuo aiuto per tradurre CommaFeed.",
-      "link" : "Scopri come aiutarci nella traduzioni."
+      "link" : "Scopri come aiutarci nelle traduzioni."
     },
     "announcements" : "Annunci",
     "shortcuts" : {
@@ -177,7 +177,8 @@
       "font_size" : "aumenta/decrementa la dimensione del font per la voce corrente",
       "go_to_all" : "vai alla vista Tutti",
       "go_to_starred" : "vai alla vista Preferiti",
-      "feed_search" : "raggiungi una sottoscrizione scrivendo il suo nome"
+      "feed_search" : "raggiungi una sottoscrizione scrivendo il suo nome",
+      "refresh" : "aggiorna"
     }
   }
 }

src/main/app/index.html

@@ -70,6 +70,7 @@
 	<script type="text/javascript" src="lib/mousetrap/mousetrap.js"></script>
 	<script type="text/javascript" src="lib/momentjs/min/moment-with-locales.js"></script>
 	<script type="text/javascript" src="lib/devicejs/lib/device.js"></script>
+	<script type="text/javascript" src="lib/tinycon/tinycon.js"></script>
 	
 	<script type="text/javascript" src="js/controllers.js"></script>
 	<script type="text/javascript" src="js/directives.js"></script>

src/main/app/js/controllers.js

@@ -194,11 +194,7 @@ module.controller('CategoryTreeCtrl', [
 			};
 
 			$scope.$watch(rootUnreadCount, function(value) {
-				var label = 'CommaFeed';
-				if (value > 0) {
-					label = '(' + value + ') ' + label;
-				}
-				$window.document.title = label;
+				Tinycon.setBubble(value);
 			});
 
 			var mark = function(node, entry) {
@@ -1061,6 +1057,7 @@ module.controller('FeedListCtrl', [
 				}
 			};
 
+			// keyboard shortcuts
 			Mousetrap.bind('j', function(e) {
 				$scope.$apply(function() {
 					$scope.navigationMode = 'keyboard';

src/main/app/templates/_shortcuts.html

@@ -1,4 +1,7 @@
 <dl class="dl-horizontal">
+	<dt>r</dt>
+	<dd>{{ 'about.shortcuts.refresh' | translate }}</dd>
+
 	<dt>j</dt>
 	<dd>{{ 'about.shortcuts.open_next_entry' | translate }}</dd>
 
@@ -68,4 +71,4 @@
 	</dt>
 	<dd>{{ 'about.shortcuts.feed_search' | translate }}</dd>
 
-</dl>
+</dl>

src/main/java/com/commafeed/backend/HttpGetter.java

@@ -151,9 +151,13 @@ public class HttpGetter {
 					contentType = entity.getContentType().getValue();
 				}
 			}
-			HttpUriRequest req = (HttpUriRequest) context.getRequest();
-			HttpHost host = context.getTargetHost();
-			String urlAfterRedirect = req.getURI().isAbsolute() ? req.getURI().toString() : host.toURI() + req.getURI();
+
+			String urlAfterRedirect = url;
+			if (context.getRequest() instanceof HttpUriRequest) {
+				HttpUriRequest req = (HttpUriRequest) context.getRequest();
+				HttpHost host = context.getTargetHost();
+				urlAfterRedirect = req.getURI().isAbsolute() ? req.getURI().toString() : host.toURI() + req.getURI();
+			}
 
 			long duration = System.currentTimeMillis() - start;
 			result = new HttpResult(content, contentType, lastModifiedHeaderValue, eTagHeaderValue, duration, urlAfterRedirect);