From 1ad83f740e935c031bdf8d7cea3c541312362917 Mon Sep 17 00:00:00 2001 From: ArthurClemens Date: Sat, 28 Aug 2010 00:15:12 +0000 Subject: [PATCH] Item9575: Rename WebChangesAlert to WebNotifyHelp (but because WebChangesAlert is linked to from extensions the topic is not deleted but deprecated) git-svn-id: http://svn.foswiki.org/trunk@8807 0b4bb1d4-4e5a-0410-9cc4-b2b747904278 --- MailerContrib/data/System/MailerContrib.txt | 2 +- core/data/Main/WebNotify.txt | 2 +- core/data/Sandbox/WebNotify.txt | 2 +- core/data/System/SiteTools.txt | 2 +- core/data/System/WebChangesAlert.txt | 20 ++------------------ core/data/System/WebNotify.txt | 3 ++- core/data/System/WebNotifyHelp.txt | 20 ++++++++++++++++++++ core/data/Trash/WebNotify.txt | 2 +- core/data/_default/WebNotify.txt | 2 +- core/lib/Foswiki/Contrib/core/MANIFEST | 1 + core/locale/Foswiki.pot | 2 +- core/locale/bg.po | 2 +- core/locale/cs.po | 2 +- core/locale/da.po | 2 +- core/locale/de.po | 2 +- core/locale/es.po | 2 +- core/locale/fi.po | 2 +- core/locale/fr.po | 2 +- core/locale/it.po | 2 +- core/locale/ja.po | 2 +- core/locale/ko.po | 2 +- core/locale/nl.po | 2 +- core/locale/no.po | 2 +- core/locale/pl.po | 2 +- core/locale/pt-br.po | 2 +- core/locale/pt.po | 2 +- core/locale/ru.po | 2 +- core/locale/sv.po | 2 +- core/locale/tr.po | 2 +- core/locale/uk.po | 2 +- core/locale/zh-cn.po | 2 +- core/locale/zh-tw.po | 2 +- 32 files changed, 53 insertions(+), 47 deletions(-) create mode 100644 core/data/System/WebNotifyHelp.txt diff --git a/MailerContrib/data/System/MailerContrib.txt b/MailerContrib/data/System/MailerContrib.txt index fc1d737ce9..877795a024 100644 --- a/MailerContrib/data/System/MailerContrib.txt +++ b/MailerContrib/data/System/MailerContrib.txt @@ -30,7 +30,7 @@ Allows users to "subscribe" to regularly scheduled e-mails containing either: The mailer collates the changes emails so that each subscriber only receives one changes notification for all changes in all webs in the Foswiki. Furthermore, users can elect to receive just summaries of changes, or the entire content of topics that have changed. Each web can optionally contain a topic called %NOTIFYTOPIC%. - + %STARTINCLUDE% Users subscribe to email notifications using their [[%SYSTEMWEB%.WikiName][WikiName]] or an alternative email address, and can specify the webs/topics they wish to track, Whole groups of users can also be subscribed for notification. diff --git a/core/data/Main/WebNotify.txt b/core/data/Main/WebNotify.txt index 514c8ef36a..7063b68643 100644 --- a/core/data/Main/WebNotify.txt +++ b/core/data/Main/WebNotify.txt @@ -6,4 +6,4 @@ * %USERSWEB%.WikiGuest - example@your.company -%INCLUDE{"%SYSTEMWEB%.WebChangesAlert"}% +%INCLUDE{"%SYSTEMWEB%.WebNotifyHelp"}% diff --git a/core/data/Sandbox/WebNotify.txt b/core/data/Sandbox/WebNotify.txt index a4543af7c9..3261c3ff87 100644 --- a/core/data/Sandbox/WebNotify.txt +++ b/core/data/Sandbox/WebNotify.txt @@ -5,4 +5,4 @@ * %USERSWEB%.WikiGuest - example@your.company -%INCLUDE{"%SYSTEMWEB%.WebChangesAlert"}% +%INCLUDE{"%SYSTEMWEB%.WebNotifyHelp"}% diff --git a/core/data/System/SiteTools.txt b/core/data/System/SiteTools.txt index 15de12bc4d..69faa932ab 100644 --- a/core/data/System/SiteTools.txt +++ b/core/data/System/SiteTools.txt @@ -14,7 +14,7 @@ In particular, you have two highly configurable, automated site monitoring tools #WebNotify ---++ WebNotify - recent changes alert -%INCLUDE{"WebChangesAlert" section="includeasdocumentation"}% +%INCLUDE{"WebNotifyHelp" section="includeasdocumentation"}% #WebSearch ---++ WebSearch - search the site diff --git a/core/data/System/WebChangesAlert.txt b/core/data/System/WebChangesAlert.txt index 321ca5e347..b8a9c1a233 100644 --- a/core/data/System/WebChangesAlert.txt +++ b/core/data/System/WebChangesAlert.txt @@ -1,20 +1,4 @@ %META:TOPICINFO{author="ProjectContributor" date="1252721307" format="1.1" version="$Rev$"}% %META:TOPICPARENT{name="WebHome"}% -%TWISTY{showlink="► %MAKETEXT{"Notification help"}%" hidelink="▼ %MAKETEXT{"Notification help"}%" linkclass="foswikiButton" remember="on"}% -
-%STARTSECTION{"includeasdocumentation"}% ----+++ Web Changes Notification Service - -Each Foswiki web has an automatic e-mail notification service that sends you an e-mail with links to all of the topics modified since the last alert. - -%INCLUDE{"MailerContrib"}% - -*Note for System Administrators:* Notification is supported by an add-on to the Foswiki kernel called the !MailerContrib. See the [[%SYSTEMWEB%.MailerContrib][MailerContrib]] topic for details of how to set up this service. - -*Note:* If you prefer a news feed, point your reader to [[%BASEWEB%.WebRss][WebRss]] (for RSS 1.0 feeds) or [[%BASEWEB%.WebAtom][WebAtom]] (for ATOM 1.0 feeds). Learn more at [[%SYSTEMWEB%.WebRssBase][WebRssBase]] and [[%SYSTEMWEB%.WebAtomBase][WebAtomBase]], respectively. - ---- -*Related topics:* [[%SYSTEMWEB%.WebChangesAlert][WebChangesAlert]], [[%USERSWEB%.%WIKIUSERSTOPIC%]], [[%SYSTEMWEB%.UserRegistration][UserRegistration]] -%ENDSECTION{"includeasdocumentation"}% -
-%ENDTWISTY% \ No newline at end of file +%INCLUDE{"%SYSTEMWEB%.WebNotifyHelp"}% + \ No newline at end of file diff --git a/core/data/System/WebNotify.txt b/core/data/System/WebNotify.txt index 8387c2bfe8..9f6bad2203 100644 --- a/core/data/System/WebNotify.txt +++ b/core/data/System/WebNotify.txt @@ -1,9 +1,10 @@ %META:TOPICINFO{author="ProjectContributor" date="1252718589" format="1.1" version="$Rev$"}% %META:TOPICPARENT{name="WebHome"}% +---+!! %MAKETEXT{"Web Changes notification service"}% %MAKETEXT{"This is a subscription service to be automatically notified by e-mail when topics change in this [_1] web. This is a convenient service, so you do not have to come back and check all the time if something has changed. To subscribe, please add a bullet with your [_2] in alphabetical order to this list:" args="*%WEB%*,[[%SYSTEMWEB%.WikiName][WikiName]]"}% * %USERSWEB%.WikiGuest * %USERSWEB%.WikiGuest - example@your.company -%INCLUDE{"%SYSTEMWEB%.WebChangesAlert"}% \ No newline at end of file +%INCLUDE{"%SYSTEMWEB%.WebNotifyHelp"}% \ No newline at end of file diff --git a/core/data/System/WebNotifyHelp.txt b/core/data/System/WebNotifyHelp.txt new file mode 100644 index 0000000000..fd5447af85 --- /dev/null +++ b/core/data/System/WebNotifyHelp.txt @@ -0,0 +1,20 @@ +%META:TOPICINFO{author="ProjectContributor" date="1252721307" format="1.1" version="$Rev: 7989 $"}% +%META:TOPICPARENT{name="WebHome"}% +%TWISTY{showlink="► %MAKETEXT{"Notification help"}%" hidelink="▼ %MAKETEXT{"Notification help"}%" linkclass="foswikiButton" remember="on"}% +
+%STARTSECTION{"includeasdocumentation"}% +---+++ About the Web changes notification service + +Each Foswiki web has an automatic e-mail notification service that sends you an e-mail with links to all of the topics modified since the last alert. + +%INCLUDE{"MailerContrib"}% + +*Note for System Administrators:* Notification is supported by an add-on to the Foswiki kernel called the !MailerContrib. See the [[%SYSTEMWEB%.MailerContrib][MailerContrib]] topic for details of how to set up this service. + +*Note:* If you prefer a news feed, point your reader to [[%BASEWEB%.WebRss][WebRss]] (for RSS 1.0 feeds) or [[%BASEWEB%.WebAtom][WebAtom]] (for ATOM 1.0 feeds). Learn more at [[%SYSTEMWEB%.WebRssBase][WebRssBase]] and [[%SYSTEMWEB%.WebAtomBase][WebAtomBase]], respectively. + +--- +*Related topics:* [[%USERSWEB%.%WIKIUSERSTOPIC%]], [[%SYSTEMWEB%.UserRegistration][UserRegistration]] +%ENDSECTION{"includeasdocumentation"}% +
+%ENDTWISTY% \ No newline at end of file diff --git a/core/data/Trash/WebNotify.txt b/core/data/Trash/WebNotify.txt index a4543af7c9..3261c3ff87 100644 --- a/core/data/Trash/WebNotify.txt +++ b/core/data/Trash/WebNotify.txt @@ -5,4 +5,4 @@ * %USERSWEB%.WikiGuest - example@your.company -%INCLUDE{"%SYSTEMWEB%.WebChangesAlert"}% +%INCLUDE{"%SYSTEMWEB%.WebNotifyHelp"}% diff --git a/core/data/_default/WebNotify.txt b/core/data/_default/WebNotify.txt index a4543af7c9..3261c3ff87 100644 --- a/core/data/_default/WebNotify.txt +++ b/core/data/_default/WebNotify.txt @@ -5,4 +5,4 @@ * %USERSWEB%.WikiGuest - example@your.company -%INCLUDE{"%SYSTEMWEB%.WebChangesAlert"}% +%INCLUDE{"%SYSTEMWEB%.WebNotifyHelp"}% diff --git a/core/lib/Foswiki/Contrib/core/MANIFEST b/core/lib/Foswiki/Contrib/core/MANIFEST index 2bde329cbf..0aebb3741c 100644 --- a/core/lib/Foswiki/Contrib/core/MANIFEST +++ b/core/lib/Foswiki/Contrib/core/MANIFEST @@ -311,6 +311,7 @@ data/System/WebCreateNewTopicTemplate.txt 0644 data/System/WebHome.txt 0644 data/System/WebIndex.txt 0644 data/System/WebNotify.txt 0644 +data/System/WebNotifyHelp.txt 0644 data/System/WebPreferences.txt 0644 data/System/WebPreferencesHelp.txt 0644 data/System/WebRss.txt 0644 diff --git a/core/locale/Foswiki.pot b/core/locale/Foswiki.pot index c6a1a00f73..21b7bbeb91 100644 --- a/core/locale/Foswiki.pot +++ b/core/locale/Foswiki.pot @@ -1932,7 +1932,7 @@ msgstr "" msgid "Notes:" msgstr "" -#: core/data/System/WebChangesAlert.txt:3 +#: core/data/System/WebNotifyHelp.txt:3 msgid "Notification help" msgstr "" diff --git a/core/locale/bg.po b/core/locale/bg.po index e0e7c965c7..da5fea59f6 100644 --- a/core/locale/bg.po +++ b/core/locale/bg.po @@ -2116,7 +2116,7 @@ msgstr "Забележка:" msgid "Notes:" msgstr "Бележки:" -#: core/data/System/WebChangesAlert.txt:3 +#: core/data/System/WebNotifyHelp.txt:3 msgid "Notification help" msgstr "Помощ за уведомяване" diff --git a/core/locale/cs.po b/core/locale/cs.po index 6898d8c131..590a1c7199 100755 --- a/core/locale/cs.po +++ b/core/locale/cs.po @@ -2111,7 +2111,7 @@ msgstr "Poznámka:" msgid "Notes:" msgstr "Poznámky:" -#: core/data/System/WebChangesAlert.txt:3 +#: core/data/System/WebNotifyHelp.txt:3 msgid "Notification help" msgstr "Nápověda k notifikacím" diff --git a/core/locale/da.po b/core/locale/da.po index fd3067207c..5cb2c94601 100644 --- a/core/locale/da.po +++ b/core/locale/da.po @@ -2144,7 +2144,7 @@ msgstr "Note:" msgid "Notes:" msgstr "Noter:" -#: core/data/System/WebChangesAlert.txt:3 +#: core/data/System/WebNotifyHelp.txt:3 msgid "Notification help" msgstr "Notificeringshjælp" diff --git a/core/locale/de.po b/core/locale/de.po index 2c2db93af6..3debc5b035 100644 --- a/core/locale/de.po +++ b/core/locale/de.po @@ -2134,7 +2134,7 @@ msgstr "Hinweis:" msgid "Notes:" msgstr "Hinweise:" -#: core/data/System/WebChangesAlert.txt:3 +#: core/data/System/WebNotifyHelp.txt:3 msgid "Notification help" msgstr "Hilfe für Benachrichtigungen" diff --git a/core/locale/es.po b/core/locale/es.po index 80a5d119f0..dc47b3774e 100644 --- a/core/locale/es.po +++ b/core/locale/es.po @@ -2152,7 +2152,7 @@ msgstr "Nota:" msgid "Notes:" msgstr "Notas:" -#: core/data/System/WebChangesAlert.txt:3 +#: core/data/System/WebNotifyHelp.txt:3 msgid "Notification help" msgstr "Ayuda acerca de notificaciones" diff --git a/core/locale/fi.po b/core/locale/fi.po index 5aa34cd1c2..e75ecf83e9 100644 --- a/core/locale/fi.po +++ b/core/locale/fi.po @@ -2007,7 +2007,7 @@ msgstr "Huomaa:" msgid "Notes:" msgstr "Huomautukset:" -#: core/data/System/WebChangesAlert.txt:3 +#: core/data/System/WebNotifyHelp.txt:3 msgid "Notification help" msgstr "" diff --git a/core/locale/fr.po b/core/locale/fr.po index 5a01d76f7a..96e5acc2e8 100644 --- a/core/locale/fr.po +++ b/core/locale/fr.po @@ -2171,7 +2171,7 @@ msgstr "Note :" msgid "Notes:" msgstr "Notes :" -#: core/data/System/WebChangesAlert.txt:3 +#: core/data/System/WebNotifyHelp.txt:3 msgid "Notification help" msgstr "Aide notification" diff --git a/core/locale/it.po b/core/locale/it.po index dc08ad97d3..2209df0dce 100644 --- a/core/locale/it.po +++ b/core/locale/it.po @@ -2137,7 +2137,7 @@ msgstr "Nota:" msgid "Notes:" msgstr "Annotazioni:" -#: core/data/System/WebChangesAlert.txt:3 +#: core/data/System/WebNotifyHelp.txt:3 msgid "Notification help" msgstr "Notifica di aiuto." diff --git a/core/locale/ja.po b/core/locale/ja.po index 5e76006686..5c51d4c336 100644 --- a/core/locale/ja.po +++ b/core/locale/ja.po @@ -2123,7 +2123,7 @@ msgstr "注意:" msgid "Notes:" msgstr "注意:" -#: core/data/System/WebChangesAlert.txt:3 +#: core/data/System/WebNotifyHelp.txt:3 #, fuzzy msgid "Notification help" msgstr "公告" diff --git a/core/locale/ko.po b/core/locale/ko.po index c321d8582e..c96de034a1 100644 --- a/core/locale/ko.po +++ b/core/locale/ko.po @@ -2003,7 +2003,7 @@ msgstr "" msgid "Notes:" msgstr "" -#: core/data/System/WebChangesAlert.txt:3 +#: core/data/System/WebNotifyHelp.txt:3 msgid "Notification help" msgstr "알림 도움말" diff --git a/core/locale/nl.po b/core/locale/nl.po index 06cbc14bf6..1c7f88ff96 100644 --- a/core/locale/nl.po +++ b/core/locale/nl.po @@ -2153,7 +2153,7 @@ msgstr "Opmerking:" msgid "Notes:" msgstr "Opmerkingen:" -#: core/data/System/WebChangesAlert.txt:3 +#: core/data/System/WebNotifyHelp.txt:3 msgid "Notification help" msgstr "Blijf op de hoogte" diff --git a/core/locale/no.po b/core/locale/no.po index e7ac4e4c07..b8d1040d47 100644 --- a/core/locale/no.po +++ b/core/locale/no.po @@ -2115,7 +2115,7 @@ msgstr "Merk:" msgid "Notes:" msgstr "Merknader:" -#: core/data/System/WebChangesAlert.txt:3 +#: core/data/System/WebNotifyHelp.txt:3 msgid "Notification help" msgstr "Varslingshjelp" diff --git a/core/locale/pl.po b/core/locale/pl.po index eda72e559c..b75fcd028a 100644 --- a/core/locale/pl.po +++ b/core/locale/pl.po @@ -2132,7 +2132,7 @@ msgstr "Uwaga:" msgid "Notes:" msgstr "Uwagi:" -#: core/data/System/WebChangesAlert.txt:3 +#: core/data/System/WebNotifyHelp.txt:3 msgid "Notification help" msgstr "Pomoc do powiadomień" diff --git a/core/locale/pt-br.po b/core/locale/pt-br.po index 4a3e28444e..7bb445e2e6 100644 --- a/core/locale/pt-br.po +++ b/core/locale/pt-br.po @@ -2153,7 +2153,7 @@ msgstr "Aviso:" msgid "Notes:" msgstr "Avisos:" -#: core/data/System/WebChangesAlert.txt:3 +#: core/data/System/WebNotifyHelp.txt:3 msgid "Notification help" msgstr "Notificações de ajuda" diff --git a/core/locale/pt.po b/core/locale/pt.po index 028c83d432..271e9c1af5 100644 --- a/core/locale/pt.po +++ b/core/locale/pt.po @@ -2152,7 +2152,7 @@ msgstr "Aviso:" msgid "Notes:" msgstr "Avisos:" -#: core/data/System/WebChangesAlert.txt:3 +#: core/data/System/WebNotifyHelp.txt:3 msgid "Notification help" msgstr "Notificações de ajudaa" diff --git a/core/locale/ru.po b/core/locale/ru.po index ebd714ad3d..2700895132 100644 --- a/core/locale/ru.po +++ b/core/locale/ru.po @@ -2156,7 +2156,7 @@ msgstr "Примечание:" msgid "Notes:" msgstr "Примечания:" -#: core/data/System/WebChangesAlert.txt:3 +#: core/data/System/WebNotifyHelp.txt:3 msgid "Notification help" msgstr "Помощь по уведомлениям" diff --git a/core/locale/sv.po b/core/locale/sv.po index a69ef26238..57a867695d 100644 --- a/core/locale/sv.po +++ b/core/locale/sv.po @@ -2124,7 +2124,7 @@ msgstr "Observera:" msgid "Notes:" msgstr "Observera:" -#: core/data/System/WebChangesAlert.txt:3 +#: core/data/System/WebNotifyHelp.txt:3 msgid "Notification help" msgstr "Hjälp om meddelanden" diff --git a/core/locale/tr.po b/core/locale/tr.po index 77230773f8..63c9ca1278 100644 --- a/core/locale/tr.po +++ b/core/locale/tr.po @@ -1998,7 +1998,7 @@ msgstr "Not:" msgid "Notes:" msgstr "Notlar:" -#: core/data/System/WebChangesAlert.txt:2 +#: core/data/System/WebNotifyHelp.txt:2 msgid "Notification help" msgstr "Bildirim Yardımı" diff --git a/core/locale/uk.po b/core/locale/uk.po index 141f980615..dfb237df3b 100644 --- a/core/locale/uk.po +++ b/core/locale/uk.po @@ -2155,7 +2155,7 @@ msgstr "Примітка:" msgid "Notes:" msgstr "Примітки:" -#: core/data/System/WebChangesAlert.txt:3 +#: core/data/System/WebNotifyHelp.txt:3 #, fuzzy msgid "Notification help" msgstr "Повідомлення" diff --git a/core/locale/zh-cn.po b/core/locale/zh-cn.po index 916f5c4060..ae8764c884 100644 --- a/core/locale/zh-cn.po +++ b/core/locale/zh-cn.po @@ -2045,7 +2045,7 @@ msgstr "注意:" msgid "Notes:" msgstr "注意:" -#: core/data/System/WebChangesAlert.txt:3 +#: core/data/System/WebNotifyHelp.txt:3 msgid "Notification help" msgstr "说明通知" diff --git a/core/locale/zh-tw.po b/core/locale/zh-tw.po index 156bd83223..cc8ec3e81c 100644 --- a/core/locale/zh-tw.po +++ b/core/locale/zh-tw.po @@ -2045,7 +2045,7 @@ msgstr "注意:" msgid "Notes:" msgstr "注意:" -#: core/data/System/WebChangesAlert.txt:3 +#: core/data/System/WebNotifyHelp.txt:3 msgid "Notification help" msgstr "說明通知"