Implemented LANG using ContactDataObject.

diff --git a/source/contacteditor/frmContactEditor-Load.cpp b/source/contacteditor/frmContactEditor-Load.cpp
index a48d0a3..d7f8134 100644 (file)
--- a/source/contacteditor/frmContactEditor-Load.cpp
+++ b/source/contacteditor/frmContactEditor-Load.cpp
@@ -185,7 +185,7 @@ bool frmContactEditor::LoadContact(wxString Filename){
                &ContactEditorData.BusinessAddressListPref,
                &ADRCount);
 
-       // Process the timezones (TZ) (frmContactEditor-LoadTimeZone.cpp)
+       // Process the timezones (TZ).
        
        LoadData(&ContactEditorData.GeneralTZList,
                &ContactEditorData.GeneralTZListPref,
@@ -198,7 +198,7 @@ bool frmContactEditor::LoadContact(wxString Filename){
                lboBusinessTimezones,
                &TZCount);
                
-       // Process the emails (EMAIL) (frmContactEditor-LoadEmail.cpp)
+       // Process the emails (EMAIL).
        
        LoadData(&ContactEditorData.GeneralEmailList,
                &ContactEditorData.GeneralEmailListPref,
@@ -211,7 +211,7 @@ bool frmContactEditor::LoadContact(wxString Filename){
                lboBusinessEmail,
                &EmailCount);
 
-       // Process the nicknames (NICKNAME) (frmContactEditor-LoadNickname.cpp)
+       // Process the nicknames (NICKNAME).
        
        LoadData(&ContactEditorData.GeneralNicknamesList,
                &ContactEditorData.GeneralNicknamesListPref,
@@ -223,6 +223,19 @@ bool frmContactEditor::LoadContact(wxString Filename){
                &ContactEditorData.BusinessNicknamesListPref,
                lboBusinessNicknames,
                &NicknameCount);
+               
+       // Process the languages (LANG).
+       
+       LoadData(&ContactEditorData.GeneralLanguageList,
+               &ContactEditorData.GeneralLanguageListPref,
+               lboLanguages,
+               &ContactEditorData.HomeLanguageList,
+               &ContactEditorData.HomeLanguageListPref,
+               lboHomeLanguages,
+               &ContactEditorData.BusinessLanguageList,
+               &ContactEditorData.BusinessLanguageListPref,
+               lboBusinessLanguages,
+               &LangCount);
 
        for (std::map<int,wxString>::iterator iter = ContactFileLines.begin(); 
         iter != ContactFileLines.end(); ++iter){
@@ -403,13 +416,13 @@ bool frmContactEditor::LoadContact(wxString Filename){
                
                        LoadTelephone(wxSPropertySeg1, wxSPropertySeg2, &TelCount);
                
-               } else if (wxSProperty == wxT("LANG")){
+               }/* else if (wxSProperty == wxT("LANG")){
                
                        // See frmContactEditor-LoadLanguage.cpp
                        
                        LoadLanguage(wxSPropertySeg1, wxSPropertySeg2, &LangCount);
                
-               } else if (wxSProperty == wxT("GEO")){
+               }*/ else if (wxSProperty == wxT("GEO")){
                
                        // See frmContactEditor-LoadGeo.cpp