mlhim-specs-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 310
committer: Eduardo Ribeiro <xcesar@xxxxxxxxx>
branch nick: devel
timestamp: Fri 2013-02-01 17:40:34 -0200
message:
  Minor correction in metadata
modified:
  src/2.0/metadata.py


--
lp:cdd
https://code.launchpad.net/~cdd-dev/cdd/trunk

Your team MLHIM Specifications Developers is subscribed to branch lp:cdd.
To unsubscribe from this branch go to https://code.launchpad.net/~cdd-dev/cdd/trunk/+edit-subscription

=== modified file 'src/2.0/metadata.py'
--- src/2.0/metadata.py	2013-02-01 19:08:51 +0000
+++ src/2.0/metadata.py	2013-02-01 19:40:34 +0000
@@ -4,6 +4,7 @@
 
 import wx
 import cdd_gui
+from aux_gui import *
 
 class MetadataPanel(cdd_gui.MetadataPanel):
     def __init__(self, *args, **kwds):
@@ -21,13 +22,14 @@
         self.relation = ''
         self.coverage = ''
         self.language = ''
+        self.language_num = 0
         self.date = ''
 
         self.init_config()
         self.read_config()
         
         #self.button_ok.Disable()
-        self.button_set_default.Disable()
+
 
         self.set_binds()
         
@@ -54,7 +56,7 @@
                 'rights' : 'CC-BY http://creativecommons.org/licenses/by/3.0/',
                 'relation' : 'None',
                 'coverage' : 'Universal',
-                'language' : '76',
+                'language' : 'en-US',
                 'choice_definition' : '0',
                 })
 
@@ -70,7 +72,7 @@
         self.load_fields()
         self.set_panel_configs()
         self.set_panel_date_to_current()
-        
+        self.button_set_default.Disable()        
         
     def set_panel_date_to_current(self):
         date = wx.DateTime()
@@ -110,7 +112,9 @@
         self.relation = self.text_ctrl_relation.GetValue().encode('utf8')
         self.coverage = self.text_ctrl_coverage.GetValue().encode('utf8')
 
-        self.language = str(self.choice_lang.GetSelection())
+
+        self.language_num = self.choice_lang.GetSelection()
+        self.language = get_lang_list()[self.language_num]
         
         date = self.datepicker_ctrl_date.GetValue()
         self.date = '{Y}-{M:02}-{D:02}'.format(Y=date.GetYear(), M=date.GetMonth()+1, D=date.GetDay())
@@ -128,8 +132,12 @@
         self.text_ctrl_rights.SetValue(self.rights)
         self.text_ctrl_relation.SetValue(self.relation)
         self.text_ctrl_coverage.SetValue(self.coverage)
-
-        self.choice_lang.SetSelection(int(self.language))
+        
+        try:
+            self.language_num = get_lang_list().index(self.language)
+        except:
+            self.language_num = 76
+        self.choice_lang.SetSelection(self.language_num)
         
         if self.date:
             year, month, day = self.date.split('-')
@@ -178,7 +186,7 @@
             description = self.description,
             creator = self.creator,
             creator_email = self.creator_email,
-            contributor = self.contributor,
+            contributors = self.contributors,
             publisher = self.publisher,
             subject = self.subject,
             source = self.source,
@@ -195,7 +203,7 @@
         self.description = md.get('description')
         self.creator = md.get('creator')
         self.creator_email = md.get('creator_email')
-        self.contributor = md.get('contributor')
+        self.contributors = md.get('contributors')
         self.publisher = md.get('publisher')
         self.subject = md.get('subject')
         self.source = md.get('source')