aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--default_user/ChangeLog5
-rw-r--r--default_user/searches.xml14
-rw-r--r--filter/ChangeLog5
-rw-r--r--filter/filter-rule.c2
4 files changed, 18 insertions, 8 deletions
diff --git a/default_user/ChangeLog b/default_user/ChangeLog
index c0936d45e9..f42b7e3f9c 100644
--- a/default_user/ChangeLog
+++ b/default_user/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-14 Peter Williams <peterw@ximian.com>
+
+ * searches.xml: Rename <title> to <_title> so that these fields can
+ be translated.
+
2001-08-09 Chris Toshok <toshok@ximian.com>
* addressbook-sources.xml: remove the description field.
diff --git a/default_user/searches.xml b/default_user/searches.xml
index 5ab14c6bac..69221817e8 100644
--- a/default_user/searches.xml
+++ b/default_user/searches.xml
@@ -2,7 +2,7 @@
<filteroptions>
<ruleset>
<rule grouping="any" source="demand">
- <title>Sender contains</title>
+ <_title>Sender contains</_title>
<partset>
<part name="sender">
<value name="sender-type" type="option" value="contains"/>
@@ -13,7 +13,7 @@
</rule>
<rule grouping="any" source="demand">
- <title>Body or subject contains</title>
+ <_title>Body or subject contains</_title>
<partset>
<part name="subject">
<value name="subject-type" type="option" value="contains"/>
@@ -28,7 +28,7 @@
</rule>
<rule grouping="any" source="demand">
- <title>Body contains</title>
+ <_title>Body contains</_title>
<partset>
<part name="body">
<value name="body-type" type="option" value="contains"/>
@@ -39,7 +39,7 @@
</rule>
<rule grouping="any" source="demand">
- <title>Subject contains</title>
+ <_title>Subject contains</_title>
<partset>
<part name="subject">
<value name="subject-type" type="option" value="contains"/>
@@ -50,7 +50,7 @@
</rule>
<rule grouping="any" source="demand">
- <title>Body does not contain</title>
+ <_title>Body does not contain</_title>
<partset>
<part name="body">
<value name="body-type" type="option" value="not contains"/>
@@ -61,7 +61,7 @@
</rule>
<rule grouping="any" source="demand">
- <title>Subject does not contain</title>
+ <_title>Subject does not contain</_title>
<partset>
<part name="subject">
<value name="subject-type" type="option" value="not contains"/>
@@ -72,7 +72,7 @@
</rule>
<rule grouping="any" source="demand">
- <title>Recipients contain</title>
+ <_title>Recipients contain</_title>
<partset>
<part name="to">
<value name="recipient-type" type="option" value="contains"/>
diff --git a/filter/ChangeLog b/filter/ChangeLog
index 02ef3cb122..7770246fe9 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-14 Peter Williams <peterw@ximian.com>
+
+ * filter-rule.c (xml_decode): Match either "title" or "_title" to allow
+ for translations of the title (provided in the default files)
+
2001-08-13 Peter Williams <peterw@ximian.com>
* filter-datespec.c (make_span_editor): Add a gettext around our static
diff --git a/filter/filter-rule.c b/filter/filter-rule.c
index 9bcbc1c459..aff01a0f25 100644
--- a/filter/filter-rule.c
+++ b/filter/filter-rule.c
@@ -324,7 +324,7 @@ xml_decode (FilterRule *fr, xmlNodePtr node, RuleContext *f)
while (work) {
if (!strcmp (work->name, "partset")) {
load_set (work, fr, f);
- } else if (!strcmp (work->name, "title")) {
+ } else if (!strcmp (work->name, "title") || !strcmp (work->name, "_title")) {
if (!fr->name) {
gchar *str, *decstr;
str = xmlNodeGetContent (work);