Unverified Commit 6526e85d authored by IKEDA Soji's avatar IKEDA Soji Committed by GitHub
Browse files

Merge branch 'sympa-6.2' into issue-893

parents d1bfa2fe d2a043dd
......@@ -300,7 +300,7 @@
[% IF subaction == 'tracker' %]
<h2>[%|loc%]Submitting a bug, a feature request[%END%]</h2><br />
<div>
[%|loc%]You can submit a problem or request a new feature: [%END%]<a href="http://www.sympa.org/tracking">http://www.sympa.org/tracking</a>
[%|loc%]You can submit a problem or request a new feature: [%END%]<a href="https://github.com/sympa-community/sympa/issues/new/choose">https://github.com/sympa-community/sympa/issues/new/choose</a>
</div>
[% END %]
......
......@@ -180,22 +180,22 @@ Default value is "nobody".
=item C<[topic]>
Topic of the message.
This variable has a value if any of the previous
C<[topic-*]> variable has a value.
This variable has a value if any of the following
C<[topic_*]> variables has a value.
=item C<[topic-auto]>
=item C<[topic_auto]>
Topic of the message if it has been automatically tagged.
=item C<[topic-editor]>
=item C<[topic_editor]>
Topic of the message if it has been tagged by editor.
=item C<[topic-needed]>
=item C<[topic_needed]>
The message has not got any topic and message topic are required for the list.
=item C<[topic-sender]>
=item C<[topic_sender]>
Topic of the message if it has been tagged by sender.
......@@ -349,10 +349,10 @@ var : "[email]"
| "[sender]"
| "[subscriber->" subscriber_key_word "]"
| "[topic]"
| "[topic-auto]"
| "[topic-editor]"
| "[topic-needed]"
| "[topic-sender]"
| "[topic_auto]"
| "[topic_editor]"
| "[topic_needed]"
| "[topic_sender]"
| "[user->" user_key_word "]"
| "[user_attributes->" user_attributes_keyword "]"
| string
......
ar
br
bg
br
ca
cs
de
......@@ -35,6 +35,7 @@ zh_TW
af
eo
hr
io
nn
rm
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment