diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php index af4f6fd65..08c272bcf 100644 --- a/web/lang/en_gb.php +++ b/web/lang/en_gb.php @@ -776,6 +776,8 @@ $SLANG = array( 'TargetColorspace' => 'Target colorspace', 'Removed' => 'removed', 'DeprecatedColoursSetting' => 'Deprecated - will be auto-detected in a future release', + 'ThisSession' => 'This Session', + 'ThisSessionHint' => 'These settings apply to this browser session only. They are kept in a cookie rather than saved on the server, so they do not affect other sessions or other users.', 'TimeDelta' => 'Time Delta', 'TimelineTip1' => 'Pass your mouse over the graph to view a snapshot image and event details.', // Added 2013.08.15. 'TimelineTip2' => 'Click on the coloured sections of the graph, or the image, to view the event.', // Added 2013.08.15. diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php index 4650e0813..34ab3977f 100644 --- a/web/skins/classic/includes/functions.php +++ b/web/skins/classic/includes/functions.php @@ -1918,6 +1918,20 @@ function xhtmlFooter() { class ZM_Menu { public static $submenuOptionsItems = []; + // A tab is not always named after its category key. 'display' holds + // per-browser state kept in a cookie rather than stored configuration, and + // 'web' holds the display settings that are stored, so labelling either one + // after its key tells the user the wrong thing. + private static $categoryLabels = [ + 'version' => 'Versions', + 'display' => 'ThisSession', + 'web' => 'Display', + ]; + + private static function categoryLabel($cat) { + return translate(isset(self::$categoryLabels[$cat]) ? self::$categoryLabels[$cat] : mb_ucfirst($cat)); + } + public function __construct(string $typeMenu, array $menuItems) { } @@ -1934,7 +1948,7 @@ class ZM_Menu { $added = true; } if ($added) { - self::$submenuOptionsItems[$cat] = translate(mb_ucfirst(($cat == 'version') ? 'Versions' : $cat)); + self::$submenuOptionsItems[$cat] = self::categoryLabel($cat); unset($categoriesOptionsInDB[$key]); } } @@ -1943,7 +1957,7 @@ class ZM_Menu { if (count($categoriesOptionsInDB)) { foreach ($categoriesOptionsInDB as $cat) { if (!in_array(strtolower($cat), ['dynamic', 'hidden'], $strict = false)) // Prohibited categories - self::$submenuOptionsItems[$cat] = translate(mb_ucfirst($cat)); + self::$submenuOptionsItems[$cat] = self::categoryLabel($cat); } } } diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php index ea2cc5b7c..1914587bb 100644 --- a/web/skins/classic/views/options.php +++ b/web/skins/classic/views/options.php @@ -55,6 +55,9 @@ if ($tab == 'display') {
+ +