mirror of
https://github.com/FreshRSS/FreshRSS.git
synced 2026-05-14 18:23:52 -04:00
Closes FreshRSS/FreshRSS#6522. Refresh of FreshRSS/FreshRSS#6590 by @sgzmd, which has been stalled with merge conflicts since 2024. All original commits are preserved as-is in the history (authorship intact); this PR adds a merge with current `edge` plus minor fixes. ## Summary Adds a user setting `show_title_unread` (default `true`, so existing behavior is preserved) that hides the unread article counter from both the tab title and the favicon overlay. A single toggle controls both, matching the request in #6522. ## Screenshots Toggle in display settings: <img width="320" height="127" alt="Display settings with new toggle" src="https://github.com/user-attachments/assets/fc78f825-161d-4b47-9b85-08e39554a4b1" /> Tab title and favicon when **enabled** (current behavior): <img width="253" height="42" alt="Tab title and favicon with unread counter" src="https://github.com/user-attachments/assets/57387600-72e0-4b22-b059-04b5bfea673a" /> Tab title and favicon when **disabled** (new behavior): <img width="254" height="40" alt="Tab title and favicon without unread counter" src="https://github.com/user-attachments/assets/93ac7997-dd4e-49bc-ab4a-74e4f0d2db1b" /> ## Changes on top of #6590 - Resolved merge conflicts with current `edge` (controllers, model, view, `config.default.php`, ~25 i18n files, plus the `zh-tw` -> `zh-TW` rename). - Replaced Czech text mistakenly placed in `de/conf.php` with an English `// TODO` marker so a German speaker can translate later. - Renamed JS context key `show_unread_favicon` -> `show_title_unread` to match the backend property and avoid a confusing dual-name for one setting. - Removed an unused duplicate of `show_title_unread` from `config.default.php` (the setting is read via `userConf()`, never `systemConf()`). - Gated the dynamic title rewrite in `incUnreadsFeed` (`p/scripts/main.js`) on the setting. Without this, marking an article read while the setting was off would re-add the `(N)` prefix to the tab title. - Escaped a stray apostrophe in the Occitan translation that broke parsing. - `make fix-all` re-sorted i18n keys and added `// TODO` placeholders for `fi`, `pt-PT`, `uk` (untranslated by the original PR). ## Test plan - [x] `make test-all` passes (620/620 PHPUnit, phpstan, phpcs, eslint, stylelint, markdownlint clean; `bin/typos` failed locally with a binary arch mismatch on macOS arm64 - unrelated to this change). - [x] Manually tested on a real instance: default behavior unchanged; toggling the setting hides both the tab title `(N) ` prefix and the favicon overlay; toggling back restores both; marking articles read while the setting is off does not bring the counter back; opening and closing an article preserves the user's choice. * Make showing the number of unread items in the title configurable. * Proposed approach to passing show_unread_favicon setting down to client-side code * Fixes and refactoring * Updating default config for the user. When user's config wasn't initialised we are copying it from `config-user.default.php` - if `show_title_unread` is not there, it is assumed to be false, whereas in `config.default.php` it's true by default. This results in inconsistency until user changes the field for the first time in Config->Display. * Adding translations. * fix: gate JS title rewrite + drop dead system config entry The original PR added show_title_unread to both config-user.default.php (read by userConf, the right place) and config.default.php (read by systemConf, never used here). Drop the system-level entry. Also: incUnreadsFeed dynamically rewrites document.title when articles are marked read/unread. That code path was not gated by the setting, so toggling the setting off and then marking an article read would re-add the (N) prefix to the tab title. Skip the document.title / prevTitle write when context.show_title_unread is false. * fix: drop README pollution from local make fix-all `make fix-all` regenerated the README translation tables on macOS, where the case-insensitive filesystem and an untracked local `app/i18n/nb/` directory caused the generator to emit `zh-tw` (lowercase) and an `nb` entry. Reset both README files to upstream/edge so CI can regenerate them cleanly. * fix: restore zh-TW/conf.php from edge (case-insensitive FS damage) The macOS case-insensitive filesystem caused the merge to overwrite upstream/edge's properly-translated zh-TW/conf.php with the older zh-tw/conf.php content from the PR side, regressing translation coverage from 94% to 71%. Reset the file to edge's content and re-add the show_title_unread Traditional Chinese translation. --------- Co-authored-by: sgzmd <sigizmund@gmail.com> Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr> Co-authored-by: Bjørn A. Andersen <polybjorn@users.noreply.github.com>
148 lines
4.3 KiB
PHP
148 lines
4.3 KiB
PHP
<?php
|
|
|
|
# Do not modify this file, which defines default values, but create a
|
|
# `./data/config-user.custom.php` file instead, containing the keys you want to
|
|
# override.
|
|
return array (
|
|
'enabled' => true,
|
|
'is_admin' => false,
|
|
'language' => 'en',
|
|
// A timezone identifier such as 'Europe/Paris' https://php.net/timezones or blank for server default
|
|
'timezone' => '',
|
|
'archiving' => [
|
|
'keep_period' => 'P3M',
|
|
'keep_max' => 200,
|
|
'keep_min' => 50,
|
|
'keep_favourites' => true,
|
|
'keep_labels' => true,
|
|
'keep_unreads' => false,
|
|
],
|
|
'ttl_default' => 3600,
|
|
'dynamic_opml_ttl_default' => 43200,
|
|
'mail_login' => '',
|
|
'email_validation_token' => '',
|
|
'token' => '',
|
|
'passwordHash' => '',
|
|
'apiPasswordHash' => '',
|
|
//feverKey is md5($user . ':' . $apiPasswordPlain)
|
|
'feverKey' => '',
|
|
'posts_per_page' => 20,
|
|
'since_hours_posts_per_rss' => 168,
|
|
'max_posts_per_rss' => 400,
|
|
'view_mode' => 'normal',
|
|
'default_view' => 'adaptive',
|
|
'default_state' => FreshRSS_Entry::STATE_NOT_READ,
|
|
'show_fav_unread' => false,
|
|
'show_title_unread' => true,
|
|
'auto_load_more' => true,
|
|
'display_posts' => false,
|
|
'display_categories' => 'active', //{ active, remember, all, none }
|
|
'show_tags' => 'f', // {0 => none, b => both, f => footer, h => header}
|
|
'show_tags_max' => 7,
|
|
'show_author_date' => 'h', // {0 => none, b => both, f => footer, h => header}
|
|
'show_feed_name' => 'a', // {0 => none, a => with authors, t => above title}
|
|
'show_article_icons' => 't', // {a => with_authors, t => above title}
|
|
'hide_read_feeds' => true,
|
|
'onread_jump_next' => true,
|
|
'lazyload' => true,
|
|
'sides_close_article' => false,
|
|
'sticky_post' => true,
|
|
'reading_confirm' => false,
|
|
'auto_remove_article' => false,
|
|
|
|
# In the case an article has changed (e.g. updated content):
|
|
# Set to `true` to mark it unread, or `false` to leave it as-is.
|
|
'mark_updated_article_unread' => false, //TODO: -1 => ignore, 0 => update, 1 => update and mark as unread
|
|
|
|
# 'id'|'c.name'|'date'|'f.name'|'length'|'link'|'rand'|'title'
|
|
'sort' => 'id',
|
|
'sort_order' => 'DESC',
|
|
# 'id'|'date'|'link'|'title'
|
|
'secondary_sort' => 'id',
|
|
'secondary_sort_order' => 'DESC',
|
|
|
|
'anon_access' => false,
|
|
'mark_when' => array (
|
|
'article' => true,
|
|
'gone' => false,
|
|
'max_n_unread' => false,
|
|
'reception' => false,
|
|
'same_title_in_feed' => false,
|
|
'scroll' => false,
|
|
'focus' => false,
|
|
'site' => true,
|
|
),
|
|
'filters' => [],
|
|
'theme' => 'Origine',
|
|
'darkMode' => 'auto',
|
|
'content_width' => 'thin',
|
|
'shortcuts' => array (
|
|
'actualize' => 'q',
|
|
'mark_read' => 'r',
|
|
'mark_favorite' => 'f',
|
|
'go_website' => 'space',
|
|
'next_entry' => 'j',
|
|
'next_unread_entry' => 'h',
|
|
'prev_entry' => 'k',
|
|
'skip_next_entry' => 'n',
|
|
'skip_prev_entry' => 'p',
|
|
'first_entry' => 'home',
|
|
'last_entry' => 'end',
|
|
'collapse_entry' => 'c',
|
|
'load_more' => 'm',
|
|
'mylabels' => 'l',
|
|
'auto_share' => 's',
|
|
'focus_search' => 'a',
|
|
'user_filter' => 'u',
|
|
'help' => 'f1',
|
|
'close_menus' => 'escape',
|
|
'normal_view' => '1',
|
|
'global_view' => '2',
|
|
'reading_view' => '3',
|
|
'toggle_media' => 'v',
|
|
'toggle_aside' => 't',
|
|
),
|
|
|
|
# Disabling favicons and using emojis instead of icons improves performance for users with many feeds
|
|
'show_favicons' => true,
|
|
'icons_as_emojis' => false,
|
|
# Hide the dropdown configuration menu and favicon in the aside list in case of many feeds, for UI performance
|
|
'simplify_over_n_feeds' => 1000,
|
|
|
|
'mark_read_button' => 'big',
|
|
'topline_read' => true,
|
|
'topline_favorite' => true,
|
|
'topline_myLabels' => false,
|
|
'topline_sharing' => false,
|
|
'topline_website' => 'full',
|
|
'topline_thumbnail' => 'none',
|
|
'topline_summary' => false,
|
|
'topline_display_authors' => false,
|
|
'topline_date' => true,
|
|
'topline_link' => true,
|
|
'bottomline_read' => true,
|
|
'bottomline_favorite' => true,
|
|
'bottomline_sharing' => true,
|
|
'bottomline_tags' => true,
|
|
'bottomline_myLabels' => true,
|
|
'bottomline_date' => true,
|
|
'bottomline_link' => true,
|
|
'sharing' => array (
|
|
),
|
|
'queries' => array (
|
|
),
|
|
'html5_notif_timeout' => 0,
|
|
'html5_enable_notif' => true,
|
|
'good_notification_timeout' => 3,
|
|
'bad_notification_timeout' => 8,
|
|
'show_nav_buttons' => true,
|
|
'sidebar_hidden_by_default' => false,
|
|
# List of enabled FreshRSS extensions.
|
|
'extensions_enabled' => [],
|
|
# Privacy settings
|
|
'retrieve_extension_list' => true,
|
|
'send_referrer_allowlist' => [],
|
|
# Extensions configurations
|
|
'extensions' => [],
|
|
);
|