Merge lp:~kelemeng/activity-log-manager/bug958483 into lp:~activity-log-manager/activity-log-manager/vala

[Gabor Kelemen]

[Manish Sinha (मनीष सिन्हा) (manishsinha)]

> var last_accessed = time.format(_("%e %B %Y"));

These are string formatting for how the time should be rendered. It doesn't get printed on the screen. It doesn't need to be translated.

> var date_string = date.format(_("%d %B %Y"));
Same

> var date_string = date.format(_("%d %B %Y"));
Same

review: Needs Fixing

[Stefano Candori (cando)]

Manish, those gettext changes are already in my branch.. could you review
my merge request?

Stefano Candori
Il giorno 18/mar/2012 19:47, "Manish Sinha (मनीष सिन्हा" <
<email address hidden>> ha scritto:

> Review: Needs Fixing
>
> > var last_accessed = time.format(_("%e %B %Y"));
>
> These are string formatting for how the time should be rendered. It
> doesn't get printed on the screen. It doesn't need to be translated.
>
> > var date_string = date.format(_("%d %B %Y"));
> Same
>
> > var date_string = date.format(_("%d %B %Y"));
> Same
> --
>
> https://code.launchpad.net/~kelemeng/activity-log-manager/bug958483/+merge/98096
> Your team Activity Log Manager is subscribed to branch
> lp:activity-log-manager.
>

[Gabor Kelemen (kelemeng)]

>> var last_accessed = time.format(_("%e %B %Y"));

> These are string formatting for how the time should be rendered. It doesn't get printed on the
> screen. It doesn't need to be translated.

The date gets printed in a format specified by these strings. Preferred date formats are different in various languages, so formatting strings needs to be marked for translation.

This is covered here: http://www.gnu.org/software/gettext/manual/gettext.html#Aspects

As for Stefanoss branch: you missed the untranslated Name string in the ApplicationsTreeView class. This is not visible, but it is an accessible description of the blacklisted applications list, and can be heard when using Orca.

Also you should mark the time formatting strings for translation too. Also please avoid using string surgeries like:

time.format(today + ", %H:%M")

This won't look good in some languages, even if the two parts would be translatable individually. See: https://live.gnome.org/TranslationProject/DevGuidelines/Never%20split%20sentences

[Manish Sinha (मनीष सिन्हा) (manishsinha)]

@Stefano

I reviewed yours. It's fine. Will merge it by end of the day

[Manish Sinha (मनीष सिन्हा) (manishsinha)]

@Gabor
Cool. Looks fine. Will merge both the branches.

I just checked Stefano's diff. Will have a thorough look at the codebcase before making a release.

review: Approve

=== modified file 'src/applications-widget.vala'
--- src/applications-widget.vala	2012-03-12 14:45:32 +0000
+++ src/applications-widget.vala	2012-03-18 11:54:18 +0000
@@ -328,7 +328,7 @@
 		
 		private void set_up_ui () {
 			var column_pix_name = new TreeViewColumn ();
-			column_pix_name.set_title ("Name");
+			column_pix_name.set_title (_("Name"));
 			this.treeview.append_column (column_pix_name);
 			var pix_rend = new CellRendererPixbuf ();
 			column_pix_name.pack_start (pix_rend, false);
@@ -466,7 +466,7 @@
 		
 		private void set_up_ui () {
 			var column_pix_name = new TreeViewColumn ();
-			column_pix_name.set_title ("Name");
+			column_pix_name.set_title (_("Name"));
 			this.treeview.append_column (column_pix_name);
 			var pix_rend = new CellRendererPixbuf ();
 			column_pix_name.pack_start (pix_rend, false);
@@ -480,7 +480,7 @@
 			column_pix_name.set_sort_column_id (0);
 
 			var column_used_name = new TreeViewColumn ();
-			column_used_name.set_title ("Last Used");
+			column_used_name.set_title (_("Last Used"));
 			this.treeview.append_column (column_used_name);
 			var used_rend = new CellRendererText ();
 			used_rend.set_property ("ellipsize", Pango.EllipsizeMode.END);
@@ -492,7 +492,7 @@
 			used_rend.set_property("xalign", 1);
 			
 			var column_usage_name = new TreeViewColumn ();
-			column_usage_name.set_title ("Activity");
+			column_usage_name.set_title (_("Activity"));
 			this.treeview.append_column (column_usage_name);
 			var usage_rend = new UsageCellRenderer ();
 			column_usage_name.pack_start (usage_rend, true);
@@ -574,7 +574,7 @@
 				if(last_accessed_time != null)
 				{
 					var time = new DateTime.from_unix_local (last_accessed_time/1000);
-					var last_accessed = time.format("%e %B %Y");
+					var last_accessed = time.format(_("%e %B %Y"));
 
 					insert_liststore(app_info, last_accessed, last_accessed_time,
 									0);

=== modified file 'src/history-widget.vala'
--- src/history-widget.vala	2012-03-03 12:09:23 +0000
+++ src/history-widget.vala	2012-03-18 11:54:18 +0000
@@ -343,7 +343,7 @@
 			calendar.get_date(out year, out month, out day);
 		
 			DateTime date = new DateTime.local((int)year, (int)month+1, (int)day, 0, 0 ,0);
-			var date_string = date.format("%d %B %Y");
+			var date_string = date.format(_("%d %B %Y"));
 			entry.set_text(date_string);
 			widget.set_sensitive(true);
 			dialog.hide();
@@ -376,7 +376,7 @@
 				calendar.get_date(out year, out month, out day);
 				
 				DateTime date = new DateTime.local((int)year, (int)month+1, (int)day, 0, 0 ,0);
-				var date_string = date.format("%d %B %Y");
+				var date_string = date.format(_("%d %B %Y"));
 				entry.set_text(date_string);
 				widget.set_sensitive(true);
 				dialog.hide();