From f1ac6dd5509c6aa9e1d99401c5e1a0b894d4e7b0 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 24 Jan 2019 20:44:45 +0100
Subject: Export/import articles read/unread state (#2226)

---
 app/views/helpers/export/articles.phtml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/views')

diff --git a/app/views/helpers/export/articles.phtml b/app/views/helpers/export/articles.phtml
index eb2cb0924..2d1fcd133 100644
--- a/app/views/helpers/export/articles.phtml
+++ b/app/views/helpers/export/articles.phtml
@@ -56,6 +56,7 @@ foreach ($this->entriesRaw as $entryRaw) {
 			'feedUrl' => $feed == null ? '' : $feed->url(),
 		)
 	);
+	$article['categories'][] = $entry->isRead() ? 'user/-/state/com.google/read' : 'user/-/state/com.google/unread';
 	if ($entry->isFavorite()) {
 		$article['categories'][] = 'user/-/state/com.google/starred';
 	}
-- 
cgit v1.2.3


From 8afc260e0999a0aa70f19cccf9700292403026f9 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 26 Jan 2019 15:44:01 +0100
Subject: i18n: oc fixes (#2231)

https://github.com/FreshRSS/FreshRSS/pull/2230
---
 app/i18n/oc/gen.php               | 6 +++---
 app/views/configure/display.phtml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/views')

diff --git a/app/i18n/oc/gen.php b/app/i18n/oc/gen.php
index 77ef14a16..168ea4732 100644
--- a/app/i18n/oc/gen.php
+++ b/app/i18n/oc/gen.php
@@ -56,8 +56,8 @@ return array(
 		'Feb' => '\\f\\e\\b\\r\\i\\è\\r',
 		'feb' => 'feb.',
 		'february' => 'febrièr',
-		'format_date' => 'j \\de %s \\de Y',
-		'format_date_hour' => 'j \\de %s \\de Y \\a H\:i',
+		'format_date' => 'j \\d\\e %s \\d\\e Y',
+		'format_date_hour' => 'j \\d\\e %s \\d\\e Y \\a H\:i',
 		'fri' => 'dv',
 		'Jan' => '\\g\\e\\n\\i\\è\\r',
 		'jan' => 'gen.',
@@ -183,7 +183,7 @@ return array(
 	'short' => array(
 		'attention' => 'Atencion !',
 		'blank_to_disable' => 'Daissar void per desactivar',
-		'by_author' => 'Per <em>%s</em>',
+		'by_author' => 'Per : ',
 		'by_default' => 'Per defaut',
 		'damn' => 'Zut !',
 		'default_category' => 'Pas triat',
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index c6c08e3bc..58c4e219a 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -72,7 +72,7 @@
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="theme"><?php echo _t('conf.display.icon.entry'); ?></label>
+			<label class="group-name"><?php echo _t('conf.display.icon.entry'); ?></label>
 			<table>
 				<thead>
 					<tr>
-- 
cgit v1.2.3