author | eilers <eilers> | 2002-10-14 09:26:18 (UTC) |
---|---|---|
committer | eilers <eilers> | 2002-10-14 09:26:18 (UTC) |
commit | 0bccef01b70fec98e744fab286f5ea443287cdad (patch) (unidiff) | |
tree | 3a602e633dcbe81eca22f490402d39467c4eb32a /core/pim/addressbook | |
parent | 59d6018e53537e15d27cd0174adefba2ec8b8f6e (diff) | |
download | opie-0bccef01b70fec98e744fab286f5ea443287cdad.zip opie-0bccef01b70fec98e744fab286f5ea443287cdad.tar.gz opie-0bccef01b70fec98e744fab286f5ea443287cdad.tar.bz2 |
Last patch for language bug. I am not really happy with it, but it should work now.
Please use the current release of libopie with this application. Otherwise the
app will fail !
-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 3 | ||||
-rw-r--r-- | core/pim/addressbook/contacteditor.cpp | 88 |
2 files changed, 53 insertions, 38 deletions
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index 472b13e..2eb9ddf 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp | |||
@@ -33,3 +33,3 @@ | |||
33 | #include <qpe/config.h> | 33 | #include <qpe/config.h> |
34 | #include <qpe/contact.h> | 34 | #include <opie/ocontact.h> |
35 | 35 | ||
@@ -859,2 +859,3 @@ void AddressbookWindow::initFields() | |||
859 | } | 859 | } |
860 | |||
860 | if ( slOrderedFields.count() > 0 ) { | 861 | if ( slOrderedFields.count() > 0 ) { |
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp index b01583f..bae3a2b 100644 --- a/core/pim/addressbook/contacteditor.cpp +++ b/core/pim/addressbook/contacteditor.cpp | |||
@@ -86,2 +86,4 @@ void ContactEditor::init() { | |||
86 | 86 | ||
87 | QStringList trlChooserNames; | ||
88 | |||
87 | for (i = 0; i <= 6; i++) { | 89 | for (i = 0; i <= 6; i++) { |
@@ -105,2 +107,3 @@ void ContactEditor::init() { | |||
105 | QStringList::ConstIterator it = slOrdered.begin(); | 107 | QStringList::ConstIterator it = slOrdered.begin(); |
108 | |||
106 | for ( i = 0; it != slOrdered.end(); i++, ++it ) { | 109 | for ( i = 0; it != slOrdered.end(); i++, ++it ) { |
@@ -108,3 +111,4 @@ void ContactEditor::init() { | |||
108 | if ( (*it) == "Business Fax" ) { | 111 | if ( (*it) == "Business Fax" ) { |
109 | slChooserNames.append( tr( "Business Fax" ) ); | 112 | trlChooserNames.append( tr( "Business Fax" ) ); |
113 | slChooserNames.append( *it ); | ||
110 | slChooserValues.append("" ); | 114 | slChooserValues.append("" ); |
@@ -115,3 +119,4 @@ void ContactEditor::init() { | |||
115 | if ( (*it) == "Home Fax" ) { | 119 | if ( (*it) == "Home Fax" ) { |
116 | slChooserNames.append( tr( "Home Fax" ) ); | 120 | trlChooserNames.append( tr( "Home Fax" ) ); |
121 | slChooserNames.append( *it ); | ||
117 | slChooserValues.append("" ); | 122 | slChooserValues.append("" ); |
@@ -123,3 +128,4 @@ void ContactEditor::init() { | |||
123 | if ( (*it) == "Business Phone" ) { | 128 | if ( (*it) == "Business Phone" ) { |
124 | slChooserNames.append( tr( "Business Phone" ) ); | 129 | trlChooserNames.append( tr( "Business Phone" ) ); |
130 | slChooserNames.append( *it ); | ||
125 | slChooserValues.append( "" ); | 131 | slChooserValues.append( "" ); |
@@ -130,3 +136,4 @@ void ContactEditor::init() { | |||
130 | if ( (*it) == "Home Phone" ) { | 136 | if ( (*it) == "Home Phone" ) { |
131 | slChooserNames.append( tr( "Home Phone" ) ); | 137 | trlChooserNames.append( tr( "Home Phone" ) ); |
138 | slChooserNames.append( *it ); | ||
132 | slChooserValues.append( "" ); | 139 | slChooserValues.append( "" ); |
@@ -145,3 +152,4 @@ void ContactEditor::init() { | |||
145 | if ( (*it) == "Business Mobile" ) { | 152 | if ( (*it) == "Business Mobile" ) { |
146 | slChooserNames.append( tr( "Business Mobile" ) ); | 153 | trlChooserNames.append( tr( "Business Mobile" ) ); |
154 | slChooserNames.append( *it ); | ||
147 | slChooserValues.append( "" ); | 155 | slChooserValues.append( "" ); |
@@ -152,3 +160,4 @@ void ContactEditor::init() { | |||
152 | if ( (*it) == "Home Mobile" ) { | 160 | if ( (*it) == "Home Mobile" ) { |
153 | slChooserNames.append( tr( "Home Mobile" ) ); | 161 | trlChooserNames.append( tr( "Home Mobile" ) ); |
162 | slChooserNames.append( *it ); | ||
154 | slChooserValues.append( "" ); | 163 | slChooserValues.append( "" ); |
@@ -160,3 +169,4 @@ void ContactEditor::init() { | |||
160 | if ( (*it) == "Business WebPage" ) { | 169 | if ( (*it) == "Business WebPage" ) { |
161 | slChooserNames.append( tr( "Business WebPage" ) ); | 170 | trlChooserNames.append( tr( "Business WebPage" ) ); |
171 | slChooserNames.append( *it ); | ||
162 | slChooserValues.append( "" ); | 172 | slChooserValues.append( "" ); |
@@ -167,3 +177,4 @@ void ContactEditor::init() { | |||
167 | if ( (*it) == "Home Web Page" ) { | 177 | if ( (*it) == "Home Web Page" ) { |
168 | slChooserNames.append( tr( "Home Web Page" ) ); | 178 | trlChooserNames.append( tr( "Home Web Page" ) ); |
179 | slChooserNames.append( *it ); | ||
169 | slChooserValues.append( "" ); | 180 | slChooserValues.append( "" ); |
@@ -174,3 +185,4 @@ void ContactEditor::init() { | |||
174 | if ( (*it) == "Business Pager" ) { | 185 | if ( (*it) == "Business Pager" ) { |
175 | slChooserNames.append( tr( "Business Pager" ) ); | 186 | trlChooserNames.append( tr( "Business Pager" ) ); |
187 | slChooserNames.append( *it ); | ||
176 | slChooserValues.append( "" ); | 188 | slChooserValues.append( "" ); |
@@ -181,3 +193,4 @@ void ContactEditor::init() { | |||
181 | if ( *it == "Default Email" ) { | 193 | if ( *it == "Default Email" ) { |
182 | slChooserNames.append( tr( "Default Email" ) ); | 194 | trlChooserNames.append( tr( "Default Email" ) ); |
195 | slChooserNames.append( *it ); | ||
183 | slChooserValues.append( "" ); | 196 | slChooserValues.append( "" ); |
@@ -188,3 +201,4 @@ void ContactEditor::init() { | |||
188 | if ( *it == "Emails" ) { | 201 | if ( *it == "Emails" ) { |
189 | slChooserNames.append( tr( "Emails" ) ); | 202 | trlChooserNames.append( tr( "Emails" ) ); |
203 | slChooserNames.append( *it ); | ||
190 | slChooserValues.append( "" ); | 204 | slChooserValues.append( "" ); |
@@ -751,6 +765,6 @@ void ContactEditor::init() { | |||
751 | 765 | ||
752 | cmbChooserField1->insertStringList( slChooserNames ); | 766 | cmbChooserField1->insertStringList( trlChooserNames ); |
753 | cmbChooserField2->insertStringList( slChooserNames ); | 767 | cmbChooserField2->insertStringList( trlChooserNames ); |
754 | cmbChooserField3->insertStringList( slChooserNames ); | 768 | cmbChooserField3->insertStringList( trlChooserNames ); |
755 | cmbChooserField4->insertStringList( slChooserNames ); | 769 | cmbChooserField4->insertStringList( trlChooserNames ); |
756 | 770 | ||
@@ -1362,33 +1376,33 @@ void ContactEditor::setEntry( const OContact &entry ) { | |||
1362 | for ( it = slDynamicEntries.begin(); it != slDynamicEntries.end(); ++it, ++itLE) { | 1376 | for ( it = slDynamicEntries.begin(); it != slDynamicEntries.end(); ++it, ++itLE) { |
1363 | if ( *it =="Department" ) | 1377 | if ( *it == tr( "Department" ) ) |
1364 | (*itLE)->setText( ent.department() ); | 1378 | (*itLE)->setText( ent.department() ); |
1365 | 1379 | ||
1366 | if ( *it == "Company" ) | 1380 | if ( *it == tr( "Company" ) ) |
1367 | (*itLE)->setText( ent.company() ); | 1381 | (*itLE)->setText( ent.company() ); |
1368 | 1382 | ||
1369 | if ( *it == "Office" ) | 1383 | if ( *it == tr( "Office" ) ) |
1370 | (*itLE)->setText( ent.office() ); | 1384 | (*itLE)->setText( ent.office() ); |
1371 | 1385 | ||
1372 | if ( *it == "Profession" ) | 1386 | if ( *it == tr( "Profession" ) ) |
1373 | (*itLE)->setText( ent.profession() ); | 1387 | (*itLE)->setText( ent.profession() ); |
1374 | 1388 | ||
1375 | if ( *it == "Assistant" ) | 1389 | if ( *it == tr( "Assistant" ) ) |
1376 | (*itLE)->setText( ent.assistant() ); | 1390 | (*itLE)->setText( ent.assistant() ); |
1377 | 1391 | ||
1378 | if ( *it == "Manager" ) | 1392 | if ( *it == tr( "Manager" ) ) |
1379 | (*itLE)->setText( ent.manager() ); | 1393 | (*itLE)->setText( ent.manager() ); |
1380 | 1394 | ||
1381 | if ( *it == "Spouse" ) | 1395 | if ( *it == tr( "Spouse" ) ) |
1382 | (*itLE)->setText( ent.spouse() ); | 1396 | (*itLE)->setText( ent.spouse() ); |
1383 | 1397 | ||
1384 | if ( *it == "Birthday" ) | 1398 | if ( *it == tr( "Birthday" ) ) |
1385 | (*itLE)->setText( ent.birthday() ); | 1399 | (*itLE)->setText( ent.birthday() ); |
1386 | 1400 | ||
1387 | if ( *it == "Anniversary" ) | 1401 | if ( *it == tr( "Anniversary" ) ) |
1388 | (*itLE)->setText( ent.anniversary() ); | 1402 | (*itLE)->setText( ent.anniversary() ); |
1389 | 1403 | ||
1390 | if ( *it == "Nickname" ) | 1404 | if ( *it == tr( "Nickname" ) ) |
1391 | (*itLE)->setText( ent.nickname() ); | 1405 | (*itLE)->setText( ent.nickname() ); |
1392 | 1406 | ||
1393 | if ( *it == "Children" ) | 1407 | if ( *it == tr( "Children" ) ) |
1394 | (*itLE)->setText( ent.children() ); | 1408 | (*itLE)->setText( ent.children() ); |
@@ -1560,33 +1574,33 @@ void ContactEditor::saveEntry() { | |||
1560 | for ( it = slDynamicEntries.begin(); it != slDynamicEntries.end(); ++it, ++itLE) { | 1574 | for ( it = slDynamicEntries.begin(); it != slDynamicEntries.end(); ++it, ++itLE) { |
1561 | if ( *it == "Department" ) | 1575 | if ( *it == tr( "Department" ) ) |
1562 | ent.setDepartment( (*itLE)->text() ); | 1576 | ent.setDepartment( (*itLE)->text() ); |
1563 | 1577 | ||
1564 | if ( *it == "Company" ) | 1578 | if ( *it == tr( "Company" ) ) |
1565 | ent.setCompany( (*itLE)->text() ); | 1579 | ent.setCompany( (*itLE)->text() ); |
1566 | 1580 | ||
1567 | if ( *it == "Office" ) | 1581 | if ( *it == tr( "Office" ) ) |
1568 | ent.setOffice( (*itLE)->text() ); | 1582 | ent.setOffice( (*itLE)->text() ); |
1569 | 1583 | ||
1570 | if ( *it == "Profession" ) | 1584 | if ( *it == tr( "Profession" ) ) |
1571 | ent.setProfession( (*itLE)->text() ); | 1585 | ent.setProfession( (*itLE)->text() ); |
1572 | 1586 | ||
1573 | if ( *it == "Assistant" ) | 1587 | if ( *it == tr( "Assistant" ) ) |
1574 | ent.setAssistant( (*itLE)->text() ); | 1588 | ent.setAssistant( (*itLE)->text() ); |
1575 | 1589 | ||
1576 | if ( *it == "Manager" ) | 1590 | if ( *it == tr( "Manager" ) ) |
1577 | ent.setManager( (*itLE)->text() ); | 1591 | ent.setManager( (*itLE)->text() ); |
1578 | 1592 | ||
1579 | if ( *it == "Spouse" ) | 1593 | if ( *it == tr( "Spouse" ) ) |
1580 | ent.setSpouse( (*itLE)->text() ); | 1594 | ent.setSpouse( (*itLE)->text() ); |
1581 | 1595 | ||
1582 | if ( *it == "Birthday" ) | 1596 | if ( *it == tr( "Birthday" ) ) |
1583 | ent.setBirthday( (*itLE)->text() ); | 1597 | ent.setBirthday( (*itLE)->text() ); |
1584 | 1598 | ||
1585 | if ( *it == "Anniversary" ) | 1599 | if ( *it == tr( "Anniversary" ) ) |
1586 | ent.setAnniversary( (*itLE)->text() ); | 1600 | ent.setAnniversary( (*itLE)->text() ); |
1587 | 1601 | ||
1588 | if ( *it == "Nickname" ) | 1602 | if ( *it == tr( "Nickname" ) ) |
1589 | ent.setNickname( (*itLE)->text() ); | 1603 | ent.setNickname( (*itLE)->text() ); |
1590 | 1604 | ||
1591 | if ( *it == "Children" ) | 1605 | if ( *it == tr( "Children" ) ) |
1592 | ent.setChildren( (*itLE)->text() ); | 1606 | ent.setChildren( (*itLE)->text() ); |