Merge pull request #227 from ikedas/pr-217

Issue #216: Unify scenario names #217 by qosobrin

default/Makefile.am

@@ -70,12 +70,6 @@ nobase_default_DATA = \
 	list_task_models/remind.monthly.task \
 	list_task_models/remind.yearly.task \
 	list_task_models/sync_include.ttl.task \
-	scenari/access_web_archive.closed \
-	scenari/access_web_archive.intranet \
-	scenari/access_web_archive.listmaster \
-	scenari/access_web_archive.owner \
-	scenari/access_web_archive.private \
-	scenari/access_web_archive.public \
 	scenari/add.auth \
 	scenari/add.authdkim \
 	scenari/add.closed \
@@ -86,6 +80,12 @@ nobase_default_DATA = \
 	scenari/archive_mail_access.owner \
 	scenari/archive_mail_access.private \
 	scenari/archive_mail_access.public \
+	scenari/archive_web_access.closed \
+	scenari/archive_web_access.intranet \
+	scenari/archive_web_access.listmaster \
+	scenari/archive_web_access.owner \
+	scenari/archive_web_access.private \
+	scenari/archive_web_access.public \
 	scenari/automatic_list_creation.listmaster \
 	scenari/automatic_list_creation.public \
 	scenari/automatic_list_creation.family_owner \

po/sympa/POTFILES.in

@@ -79,12 +79,12 @@ default/list_task_models/remind.monthly.task
 default/list_task_models/remind.yearly.task
 default/list_task_models/sync_include.ttl.task
 default/mhonarc-ressources.tt2
-default/scenari/access_web_archive.closed
-default/scenari/access_web_archive.intranet
-default/scenari/access_web_archive.listmaster
-default/scenari/access_web_archive.owner
-default/scenari/access_web_archive.private
-default/scenari/access_web_archive.public
+default/scenari/archive_web_access.closed
+default/scenari/archive_web_access.intranet
+default/scenari/archive_web_access.listmaster
+default/scenari/archive_web_access.owner
+default/scenari/archive_web_access.private
+default/scenari/archive_web_access.public
 default/scenari/add.auth
 default/scenari/add.closed
 default/scenari/add.owner

src/lib/Sympa/ListDef.pm

@@ -815,7 +815,7 @@ our %pinfo = (
             'access' => {
                 'order'      => 1,
                 'gettext_id' => "access right",
-                'scenario'   => 'access_web_archive',
+                'scenario'   => 'archive_web_access',
                 'obsolete'   => 1,                    # Use archive.web_access
             },
             'quota' => {
@@ -860,7 +860,7 @@ our %pinfo = (
             'web_access' => {
                 'order'      => 3,
                 'gettext_id' => "access right",
-                'scenario'   => 'access_web_archive'
+                'scenario'   => 'archive_web_access'
             },
             'mail_access' => {
                 'order'      => 4,