diff options
| -rw-r--r-- | include/localized_schema.php | 4 | ||||
| -rw-r--r-- | include/sanity_check.php | 2 | ||||
| -rw-r--r-- | schema/ttrss_schema_mysql.sql | 4 | ||||
| -rw-r--r-- | schema/ttrss_schema_pgsql.sql | 4 | ||||
| -rw-r--r-- | schema/versions/mysql/91.sql | 7 | ||||
| -rw-r--r-- | schema/versions/pgsql/91.sql | 7 |
6 files changed, 21 insertions, 7 deletions
diff --git a/include/localized_schema.php b/include/localized_schema.php index a13a7f58b..d370bdc43 100644 --- a/include/localized_schema.php +++ b/include/localized_schema.php @@ -1,4 +1,4 @@ -<?php # This file has been generated at: Mon Mar 12 13:59:27 MSK 2012 +<?php # This file has been generated at: Thu Mar 29 15:07:22 MSK 2012 __("Title"); __("Title or Content"); @@ -20,7 +20,7 @@ __("Advanced"); __('This option is useful when you are reading several planet-type aggregators with partially colliding userbase. When disabled, it forces same posts from different feeds to appear only once.'); __('Display expanded list of feed articles, instead of separate displays for headlines and article content'); -__('When "Mark as read" button is clicked in toolbar, automatically open next feed with unread articles.'); +__('Automatically open next feed with unread articles after marking one as read'); __('This option enables sending daily digest of new (and unread) headlines on your configured e-mail address'); __('This option enables marking articles as read automatically while you scroll article list.'); __('Strip all but most common HTML tags when reading articles.'); diff --git a/include/sanity_check.php b/include/sanity_check.php index d77be4201..2bb957827 100644 --- a/include/sanity_check.php +++ b/include/sanity_check.php @@ -6,7 +6,7 @@ } else { define('EXPECTED_CONFIG_VERSION', 25); - define('SCHEMA_VERSION', 90); + define('SCHEMA_VERSION', 91); require_once "config.php"; require_once "sanity_config.php"; diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql index 769922cff..c75d00862 100644 --- a/schema/ttrss_schema_mysql.sql +++ b/schema/ttrss_schema_mysql.sql @@ -260,7 +260,7 @@ create table ttrss_tags (id integer primary key auto_increment, create table ttrss_version (schema_version int not null) ENGINE=InnoDB DEFAULT CHARSET=UTF8; -insert into ttrss_version values (90); +insert into ttrss_version values (91); create table ttrss_enclosures (id integer primary key auto_increment, content_url text not null, @@ -324,7 +324,7 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('HIDE_READ_FEEDS', 1, 'false', 'Hide feeds with no unread messages',2); -insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('ON_CATCHUP_SHOW_NEXT_FEED', 1, 'false', 'On catchup show next feed',2, 'When "Mark as read" button is clicked in toolbar, automatically open next feed with unread articles.'); +insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('ON_CATCHUP_SHOW_NEXT_FEED', 1, 'false', 'On catchup show next feed',2, 'Automatically open next feed with unread articles after marking one as read'); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('FEEDS_SORT_BY_UNREAD', 1, 'false', 'Sort feeds by unread articles count',2); diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql index eddc5e8f0..2d3c963ca 100644 --- a/schema/ttrss_schema_pgsql.sql +++ b/schema/ttrss_schema_pgsql.sql @@ -229,7 +229,7 @@ create index ttrss_tags_post_int_id_idx on ttrss_tags(post_int_id); create table ttrss_version (schema_version int not null); -insert into ttrss_version values (90); +insert into ttrss_version values (91); create table ttrss_enclosures (id serial not null primary key, content_url text not null, @@ -286,7 +286,7 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('HIDE_READ_FEEDS', 1, 'false', 'Hide feeds with no unread messages',2); -insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('ON_CATCHUP_SHOW_NEXT_FEED', 1, 'false', 'On catchup show next feed',2, 'When "Mark as read" button is clicked in toolbar, automatically open next feed with unread articles.'); +insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('ON_CATCHUP_SHOW_NEXT_FEED', 1, 'false', 'On catchup show next feed',2, 'Automatically open next feed with unread articles after marking one as read'); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('FEEDS_SORT_BY_UNREAD', 1, 'false', 'Sort feeds by unread articles count',2); diff --git a/schema/versions/mysql/91.sql b/schema/versions/mysql/91.sql new file mode 100644 index 000000000..791d43063 --- /dev/null +++ b/schema/versions/mysql/91.sql @@ -0,0 +1,7 @@ +begin; + +update ttrss_prefs set help_text = 'Automatically open next feed with unread articles after marking one as read' where pref_name = 'ON_CATCHUP_SHOW_NEXT_FEED'; + +update ttrss_version set schema_version = 91; + +commit; diff --git a/schema/versions/pgsql/91.sql b/schema/versions/pgsql/91.sql new file mode 100644 index 000000000..791d43063 --- /dev/null +++ b/schema/versions/pgsql/91.sql @@ -0,0 +1,7 @@ +begin; + +update ttrss_prefs set help_text = 'Automatically open next feed with unread articles after marking one as read' where pref_name = 'ON_CATCHUP_SHOW_NEXT_FEED'; + +update ttrss_version set schema_version = 91; + +commit; |