diff options
author | Andrew Dolgov <[email protected]> | 2015-06-19 10:12:47 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-06-19 10:12:47 +0300 |
commit | 3318d324105ee222a54afc94076878c12b588c24 (patch) | |
tree | a12222c9add62f165946cf6b03a6cd7e885350d8 /include | |
parent | 724e08f1c01bb60681616e3b1ddc14bc0648de3a (diff) |
move language detection to a plugin, remove config.php constant
Diffstat (limited to 'include')
-rw-r--r-- | include/functions.php | 2 | ||||
-rw-r--r-- | include/rssfuncs.php | 29 | ||||
-rw-r--r-- | include/sanity_config.php | 4 |
3 files changed, 7 insertions, 28 deletions
diff --git a/include/functions.php b/include/functions.php index edc196f31..5c10ac6ac 100644 --- a/include/functions.php +++ b/include/functions.php @@ -99,8 +99,6 @@ require_once "lib/accept-to-gettext.php"; require_once "lib/gettext/gettext.inc"; - require_once "lib/languagedetect/LanguageDetect.php"; - function startup_gettext() { # Get locale from Accept-Language header diff --git a/include/rssfuncs.php b/include/rssfuncs.php index 4efc843c4..7a3ea7402 100644 --- a/include/rssfuncs.php +++ b/include/rssfuncs.php @@ -443,13 +443,6 @@ $rss->init(); } - if (DETECT_ARTICLE_LANGUAGE) { - require_once "lib/languagedetect/LanguageDetect.php"; - - $lang = new Text_LanguageDetect(); - $lang->setNameMode(2); - } - // print_r($rss); $feed = db_escape_string($feed); @@ -645,21 +638,6 @@ print "\n"; } - $entry_language = ""; - - if (DETECT_ARTICLE_LANGUAGE) { - $entry_language = $lang->detect($entry_title . " " . $entry_content, 1); - - if (count($entry_language) > 0) { - $possible = array_keys($entry_language); - $entry_language = $possible[0]; - - _debug("detected language: $entry_language", $debug_enabled); - } else { - $entry_language = ""; - } - } - $entry_comments = $item->get_comments_url(); $entry_author = $item->get_author(); @@ -695,17 +673,19 @@ _debug("done collecting data.", $debug_enabled); - $result = db_query("SELECT id, content_hash FROM ttrss_entries + $result = db_query("SELECT id, content_hash, lang FROM ttrss_entries WHERE guid = '".db_escape_string($entry_guid)."' OR guid = '$entry_guid_hashed'"); if (db_num_rows($result) != 0) { $base_entry_id = db_fetch_result($result, 0, "id"); $entry_stored_hash = db_fetch_result($result, 0, "content_hash"); $article_labels = get_article_labels($base_entry_id, $owner_uid); + $entry_language = db_fetch_result($result, 0, "lang"); } else { $base_entry_id = false; $entry_stored_hash = ""; $article_labels = array(); + $entry_language = ""; } $article = array("owner_uid" => $owner_uid, // read only @@ -719,7 +699,7 @@ "author" => $entry_author, "force_catchup" => false, // ugly hack for the time being "score_modifier" => 0, // no previous value, plugin should recalculate score modifier based on content if needed - "language" => $entry_language, // read only + "language" => $entry_language, "feed" => array("id" => $feed, "fetch_url" => $fetch_url, "site_url" => $site_url) @@ -783,6 +763,7 @@ $entry_force_catchup = $article["force_catchup"]; $article_labels = $article["labels"]; $entry_score_modifier = (int) $article["score_modifier"]; + $entry_language = db_escape_string($article["language"]); if ($debug_enabled) { _debug("article labels:", $debug_enabled); diff --git a/include/sanity_config.php b/include/sanity_config.php index 6120e5fe0..eaa1668b7 100644 --- a/include/sanity_config.php +++ b/include/sanity_config.php @@ -1,3 +1,3 @@ -<?php # This file has been generated at: Tue Feb 3 14:45:46 MSK 2015 +<?php # This file has been generated at: Fri, Jun 19, 2015 10:11:43 AM define('GENERATED_CONFIG_CHECK', 26); -$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'FEED_CRYPT_KEY', 'SINGLE_USER_MODE', 'SIMPLE_UPDATE_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'FORCE_ARTICLE_PURGE', 'PUBSUBHUBBUB_HUB', 'PUBSUBHUBBUB_ENABLED', 'SPHINX_SERVER', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SESSION_CHECK_ADDRESS', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_SERVER', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'SMTP_SECURE', 'CHECK_FOR_UPDATES', 'DETECT_ARTICLE_LANGUAGE', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'LOG_DESTINATION', 'CONFIG_VERSION'); ?> +$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'FEED_CRYPT_KEY', 'SINGLE_USER_MODE', 'SIMPLE_UPDATE_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'FORCE_ARTICLE_PURGE', 'PUBSUBHUBBUB_HUB', 'PUBSUBHUBBUB_ENABLED', 'SPHINX_SERVER', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SESSION_CHECK_ADDRESS', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_SERVER', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'SMTP_SECURE', 'CHECK_FOR_UPDATES', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'LOG_DESTINATION', 'CONFIG_VERSION'); ?> |