From 3261b7bafbb8e7cd0003c0cfbf26e4d4a4b65def Mon Sep 17 00:00:00 2001 From: maTh <1645099+math-GH@users.noreply.github.com> Date: Thu, 18 Apr 2024 14:00:17 +0200 Subject: i18n improved: dotted path -> dot-notation (#6317) * dotted path -> dot-notation * dot-notation -> dot notation * rename json_dotpath => json_dotnotation * Update app/i18n/fr/sub.php Co-authored-by: Alexandre Alapetite * Update app/i18n/fr/sub.php Co-authored-by: Alexandre Alapetite * Update app/i18n/fr/sub.php Co-authored-by: Alexandre Alapetite * Update app/i18n/nl/sub.php Co-authored-by: Frans de Jonge * Update app/i18n/nl/sub.php Co-authored-by: Frans de Jonge * Update app/i18n/nl/sub.php Co-authored-by: Frans de Jonge * Update app/i18n/nl/sub.php Co-authored-by: Frans de Jonge * Rename corresponding class --------- Co-authored-by: Alexandre Alapetite Co-authored-by: Frans de Jonge --- app/Models/Feed.php | 2 +- app/Utils/dotNotationUtil.php | 205 ++++++++++++++++++++++++++++++++++++ app/Utils/dotpathUtil.php | 204 ----------------------------------- app/i18n/cz/sub.php | 10 +- app/i18n/de/sub.php | 10 +- app/i18n/el/sub.php | 10 +- app/i18n/en-us/sub.php | 10 +- app/i18n/en/sub.php | 10 +- app/i18n/es/sub.php | 10 +- app/i18n/fa/sub.php | 10 +- app/i18n/fr/sub.php | 10 +- app/i18n/he/sub.php | 10 +- app/i18n/hu/sub.php | 10 +- app/i18n/id/sub.php | 10 +- app/i18n/it/sub.php | 10 +- app/i18n/ja/sub.php | 10 +- app/i18n/ko/sub.php | 10 +- app/i18n/lv/sub.php | 10 +- app/i18n/nl/sub.php | 10 +- app/i18n/oc/sub.php | 10 +- app/i18n/pl/sub.php | 10 +- app/i18n/pt-br/sub.php | 10 +- app/i18n/ru/sub.php | 10 +- app/i18n/sk/sub.php | 10 +- app/i18n/tr/sub.php | 10 +- app/i18n/zh-cn/sub.php | 10 +- app/i18n/zh-tw/sub.php | 10 +- app/views/helpers/feed/update.phtml | 2 +- app/views/subscription/add.phtml | 2 +- 29 files changed, 328 insertions(+), 327 deletions(-) create mode 100644 app/Utils/dotNotationUtil.php delete mode 100644 app/Utils/dotpathUtil.php (limited to 'app') diff --git a/app/Models/Feed.php b/app/Models/Feed.php index cde0a91b8..ac2b2554f 100644 --- a/app/Models/Feed.php +++ b/app/Models/Feed.php @@ -666,7 +666,7 @@ class FreshRSS_Feed extends Minz_Model { $json_dotpath = $this->attributeArray('json_dotpath') ?? []; $dotPaths = $this->kind() === FreshRSS_Feed::KIND_JSONFEED ? $this->dotPathsForStandardJsonFeed() : $json_dotpath; - $feedContent = FreshRSS_dotpath_Util::convertJsonToRss($jf, $feedSourceUrl, $dotPaths, $this->name()); + $feedContent = FreshRSS_dotNotation_Util::convertJsonToRss($jf, $feedSourceUrl, $dotPaths, $this->name()); if ($feedContent == null) { return null; } diff --git a/app/Utils/dotNotationUtil.php b/app/Utils/dotNotationUtil.php new file mode 100644 index 000000000..8ec20d349 --- /dev/null +++ b/app/Utils/dotNotationUtil.php @@ -0,0 +1,205 @@ +|array|mixed $array + * @param string|null $key + * @param mixed $default + * @return mixed + */ + public static function get($array, ?string $key, mixed $default = null) { + if (!static::accessible($array)) { + return static::value($default); + } + /** @var \ArrayAccess|array $array */ + if ($key === null || $key === '') { + return $array; + } + + // Compatibility with brackets path such as `items[0].value` + $key = preg_replace('/\[(\d+)\]/', '.$1', $key); + if ($key === null) { + return null; + } + + if (static::exists($array, $key)) { + return $array[$key]; + } + if (strpos($key, '.') === false) { + return $array[$key] ?? static::value($default); + } + foreach (explode('.', $key) as $segment) { + if (static::accessible($array) && static::exists($array, $segment)) { + $array = $array[$segment]; + } else { + return static::value($default); + } + } + return $array; + } + + /** + * Get a string from an array using "dot" notation. + * + * @param \ArrayAccess|array|mixed $array + * @param string|null $key + */ + public static function getString($array, ?string $key): ?string { + $result = self::get($array, $key, null); + return is_string($result) ? $result : null; + } + + /** + * Determine whether the given value is array accessible. + * + * @param mixed $value + * @return bool + */ + private static function accessible($value): bool { + return is_array($value) || $value instanceof \ArrayAccess; + } + + /** + * Determine if the given key exists in the provided array. + * + * @param \ArrayAccess|array|mixed $array + * @param string $key + * @return bool + */ + private static function exists($array, string $key): bool { + if ($array instanceof \ArrayAccess) { + return $array->offsetExists($key); + } + if (is_array($array)) { + return array_key_exists($key, $array); + } + return false; + } + + /** @param mixed $value */ + private static function value($value): mixed { + return $value instanceof Closure ? $value() : $value; + } + + /** + * Convert a JSON object to a RSS document + * mapping fields from the JSON object into RSS equivalents + * according to the dot-separated paths + * + * @param array $jf json feed + * @param string $feedSourceUrl the source URL for the feed + * @param array $dotPaths dot paths to map JSON into RSS + * @param string $defaultRssTitle Default title of the RSS feed, if not already provided in dotPath `feedTitle` + */ + public static function convertJsonToRss(array $jf, string $feedSourceUrl, array $dotPaths, string $defaultRssTitle = ''): ?string { + if (!isset($dotPaths['item']) || $dotPaths['item'] === '') { + return null; //no definition of item path, but we can't scrape anything without knowing this + } + + $view = new FreshRSS_View(); + $view->_path('index/rss.phtml'); + $view->internal_rendering = true; + $view->rss_url = htmlspecialchars($feedSourceUrl, ENT_COMPAT, 'UTF-8'); + $view->html_url = $view->rss_url; + $view->entries = []; + + $view->rss_title = isset($dotPaths['feedTitle']) + ? (htmlspecialchars(FreshRSS_dotNotation_Util::getString($jf, $dotPaths['feedTitle']) ?? '', ENT_COMPAT, 'UTF-8') ?: $defaultRssTitle) + : $defaultRssTitle; + + $jsonItems = FreshRSS_dotNotation_Util::get($jf, $dotPaths['item']); + if (!is_array($jsonItems) || count($jsonItems) === 0) { + return null; + } + + foreach ($jsonItems as $jsonItem) { + $rssItem = []; + $rssItem['link'] = isset($dotPaths['itemUri']) ? FreshRSS_dotNotation_Util::getString($jsonItem, $dotPaths['itemUri']) ?? '' : ''; + if (empty($rssItem['link'])) { + continue; + } + $rssItem['title'] = isset($dotPaths['itemTitle']) ? FreshRSS_dotNotation_Util::getString($jsonItem, $dotPaths['itemTitle']) ?? '' : ''; + $rssItem['author'] = isset($dotPaths['itemAuthor']) ? FreshRSS_dotNotation_Util::getString($jsonItem, $dotPaths['itemAuthor']) ?? '' : ''; + $rssItem['timestamp'] = isset($dotPaths['itemTimestamp']) ? FreshRSS_dotNotation_Util::getString($jsonItem, $dotPaths['itemTimestamp']) ?? '' : ''; + + //get simple content, but if a path for HTML content has been provided, replace the simple content with HTML content + $rssItem['content'] = isset($dotPaths['itemContent']) ? FreshRSS_dotNotation_Util::getString($jsonItem, $dotPaths['itemContent']) ?? '' : ''; + $rssItem['content'] = isset($dotPaths['itemContentHTML']) + ? FreshRSS_dotNotation_Util::getString($jsonItem, $dotPaths['itemContentHTML']) ?? '' + : $rssItem['content']; + + if (isset($dotPaths['itemTimeFormat']) && is_string($dotPaths['itemTimeFormat'])) { + $dateTime = DateTime::createFromFormat($dotPaths['itemTimeFormat'], $rssItem['timestamp']); + if ($dateTime != false) { + $rssItem['timestamp'] = $dateTime->format(DateTime::ATOM); + } + } + + if (isset($dotPaths['itemCategories'])) { + $jsonItemCategories = FreshRSS_dotNotation_Util::get($jsonItem, $dotPaths['itemCategories']); + if (is_string($jsonItemCategories) && $jsonItemCategories !== '') { + $rssItem['tags'] = [$jsonItemCategories]; + } elseif (is_array($jsonItemCategories) && count($jsonItemCategories) > 0) { + $rssItem['tags'] = []; + foreach ($jsonItemCategories as $jsonItemCategory) { + if (is_string($jsonItemCategory)) { + $rssItem['tags'][] = $jsonItemCategory; + } + } + } + } + + $rssItem['thumbnail'] = isset($dotPaths['itemThumbnail']) ? FreshRSS_dotNotation_Util::getString($jsonItem, $dotPaths['itemThumbnail']) ?? '' : ''; + + //Enclosures? + if (isset($dotPaths['itemAttachment'])) { + $jsonItemAttachments = FreshRSS_dotNotation_Util::get($jsonItem, $dotPaths['itemAttachment']); + if (is_array($jsonItemAttachments) && count($jsonItemAttachments) > 0) { + $rssItem['attachments'] = []; + foreach ($jsonItemAttachments as $attachment) { + $rssAttachment = []; + $rssAttachment['url'] = isset($dotPaths['itemAttachmentUrl']) + ? FreshRSS_dotNotation_Util::getString($attachment, $dotPaths['itemAttachmentUrl']) + : ''; + $rssAttachment['type'] = isset($dotPaths['itemAttachmentType']) + ? FreshRSS_dotNotation_Util::getString($attachment, $dotPaths['itemAttachmentType']) + : ''; + $rssAttachment['length'] = isset($dotPaths['itemAttachmentLength']) + ? FreshRSS_dotNotation_Util::get($attachment, $dotPaths['itemAttachmentLength']) + : ''; + $rssItem['attachments'][] = $rssAttachment; + } + } + } + + if (isset($dotPaths['itemUid'])) { + $rssItem['guid'] = FreshRSS_dotNotation_Util::getString($jsonItem, $dotPaths['itemUid']); + } + + if (empty($rssItem['guid'])) { + $rssItem['guid'] = 'urn:sha1:' . sha1($rssItem['title'] . $rssItem['content'] . $rssItem['link']); + } + + if ($rssItem['title'] != '' || $rssItem['content'] != '' || $rssItem['link'] != '') { + // HTML-encoding/escaping of the relevant fields (all except 'content') + foreach (['author', 'guid', 'link', 'thumbnail', 'timestamp', 'tags', 'title'] as $key) { + if (!empty($rssItem[$key]) && is_string($rssItem[$key])) { + $rssItem[$key] = Minz_Helper::htmlspecialchars_utf8($rssItem[$key]); + } + } + $view->entries[] = FreshRSS_Entry::fromArray($rssItem); + } + } + + return $view->renderToString(); + } +} diff --git a/app/Utils/dotpathUtil.php b/app/Utils/dotpathUtil.php deleted file mode 100644 index 939434c5a..000000000 --- a/app/Utils/dotpathUtil.php +++ /dev/null @@ -1,204 +0,0 @@ -|array|mixed $array - * @param string|null $key - * @param mixed $default - * @return mixed - */ - public static function get($array, ?string $key, mixed $default = null) { - if (!static::accessible($array)) { - return static::value($default); - } - /** @var \ArrayAccess|array $array */ - if ($key === null || $key === '') { - return $array; - } - - // Compatibility with brackets path such as `items[0].value` - $key = preg_replace('/\[(\d+)\]/', '.$1', $key); - if ($key === null) { - return null; - } - - if (static::exists($array, $key)) { - return $array[$key]; - } - if (strpos($key, '.') === false) { - return $array[$key] ?? static::value($default); - } - foreach (explode('.', $key) as $segment) { - if (static::accessible($array) && static::exists($array, $segment)) { - $array = $array[$segment]; - } else { - return static::value($default); - } - } - return $array; - } - - /** - * Get a string from an array using "dot" notation. - * - * @param \ArrayAccess|array|mixed $array - * @param string|null $key - */ - public static function getString($array, ?string $key): ?string { - $result = self::get($array, $key, null); - return is_string($result) ? $result : null; - } - - /** - * Determine whether the given value is array accessible. - * - * @param mixed $value - * @return bool - */ - private static function accessible($value): bool { - return is_array($value) || $value instanceof \ArrayAccess; - } - - /** - * Determine if the given key exists in the provided array. - * - * @param \ArrayAccess|array|mixed $array - * @param string $key - * @return bool - */ - private static function exists($array, string $key): bool { - if ($array instanceof \ArrayAccess) { - return $array->offsetExists($key); - } - if (is_array($array)) { - return array_key_exists($key, $array); - } - return false; - } - - /** @param mixed $value */ - private static function value($value): mixed { - return $value instanceof Closure ? $value() : $value; - } - - /** - * Convert a JSON object to a RSS document - * mapping fields from the JSON object into RSS equivalents - * according to the dot-separated paths - * - * @param array $jf json feed - * @param string $feedSourceUrl the source URL for the feed - * @param array $dotPaths dot paths to map JSON into RSS - * @param string $defaultRssTitle Default title of the RSS feed, if not already provided in dotPath `feedTitle` - */ - public static function convertJsonToRss(array $jf, string $feedSourceUrl, array $dotPaths, string $defaultRssTitle = ''): ?string { - if (!isset($dotPaths['item']) || $dotPaths['item'] === '') { - return null; //no definition of item path, but we can't scrape anything without knowing this - } - - $view = new FreshRSS_View(); - $view->_path('index/rss.phtml'); - $view->internal_rendering = true; - $view->rss_url = htmlspecialchars($feedSourceUrl, ENT_COMPAT, 'UTF-8'); - $view->html_url = $view->rss_url; - $view->entries = []; - - $view->rss_title = isset($dotPaths['feedTitle']) - ? (htmlspecialchars(FreshRSS_dotpath_Util::getString($jf, $dotPaths['feedTitle']) ?? '', ENT_COMPAT, 'UTF-8') ?: $defaultRssTitle) - : $defaultRssTitle; - - $jsonItems = FreshRSS_dotpath_Util::get($jf, $dotPaths['item']); - if (!is_array($jsonItems) || count($jsonItems) === 0) { - return null; - } - - foreach ($jsonItems as $jsonItem) { - $rssItem = []; - $rssItem['link'] = isset($dotPaths['itemUri']) ? FreshRSS_dotpath_Util::getString($jsonItem, $dotPaths['itemUri']) ?? '' : ''; - if (empty($rssItem['link'])) { - continue; - } - $rssItem['title'] = isset($dotPaths['itemTitle']) ? FreshRSS_dotpath_Util::getString($jsonItem, $dotPaths['itemTitle']) ?? '' : ''; - $rssItem['author'] = isset($dotPaths['itemAuthor']) ? FreshRSS_dotpath_Util::getString($jsonItem, $dotPaths['itemAuthor']) ?? '' : ''; - $rssItem['timestamp'] = isset($dotPaths['itemTimestamp']) ? FreshRSS_dotpath_Util::getString($jsonItem, $dotPaths['itemTimestamp']) ?? '' : ''; - - //get simple content, but if a path for HTML content has been provided, replace the simple content with HTML content - $rssItem['content'] = isset($dotPaths['itemContent']) ? FreshRSS_dotpath_Util::getString($jsonItem, $dotPaths['itemContent']) ?? '' : ''; - $rssItem['content'] = isset($dotPaths['itemContentHTML']) - ? FreshRSS_dotpath_Util::getString($jsonItem, $dotPaths['itemContentHTML']) ?? '' - : $rssItem['content']; - - if (isset($dotPaths['itemTimeFormat']) && is_string($dotPaths['itemTimeFormat'])) { - $dateTime = DateTime::createFromFormat($dotPaths['itemTimeFormat'], $rssItem['timestamp']); - if ($dateTime != false) { - $rssItem['timestamp'] = $dateTime->format(DateTime::ATOM); - } - } - - if (isset($dotPaths['itemCategories'])) { - $jsonItemCategories = FreshRSS_dotpath_Util::get($jsonItem, $dotPaths['itemCategories']); - if (is_string($jsonItemCategories) && $jsonItemCategories !== '') { - $rssItem['tags'] = [$jsonItemCategories]; - } elseif (is_array($jsonItemCategories) && count($jsonItemCategories) > 0) { - $rssItem['tags'] = []; - foreach ($jsonItemCategories as $jsonItemCategory) { - if (is_string($jsonItemCategory)) { - $rssItem['tags'][] = $jsonItemCategory; - } - } - } - } - - $rssItem['thumbnail'] = isset($dotPaths['itemThumbnail']) ? FreshRSS_dotpath_Util::getString($jsonItem, $dotPaths['itemThumbnail']) ?? '' : ''; - - //Enclosures? - if (isset($dotPaths['itemAttachment'])) { - $jsonItemAttachments = FreshRSS_dotpath_Util::get($jsonItem, $dotPaths['itemAttachment']); - if (is_array($jsonItemAttachments) && count($jsonItemAttachments) > 0) { - $rssItem['attachments'] = []; - foreach ($jsonItemAttachments as $attachment) { - $rssAttachment = []; - $rssAttachment['url'] = isset($dotPaths['itemAttachmentUrl']) - ? FreshRSS_dotpath_Util::getString($attachment, $dotPaths['itemAttachmentUrl']) - : ''; - $rssAttachment['type'] = isset($dotPaths['itemAttachmentType']) - ? FreshRSS_dotpath_Util::getString($attachment, $dotPaths['itemAttachmentType']) - : ''; - $rssAttachment['length'] = isset($dotPaths['itemAttachmentLength']) - ? FreshRSS_dotpath_Util::get($attachment, $dotPaths['itemAttachmentLength']) - : ''; - $rssItem['attachments'][] = $rssAttachment; - } - } - } - - if (isset($dotPaths['itemUid'])) { - $rssItem['guid'] = FreshRSS_dotpath_Util::getString($jsonItem, $dotPaths['itemUid']); - } - - if (empty($rssItem['guid'])) { - $rssItem['guid'] = 'urn:sha1:' . sha1($rssItem['title'] . $rssItem['content'] . $rssItem['link']); - } - - if ($rssItem['title'] != '' || $rssItem['content'] != '' || $rssItem['link'] != '') { - // HTML-encoding/escaping of the relevant fields (all except 'content') - foreach (['author', 'guid', 'link', 'thumbnail', 'timestamp', 'tags', 'title'] as $key) { - if (!empty($rssItem[$key]) && is_string($rssItem[$key])) { - $rssItem[$key] = Minz_Helper::htmlspecialchars_utf8($rssItem[$key]); - } - } - $view->entries[] = FreshRSS_Entry::fromArray($rssItem); - } - } - - return $view->renderToString(); - } -} diff --git a/app/i18n/cz/sub.php b/app/i18n/cz/sub.php index 08eadaf58..51f735164 100644 --- a/app/i18n/cz/sub.php +++ b/app/i18n/cz/sub.php @@ -126,13 +126,13 @@ return array( 'relative' => 'XPath (vzhledem k položce) pro:', 'xpath' => 'XPath pro:', ), - 'json_dotpath' => array( - '_' => 'JSON (Dotted paths)', // TODO + 'json_dotnotation' => array( + '_' => 'JSON (dot notation)', // TODO 'feed_title' => array( '_' => 'feed title', // TODO 'help' => 'Example: meta.title or a static string: "My custom feed"', // TODO ), - 'help' => 'A JSON dotted path uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO + 'help' => 'A JSON dot notated uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO 'item' => array( '_' => 'finding news items
(most important)', // TODO 'help' => 'JSON path to the array containing the items, e.g. newsItems', // TODO @@ -161,8 +161,8 @@ return array( '_' => 'item link (URL)', // TODO 'help' => 'Example: permalink', // TODO ), - 'json' => 'Dotted Path for:', // TODO - 'relative' => 'Dotted Path (relative to item) for:', // TODO + 'json' => 'dot notation for:', // TODO + 'relative' => 'dot notated path (relative to item) for:', // TODO ), 'jsonfeed' => 'JSON Feed', // TODO 'rss' => 'RSS / Atom (výchozí)', diff --git a/app/i18n/de/sub.php b/app/i18n/de/sub.php index 6d609226e..ac10abb64 100644 --- a/app/i18n/de/sub.php +++ b/app/i18n/de/sub.php @@ -126,13 +126,13 @@ return array( 'relative' => 'XPath (relativ zum Artikel) für:', 'xpath' => 'XPath für:', ), - 'json_dotpath' => array( - '_' => 'JSON (Dotted paths)', // TODO + 'json_dotnotation' => array( + '_' => 'JSON (dot notation)', // TODO 'feed_title' => array( '_' => 'feed title', // TODO 'help' => 'Example: meta.title or a static string: "My custom feed"', // TODO ), - 'help' => 'A JSON dotted path uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO + 'help' => 'A JSON dot notated uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO 'item' => array( '_' => 'finding news items
(most important)', // TODO 'help' => 'JSON path to the array containing the items, e.g. newsItems', // TODO @@ -161,8 +161,8 @@ return array( '_' => 'item link (URL)', // TODO 'help' => 'Example: permalink', // TODO ), - 'json' => 'Dotted Path for:', // TODO - 'relative' => 'Dotted Path (relative to item) for:', // TODO + 'json' => 'dot notation for:', // TODO + 'relative' => 'dot notated path (relative to item) for:', // TODO ), 'jsonfeed' => 'JSON Feed', // TODO 'rss' => 'RSS / Atom (Standard)', diff --git a/app/i18n/el/sub.php b/app/i18n/el/sub.php index f3964717c..5f16ca1bd 100644 --- a/app/i18n/el/sub.php +++ b/app/i18n/el/sub.php @@ -126,13 +126,13 @@ return array( 'relative' => 'XPath (relative to item) for:', // TODO 'xpath' => 'XPath for:', // TODO ), - 'json_dotpath' => array( - '_' => 'JSON (Dotted paths)', // TODO + 'json_dotnotation' => array( + '_' => 'JSON (dot notation)', // TODO 'feed_title' => array( '_' => 'feed title', // TODO 'help' => 'Example: meta.title or a static string: "My custom feed"', // TODO ), - 'help' => 'A JSON dotted path uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO + 'help' => 'A JSON dot notated uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO 'item' => array( '_' => 'finding news items
(most important)', // TODO 'help' => 'JSON path to the array containing the items, e.g. newsItems', // TODO @@ -161,8 +161,8 @@ return array( '_' => 'item link (URL)', // TODO 'help' => 'Example: permalink', // TODO ), - 'json' => 'Dotted Path for:', // TODO - 'relative' => 'Dotted Path (relative to item) for:', // TODO + 'json' => 'dot notation for:', // TODO + 'relative' => 'dot notated path (relative to item) for:', // TODO ), 'jsonfeed' => 'JSON Feed', // TODO 'rss' => 'RSS / Atom (default)', // TODO diff --git a/app/i18n/en-us/sub.php b/app/i18n/en-us/sub.php index 5b890475c..a8bf2be95 100644 --- a/app/i18n/en-us/sub.php +++ b/app/i18n/en-us/sub.php @@ -126,13 +126,13 @@ return array( 'relative' => 'XPath (relative to item) for:', // IGNORE 'xpath' => 'XPath for:', // IGNORE ), - 'json_dotpath' => array( - '_' => 'JSON (Dotted paths)', // IGNORE + 'json_dotnotation' => array( + '_' => 'JSON (dot notation)', // IGNORE 'feed_title' => array( '_' => 'feed title', // IGNORE 'help' => 'Example: meta.title or a static string: "My custom feed"', // IGNORE ), - 'help' => 'A JSON dotted path uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // IGNORE + 'help' => 'A JSON dot notated uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // IGNORE 'item' => array( '_' => 'finding news items
(most important)', // IGNORE 'help' => 'JSON path to the array containing the items, e.g. newsItems', // IGNORE @@ -161,8 +161,8 @@ return array( '_' => 'item link (URL)', // IGNORE 'help' => 'Example: permalink', // IGNORE ), - 'json' => 'Dotted Path for:', // IGNORE - 'relative' => 'Dotted Path (relative to item) for:', // IGNORE + 'json' => 'dot notation for:', // IGNORE + 'relative' => 'dot notated path (relative to item) for:', // IGNORE ), 'jsonfeed' => 'JSON Feed', // IGNORE 'rss' => 'RSS / Atom (default)', // IGNORE diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php index ae67721c0..cd3c0ad2f 100644 --- a/app/i18n/en/sub.php +++ b/app/i18n/en/sub.php @@ -126,13 +126,13 @@ return array( 'relative' => 'XPath (relative to item) for:', 'xpath' => 'XPath for:', ), - 'json_dotpath' => array( - '_' => 'JSON (Dotted paths)', + 'json_dotnotation' => array( + '_' => 'JSON (dot notation)', 'feed_title' => array( '_' => 'feed title', 'help' => 'Example: meta.title or a static string: "My custom feed"', ), - 'help' => 'A JSON dotted path uses dots between objects and brackets for arrays (e.g. data.items[0].title)', + 'help' => 'A JSON dot notated uses dots between objects and brackets for arrays (e.g. data.items[0].title)', 'item' => array( '_' => 'finding news items
(most important)', 'help' => 'JSON path to the array containing the items, e.g. newsItems', @@ -161,8 +161,8 @@ return array( '_' => 'item link (URL)', 'help' => 'Example: permalink', ), - 'json' => 'Dotted Path for:', - 'relative' => 'Dotted Path (relative to item) for:', + 'json' => 'dot notation for:', + 'relative' => 'dot notated path (relative to item) for:', ), 'jsonfeed' => 'JSON Feed', 'rss' => 'RSS / Atom (default)', diff --git a/app/i18n/es/sub.php b/app/i18n/es/sub.php index c96230ce8..37ac168bb 100644 --- a/app/i18n/es/sub.php +++ b/app/i18n/es/sub.php @@ -126,13 +126,13 @@ return array( 'relative' => 'XPath (relativo al elemento) para:', 'xpath' => 'XPath para:', ), - 'json_dotpath' => array( - '_' => 'JSON (Dotted paths)', // TODO + 'json_dotnotation' => array( + '_' => 'JSON (dot notation)', // TODO 'feed_title' => array( '_' => 'feed title', // TODO 'help' => 'Example: meta.title or a static string: "My custom feed"', // TODO ), - 'help' => 'A JSON dotted path uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO + 'help' => 'A JSON dot notated uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO 'item' => array( '_' => 'finding news items
(most important)', // TODO 'help' => 'JSON path to the array containing the items, e.g. newsItems', // TODO @@ -161,8 +161,8 @@ return array( '_' => 'item link (URL)', // TODO 'help' => 'Example: permalink', // TODO ), - 'json' => 'Dotted Path for:', // TODO - 'relative' => 'Dotted Path (relative to item) for:', // TODO + 'json' => 'dot notation for:', // TODO + 'relative' => 'dot notated path (relative to item) for:', // TODO ), 'jsonfeed' => 'JSON Feed', // TODO 'rss' => 'RSS / Atom (por defecto)', diff --git a/app/i18n/fa/sub.php b/app/i18n/fa/sub.php index 78ee9faba..eb1299486 100644 --- a/app/i18n/fa/sub.php +++ b/app/i18n/fa/sub.php @@ -126,13 +126,13 @@ return array( 'relative' => 'XPath (نسبت به مورد) برای:', 'xpath' => ' XPath برای:', ), - 'json_dotpath' => array( - '_' => 'JSON (Dotted paths)', // TODO + 'json_dotnotation' => array( + '_' => 'JSON (dot notation)', // TODO 'feed_title' => array( '_' => 'feed title', // TODO 'help' => 'Example: meta.title or a static string: "My custom feed"', // TODO ), - 'help' => 'A JSON dotted path uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO + 'help' => 'A JSON dot notated uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO 'item' => array( '_' => 'finding news items
(most important)', // TODO 'help' => 'JSON path to the array containing the items, e.g. newsItems', // TODO @@ -161,8 +161,8 @@ return array( '_' => 'item link (URL)', // TODO 'help' => 'Example: permalink', // TODO ), - 'json' => 'Dotted Path for:', // TODO - 'relative' => 'Dotted Path (relative to item) for:', // TODO + 'json' => 'dot notation for:', // TODO + 'relative' => 'dot notated path (relative to item) for:', // TODO ), 'jsonfeed' => 'JSON Feed', // TODO 'rss' => ' RSS / Atom (پیش‌فرض)', diff --git a/app/i18n/fr/sub.php b/app/i18n/fr/sub.php index 7c0d56122..5f21f781e 100644 --- a/app/i18n/fr/sub.php +++ b/app/i18n/fr/sub.php @@ -126,13 +126,13 @@ return array( 'relative' => 'XPath (relatif à l’article) pour :', 'xpath' => 'XPath pour :', ), - 'json_dotpath' => array( - '_' => 'JSON (Chemin)', + 'json_dotnotation' => array( + '_' => 'JSON (notation point)', 'feed_title' => array( '_' => 'titre de flux', 'help' => 'Exemple : meta.title ou un texte statique : "Mon flux personnalisé"', ), - 'help' => 'Un chemin JSON utilise le point comme séparateur objet, et des crochets pour un tableau : (ex : data.items[0].title)', + 'help' => 'La notation point pour JSON utilise le point comme séparateur objet, et des crochets pour un tableau : (ex : data.items[0].title)', 'item' => array( '_' => 'trouver les articles
(c’est le plus important)', 'help' => 'Chemin vers le tableau contenant les articles, par exemple newsItems', @@ -161,8 +161,8 @@ return array( '_' => 'lien (URL) de l’article', 'help' => 'Exemple : permalink', ), - 'json' => 'Chemin JSON pour :', - 'relative' => 'Chemin relatif à l’article pour :', + 'json' => 'notation point pour :', + 'relative' => 'notation point relative à l’article pour :', ), 'jsonfeed' => 'JSON Feed', // IGNORE 'rss' => 'RSS / Atom (par défaut)', diff --git a/app/i18n/he/sub.php b/app/i18n/he/sub.php index 054be5858..e7c218076 100644 --- a/app/i18n/he/sub.php +++ b/app/i18n/he/sub.php @@ -126,13 +126,13 @@ return array( 'relative' => 'XPath (relative to item) for:', // TODO 'xpath' => 'XPath for:', // TODO ), - 'json_dotpath' => array( - '_' => 'JSON (Dotted paths)', // TODO + 'json_dotnotation' => array( + '_' => 'JSON (dot notation)', // TODO 'feed_title' => array( '_' => 'feed title', // TODO 'help' => 'Example: meta.title or a static string: "My custom feed"', // TODO ), - 'help' => 'A JSON dotted path uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO + 'help' => 'A JSON dot notated uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO 'item' => array( '_' => 'finding news items
(most important)', // TODO 'help' => 'JSON path to the array containing the items, e.g. newsItems', // TODO @@ -161,8 +161,8 @@ return array( '_' => 'item link (URL)', // TODO 'help' => 'Example: permalink', // TODO ), - 'json' => 'Dotted Path for:', // TODO - 'relative' => 'Dotted Path (relative to item) for:', // TODO + 'json' => 'dot notation for:', // TODO + 'relative' => 'dot notated path (relative to item) for:', // TODO ), 'jsonfeed' => 'JSON Feed', // TODO 'rss' => 'RSS / Atom (default)', // TODO diff --git a/app/i18n/hu/sub.php b/app/i18n/hu/sub.php index 7234cbf0e..2b5f8280c 100644 --- a/app/i18n/hu/sub.php +++ b/app/i18n/hu/sub.php @@ -126,13 +126,13 @@ return array( 'relative' => 'XPath (az elemhez viszonyítva) ehhez:', 'xpath' => 'XPath ehhez:', ), - 'json_dotpath' => array( - '_' => 'JSON (Dotted paths)', // TODO + 'json_dotnotation' => array( + '_' => 'JSON (dot notation)', // TODO 'feed_title' => array( '_' => 'feed title', // TODO 'help' => 'Example: meta.title or a static string: "My custom feed"', // TODO ), - 'help' => 'A JSON dotted path uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO + 'help' => 'A JSON dot notated uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO 'item' => array( '_' => 'finding news items
(most important)', // TODO 'help' => 'JSON path to the array containing the items, e.g. newsItems', // TODO @@ -161,8 +161,8 @@ return array( '_' => 'item link (URL)', // TODO 'help' => 'Example: permalink', // TODO ), - 'json' => 'Dotted Path for:', // TODO - 'relative' => 'Dotted Path (relative to item) for:', // TODO + 'json' => 'dot notation for:', // TODO + 'relative' => 'dot notated path (relative to item) for:', // TODO ), 'jsonfeed' => 'JSON Feed', // TODO 'rss' => 'RSS / Atom (alapértelmezett)', diff --git a/app/i18n/id/sub.php b/app/i18n/id/sub.php index 14b6cc644..7edd6b6fb 100644 --- a/app/i18n/id/sub.php +++ b/app/i18n/id/sub.php @@ -126,13 +126,13 @@ return array( 'relative' => 'XPath (relative to item) for:', // TODO 'xpath' => 'XPath for:', // TODO ), - 'json_dotpath' => array( - '_' => 'JSON (Dotted paths)', // TODO + 'json_dotnotation' => array( + '_' => 'JSON (dot notation)', // TODO 'feed_title' => array( '_' => 'feed title', // TODO 'help' => 'Example: meta.title or a static string: "My custom feed"', // TODO ), - 'help' => 'A JSON dotted path uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO + 'help' => 'A JSON dot notated uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO 'item' => array( '_' => 'finding news items
(most important)', // TODO 'help' => 'JSON path to the array containing the items, e.g. newsItems', // TODO @@ -161,8 +161,8 @@ return array( '_' => 'item link (URL)', // TODO 'help' => 'Example: permalink', // TODO ), - 'json' => 'Dotted Path for:', // TODO - 'relative' => 'Dotted Path (relative to item) for:', // TODO + 'json' => 'dot notation for:', // TODO + 'relative' => 'dot notated path (relative to item) for:', // TODO ), 'jsonfeed' => 'JSON Feed', // TODO 'rss' => 'RSS / Atom (default)', // TODO diff --git a/app/i18n/it/sub.php b/app/i18n/it/sub.php index 5060a412b..f5d4e4ea1 100644 --- a/app/i18n/it/sub.php +++ b/app/i18n/it/sub.php @@ -126,13 +126,13 @@ return array( 'relative' => 'XPath (relativo all’oggetto) per:', 'xpath' => 'XPath per:', ), - 'json_dotpath' => array( - '_' => 'JSON (path con i punti)', + 'json_dotnotation' => array( + '_' => 'JSON (dot notation)', // TODO 'feed_title' => array( '_' => 'titolo feed', 'help' => 'Esempio: meta.title o una stringa statica: "Il mio feed personalizzato"', ), - 'help' => 'Un JSON con le path divise da punti usa dei punti fra gli oggetti e le parentesi per gli array. (es. data.items[0].title)', + 'help' => 'A JSON dot notated uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO 'item' => array( '_' => 'ricerca nuovi elementi
(più importante)', 'help' => 'percorso JSON per l’array contenente gli elementi, es. newsItems', @@ -161,8 +161,8 @@ return array( '_' => 'link elemento (URL)', 'help' => 'Esempio: permalink', ), - 'json' => 'Percorso con i punti per:', - 'relative' => 'Percorso con i punti (relativo all’elemento) per:', + 'json' => 'dot notation for:', // TODO + 'relative' => 'dot notated path (relative to item) for:', // TODO ), 'jsonfeed' => 'Feed JSON', 'rss' => 'RSS / Atom (predefinito)', diff --git a/app/i18n/ja/sub.php b/app/i18n/ja/sub.php index 19972fe94..4cb6544a5 100644 --- a/app/i18n/ja/sub.php +++ b/app/i18n/ja/sub.php @@ -126,13 +126,13 @@ return array( 'relative' => 'XPath (関連する項目):', 'xpath' => 'XPathは:', ), - 'json_dotpath' => array( - '_' => 'JSON (Dotted paths)', // TODO + 'json_dotnotation' => array( + '_' => 'JSON (dot notation)', // TODO 'feed_title' => array( '_' => 'feed title', // TODO 'help' => 'Example: meta.title or a static string: "My custom feed"', // TODO ), - 'help' => 'A JSON dotted path uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO + 'help' => 'A JSON dot notated uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO 'item' => array( '_' => 'finding news items
(most important)', // TODO 'help' => 'JSON path to the array containing the items, e.g. newsItems', // TODO @@ -161,8 +161,8 @@ return array( '_' => 'item link (URL)', // TODO 'help' => 'Example: permalink', // TODO ), - 'json' => 'Dotted Path for:', // TODO - 'relative' => 'Dotted Path (relative to item) for:', // TODO + 'json' => 'dot notation for:', // TODO + 'relative' => 'dot notated path (relative to item) for:', // TODO ), 'jsonfeed' => 'JSON Feed', // TODO 'rss' => 'RSS / Atom (標準)', diff --git a/app/i18n/ko/sub.php b/app/i18n/ko/sub.php index f39ded85e..d2ed64d53 100644 --- a/app/i18n/ko/sub.php +++ b/app/i18n/ko/sub.php @@ -126,13 +126,13 @@ return array( 'relative' => '다음의 (기사와 관련된) XPath:', 'xpath' => '다음의 XPath:', ), - 'json_dotpath' => array( - '_' => 'JSON (Dotted paths)', // TODO + 'json_dotnotation' => array( + '_' => 'JSON (dot notation)', // TODO 'feed_title' => array( '_' => 'feed title', // TODO 'help' => 'Example: meta.title or a static string: "My custom feed"', // TODO ), - 'help' => 'A JSON dotted path uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO + 'help' => 'A JSON dot notated uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO 'item' => array( '_' => 'finding news items
(most important)', // TODO 'help' => 'JSON path to the array containing the items, e.g. newsItems', // TODO @@ -161,8 +161,8 @@ return array( '_' => 'item link (URL)', // TODO 'help' => 'Example: permalink', // TODO ), - 'json' => 'Dotted Path for:', // TODO - 'relative' => 'Dotted Path (relative to item) for:', // TODO + 'json' => 'dot notation for:', // TODO + 'relative' => 'dot notated path (relative to item) for:', // TODO ), 'jsonfeed' => 'JSON Feed', // TODO 'rss' => 'RSS / Atom (기본값)', diff --git a/app/i18n/lv/sub.php b/app/i18n/lv/sub.php index 800ea7574..580bf4c32 100644 --- a/app/i18n/lv/sub.php +++ b/app/i18n/lv/sub.php @@ -126,13 +126,13 @@ return array( 'relative' => 'XPath (relatīvs rakstam) priekš:', 'xpath' => 'XPath priekš:', ), - 'json_dotpath' => array( - '_' => 'JSON (Dotted paths)', // TODO + 'json_dotnotation' => array( + '_' => 'JSON (dot notation)', // TODO 'feed_title' => array( '_' => 'feed title', // TODO 'help' => 'Example: meta.title or a static string: "My custom feed"', // TODO ), - 'help' => 'A JSON dotted path uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO + 'help' => 'A JSON dot notated uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO 'item' => array( '_' => 'finding news items
(most important)', // TODO 'help' => 'JSON path to the array containing the items, e.g. newsItems', // TODO @@ -161,8 +161,8 @@ return array( '_' => 'item link (URL)', // TODO 'help' => 'Example: permalink', // TODO ), - 'json' => 'Dotted Path for:', // TODO - 'relative' => 'Dotted Path (relative to item) for:', // TODO + 'json' => 'dot notation for:', // TODO + 'relative' => 'dot notated path (relative to item) for:', // TODO ), 'jsonfeed' => 'JSON Feed', // TODO 'rss' => 'RSS / Atom (noklusējums)', diff --git a/app/i18n/nl/sub.php b/app/i18n/nl/sub.php index f964c2132..29d6e9dca 100644 --- a/app/i18n/nl/sub.php +++ b/app/i18n/nl/sub.php @@ -126,13 +126,13 @@ return array( 'relative' => 'XPath (relatief naar bericht) voor:', 'xpath' => 'XPath voor:', ), - 'json_dotpath' => array( - '_' => 'JSON (Dotted paths)', // TODO + 'json_dotnotation' => array( + '_' => 'JSON (puntnotatie)', 'feed_title' => array( '_' => 'feed title', // TODO 'help' => 'Example: meta.title or a static string: "My custom feed"', // TODO ), - 'help' => 'A JSON dotted path uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO + 'help' => 'JSON-puntnotatie gebruikt punten tussen objecten en vierkante haakjes voor arrays (bv. data.items[0].titel)', 'item' => array( '_' => 'finding news items
(most important)', // TODO 'help' => 'JSON path to the array containing the items, e.g. newsItems', // TODO @@ -161,8 +161,8 @@ return array( '_' => 'item link (URL)', // TODO 'help' => 'Example: permalink', // TODO ), - 'json' => 'Dotted Path for:', // TODO - 'relative' => 'Dotted Path (relative to item) for:', // TODO + 'json' => 'puntnotatie voor:', + 'relative' => 'puntnotatiepad (relatief aan item) voor:', ), 'jsonfeed' => 'JSON Feed', // TODO 'rss' => 'RSS / Atom (standaard)', diff --git a/app/i18n/oc/sub.php b/app/i18n/oc/sub.php index 36ef8d021..530b65a83 100644 --- a/app/i18n/oc/sub.php +++ b/app/i18n/oc/sub.php @@ -126,13 +126,13 @@ return array( 'relative' => 'XPath (relatiu a l’element) per :', 'xpath' => 'XPath per :', ), - 'json_dotpath' => array( - '_' => 'JSON (Dotted paths)', // TODO + 'json_dotnotation' => array( + '_' => 'JSON (dot notation)', // TODO 'feed_title' => array( '_' => 'feed title', // TODO 'help' => 'Example: meta.title or a static string: "My custom feed"', // TODO ), - 'help' => 'A JSON dotted path uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO + 'help' => 'A JSON dot notated uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO 'item' => array( '_' => 'finding news items
(most important)', // TODO 'help' => 'JSON path to the array containing the items, e.g. newsItems', // TODO @@ -161,8 +161,8 @@ return array( '_' => 'item link (URL)', // TODO 'help' => 'Example: permalink', // TODO ), - 'json' => 'Dotted Path for:', // TODO - 'relative' => 'Dotted Path (relative to item) for:', // TODO + 'json' => 'dot notation for:', // TODO + 'relative' => 'dot notated path (relative to item) for:', // TODO ), 'jsonfeed' => 'JSON Feed', // TODO 'rss' => 'RSS / Atom (defaut)', diff --git a/app/i18n/pl/sub.php b/app/i18n/pl/sub.php index 62187a80a..acd76e25b 100644 --- a/app/i18n/pl/sub.php +++ b/app/i18n/pl/sub.php @@ -126,13 +126,13 @@ return array( 'relative' => 'XPath (względem wiadomości) dla:', 'xpath' => 'XPath dla:', ), - 'json_dotpath' => array( - '_' => 'JSON (Dotted paths)', // TODO + 'json_dotnotation' => array( + '_' => 'JSON (dot notation)', // TODO 'feed_title' => array( '_' => 'feed title', // TODO 'help' => 'Example: meta.title or a static string: "My custom feed"', // TODO ), - 'help' => 'A JSON dotted path uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO + 'help' => 'A JSON dot notated uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO 'item' => array( '_' => 'finding news items
(most important)', // TODO 'help' => 'JSON path to the array containing the items, e.g. newsItems', // TODO @@ -161,8 +161,8 @@ return array( '_' => 'item link (URL)', // TODO 'help' => 'Example: permalink', // TODO ), - 'json' => 'Dotted Path for:', // TODO - 'relative' => 'Dotted Path (relative to item) for:', // TODO + 'json' => 'dot notation for:', // TODO + 'relative' => 'dot notated path (relative to item) for:', // TODO ), 'jsonfeed' => 'JSON Feed', // TODO 'rss' => 'RSS / Atom (domyślne)', diff --git a/app/i18n/pt-br/sub.php b/app/i18n/pt-br/sub.php index c5e048358..fad0adbb5 100644 --- a/app/i18n/pt-br/sub.php +++ b/app/i18n/pt-br/sub.php @@ -126,13 +126,13 @@ return array( 'relative' => 'XPath (relativo do item) para:', 'xpath' => 'XPath para:', ), - 'json_dotpath' => array( - '_' => 'JSON (Dotted paths)', // TODO + 'json_dotnotation' => array( + '_' => 'JSON (dot notation)', // TODO 'feed_title' => array( '_' => 'feed title', // TODO 'help' => 'Example: meta.title or a static string: "My custom feed"', // TODO ), - 'help' => 'A JSON dotted path uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO + 'help' => 'A JSON dot notated uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO 'item' => array( '_' => 'finding news items
(most important)', // TODO 'help' => 'JSON path to the array containing the items, e.g. newsItems', // TODO @@ -161,8 +161,8 @@ return array( '_' => 'item link (URL)', // TODO 'help' => 'Example: permalink', // TODO ), - 'json' => 'Dotted Path for:', // TODO - 'relative' => 'Dotted Path (relative to item) for:', // TODO + 'json' => 'dot notation for:', // TODO + 'relative' => 'dot notated path (relative to item) for:', // TODO ), 'jsonfeed' => 'JSON Feed', // TODO 'rss' => 'RSS / Atom (padrão)', diff --git a/app/i18n/ru/sub.php b/app/i18n/ru/sub.php index 29d9e90ac..cfd14066f 100644 --- a/app/i18n/ru/sub.php +++ b/app/i18n/ru/sub.php @@ -126,13 +126,13 @@ return array( 'relative' => 'XPath (относительно элемента) для:', 'xpath' => 'XPath для:', ), - 'json_dotpath' => array( - '_' => 'JSON (Dotted paths)', // TODO + 'json_dotnotation' => array( + '_' => 'JSON (dot notation)', // TODO 'feed_title' => array( '_' => 'feed title', // TODO 'help' => 'Example: meta.title or a static string: "My custom feed"', // TODO ), - 'help' => 'A JSON dotted path uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO + 'help' => 'A JSON dot notated uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO 'item' => array( '_' => 'finding news items
(most important)', // TODO 'help' => 'JSON path to the array containing the items, e.g. newsItems', // TODO @@ -161,8 +161,8 @@ return array( '_' => 'item link (URL)', // TODO 'help' => 'Example: permalink', // TODO ), - 'json' => 'Dotted Path for:', // TODO - 'relative' => 'Dotted Path (relative to item) for:', // TODO + 'json' => 'dot notation for:', // TODO + 'relative' => 'dot notated path (relative to item) for:', // TODO ), 'jsonfeed' => 'JSON Feed', // TODO 'rss' => 'RSS / Atom (по умолчанию)', diff --git a/app/i18n/sk/sub.php b/app/i18n/sk/sub.php index 92cabf985..a0e7291f5 100644 --- a/app/i18n/sk/sub.php +++ b/app/i18n/sk/sub.php @@ -126,13 +126,13 @@ return array( 'relative' => 'XPath (relatívne k položke) pre:', 'xpath' => 'XPath pre:', ), - 'json_dotpath' => array( - '_' => 'JSON (Dotted paths)', // TODO + 'json_dotnotation' => array( + '_' => 'JSON (dot notation)', // TODO 'feed_title' => array( '_' => 'feed title', // TODO 'help' => 'Example: meta.title or a static string: "My custom feed"', // TODO ), - 'help' => 'A JSON dotted path uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO + 'help' => 'A JSON dot notated uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO 'item' => array( '_' => 'finding news items
(most important)', // TODO 'help' => 'JSON path to the array containing the items, e.g. newsItems', // TODO @@ -161,8 +161,8 @@ return array( '_' => 'item link (URL)', // TODO 'help' => 'Example: permalink', // TODO ), - 'json' => 'Dotted Path for:', // TODO - 'relative' => 'Dotted Path (relative to item) for:', // TODO + 'json' => 'dot notation for:', // TODO + 'relative' => 'dot notated path (relative to item) for:', // TODO ), 'jsonfeed' => 'JSON Feed', // TODO 'rss' => 'RSS / Atom (prednastavené)', diff --git a/app/i18n/tr/sub.php b/app/i18n/tr/sub.php index 4c9f6c7de..43b809b5c 100644 --- a/app/i18n/tr/sub.php +++ b/app/i18n/tr/sub.php @@ -126,13 +126,13 @@ return array( 'relative' => 'XPath (nesneye ait):', 'xpath' => 'XPath:', ), - 'json_dotpath' => array( - '_' => 'JSON (Dotted paths)', // TODO + 'json_dotnotation' => array( + '_' => 'JSON (dot notation)', // TODO 'feed_title' => array( '_' => 'feed title', // TODO 'help' => 'Example: meta.title or a static string: "My custom feed"', // TODO ), - 'help' => 'A JSON dotted path uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO + 'help' => 'A JSON dot notated uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO 'item' => array( '_' => 'finding news items
(most important)', // TODO 'help' => 'JSON path to the array containing the items, e.g. newsItems', // TODO @@ -161,8 +161,8 @@ return array( '_' => 'item link (URL)', // TODO 'help' => 'Example: permalink', // TODO ), - 'json' => 'Dotted Path for:', // TODO - 'relative' => 'Dotted Path (relative to item) for:', // TODO + 'json' => 'dot notation for:', // TODO + 'relative' => 'dot notated path (relative to item) for:', // TODO ), 'jsonfeed' => 'JSON Feed', // TODO 'rss' => 'RSS / Atom (varsayılan)', diff --git a/app/i18n/zh-cn/sub.php b/app/i18n/zh-cn/sub.php index 78171e1fc..77f43ca63 100644 --- a/app/i18n/zh-cn/sub.php +++ b/app/i18n/zh-cn/sub.php @@ -126,13 +126,13 @@ return array( 'relative' => 'XPath（文章）：', 'xpath' => 'XPath 定位：', ), - 'json_dotpath' => array( - '_' => 'JSON (Dotted paths)', // TODO + 'json_dotnotation' => array( + '_' => 'JSON (dot notation)', // TODO 'feed_title' => array( '_' => 'feed title', // TODO 'help' => 'Example: meta.title or a static string: "My custom feed"', // TODO ), - 'help' => 'A JSON dotted path uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO + 'help' => 'A JSON dot notated uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO 'item' => array( '_' => 'finding news items
(most important)', // TODO 'help' => 'JSON path to the array containing the items, e.g. newsItems', // TODO @@ -161,8 +161,8 @@ return array( '_' => 'item link (URL)', // TODO 'help' => 'Example: permalink', // TODO ), - 'json' => 'Dotted Path for:', // TODO - 'relative' => 'Dotted Path (relative to item) for:', // TODO + 'json' => 'dot notation for:', // TODO + 'relative' => 'dot notated path (relative to item) for:', // TODO ), 'jsonfeed' => 'JSON Feed', // TODO 'rss' => 'RSS / Atom (默认)', diff --git a/app/i18n/zh-tw/sub.php b/app/i18n/zh-tw/sub.php index 2fcd87063..259bf6e5c 100644 --- a/app/i18n/zh-tw/sub.php +++ b/app/i18n/zh-tw/sub.php @@ -126,13 +126,13 @@ return array( 'relative' => 'XPath（文章）：', 'xpath' => 'XPath 定位：', ), - 'json_dotpath' => array( - '_' => 'JSON (Dotted paths)', // TODO + 'json_dotnotation' => array( + '_' => 'JSON (dot notation)', // TODO 'feed_title' => array( '_' => 'feed title', // TODO 'help' => 'Example: meta.title or a static string: "My custom feed"', // TODO ), - 'help' => 'A JSON dotted path uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO + 'help' => 'A JSON dot notated uses dots between objects and brackets for arrays (e.g. data.items[0].title)', // TODO 'item' => array( '_' => 'finding news items
(most important)', // TODO 'help' => 'JSON path to the array containing the items, e.g. newsItems', // TODO @@ -161,8 +161,8 @@ return array( '_' => 'item link (URL)', // TODO 'help' => 'Example: permalink', // TODO ), - 'json' => 'Dotted Path for:', // TODO - 'relative' => 'Dotted Path (relative to item) for:', // TODO + 'json' => 'dot notation for:', // TODO + 'relative' => 'dot notated path (relative to item) for:', // TODO ), 'jsonfeed' => 'JSON Feed', // TODO 'rss' => 'RSS / Atom (默認)', diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml index bc6f81091..9b5a27a3f 100644 --- a/app/views/helpers/feed/update.phtml +++ b/app/views/helpers/feed/update.phtml @@ -413,7 +413,7 @@ - + diff --git a/app/views/subscription/add.phtml b/app/views/subscription/add.phtml index fad1ee0ff..5a179eb72 100644 --- a/app/views/subscription/add.phtml +++ b/app/views/subscription/add.phtml @@ -72,7 +72,7 @@ - + -- cgit v1.2.3