Commit (chpwn): essential-alerts.patch

[cydia.git] / Cydia.app / confirm.js

diff --git a/Cydia.app/confirm.js b/Cydia.app/confirm.js
index 9210295d033072a0adc60ffd706dac7b6bc604e5..ba2e2e5d9a2807eb73923f5f39e6e59352a4f8a4 100644 (file)
--- a/Cydia.app/confirm.js
+++ b/Cydia.app/confirm.js
@@ -24,15 +24,17 @@ $(function () {
             size = size.substr(1);
         }
 
-        $("#disk-key").html(negative ? "Disk Freeing" : "Disk Using");
+        $("#disk-key").html(cydia.localize(negative ? "DISK_FREEING" : "DISK_USING"));
         $("#disk-value").html($.xml(size));
     } else for (var i = 0; i != issues.length; ++i) {
+        document.title = cydia.localize("CANNOT_COMPLY");
+
         $("._issues").remove();
 
         var issue = issues[i];
 
         $("#issues").append(
-            "<label style=\"color: #704d4d\">" + issue[0] + "</label>" +
+            "<label style=\"color: #704d4d\">" + $.xml(issue[0]) + "</label>" +
             "<fieldset style=\"background-color: #dddddd\" class=\"clearfix\" id=\"i" + i + "\"></fieldset>"
         );
 
@@ -41,19 +43,22 @@ $(function () {
             var type = entry[0];
             if (type == "PreDepends")
                 type = "Depends";
-            $("#i" + i).append("<div>" +
-                "<label>" + type + "</label>" +
-                "<div>" + entry[1] + " " + entry[3] + "</div>" +
-            "</div>");
+            var version = entry[1];
+            if (entry.length >= 4)
+                version += " " + entry[3];
+            $("#i" + i).append("<div class=\"clearfix\"><div>" +
+                "<label>" + $.xml(type) + "</label>" +
+                "<label>" + $.xml(version) + "</label>" +
+            "</div></div>");
         }
     }
 
     var keys = [
-        "Install",
-        "Reinstall",
-        "Upgrade",
-        "Downgrade",
-        "Remove"
+        "INSTALL",
+        "REINSTALL",
+        "UPGRADE",
+        "DOWNGRADE",
+        "REMOVE"
     ];
 
     for (var i = 0; i != 5; ++i) {
@@ -61,10 +66,10 @@ $(function () {
         var length = list.length;
 
         if (length != 0) {
-            $("#modifications").append("<div class=\"clearfix\">" +
-                "<label>" + keys[i] + "</label>" +
-                "<div id=\"c" + i + "\"></div>" +
-            "</div>");
+            $("#modifications").append("<div class=\"clearfix\"><div>" +
+                "<label>" + cydia.localize($.xml(keys[i])) + "</label>" +
+                "<label id=\"c" + i + "\"></label>" +
+            "</div></div>");
 
             var value = "";
             for (var j = 0; j != length; ++j) {