evolution r35689 - in trunk: calendar calendar/gui filter
- From: tobiasmue svn gnome org
- To: svn-commits-list gnome org
- Subject: evolution r35689 - in trunk: calendar calendar/gui filter
- Date: Fri, 27 Jun 2008 17:23:45 +0000 (UTC)
Author: tobiasmue
Date: Fri Jun 27 17:23:45 2008
New Revision: 35689
URL: http://svn.gnome.org/viewvc/evolution?rev=35689&view=rev
Log:
Patch from Maciej Piechotka <uzytkownik2 gmail com>
which fixes bug 526262 - "untranslated strings in advanced search"
Modified:
trunk/calendar/ChangeLog
trunk/calendar/gui/caltypes.xml
trunk/calendar/gui/memotypes.xml
trunk/calendar/gui/tasktypes.xml
trunk/filter/ChangeLog
trunk/filter/filter-option.c
trunk/filter/filter-part.c
Modified: trunk/calendar/gui/caltypes.xml
==============================================================================
--- trunk/calendar/gui/caltypes.xml (original)
+++ trunk/calendar/gui/caltypes.xml Fri Jun 27 17:23:45 2008
@@ -2,14 +2,14 @@
<filterdescription>
<partset>
<part name="summary">
- <title>Summary</title>
+ <_title>Summary</_title>
<input type="optionlist" name="summary-type">
<option value="contains">
- <title>contains</title>
+ <_title>contains</_title>
<code>(contains? "summary" ${summary})</code>
</option>
<option value="not contains">
- <title>does not contain</title>
+ <_title>does not contain</_title>
<code>(not (contains? "summary" ${summary}))</code>
</option>
</input>
@@ -17,28 +17,28 @@
</part>
<part name="description">
- <title>Description</title>
+ <_title>Description</_title>
<input type="optionlist" name="description-type">
<option value="contains">
- <title>contains</title>
+ <_title>contains</_title>
<code>(contains? "description" ${description})</code>
</option>
<option value="not contains">
- <title>does not contain</title>
+ <_title>does not contain</_title>
<code>(not (contains? "description" ${description}))</code>
</option>
</input>
<input type="string" name="description"/>
</part>
<part name="anyfield">
- <title>Any Field</title>
+ <_title>Any Field</_title>
<input type="optionlist" name="anyfield-type">
<option value="contains">
- <title>contains</title>
+ <_title>contains</_title>
<code>(contains? "any" ${anyfield})</code>
</option>
<option value="not contains">
- <title>does not contain</title>
+ <_title>does not contain</_title>
<code>(not (contains? "any" ${anyfield}))</code>
</option>
</input>
@@ -46,40 +46,40 @@
</part>
<part name="name5">
- <title>Classification</title>
+ <_title>Classification</_title>
<input type="optionlist" name="name-type">
<option value="is">
- <title>is</title>
+ <_title>is</_title>
<code>(contains? "classification" ${classification})</code>
</option>
<option value="is not">
- <title>is not</title>
+ <_title>is not</_title>
<code>(not(contains? "classification" ${classification}))</code>
</option>
</input>
<input type="optionlist" name="classification">
<option value="Public">
- <title>Public</title>
+ <_title>Public</_title>
</option>
<option value="Private">
- <title>Private</title>
+ <_title>Private</_title>
</option>
<option value="Confidential">
- <title>Confidential</title>
+ <_title>Confidential</_title>
</option>
</input>
</part>
<part name="name2">
- <title>Organizer</title>
+ <_title>Organizer</_title>
<input type="optionlist" name="name-type">
<option value="contains">
- <title>contains</title>
+ <_title>contains</_title>
<code>(contains? "organizer" ${name})</code>
</option>
<option value="not contains">
- <title>does not contain</title>
+ <_title>does not contain</_title>
<code>(not (contains? "organizer" ${name}))</code>
</option>
</input>
@@ -87,14 +87,14 @@
</part>
<part name="name3">
- <title>Attendee</title>
+ <_title>Attendee</_title>
<input type="optionlist" name="name-type">
<option value="contains">
- <title>contains</title>
+ <_title>contains</_title>
<code>(contains? "attendee" ${name})</code>
</option>
<option value="not contains">
- <title>does not contain</title>
+ <_title>does not contain</_title>
<code>(not (contains? "attendee" ${name}))</code>
</option>
</input>
@@ -102,14 +102,14 @@
</part>
<part name="name4">
- <title>Loaction</title>
+ <_title>Location</_title>
<input type="optionlist" name="name-type">
<option value="contains">
- <title>contains</title>
+ <_title>contains</_title>
<code>(contains? "location" ${name})</code>
</option>
<option value="not contains">
- <title>does not contain</title>
+ <_title>does not contain</_title>
<code>(not (contains? "location" ${name}))</code>
</option>
</input>
@@ -117,101 +117,101 @@
</part>
<part name="category">
- <title>Category</title>
+ <_title>Category</_title>
<input type="optionlist" name="category-type">
<option value="is">
- <title>is</title>
+ <_title>is</_title>
<code>(has-categories? ${category})</code>
</option>
<option value="is not">
- <title>is not</title>
+ <_title>is not</_title>
<code>(not(has-categories? ${category}))</code>
</option>
</input>
<input type="optionlist" name="category">
<option value="Anniversary">
- <title>Anniversary</title>
+ <_title>Anniversary</_title>
</option>
<option value="Holiday">
- <title>Holiday</title>
+ <_title>Holiday</_title>
</option>
<option value="Ideas">
- <title>Ideas</title>
+ <_title>Ideas</_title>
</option>
<option value="Status">
- <title>Status</title>
+ <_title>Status</_title>
</option>
<option value="Holiday Cards">
- <title>Holiday Cards</title>
+ <_title>Holiday Cards</_title>
</option>
<option value="Hot Contacts">
- <title>Hot Contacts</title>
+ <_title>Hot Contacts</_title>
</option>
<option value="International">
- <title>International</title>
+ <_title>International</_title>
</option>
<option value="Next 7 days">
- <title>Next 7 days</title>
+ <_title>Next 7 days</_title>
</option>
<option value="Birthday">
- <title>Birthday</title>
+ <_title>Birthday</_title>
</option>
<option value="VIP">
- <title>VIP</title>
+ <_title>VIP</_title>
</option>
<option value="Gifts">
- <title>Gifts</title>
+ <_title>Gifts</_title>
</option>
<option value="Waiting">
- <title>Waiting</title>
+ <_title>Waiting</_title>
</option>
<option value="Key Customer">
- <title>Key Customer</title>
+ <_title>Key Customer</_title>
</option>
<option value="Time & Expenses">
- <title>Time & Expenses </title>
+ <_title>Time & Expenses </_title>
</option>
<option value="Miscellaneous">
- <title>Miscellaneous</title>
+ <_title>Miscellaneous</_title>
</option>
<option value="Business">
- <title>Business</title>
+ <_title>Business</_title>
</option>
<option value="Personal">
- <title>Personal</title>
+ <_title>Personal</_title>
</option>
<option value="Suppliers">
- <title>Suppliers</title>
+ <_title>Suppliers</_title>
</option>
<option value="Goals/Objectives">
- <title>Goals/Objectives</title>
+ <_title>Goals/Objectives</_title>
</option>
<option value="Strategies">
- <title>Strategies</title>
+ <_title>Strategies</_title>
</option>
<option value="Competition">
- <title>Competition</title>
+ <_title>Competition</_title>
</option>
<option value="Favourites">
- <title>Favourites</title>
+ <_title>Favourites</_title>
</option>
<option value="Phone Calls">
- <title>Phone Calls</title>
+ <_title>Phone Calls</_title>
</option>
</input>
</part>
<part name="attachments">
- <title>Attachments</title>
+ <_title>Attachments</_title>
<input type="optionlist" name="match-type">
<option value="exist">
- <title>Exist</title>
+ <_title>Exist</_title>
<code>
(has-attachments?)
</code>
</option>
<option value="not exist">
- <title>Do Not Exist</title>
+ <_title>Do Not Exist</_title>
<code>
(not(has-attachments?))
</code>
@@ -220,16 +220,16 @@
</part>
<part name="recurrences">
- <title>Recurrence</title>
+ <_title>Recurrence</_title>
<input type="optionlist" name="match-type">
<option value="exist">
- <title>Exist</title>
+ <_title>Exist</_title>
<code>
(has-recurrences?)
</code>
</option>
<option value="not exist">
- <title>Do Not Exist</title>
+ <_title>Do Not Exist</_title>
<code>
(not (has-recurrences?))
</code>
Modified: trunk/calendar/gui/memotypes.xml
==============================================================================
--- trunk/calendar/gui/memotypes.xml (original)
+++ trunk/calendar/gui/memotypes.xml Fri Jun 27 17:23:45 2008
@@ -2,14 +2,14 @@
<filterdescription>
<partset>
<part name="summary">
- <title>Summary</title>
+ <_title>Summary</_title>
<input type="optionlist" name="summary-type">
<option value="contains">
- <title>contains</title>
+ <_title>contains</_title>
<code>(contains? "summary" ${summary})</code>
</option>
<option value="not contains">
- <title>does not contain</title>
+ <_title>does not contain</_title>
<code>(not (contains? "summary" ${summary}))</code>
</option>
</input>
@@ -17,14 +17,14 @@
</part>
<part name="description">
- <title>Description</title>
+ <_title>Description</_title>
<input type="optionlist" name="description-type">
<option value="contains">
- <title>contains</title>
+ <_title>contains</_title>
<code>(contains? "description" ${description})</code>
</option>
<option value="not contains">
- <title>does not contain</title>
+ <_title>does not contain</_title>
<code>(not (contains? "description" ${description}))</code>
</option>
</input>
@@ -32,14 +32,14 @@
</part>
<part name="anyfield">
- <title>Any Field</title>
+ <_title>Any Field</_title>
<input type="optionlist" name="anyfield-type">
<option value="contains">
- <title>contains</title>
+ <_title>contains</_title>
<code>(contains? "any" ${anyfield})</code>
</option>
<option value="not contains">
- <title>does not contain</title>
+ <_title>does not contain</_title>
<code>(not (contains? "any" ${anyfield}))</code>
</option>
</input>
@@ -47,14 +47,14 @@
</part>
<part name="name2">
- <title>Organizer</title>
+ <_title>Organizer</_title>
<input type="optionlist" name="name-type">
<option value="contains">
- <title>contains</title>
+ <_title>contains</_title>
<code>(contains? "organizer" ${name})</code>
</option>
<option value="not contains">
- <title>does not contain</title>
+ <_title>does not contain</_title>
<code>(not (contains? "organizer" ${name}))</code>
</option>
</input>
@@ -62,127 +62,127 @@
</part>
<part name="name2">
- <title>Classification</title>
+ <_title>Classification</_title>
<input type="optionlist" name="name-type">
<option value="is">
- <title>is</title>
+ <_title>is</_title>
<code>(contains? "classification" ${classification})</code>
</option>
<option value="is not">
- <title>is not</title>
+ <_title>is not</_title>
<code>(not(contains? "classification" ${classification}))</code>
</option>
</input>
<input type="optionlist" name="classification">
<option value="Public">
- <title>Public</title>
+ <_title>Public</_title>
</option>
<option value="Private">
- <title>Private</title>
+ <_title>Private</_title>
</option>
<option value="Confidential">
- <title>Confidential</title>
+ <_title>Confidential</_title>
</option>
</input>
</part>
<part name="category">
- <title>Category</title>
+ <_title>Category</_title>
<input type="optionlist" name="category-type">
<option value="is">
- <title>is</title>
+ <_title>is</_title>
<code>(has-categories? ${category})</code>
</option>
<option value="is not">
- <title>is not</title>
+ <_title>is not</_title>
<code>(not(has-categories? ${category}))</code>
</option>
</input>
<input type="optionlist" name="category">
<option value="Anniversary">
- <title>Anniversary</title>
+ <_title>Anniversary</_title>
</option>
<option value="Holiday">
- <title>Holiday</title>
+ <_title>Holiday</_title>
</option>
<option value="Ideas">
- <title>Ideas</title>
+ <_title>Ideas</_title>
</option>
<option value="Status">
- <title>Status</title>
+ <_title>Status</_title>
</option>
<option value="Holiday Cards">
- <title>Holiday Cards</title>
+ <_title>Holiday Cards</_title>
</option>
<option value="Hot Contacts">
- <title>Hot Contacts</title>
+ <_title>Hot Contacts</_title>
</option>
<option value="International">
- <title>International</title>
+ <_title>International</_title>
</option>
<option value="Next 7 days">
- <title>Next 7 Days'</title>
+ <_title>Next 7 Days'</_title>
</option>
<option value="Birthday">
- <title>Birthday</title>
+ <_title>Birthday</_title>
</option>
<option value="VIP">
- <title>VIP</title>
+ <_title>VIP</_title>
</option>
<option value="Gifts">
- <title>Gifts</title>
+ <_title>Gifts</_title>
</option>
<option value="Waiting">
- <title>Waiting</title>
+ <_title>Waiting</_title>
</option>
<option value="Key Customer">
- <title>Key Customer</title>
+ <_title>Key Customer</_title>
</option>
<option value="Time & Expenses">
- <title>Time & Expenses </title>
+ <_title>Time & Expenses </_title>
</option>
<option value="Miscellaneous">
- <title>Miscellaneous</title>
+ <_title>Miscellaneous</_title>
</option>
<option value="Business">
- <title>Business</title>
+ <_title>Business</_title>
</option>
<option value="Personal">
- <title>Personal</title>
+ <_title>Personal</_title>
</option>
<option value="Suppliers">
- <title>Suppliers</title>
+ <_title>Suppliers</_title>
</option>
<option value="Goals/Objectives">
- <title>Goals/Objectives</title>
+ <_title>Goals/Objectives</_title>
</option>
<option value="Strategies">
- <title>Strategies</title>
+ <_title>Strategies</_title>
</option>
<option value="Competition">
- <title>Competition</title>
+ <_title>Competition</_title>
</option>
<option value="Favourites">
- <title>Favourites</title>
+ <_title>Favourites</_title>
</option>
<option value="Phone Calls">
- <title>Phone Calls</title>
+ <_title>Phone Calls</_title>
</option>
</input>
</part>
<part name="attachments">
- <title>Attachments</title>
+ <_title>Attachments</_title>
<input type="optionlist" name="match-type">
<option value="exist">
- <title>Exist</title>
+ <_title>Exist</_title>
<code>
(has-attachments?)
</code>
</option>
<option value="not exist">
- <title>Do Not Exist</title>
+ <_title>Do Not Exist</_title>
<code>
(not(has-attachments?))
</code>
Modified: trunk/calendar/gui/tasktypes.xml
==============================================================================
--- trunk/calendar/gui/tasktypes.xml (original)
+++ trunk/calendar/gui/tasktypes.xml Fri Jun 27 17:23:45 2008
@@ -2,14 +2,14 @@
<filterdescription>
<partset>
<part name="summary">
- <title>Summary</title>
+ <_title>Summary</_title>
<input type="optionlist" name="summary-type">
<option value="contains">
- <title>contains</title>
+ <_title>contains</_title>
<code>(contains? "summary" ${summary})</code>
</option>
<option value="not contains">
- <title>does not contain</title>
+ <_title>does not contain</_title>
<code>(not (contains? "summary" ${summary}))</code>
</option>
</input>
@@ -17,14 +17,14 @@
</part>
<part name="description">
- <title>Description</title>
+ <_title>Description</_title>
<input type="optionlist" name="description-type">
<option value="contains">
- <title>contains</title>
+ <_title>contains</_title>
<code>(contains? "description" ${description})</code>
</option>
<option value="not contains">
- <title>does not contain</title>
+ <_title>does not contain</_title>
<code>(not (contains? "description" ${description}))</code>
</option>
</input>
@@ -32,14 +32,14 @@
</part>
<part name="name2">
- <title>Organizer</title>
+ <_title>Organizer</_title>
<input type="optionlist" name="name-type">
<option value="contains">
- <title>contains</title>
+ <_title>contains</_title>
<code>(contains? "organizer" ${name})</code>
</option>
<option value="not contains">
- <title>does not contain</title>
+ <_title>does not contain</_title>
<code>(not (contains? "organizer" ${name}))</code>
</option>
</input>
@@ -47,14 +47,14 @@
</part>
<part name="name3">
- <title>Attendee</title>
+ <_title>Attendee</_title>
<input type="optionlist" name="name-type">
<option value="contains">
- <title>contains</title>
+ <_title>contains</_title>
<code>(contains? "attendee" ${name})</code>
</option>
<option value="not contains">
- <title>does not contain</title>
+ <_title>does not contain</_title>
<code>(not (contains? "attendee" ${name}))</code>
</option>
</input>
@@ -62,14 +62,14 @@
</part>
<part name="anyfield">
- <title>Any Field</title>
+ <_title>Any Field</_title>
<input type="optionlist" name="anyfield-type">
<option value="contains">
- <title>contains</title>
+ <_title>contains</_title>
<code>(contains? "any" ${anyfield})</code>
</option>
<option value="not contains">
- <title>does not contain</title>
+ <_title>does not contain</_title>
<code>(not (contains? "any" ${anyfield}))</code>
</option>
</input>
@@ -77,45 +77,45 @@
</part>
<part name="status">
- <title>Status</title>
+ <_title>Status</_title>
<input type="optionlist" name="status-type">
<option value="is">
- <title>is</title>
+ <_title>is</_title>
<code>(contains? "status" ${status})</code>
</option>
<option value="is not">
- <title>is not</title>
+ <_title>is not</_title>
<code>(not(contains? "status" ${status}))</code>
</option>
</input>
<input type="optionlist" name="status">
<option value="NOT STARTED">
- <title>Not Started</title>
+ <_title>Not Started</_title>
</option>
<option value="IN PROGRESS">
- <title>In progress</title>
+ <_title>In progress</_title>
</option>
<option value="COMPLETED">
- <title>Completed</title>
+ <_title>Completed</_title>
</option>
<option value="CANCELLED">
- <title>Cancelled</title>
+ <_title>Cancelled</_title>
</option>
</input>
</part>
<part name="attachments">
- <title>Attachments</title>
+ <_title>Attachments</_title>
<input type="optionlist" name="match-type">
<option value="exist">
- <title>Exist</title>
+ <_title>Exist</_title>
<code>
(has-attachments?)
</code>
</option>
<option value="not exist">
- <title>Do Not Exist</title>
+ <_title>Do Not Exist</_title>
<code>
(not(has-attachments?))
</code>
@@ -124,143 +124,143 @@
</part>
<part name="priority">
- <title>Priority</title>
+ <_title>Priority</_title>
<input type="optionlist" name="priority-type">
<option value="is">
- <title>is</title>
+ <_title>is</_title>
<code>(contains? "priority" ${priority})</code>
</option>
<option value="is not">
- <title>is not</title>
+ <_title>is not</_title>
<code>(not(contains? "priority" ${priority}))</code>
</option>
</input>
<input type="optionlist" name="priority">
<option value="HIGH">
- <title>High</title>
+ <_title>High</_title>
</option>
<option value="NORMAL">
- <title>Normal</title>
+ <_title>Normal</_title>
</option>
<option value="LOW">
- <title>Low</title>
+ <_title>Low</_title>
</option>
<option value="UNDEFINED">
- <title>Undefined</title>
+ <_title>Undefined</_title>
</option>
</input>
</part>
<part name="category">
- <title>Category</title>
+ <_title>Category</_title>
<input type="optionlist" name="category-type">
<option value="is">
- <title>is</title>
+ <_title>is</_title>
<code>(has-categories? ${category})</code>
</option>
<option value="is not">
- <title>is not</title>
+ <_title>is not</_title>
<code>(not(has-categories? ${category}))</code>
</option>
</input>
<input type="optionlist" name="category">
<option value="Anniversary">
- <title>Anniversary</title>
+ <_title>Anniversary</_title>
</option>
<option value="Holiday">
- <title>Holiday</title>
+ <_title>Holiday</_title>
</option>
<option value="Ideas">
- <title>Ideas</title>ke
+ <_title>Ideas</_title>ke
</option>
<option value="Status">
- <title>Status</title>
+ <_title>Status</_title>
</option>
<option value="Holiday Cards">
- <title>Holiday Cards</title>
+ <_title>Holiday Cards</_title>
</option>
<option value="Hot Contacts">
- <title>Hot Contacts</title>
+ <_title>Hot Contacts</_title>
</option>
<option value="International">
- <title>International</title>
+ <_title>International</_title>
</option>
<option value="Next 7 days">
- <title>Next 7 days</title>
+ <_title>Next 7 days</_title>
</option>
<option value="Birthday">
- <title>Birthday</title>
+ <_title>Birthday</_title>
</option>
<option value="VIP">
- <title>VIP</title>
+ <_title>VIP</_title>
</option>
<option value="Gifts">
- <title>Gifts</title>
+ <_title>Gifts</_title>
</option>
<option value="Waiting">
- <title>Waiting</title>
+ <_title>Waiting</_title>
</option>
<option value="Key Customer">
- <title>Key Customer</title>
+ <_title>Key Customer</_title>
</option>
<option value="Time & Expenses">
- <title>Time & Expenses </title>
+ <_title>Time & Expenses </_title>
</option>
<option value="Miscellaneous">
- <title>Miscellaneous</title>
+ <_title>Miscellaneous</_title>
</option>
<option value="Business">
- <title>Business</title>
+ <_title>Business</_title>
</option>
<option value="Personal">
ke
- <title>Personal</title>
+ <_title>Personal</_title>
</option>
<option value="Suppliers">
- <title>Suppliers</title>
+ <_title>Suppliers</_title>
</option>
<option value="Goals/Objectives">
- <title>Goals/Objectives</title>
+ <_title>Goals/Objectives</_title>
</option>
<option value="Strategies">
- <title>Strategies</title>
+ <_title>Strategies</_title>
</option>
<option value="Competition">
- <title>Competition</title>
+ <_title>Competition</_title>
</option>
<option value="Favourites">
- <title>Favourites</title>
+ <_title>Favourites</_title>
</option>
<option value="Phone Calls">
- <title>Phone Calls</title>
+ <_title>Phone Calls</_title>
</option>
</input>
</part>
<part name="completed">
- <title>% Completed</title>
+ <_title>% Completed</_title>
<input type="optionlist" name="completed-type">
<option value="is">
- <title>is</title>
+ <_title>is</_title>
<code>
(= (percent-complete?) ${versus} )
</code>
</option>
<option value="is-not">
- <title>is not</title>
+ <_title>is not</_title>
<code>
(not(= (percent-complete?) ${versus} ))
</code>
</option>
<option value="greater-than">
- <title>is greater than</title>
+ <_title>is greater than</_title>
<code>
(> (percent-complete?) ${versus} )
</code>
</option>
<option value="less-than">
- <title>is less than</title>
+ <_title>is less than</_title>
<code>
(< (percent-complete?) ${versus} )
</code>
Modified: trunk/filter/filter-option.c
==============================================================================
--- trunk/filter/filter-option.c (original)
+++ trunk/filter/filter-option.c Fri Jun 27 17:23:45 2008
@@ -233,7 +233,7 @@
value = (char *)xmlGetProp (n, (const unsigned char *)"value");
work = n->children;
while (work) {
- if (!strcmp ((char *)work->name, "title")) {
+ if (!strcmp ((char *)work->name, "title") || !strcmp ((char *)work->name, "_title")) {
if (!title) {
if (!(tmp = (char *)xmlNodeGetContent (work)))
tmp = (char *)xmlStrdup ((const unsigned char *)"");
Modified: trunk/filter/filter-part.c
==============================================================================
--- trunk/filter/filter-part.c (original)
+++ trunk/filter/filter-part.c Fri Jun 27 17:23:45 2008
@@ -189,7 +189,7 @@
} else {
g_warning ("Invalid xml format, missing/unknown input type");
}
- } else if (!strcmp ((char *)n->name, "title")) {
+ } else if (!strcmp ((char *)n->name, "title") || !strcmp ((char *)n->name, "_title")) {
if (!ff->title) {
str = (char *)xmlNodeGetContent (n);
ff->title = g_strdup (str);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
