Ubuntu Online Tour - OBSOLETE

Merge lp:~barry-mcgee/ubuntu-online-tour/status-bar-translations into lp:ubuntu-online-tour/14.04

  1. status-bar-translations
  2. Merge into 14.04
Proposed by Barry McGee
Status: Merged
Approved by: Anthony Dillon
Approved revision: 191
Merged at revision: 192
Proposed branch: lp:~barry-mcgee/ubuntu-online-tour/status-bar-translations
Merge into: lp:ubuntu-online-tour/14.04
Diff against target: 51 lines (+16/-2)
3 files modified
en/index.html (+9/-0)
js/filesystem.js (+2/-2)
js/lang.js (+5/-0)
To merge this branch: bzr merge lp:~barry-mcgee/ubuntu-online-tour/status-bar-translations
Reviewer Review Type Date Requested Status
Anthony Dillon Approve
Review via email: mp+281898@code.launchpad.net

Description of the change

Enable translations on Nautilus status bar

To post a comment you must log in.
Revision history for this message
Anthony Dillon (ya-bo-ng) wrote :

Code and QA +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'en/index.html'
2--- en/index.html 2016-01-06 16:55:03 +0000
3+++ en/index.html 2016-01-07 17:23:57 +0000
4@@ -1210,6 +1210,15 @@
5 <p class="_rubbish_bin_folder_">
6 Rubbish bin
7 </p>
8+ <p class="_string_selected_">
9+ selected
10+ </p>
11+ <p class="_string_containing_">
12+ containing
13+ </p>
14+ <p class="_string_items_">
15+ items
16+ </p>
17 <!--
18 * Software Center System
19 -->
20
21=== modified file 'js/filesystem.js'
22--- js/filesystem.js 2014-04-16 21:45:47 +0000
23+++ js/filesystem.js 2016-01-07 17:23:57 +0000
24@@ -216,9 +216,9 @@
25 detailsCount++;
26 }
27 }
28- $('.selected-details').text('"'+detailsName+'" selected (containing '+detailsCount+' items)');
29+ $('.selected-details').text('"'+detailsName+'" '+_string_selected_+' ('+_string_containing_+' '+detailsCount+' '+_string_items_+')');
30 }else{
31- $('.selected-details').text('"'+detailsName+'" selected ('+list_of_files[$index].size()+')');
32+ $('.selected-details').text('"'+detailsName+'" '+_string_selected_+' ('+list_of_files[$index].size()+')');
33 }
34
35 $('.selected-details').show();
36
37=== modified file 'js/lang.js'
38--- js/lang.js 2016-01-06 16:55:03 +0000
39+++ js/lang.js 2016-01-07 17:23:57 +0000
40@@ -47,6 +47,11 @@
41 var _branches_folder_ = $.trim(hiddenTranslation.find('._branches_folder_').text());
42 var _rubbish_bin_folder_ = $.trim(hiddenTranslation.find('._rubbish_bin_folder_').text());
43
44+var _string_selected_ = $.trim(hiddenTranslation.find('._string_selected_').text());
45+var _string_containing_ = $.trim(hiddenTranslation.find('._string_containing_').text());
46+var _string_items_ = $.trim(hiddenTranslation.find('._string_items_').text());
47+
48+
49 /*
50 * Software Center System
51 */

Subscribers

People subscribed via source and target branches