Merge pull request #21 from 1ec5/master
authorRichard Fairhurst <richard@systemeD.net>
Mon, 12 Dec 2011 12:26:29 +0000 (04:26 -0800)
committerRichard Fairhurst <richard@systemeD.net>
Mon, 12 Dec 2011 12:26:29 +0000 (04:26 -0800)
Vietnamese translation

net/systemeD/halcyon/connection/StatusFetcher.as
net/systemeD/potlatch2/TagViewer.mxml
net/systemeD/potlatch2/options/OptionsDialog.mxml
potlatch2.mxml
resources/stylesheets/potlatch.css

index 25cf8ca45cf330a43089bddebedf938692aa6b3e..91db46d059d1cd6a74aa4364023cdc0d69067d30 100644 (file)
@@ -60,14 +60,15 @@ package net.systemeD.halcyon.connection {
 
                                // **** Specific WTFE-parsing code starts here
                                // FIXME: should be generalised
-                               //              if all users are "yes" or "auto", status is 'ok' (green)
-                               //              if first user is "no", status is 'no' (red)
-                               //              if any other users are no, status is 'partial' (softer red)
-                               //              otherwise, status is 'unsure' (yellow)
+                               //              if all users are "yes" or "auto", status is 'ok' (3, green)
+                               //              if first user is "no", status is 'no' (0, red)
+                               //              if any other users are no, status is 'partial' (1, softer red)
+                               //              otherwise, status is 'unsure' (2, yellow)
                                var s:uint=3;   // ok
                                for each (var user:XML in exml.user) {
-                                       if (user.@decision=='no' && user.@version=='first') { s=0; }    // no from v1
-                                       else if (user.@decision=='no') { s=Math.min(s,1); }                             // no from later version
+                                       if (user.@severity=='harmless' || user.@severity=='none') continue;     // ignore if harmless
+                                       if (user.@decision=='no' && user.@version=='first') { s=0; }            // no from v1
+                                       else if (user.@decision=='no') { s=Math.min(s,1); }                                     // no from later version
                                        else if (user.@decision=='undecided' || user.@decision=='anonymous') { s=Math.min(s,2); }       // unsure
                                }
                                status=STATUSES[s];
index 3dd633e7f5a41708448b5815378ec08bee111eb7..9c8ae3234f6aa44a381839a2472fa54a571312b5 100644 (file)
                        if      ( entity is Node     ) entityText = "Node";
                        else if ( entity is Way      ) entityText = "Way";
                        else if ( entity is Relation ) entityText = "Relation";
-                       advancedID.htmlText = entityText+": <b>"+entity.id+"</b>";
+                       advancedID.htmlText = entityText+": <b>"+entity.id+"</b> "+(entity.status ? entity.status : '');
                }
 
                removeRelationListeners();
index ab17648076b527c68605d0e98a4d3b9a81ac10f1..2ab31fad9d4751c7b92ab602256acce18c52ae45 100644 (file)
@@ -54,7 +54,7 @@
                        conn.statusFetcher=null;
                        userState.setProperty("licence_status",false);
                } else {
-                       conn.statusFetcher=new StatusFetcher("http://wtfe.gryph.de/api/0.6/userlist",conn);
+                       conn.statusFetcher=new StatusFetcher("http://wtfe.gryph.de/api/0.6/problems",conn);
                        conn.statusFetcher.fetch(conn.getAllLoadedEntities());
                        userState.setProperty("licence_status",true);
                        // ** FIXME: needs to also switch map style
index fc3c224c73761d79669ace11c48f5795badb6d25..32bb6d19bf733b15bb1b5787aab287d397cc3bdd 100644 (file)
                        conn.addEventListener(MapEvent.ERROR, onMapError);
                        conn.addEventListener(AttentionEvent.ATTENTION, onAttention);
                        conn.addEventListener(AttentionEvent.ALERT, onAlert);
-                       if (params['licence_status']) conn.statusFetcher=new StatusFetcher("http://wtfe.gryph.de/api/0.6/userlist",conn);
+                       if (params['licence_status']) conn.statusFetcher=new StatusFetcher("http://wtfe.gryph.de/api/0.6/problems",conn);
                        theMap.addLayer(conn, Stylesheets.instance().selected, false, true);
 
             // Auto-load vector backgrounds from config
index 88094fc43bc68b8545b185600aabde56b6ce362d..1598735d859168bcbd083dd9ca34d8a7b3453559 100644 (file)
@@ -20,9 +20,9 @@ way .area_small_name {text-color: black; font-size: 9; text: name; text-halo: #f
 
 /* Rendering for licence status */
 
-way[_status=no]::status       { z-index: 0; width: eval('_width+7'); color: red; }
-way[_status=partial]::status  { z-index: 0; width: eval('_width+7'); color: red; opacity: 0.4; }
-way[_status=unsure]::status   { z-index: 0; width: eval('_width+7'); color: orange; opacity: 0.4; }
-node[_status=no]::status      { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: red; }
-node[_status=partial]::status { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: red; opacity: 0.4; }
-node[_status=unsure]::status  { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: orange; opacity: 0.4; }
+way[_status=no]::status       { z-index: 0; width: eval('_width+7'); color: #AA0000; }
+way[_status=partial]::status  { z-index: 0; width: eval('_width+7'); color: #AA0000; opacity: 0.6; }
+way[_status=unsure]::status   { z-index: 0; width: eval('_width+7'); color: darkorange; opacity: 0.6; }
+node[_status=no]::status      { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: #AA0000; }
+node[_status=partial]::status { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: #AA0000; opacity: 0.6; }
+node[_status=unsure]::status  { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: darkorange; opacity: 0.6; }