Merge lp:~vorlon/kubuntu-default-settings/lp-553954 into lp:kubuntu-default-settings

[Steve Langasek]

=== modified file 'debian/changelog'
--- debian/changelog	2010-04-14 11:57:15 +0000
+++ debian/changelog	2010-04-15 01:42:26 +0000
@@ -1,3 +1,11 @@
+kubuntu-default-settings (1:10.04ubuntu21) lucid; urgency=low
+
+  [ Alberto Milone ]
+  * kubuntu-logo: accept a format string from mountall for the disk check
+    progress, so that localization is possible.  LP: #553954.
+
+ -- Steve Langasek <[e-mail]>  Thu, 15 Apr 2010 01:26:11 +0000
+
 kubuntu-default-settings (1:10.04ubuntu20) lucid; urgency=low
 
   [ Harald Sitter ]

=== modified file 'lib/plymouth/themes/kubuntu-logo/kubuntu-logo.script'
--- lib/plymouth/themes/kubuntu-logo/kubuntu-logo.script	2010-04-10 04:01:54 +0000
+++ lib/plymouth/themes/kubuntu-logo/kubuntu-logo.script	2010-04-15 01:42:26 +0000
@@ -132,6 +132,18 @@
     return local.destination;
 }
 
+fun StringReplace (source, pattern, replacement) {
+    local.found = StringString(source, pattern);
+    if (local.found == NULL)
+        return source;
+
+    local.new_string = StringCopy (source, 0, local.found - 1) +
+                       replacement +
+                       StringCopy (source, local.found + StringLength(pattern), NULL);
+
+    return local.new_string;
+}
+
 # it makes sense to use it only for
 # numbers up to 100
 fun StringToInteger (str) {
@@ -639,11 +651,12 @@
 #       label, the associated
 #       device and the image size of the sprite.
 
-fun init_progress_label (device) {
+fun init_progress_label (device, status_string) {
     # Make the slot unavailable
     global.progress_label.is_available = 0;
     progress_label.progress = 0;
     progress_label.device = device;
+    progress_label.status_string = status_string;
 }
 
 # See if the progress label is keeping track of the fsck
@@ -676,7 +689,13 @@
         }
     }    
     # Update progress label here
-    label = "Checking disk " + global.counter.current + " of " + global.counter.total + " (" + progress_label.progress + "% complete)";
+    #
+    # FIXME: the queue logic from this theme should really be moved into mountall
+    # instead of using string replacement to deal with localised strings.
+    label = StringReplace (progress_label.status_string[0], "%1$d", global.counter.current);
+    label = StringReplace (label, "%2$d",  global.counter.total);
+    label = StringReplace (label, "%3$d",  progress_label.progress);
+    label = StringReplace (label, "%%",  "%");
 
     progress_label = get_fsck_label (label, 0);
     #progress_label.progress = progress;
@@ -823,7 +842,7 @@
 #
 # NOTE: no more than "progress_bar.max_number" bars are allowed
 #
-fun fsck_check (device, progress) {
+fun fsck_check (device, progress, status_string) {
 
     # The 1st time this will take place
     if (!global.progress_label) {
@@ -831,7 +850,7 @@
         increase_fsck_count ();
 
         # Set up a new label for the check
-        init_progress_label (device);
+        init_progress_label (device, status_string);
         update_progress_label (progress);
 
         return;
@@ -867,7 +886,7 @@
             #Debug("setting new label for device " + device + " progress " + progress);
 
             # Set up a new label for the check
-            init_progress_label (device);
+            init_progress_label (device, status_string);
             update_progress_label (progress);
             
         }
@@ -935,10 +954,13 @@
 #    my_string = update_strings[0] + " " + update_strings[1] + " " + update_strings[2];
 #    Debug(my_string);
     # Let's assume that we're dealing with these strings fsck:sda1:40
-    if ((string_it == 2) && (update_strings[0] == "fsck")) {
+    if ((string_it >= 2) && (update_strings[0] == "fsck")) {
         
         device = update_strings[1];
         progress = update_strings[2];
+        status_string[0] = update_strings[3]; # "Checking disk %1$d of %2$d (%3$d %% complete)"
+        if (!status_string[0])
+            status_string[0] = "Checking disk %1$d of %2$d (%3$d %% complete)";
         
         if ((device != "") && (progress != "")) {
             progress = StringToInteger (progress);
@@ -955,7 +977,7 @@
 #                create_extra_fsck_label ();
             
             # Keep track of the fsck check
-            fsck_check (device, progress);
+            fsck_check (device, progress, status_string);
         }
         
     }