X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Futils.c;h=fb79aeb39af8520265d0d2983cb21c8cffd477ea;hb=f06ea973f90093fed3cf81954698c4139818064b;hp=b748580a05cb0b81f396c8dc413215699f02bcf3;hpb=0796b270b1699336f29908d11bca92d64da0653c;p=ncmpc.git

diff --git a/src/utils.c b/src/utils.c
index b748580..fb79aeb 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -1,21 +1,21 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
- 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "utils.h"
 #include "options.h"
@@ -76,15 +76,13 @@ GList *
 gcmp_list_from_path(struct mpdclient *c, const gchar *path,
 		    GList *list, gint types)
 {
-	struct mpd_connection *connection;
-	struct mpd_entity *entity;
-
-	connection = mpdclient_get_connection(c);
+	struct mpd_connection *connection = mpdclient_get_connection(c);
 	if (connection == NULL)
 		return list;
 
 	mpd_send_list_meta(connection, path);
 
+	struct mpd_entity *entity;
 	while ((entity = mpd_recv_entity(connection)) != NULL) {
 		char *name;
 
@@ -136,37 +134,35 @@ format_duration_short(char *buffer, size_t length, unsigned duration)
 void
 format_duration_long(char *p, size_t length, unsigned long duration)
 {
-	const char *year = _("year");
-	const char *years = _("years");
-	const char *week = _("week");
-	const char *weeks = _("weeks");
-	const char *day = _("day");
-	const char *days = _("days");
 	unsigned bytes_written = 0;
 
 	if (duration / 31536000 > 0) {
 		if (duration / 31536000 == 1)
-			bytes_written = g_snprintf(p, length, "%d %s, ", 1, year);
+			bytes_written = g_snprintf(p, length, "%d %s, ", 1, _("year"));
 		else
-			bytes_written = g_snprintf(p, length, "%lu %s, ", duration / 31536000, years);
+			bytes_written = g_snprintf(p, length, "%lu %s, ", duration / 31536000, _("years"));
 		duration %= 31536000;
 		length -= bytes_written;
 		p += bytes_written;
 	}
 	if (duration / 604800 > 0) {
 		if (duration / 604800 == 1)
-			bytes_written = g_snprintf(p, length, "%d %s, ", 1, week);
+			bytes_written = g_snprintf(p, length, "%d %s, ",
+						   1, _("week"));
 		else
-			bytes_written = g_snprintf(p, length, "%lu %s, ", duration / 604800, weeks);
+			bytes_written = g_snprintf(p, length, "%lu %s, ",
+						   duration / 604800, _("weeks"));
 		duration %= 604800;
 		length -= bytes_written;
 		p += bytes_written;
 	}
 	if (duration / 86400 > 0) {
 		if (duration / 86400 == 1)
-			bytes_written = g_snprintf(p, length, "%d %s, ", 1, day);
+			bytes_written = g_snprintf(p, length, "%d %s, ",
+						   1, _("day"));
 		else
-			bytes_written = g_snprintf(p, length, "%lu %s, ", duration / 86400, days);
+			bytes_written = g_snprintf(p, length, "%lu %s, ",
+						   duration / 86400, _("days"));
 		duration %= 86400;
 		length -= bytes_written;
 		p += bytes_written;