From 22a866edb5ea406bbd30ca777b58099ce9f55d1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Kapp=C3=A9?= <tobias.kappe@gmail.com>
Date: Sun, 12 Aug 2018 14:54:13 +0100
Subject: Store language of entries as indicated by the feed.

---
 classes/feeditem/atom.php |  9 +++++++++
 classes/feeditem/rss.php  | 12 +++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

(limited to 'classes/feeditem')

diff --git a/classes/feeditem/atom.php b/classes/feeditem/atom.php
index 77cd448b8..6e7a904f8 100644
--- a/classes/feeditem/atom.php
+++ b/classes/feeditem/atom.php
@@ -197,4 +197,13 @@ class FeedItem_Atom extends FeedItem_Common {
 		return $encs;
 	}
 
+	function get_language() {
+		$elem = $this->elem;
+		do {
+			$lang = $elem->getAttributeNS("http://www.w3.org/XML/1998/namespace", "lang");
+			$elem = $elem->parentNode;
+		} while (empty($lang) && $elem instanceof DOMElement);
+
+		return $lang;
+	}
 }
diff --git a/classes/feeditem/rss.php b/classes/feeditem/rss.php
index a3fa7e636..dca125be6 100644
--- a/classes/feeditem/rss.php
+++ b/classes/feeditem/rss.php
@@ -189,4 +189,14 @@ class FeedItem_RSS extends FeedItem_Common {
 		return $encs;
 	}
 
-}
\ No newline at end of file
+	function get_language() {
+		$languages = $this->doc->getElementsByTagName('language');
+
+		if (count($languages) == 0) {
+			return "";
+		}
+
+		return $languages[0]->textContent;
+	}
+
+}
-- 
cgit v1.2.3


From a377d5c981471f86c0d0c121be799aa0868e220e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Kapp=C3=A9?= <tobias.kappe@gmail.com>
Date: Sun, 12 Aug 2018 16:17:13 +0100
Subject: Determine language for atom entry without a loop.

---
 classes/feeditem/atom.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'classes/feeditem')

diff --git a/classes/feeditem/atom.php b/classes/feeditem/atom.php
index 6e7a904f8..ee5591757 100644
--- a/classes/feeditem/atom.php
+++ b/classes/feeditem/atom.php
@@ -1,5 +1,6 @@
 <?php
 class FeedItem_Atom extends FeedItem_Common {
+	const NS_XML = "http://www.w3.org/XML/1998/namespace";
 
 	function get_id() {
 		$id = $this->elem->getElementsByTagName("id")->item(0);
@@ -198,12 +199,13 @@ class FeedItem_Atom extends FeedItem_Common {
 	}
 
 	function get_language() {
-		$elem = $this->elem;
-		do {
-			$lang = $elem->getAttributeNS("http://www.w3.org/XML/1998/namespace", "lang");
-			$elem = $elem->parentNode;
-		} while (empty($lang) && $elem instanceof DOMElement);
+		$lang = $this->elem->getAttributeNS(self::NS_XML, "lang");
 
-		return $lang;
+		if (!empty($lang)) {
+			return $lang;
+		} else {
+			// Fall back to the language declared on the feed, if any.
+			return $this->doc->firstChild->getAttributeNS(self::NS_XML, "lang");
+		}
 	}
 }
-- 
cgit v1.2.3