Skip to content

Commit 3209434

Browse files
marianaballabramleymichieldrysiek_dcflores
authored
Release 3.6.13 (phpList#960)
* Avoid php 8.2 warnings (phpList#930) * Avoid php warnings when run from command line * Avoid php warning when template does not exist * Avoid php 8 deprecation regarding string interpolation * Improve handling of unknown admin to avoid php warnings and deprecations * Avoid php 8.2 warning about dynamic properties * Make the results of the timer class use period as the decimal point (phpList#931) * set DEFAULT_MESSAGE to 8 days (phpList#932) * Tidy-up output of processqueue (phpList#935) * Correct parameters to processQueueOutput() * Replace $GLOBALS['I18N']->get() by s() * Replace sprintf(s()) calls with simply s() * remove obsolete files (phpList#936) * Allow gap between async requests (phpList#937) * Allow gap between async requests * Include explanation of ASYNC_REQUEST_INTERVAL in config_extended.php * When including a message in a template use the content of the body element if it is present instead of the complete message. (phpList#938) * Allow a plugin to update phplist (phpList#946) * Allow a plugin to update the phplist code * When a new release is available link to a plugin if available in preference to the updater * Revert "Use <wbr> element instead of zero-width space character to allow wrapping of an email address or URL (phpList#926)" (phpList#949) This reverts commit 74682b0. * Use <wbr> element instead of zero-width space character to allow wrapping of an email address or URL (phpList#952) Co-authored-by: Duncan Cameron <[email protected]> * Update the Common, CKEditor, and Segment plugins (phpList#951) * fix bash issue * Translations for 3.6.13 (phpList#947) * Translated using Weblate (English) Currently translated at 91.2% (1944 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/en/ * Translated using Weblate (Polish) Currently translated at 99.5% (2121 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/pl/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (2131 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/pt/ * Translated using Weblate (French) Currently translated at 99.9% (2129 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/fr/ * Translated using Weblate (French) Currently translated at 100.0% (2131 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/fr/ * Translated using Weblate (French) Currently translated at 100.0% (2131 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/fr/ * Translated using Weblate (French) Currently translated at 100.0% (2131 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/fr/ * Translated using Weblate (French) Currently translated at 100.0% (2131 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/fr/ * Translated using Weblate (French) Currently translated at 100.0% (2131 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/fr/ * Translated using Weblate (Galician) Currently translated at 15.8% (338 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Galician) Currently translated at 20.7% (442 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Galician) Currently translated at 24.8% (530 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Galician) Currently translated at 25.8% (551 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Galician) Currently translated at 36.7% (784 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Spanish) Currently translated at 98.9% (2108 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/es/ * Translated using Weblate (Galician) Currently translated at 41.3% (882 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Galician) Currently translated at 44.5% (949 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Galician) Currently translated at 47.3% (1008 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Galician) Currently translated at 49.6% (1059 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Galician) Currently translated at 72.6% (1549 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Galician) Currently translated at 75.1% (1601 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Galician) Currently translated at 76.4% (1630 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Galician) Currently translated at 92.9% (1980 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Galician) Currently translated at 97.1% (2070 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Galician) Currently translated at 97.1% (2071 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Galician) Currently translated at 97.2% (2072 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (2131 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (English) Currently translated at 91.2% (1945 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/en/ * Update dependencies (phpList#895) * Translated using Weblate (English) Currently translated at 91.2% (1946 of 2132 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/en/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 38.9% (830 of 2132 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/zh_Hans/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 39.7% (848 of 2132 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/zh_Hans/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 53.7% (1146 of 2132 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/zh_Hant/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 81.0% (1727 of 2132 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/zh_Hans/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 82.1% (1751 of 2132 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/zh_Hans/ * Translated using Weblate (Dutch) Currently translated at 99.2% (2116 of 2132 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/nl/ * Translated using Weblate (French) Currently translated at 100.0% (2132 of 2132 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/fr/ * Translated using Weblate (English) Currently translated at 91.3% (1948 of 2132 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/en/ * Translated using Weblate (German) Currently translated at 95.2% (2030 of 2132 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/de/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 82.0% (1749 of 2132 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/zh_Hans/ --------- Co-authored-by: Duncan Cameron <[email protected]> Co-authored-by: rysiek_d <[email protected]> Co-authored-by: cflores <[email protected]> Co-authored-by: Alain Rihs <[email protected]> Co-authored-by: dinahosting <[email protected]> Co-authored-by: Michiel <[email protected]> Co-authored-by: Duncan Cameron <[email protected]> Co-authored-by: dayadiguo <[email protected]> * update version * update to use the updater plugin --------- Co-authored-by: Duncan Cameron <[email protected]> Co-authored-by: Michiel Dethmers <[email protected]> Co-authored-by: Duncan Cameron <[email protected]> Co-authored-by: rysiek_d <[email protected]> Co-authored-by: cflores <[email protected]> Co-authored-by: Alain Rihs <[email protected]> Co-authored-by: dinahosting <[email protected]> Co-authored-by: dayadiguo <[email protected]>
1 parent a638455 commit 3209434

28 files changed

+417
-484
lines changed

‎.github/workflows/build-release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
- name: Show the discovered version
2727
run: |
28-
if [[ ${{ secrets.BUILD_TEST }} ]]; then
28+
if [[ ! -z "${{ secrets.BUILD_TEST }}" ]]; then
2929
echo "RELEASE_VERSION=build-testing-RC1" >> $GITHUB_ENV
3030
fi
3131
echo \$RELEASE_VERSION = $RELEASE_VERSION

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# file that keeps track of the latest tag in cvs and the corresponding version
22
# this automates publishing a new version, when it's tagged
33
# if you don't understand this, don't worry. You don't need this file
4-
VERSION=3.6.6-RC2
4+
VERSION=3.6.13

‎composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
},
8989
{
9090
"type": "vcs",
91-
"url": "https://github.com/michield/phplist-plugin-addons.git"
91+
"url": "https://github.com/bramley/phplist-plugin-updater.git"
9292
}
9393
],
9494
"extra": {
@@ -128,7 +128,7 @@
128128
"bramley/phplist-plugin-ckeditor": "dev-master",
129129
"bramley/phplist-plugin-segment": "dev-master",
130130
"phplist/phplist-plugin-subjectlineplaceholders": "dev-master",
131-
"michield/phplist-plugin-addons": "dev-master"
131+
"bramley/phplist-plugin-updater": "dev-main"
132132
},
133133
"require-dev": {
134134
"behat/behat": "@stable",

‎composer.lock

+146-149
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docker/docker-phplist-config-dev.php

+3
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,7 @@
2323

2424
$addonsUpdater = [
2525
'work' => '/var/tmp/phplistupdate',
26+
];
27+
$updaterConfig = [
28+
'work' => '/var/tmp/phplistupdate',
2629
];

‎docker/docker-phplist-config-live.php

+3
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,7 @@
1717

1818
$addonsUpdater = [
1919
'work' => '/var/tmp/phplistupdate',
20+
];
21+
$updaterConfig = [
22+
'work' => '/var/tmp/phplistupdate',
2023
];

‎public_html/lists/admin/Updater.php

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?php
2+
/**
3+
* A plugin should implement this interface if it wants to be responsible for updating phpList.
4+
* It should implement an admin page with the name "update".
5+
*/
6+
interface Updater
7+
{
8+
}

‎public_html/lists/admin/actions/processqueue.php

+54-54
Large diffs are not rendered by default.

‎public_html/lists/admin/connect.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -2416,9 +2416,9 @@ public function elapsed($seconds = 0)
24162416
$end = $now['sec'] * 1000000 + $now['usec'];
24172417
$elapsed = $end - $this->start;
24182418
if ($seconds) {
2419-
return sprintf('%0.10f', $elapsed / 1000000);
2419+
return sprintf('%0.10F', $elapsed / 1000000);
24202420
} else {
2421-
return sprintf('%0.10f', $elapsed);
2421+
return sprintf('%0.10F', $elapsed);
24222422
}
24232423
}
24242424

@@ -2434,9 +2434,9 @@ public function interval($seconds = 0)
24342434
$this->previous = $end;
24352435

24362436
if ($seconds) {
2437-
return sprintf('%0.10f', $elapsed / 1000000);
2437+
return sprintf('%0.10F', $elapsed / 1000000);
24382438
} else {
2439-
return sprintf('%0.10f', $elapsed);
2439+
return sprintf('%0.10F', $elapsed);
24402440
}
24412441
}
24422442
}

‎public_html/lists/admin/defaultplugin.php

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ class phplistPlugin
2020
public $documentationUrl = ''; //# link to documentation for this plugin (eg https://resources.phplist.com/plugin/pluginname
2121
public $enabled = 1; // use directly, can be privitsed later and calculated with __get and __set
2222
public $system_root = ''; //# root dir of the phpList admin directory
23+
public $dependencyFailure;
2324

2425
//@@Some ideas to implement this:
2526
// * Start each method with if (!$this->enabled) return parent :: parentMethod($args);

‎public_html/lists/admin/gchart.php

-33
This file was deleted.

‎public_html/lists/admin/index.php

+10-9
Original file line numberDiff line numberDiff line change
@@ -523,24 +523,25 @@ function mb_strtolower($string)
523523
echo Info($GLOBALS['I18N']->get('Running in testmode, no emails will be sent. Check your config file.'));
524524
}
525525

526-
# if (!DEVVERSION) { ## why not, quite useful to see
527-
if (ALLOW_UPDATER) {
526+
if (ALLOW_UPDATER || $updaterplugin) {
528527
$updaterdir = __DIR__ . '/../updater';
529528

530529
include 'updateLib.php';
531530
$updateNotif = checkForUpdate();
532-
$moreInfo = ' <ul><li><a href="https://www.phplist.com/download?utm_source=pl' . VERSION . '&amp;utm_medium=updatedownload&amp;utm_campaign=phpList" title="' . s('Download the new version') . '" target="_blank">' . s('Download the new version') . '</a></li>';
533531

534-
if (file_exists($updaterdir)) {
535-
$moreInfo .= '<li>'.s('or use the %sphpList Updater%s','<a href="?page=update" title="' . s('automatic updater') . '">','</a>');
536-
}
537-
$moreInfo .= '</ul>';
532+
if ($updateNotif !== '' && $_GET['page'] !== 'update') {
533+
$moreInfo = ' <ul><li><a href="https://www.phplist.com/download?utm_source=pl' . VERSION . '&amp;utm_medium=updatedownload&amp;utm_campaign=phpList" title="' . s('Download the new version') . '" target="_blank">' . s('Download the new version') . '</a></li>';
538534

539-
if ($updateNotif !== '') {
535+
if ($updaterplugin) {
536+
$class = get_class($updaterplugin);
537+
$moreInfo .= '<li>'.s('or use the %sphpList Updater%s', sprintf('<a href="?page=update&amp;pi=%s" title="', $class) . s('automatic updater') . '">','</a>');
538+
} elseif (file_exists($updaterdir)) {
539+
$moreInfo .= '<li>'.s('or use the %sphpList Updater%s','<a href="?page=update" title="' . s('automatic updater') . '">','</a>');
540+
}
541+
$moreInfo .= '</ul>';
540542
Info($updateNotif . '' . $moreInfo);
541543
}
542544
}
543-
# }
544545

545546
if (version_compare(PHP_VERSION, '5.3.3', '<') && WARN_ABOUT_PHP_SETTINGS) {
546547
Error(s('Your PHP version is out of date. phpList requires PHP version 5.3.3 or higher.'));

‎public_html/lists/admin/init.php

+7-3
Original file line numberDiff line numberDiff line change
@@ -597,8 +597,8 @@
597597
define('MAX_AVATAR_SIZE', 2000);
598598
}
599599
if (!defined('DEFAULT_MESSAGEAGE')) {
600-
define('DEFAULT_MESSAGEAGE', 604800);
601-
} //# 7 days in seconds
600+
define('DEFAULT_MESSAGEAGE', 691200);
601+
} //# 8 days in seconds
602602
if (!defined('ADD_EMAIL_THROTTLE')) {
603603
define('ADD_EMAIL_THROTTLE', 1);
604604
} //# seconds between addemail ajax requests
@@ -786,10 +786,14 @@
786786
}
787787
if (!defined('HTTP_PROXY_HOST')) {
788788
define('HTTP_PROXY_HOST', false);
789-
}
789+
}
790790
if (!defined('HTTP_PROXY_PORT')) {
791791
define('HTTP_PROXY_PORT', false);
792792
}
793+
// interval in milliseconds between asynchronous requests
794+
if (!defined('ASYNC_REQUEST_INTERVAL')) {
795+
define('ASYNC_REQUEST_INTERVAL', 0);
796+
}
793797

794798
if (!isset($GLOBALS['export_mimetype'])) {
795799
$GLOBALS['export_mimetype'] = 'application/csv';

‎public_html/lists/admin/js/phplistapp.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,12 @@ function loadDivContent(index) {
7777
div = asyncLoadDiv[index];
7878
url = asyncLoadUrl[index];
7979
$("#"+div).html(busyImage + '<span class="loadingprogressbanner"></span>');
80-
$("#"+div).load(url, function() {
81-
loadDivContent(index + 1);
80+
$("#"+div).load(url, function(response, status, xhr) {
81+
if (status == "error") {
82+
$("#"+div).html('');
83+
} else {
84+
setTimeout(() => loadDivContent(index + 1), asyncRequestInterval);
85+
}
8286
});
8387
}
8488
}

‎public_html/lists/admin/lib.php

+31-5
Original file line numberDiff line numberDiff line change
@@ -1971,15 +1971,36 @@ function shortenText($text, $max = 30)
19711971
* mostly used for columns in listings to retrict the width, particularly on mobile devices
19721972
* it will show the full text as the title tip but restrict the size of the output
19731973
*
1974-
* will also place a space after / and @ to facilitate wrapping in the browser
1975-
*
19761974
*/
19771975
function shortenTextDisplay($text, $max = 30)
1976+
{
1977+
$display = shortenText($text, $max);
1978+
1979+
return sprintf('<span title="%s">%s</span>', htmlspecialchars($text), $display);
1980+
}
1981+
/*
1982+
* shortenEmailDisplay
1983+
*
1984+
* Similar to shortenTextDisplay() but adds a wbr element after @ to allow wrapping
1985+
*/
1986+
function shortenEmailDisplay($text, $max = 30)
1987+
{
1988+
$display = shortenText($text, $max);
1989+
$display = str_replace('@', '@<wbr>', $display);
1990+
1991+
return sprintf('<span title="%s">%s</span>', htmlspecialchars($text), $display);
1992+
}
1993+
1994+
/*
1995+
* shortenUrlDisplay
1996+
*
1997+
* Similar to shortenTextDisplay() but adds a wbr element after each / to allow wrapping
1998+
*/
1999+
function shortenUrlDisplay($text, $max = 30)
19782000
{
19792001
$display = preg_replace('!^https?://!i', '', $text);
19802002
$display = shortenText($display, $max);
1981-
$display = str_replace('/', '/&#x200b;', $display);
1982-
$display = str_replace('@', '@&#x200b;', $display);
2003+
$display = str_replace('/', '/<wbr>', $display);
19832004

19842005
return sprintf('<span title="%s">%s</span>', htmlspecialchars($text), $display);
19852006
}
@@ -2385,6 +2406,7 @@ function asyncLoadContentDiv($url,$divname)
23852406
if (typeof asyncLoadDiv == "undefined") {
23862407
var asyncLoadDiv = new Array();
23872408
var asyncLoadUrl = new Array();
2409+
var asyncRequestInterval = ' . ASYNC_REQUEST_INTERVAL . ';
23882410
}
23892411
asyncLoadDiv[asyncLoadDiv.length] = "'.$divname.'";
23902412
asyncLoadUrl[asyncLoadUrl.length] = "'.$url.'";
@@ -2453,7 +2475,11 @@ function getClientIP()
24532475
}
24542476
}
24552477

2456-
$the_ip = filter_var($_SERVER['REMOTE_ADDR'], FILTER_VALIDATE_IP);
2478+
if (isset($_SERVER['REMOTE_ADDR'])) {
2479+
$the_ip = filter_var($_SERVER['REMOTE_ADDR'], FILTER_VALIDATE_IP);
2480+
} else {
2481+
$the_ip = '';
2482+
}
24572483
//logEvent("REMOTE_ADDR ip=".$the_ip);
24582484

24592485
return $the_ip;

‎public_html/lists/admin/locale/de/phplist.po

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
msgid ""
22
msgstr ""
33
"Project-Id-Version: German (phpList)\n"
4-
"Report-Msgid-Bugs-To: \n"
4+
"Report-Msgid-Bugs-To: [email protected]\n"
55
"POT-Creation-Date: 2021-02-12 19:03+0000\n"
6-
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
7-
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
6+
"PO-Revision-Date: 2023-02-23 08:29+0000\n"
7+
"Last-Translator: Duncan Cameron <[email protected]>\n"
88
"Language-Team: German <http://translate.phplist.org/projects/phplist/"
9-
"phplist-languages/de/>\n"
9+
"phplist3/de/>\n"
1010
"Language: de\n"
1111
"MIME-Version: 1.0\n"
1212
"Content-Type: text/plain; charset=UTF-8\n"
@@ -2440,9 +2440,9 @@ msgstr ""
24402440

24412441
# Suggested in Weblate: Versende in Stapeln von %s Nachrichten
24422442
#: public_html/lists/admin/actions/processqueue.php:534
2443-
#, fuzzy, php-format
2443+
#, php-format
24442444
msgid "Sending in batches of %s messages"
2445-
msgstr "Versende in Stapeln von %d Nachrichten"
2445+
msgstr "Versende in Stapeln von %s Nachrichten"
24462446

24472447
#: public_html/lists/admin/processbounces.php:412,
24482448
#: public_html/lists/admin/processbounces.php:413

‎public_html/lists/admin/locale/en/phplist.po

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ msgstr ""
33
"Project-Id-Version: English (phpList)\n"
44
"Report-Msgid-Bugs-To: [email protected]\n"
55
"POT-Creation-Date: 2021-02-12 19:38+0000\n"
6-
"PO-Revision-Date: 2022-10-24 12:40+0000\n"
7-
"Last-Translator: Michiel <michiel@phplist.com>\n"
6+
"PO-Revision-Date: 2023-02-23 08:29+0000\n"
7+
"Last-Translator: Duncan Cameron <phplist@dcameron.me.uk>\n"
88
"Language-Team: English <http://translate.phplist.org/projects/phplist/"
99
"phplist3/en/>\n"
1010
"Language: en\n"
@@ -2448,9 +2448,9 @@ msgid "Processing has been suspended by your ISP, please try again later"
24482448
msgstr "Processing has been suspended by your ISP, please try again later"
24492449

24502450
#: public_html/lists/admin/actions/processqueue.php:534
2451-
#, fuzzy, php-format
2451+
#, php-format
24522452
msgid "Sending in batches of %s messages"
2453-
msgstr "Sending in batches of %d messages"
2453+
msgstr "Sending in batches of %s messages"
24542454

24552455
#: public_html/lists/admin/actions/processqueue.php:540
24562456
#, php-format
@@ -2460,9 +2460,9 @@ msgid ""
24602460
msgstr ""
24612461

24622462
#: public_html/lists/admin/actions/processqueue.php:544
2463-
#, fuzzy, php-format
2463+
#, php-format
24642464
msgid "Sending in batches of %s emails"
2465-
msgstr "Sending in batches of %d emails"
2465+
msgstr "Sending in batches of %s emails"
24662466

24672467
#: public_html/lists/admin/actions/processqueue.php:547
24682468
#, php-format

‎public_html/lists/admin/locale/zh_CN/phplist.po

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ msgstr ""
33
"Project-Id-Version: Chinese (Simplified) (phpList)\n"
44
"Report-Msgid-Bugs-To: [email protected]\n"
55
"POT-Creation-Date: 2021-02-12 19:05+0000\n"
6-
"PO-Revision-Date: 2022-11-06 16:49+0000\n"
6+
"PO-Revision-Date: 2023-02-23 08:29+0000\n"
77
"Last-Translator: dayadiguo <[email protected]>\n"
88
"Language-Team: Chinese (Simplified) <http://translate.phplist.org/projects/"
99
"phplist/phplist3/zh_Hans/>\n"
@@ -3064,7 +3064,7 @@ msgstr ""
30643064

30653065
#: public_html/databasestructure.php:102
30663066
msgid "Status of message"
3067-
msgstr "讯息状态"
3067+
msgstr "信息状态"
30683068

30693069
#: public_html/lists/admin/members.php:390,
30703070
#: public_html/lists/admin/members.php:427

‎public_html/lists/admin/mclicks.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
);
141141

142142
if (!$download) {
143-
$element = shortenTextDisplay($row['url']);
143+
$element = shortenUrlDisplay($row['url']);
144144
} else {
145145
$element = $row['url'];
146146
}

0 commit comments

Comments
 (0)