diff options
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/gui/caltypes.xml | 112 | ||||
| -rw-r--r-- | calendar/gui/memotypes.xml | 94 | ||||
| -rw-r--r-- | calendar/gui/tasktypes.xml | 126 | ||||
| -rw-r--r-- | filter/ChangeLog | 8 | ||||
| -rw-r--r-- | filter/filter-option.c | 2 | ||||
| -rw-r--r-- | filter/filter-part.c | 2 |
7 files changed, 183 insertions, 168 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index ead93c4a82..d10562a230 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,10 @@ +2008-06-16 Maciej Piechotka <uzytkownik2@gmail.com> + + * gui/caltypes.xml: + * gui/memotypes.xml: + * gui/tasktypes.xml: + Usage _title instead of title to allow translations. + 2008-06-10 Matthew Barnes <mbarnes@redhat.com> * common/authentication.c: diff --git a/calendar/gui/caltypes.xml b/calendar/gui/caltypes.xml index 89e25d64c0..3f93daa8ee 100644 --- a/calendar/gui/caltypes.xml +++ b/calendar/gui/caltypes.xml @@ -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> diff --git a/calendar/gui/memotypes.xml b/calendar/gui/memotypes.xml index 68a9f1fb0a..f27da759cf 100644 --- a/calendar/gui/memotypes.xml +++ b/calendar/gui/memotypes.xml @@ -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> diff --git a/calendar/gui/tasktypes.xml b/calendar/gui/tasktypes.xml index 348c2e5134..10515ad5bf 100644 --- a/calendar/gui/tasktypes.xml +++ b/calendar/gui/tasktypes.xml @@ -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> diff --git a/filter/ChangeLog b/filter/ChangeLog index 5eb7224d86..1c4e3cd3b3 100644 --- a/filter/ChangeLog +++ b/filter/ChangeLog @@ -1,3 +1,11 @@ +2008-06-16 Maciej Piechotka <uzytkownik2@gmal.com> + + ** Fix for bug #526262 + + * filter-part.c: (xml_create): + * filter-part.c: (filter_part_xml_create): + Handle _title element in analogical way as title + 2008-06-19 Milan Crha <mcrha@redhat.com> ** Fix for bug #382783 diff --git a/filter/filter-option.c b/filter/filter-option.c index 0814c0a536..5c4283b889 100644 --- a/filter/filter-option.c +++ b/filter/filter-option.c @@ -233,7 +233,7 @@ xml_create (FilterElement *fe, xmlNodePtr node) 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 *)""); diff --git a/filter/filter-part.c b/filter/filter-part.c index 01756fb711..7ed7c306e6 100644 --- a/filter/filter-part.c +++ b/filter/filter-part.c @@ -189,7 +189,7 @@ filter_part_xml_create (FilterPart *ff, xmlNodePtr node, RuleContext *rc) } 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); |