diff --git a/.github/workflows/submit-pr-for-release-notes.yml b/.github/workflows/submit-pr-for-release-notes.yml index 0a0633c29..6d96a614b 100644 --- a/.github/workflows/submit-pr-for-release-notes.yml +++ b/.github/workflows/submit-pr-for-release-notes.yml @@ -5,7 +5,7 @@ on: env: GH_PR_BODY: 'This pull request is a workplace for editing release notes `NEWS.md`.' - GH_PR_LABEL: on going,ignore-for-release + GH_PR_LABEL: ready,ignore-for-release GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} jobs: diff --git a/.github/workflows/submit-pr-for-translation.yml b/.github/workflows/submit-pr-for-translation.yml index d816783fe..22ba7a498 100644 --- a/.github/workflows/submit-pr-for-translation.yml +++ b/.github/workflows/submit-pr-for-translation.yml @@ -8,7 +8,7 @@ on: env: GH_PR_TITLE: Update translation GH_PR_BODY: This pull request was automatically submitted. - GH_PR_LABEL: translation,on going,ignore-for-release + GH_PR_LABEL: translation,ready,ignore-for-release GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} jobs: diff --git a/cpanfile b/cpanfile index 3062244eb..b1ddd0b3e 100644 --- a/cpanfile +++ b/cpanfile @@ -147,6 +147,9 @@ requires 'Text::LineFold', '>= 2018.012'; # Used to get time with sub-second precision requires 'Time::HiRes', '>= 1.29'; +# Used to get Unix time from local time +requires 'Time::Local', '>= 1.23'; + # Used to create URI containing non URI-canonical characters. # Note: '3.28' is the version included in URI-1.35. requires 'URI::Escape', '>= 3.28'; diff --git a/default/mail_tt2/report.tt2 b/default/mail_tt2/report.tt2 index c8055e848..c89550b44 100644 --- a/default/mail_tt2/report.tt2 +++ b/default/mail_tt2/report.tt2 @@ -266,9 +266,6 @@ [%~ ELSIF report_entry == 'auth_msg_failed' ~%] [%|loc(report_param.key)%]Unable to access the message authenticated with key %1[%END%] -[%~ ELSIF report_entry == 'no_identified_user' ~%] - [%|loc%]Failed to get your email address from the authentication service.[%END%] - [%~ ELSIF report_entry == 'db_error' ~%] [%|loc%]Database error.[%END%] @@ -334,7 +331,13 @@ [%~ END %] [%~ ELSIF report_entry == 'add_performed' ~%] -[%|loc(report_param.total)%]%1 subscribers added[%END%] + [% IF report_param.role == 'owner' ~%] + [%|loc(report_param.total)%]%1 owners added[%END%] + [%~ ELSIF report_param.role == 'editor' ~%] + [%|loc(report_param.total)%]%1 moderators added[%END%] + [%~ ELSE ~%] + [%|loc(report_param.total)%]%1 subscribers added[%END%] + [%~ END %] [%~ ELSIF report_entry == 'updated_info' ~%] [%|loc(report_param.email,report_param.listname)%]Information regarding user %1 has been updated for list %2.[%END%] @@ -955,6 +958,9 @@ Warning: this message may already have been sent by one of the list's moderators [%~ ELSIF report_entry == 'cannot_get_privilege' ~%] [%|loc()%]You are not allowed to get the privilege of this user.[%END%] +[%~ ELSIF report_entry == 'no_identified_user' ~%] + [%|loc%]Failed to get your email address from the authentication service.[%END%] + [%~ END ~%] [%~ END ~%] diff --git a/default/scenari/send.publickey b/default/scenari/send.publickey index d20667417..cb92118c8 100644 --- a/default/scenari/send.publickey +++ b/default/scenari/send.publickey @@ -1,4 +1,4 @@ -title.gettext anyone no authentication if DKIM signature is OK +title.gettext need authentication true() smtp -> request_auth true() md5,smime -> do_it diff --git a/default/web_tt2/nav.tt2 b/default/web_tt2/nav.tt2 index ccdb516e7..0562373ce 100644 --- a/default/web_tt2/nav.tt2 +++ b/default/web_tt2/nav.tt2 @@ -87,10 +87,6 @@
[%|loc%]Set debug level for logs written to disk. This setting is temporary, applying only for the lifetime of the fastcgi session hosting this interface.[%END%]
- -[% END %] - [% IF subaction == 'templates' %]