[meld] vc._vc: Rearrange state translations to be less fragile (bgo#720538)

[Kai Willadsen <kaiw src gnome org>]

commit c3fa712a6f1620b8d42685332cc5fa0c6228db9e
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Tue Dec 17 05:54:17 2013 +1000

    vc._vc: Rearrange state translations to be less fragile (bgo#720538)

 meld/vc/_vc.py |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)
---
diff --git a/meld/vc/_vc.py b/meld/vc/_vc.py
index e02d5e7..4610919 100644
--- a/meld/vc/_vc.py
+++ b/meld/vc/_vc.py
@@ -58,10 +58,22 @@ def partition(pred, iterable):
 
 
 class Entry(object):
-    # These are the possible states of files. Be sure to get the colons correct.
-    states = _("Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing:Not 
present").split(":")
-    states[STATE_CONFLICT] = "<b>%s</b>" % states[STATE_CONFLICT]
-    assert len(states) == STATE_MAX
+    # These are labels for possible states of version controlled files;
+    # not all states have a label to avoid visual clutter.
+    state_names = {
+        STATE_IGNORED: _("Ignored"),
+        STATE_NONE: _("Unversioned"),
+        STATE_NORMAL: _(""),
+        STATE_NOCHANGE: _(""),
+        STATE_ERROR: _("Error"),
+        STATE_EMPTY: _(""),
+        STATE_NEW: _("Newly added"),
+        STATE_MODIFIED: _("Modified"),
+        STATE_CONFLICT: "<b>%s</b>" % _("Conflict"),
+        STATE_REMOVED: _("Removed"),
+        STATE_MISSING: _("Missing"),
+        STATE_NONEXIST: _("Not present"),
+    }
 
     def __init__(self, path, name, state):
         self.path = path
@@ -77,7 +89,7 @@ class Entry(object):
                                    self.path, self.state)
 
     def get_status(self):
-        return self.states[self.state]
+        return self.state_names[self.state]
 
 
 class Dir(Entry):