diff --git a/src/configs/PublicHelpPages.php b/src/configs/PublicHelpPages.php index 02b12a402..c0850d081 100644 --- a/src/configs/PublicHelpPages.php +++ b/src/configs/PublicHelpPages.php @@ -39,6 +39,16 @@ namespace seekquarry\yioop\configs; * @var array */ $public_pages = []; +$public_pages["de"]["bot"] = <<< 'EOD' +title=Bot + +description=Describes the web crawler used with this +web site +END_HEAD_VARS +==My Web Crawler== + +Please Describe Your Robot +EOD; $public_pages["en-US"]["400"] = <<< 'EOD' page_type=standard @@ -994,39 +1004,50 @@ robots= description= +alternative_path= + page_header= page_footer= -END_HEAD_VARS'''Allowed to Crawl Sites''' is a list of urls (one-per-line) and domains that the crawler is allowed to crawl. Only pages that are on sub-sites of the urls listed here will be crawled. - -<br /> - -This textarea is only used in determining by can be crawled if '''Restrict Sites By Url''' is checked. - -<br /> - -A line like: -<pre> - http://www.somewhere.com/foo/ -</pre> -would allow the url -<pre> - http://www.somewhere.com/foo/goo.jpg -</pre> -to be crawled. +sort=aname +END_HEAD_VARS'''Allowed to Crawl Sites''' is a list of urls (one-per-line) and domains that the crawler is allowed to crawl. Only pages that are on sub-sites of the urls listed here will be crawled. + +<br /> + +This textarea is only used in determining by can be crawled if '''Restrict Sites By Url''' is checked. + +<br /> + +A line like: +<pre> + http://www.somewhere.com/foo/ +</pre> +would allow the url +<pre> + http://www.somewhere.com/foo/goo.jpg +</pre> +to be crawled. + +<br /> + +A line like: +<pre> + domain:foo.com +</pre> +would allow the url +<pre> + http://a.b.c.foo.com/blah/ +</pre> +to be crawled. + +It is also possible to allow a site using a regular expression: +<pre> + regex:/foo\d+/ +</pre> +would allow any url containing the string "foo" followed by 1 or more digits. <br /> - -A line like: -<pre> - domain:foo.com -</pre> -would allow the url -<pre> - http://a.b.c.foo.com/blah/ -</pre> -to be crawled. EOD; $help_pages["en-US"]["Arc_and_Re-crawls"] = <<< EOD page_type=standard @@ -1639,41 +1660,51 @@ robots= description= +alternative_path= + page_header= page_footer= -END_HEAD_VARS'''Disallowed to Crawl Sites''' are urls or domains (listed one-per-line) that Yioop should not crawl. - -<br /> - -A line like: -<pre> - http://www.somewhere.com/foo/ -</pre> -would disallow the url -<pre> - http://www.somewhere.com/foo/goo.jpg -</pre> -to be crawled. - -<br /> - -A line like: -<pre> - domain:foo.com -</pre> -would disallow the url -<pre> - http://a.b.c.foo.com/blah/ -</pre> -to be crawled. -<br /> +sort=aname -'''Sites with Quotes''' are urls or domains that Yioop should at most crawl some fixed number of urls from in an hour. These are listed in the same text area as Disallowed to Crawl Sites. To indicate the quota one lists after the url a fragment #some_number. For example, -<pre> - http://www.yelp.com/#100 -</pre> +END_HEAD_VARS'''Disallowed to Crawl Sites''' are urls or domains (listed one-per-line) that Yioop should not crawl. + +<br /> + +A line like: +<pre> + http://www.somewhere.com/foo/ +</pre> +would disallow the url +<pre> + http://www.somewhere.com/foo/goo.jpg +</pre> +to be crawled. + +<br /> + +A line like: +<pre> + domain:foo.com +</pre> +would disallow the url +<pre> + http://a.b.c.foo.com/blah/ +</pre> +to be crawled. +<br /> +It is also possible to disallow a site using a regular expression: +<pre> + regex:/foo\d+/ +</pre> +would disallow any url containing the string "foo" followed by 1 or more digits. +<br /> + +'''Sites with Quotas''' are urls or domains that Yioop should at most crawl some fixed number of urls from in an hour. These are listed in the same text area as Disallowed to Crawl Sites. To indicate the quota one lists after the url a fragment #some_number. For example, +<pre> + http://www.yelp.com/#100 +</pre> would restrict crawling of urls from Yelp to 100/hour. EOD; $help_pages["en-US"]["Discover_Groups"] = <<< EOD @@ -2438,6 +2469,41 @@ END_HEAD_VARSYioop can be run in a single machine or multi-machine setting. In a When someone enters a query into a Yioop set-up, they typically enter the query on the name server. The '''Use Filecache''' checkbox controls whether the query results are cached in a file so that they don't have to be recalculated when someone enters the same query again. The file cache is purged periodically so that it doesn't get too large. Sometimes it is useful, however, to know the file cache has just been cleared. The '''Clear Cache''' link clears both the file cache as well as the local domain name to IP address cache. EOD; +$help_pages["en-US"]["New_Crawl"] = <<< EOD +page_type=standard + +page_alias= + +page_border=solid-border + +toc=true + +title= + +author= + +robots= + +description= + +alternative_path= + +page_header= + +page_footer= + +sort=aname + +END_HEAD_VARSEnter a name for your crawl and click start to begin a new crawl. Previously completed crawls appear in the table below. + +<br /> + +Before you start your crawl be sure to start the queue servers and fetchers to be used for the crawl under '''Manage Machines'''. + +<br /> + +The '''Options''' link let's you specify what web sites you want to crawl or if you want to do an archive previous crawls or different kinds of data sets. +EOD; $help_pages["en-US"]["Page_Byte_Ranges"] = <<< EOD page_type=standard diff --git a/src/controllers/GroupController.php b/src/controllers/GroupController.php index fdd5fe288..b36c8d423 100644 --- a/src/controllers/GroupController.php +++ b/src/controllers/GroupController.php @@ -116,7 +116,7 @@ class GroupController extends Controller implements CrawlConstants $view = $data["VIEW"]; } } else if (isset($_REQUEST['f']) && - in_array($_REQUEST['f'], ["rss", "json", "serial"])) { + in_array($_REQUEST['f'], ["api", "json", "rss", "serial"])) { $this->setupViewFormatOutput($_REQUEST['f'], $view, $data); } $_SESSION['REMOTE_ADDR'] = L\remoteAddress(); @@ -185,8 +185,8 @@ class GroupController extends Controller implements CrawlConstants !empty($data['admin']), $data['CONTROLLER'])) . $token; } switch ($format) { - case "rss": - $view = "rss"; + case "api": + $view = "api"; break; case "json": $out_data = []; @@ -228,6 +228,9 @@ class GroupController extends Controller implements CrawlConstants } e($out); \seekquarry\yioop\library\webExit(); + case "rss": + $view = "rss"; + break; case "serial": e(serialize($out_data)); \seekquarry\yioop\library\webExit(); diff --git a/src/controllers/SearchController.php b/src/controllers/SearchController.php index 357282e38..5ef543f00 100755 --- a/src/controllers/SearchController.php +++ b/src/controllers/SearchController.php @@ -966,20 +966,8 @@ EOD; $to_show = (!empty($this->subsearch_per_page) && $this->subsearch_per_page > 0) ? $this->subsearch_per_page: C\NUM_RESULTS_PER_PAGE; - $data['SCRIPT'] .= <<< EOD - var limit = $limit; - var total_results = $total_rows; - var base_url = '$b_url'; - var end_result_string = '$end_results'; - var nextPage = initNextSearchPage(limit, total_results, - $to_show, base_url, end_result_string); - window.addEventListener("scroll", function() { - if (window.scrollY > - document.body.scrollHeight - window.innerHeight) { - nextPage(); - } - }); -EOD; + $data['SCRIPT'] .= " var nextPage = initNextResultsPage($limit," . + " $total_rows, $to_show, '$b_url', '$end_results');\n"; } $data['INCLUDE_LOCALE_SCRIPT'] = "locale"; if ($no_query || isset($_REQUEST['no_query'])) { diff --git a/src/controllers/components/SocialComponent.php b/src/controllers/components/SocialComponent.php index 95cd52cfc..e2782f06f 100644 --- a/src/controllers/components/SocialComponent.php +++ b/src/controllers/components/SocialComponent.php @@ -1560,12 +1560,14 @@ class SocialComponent extends Component implements CrawlConstants } $this->addAnyBotResponses($thread_id, $group_id, $bots_called, "--" . $title, $post_parts); - $thread_url = B\feedsUrl('thread', $thread_id, true) . + $thread_url = B\feedsUrl('thread', $thread_id) . C\CSRF_TOKEN . "=" . $parent->generateCSRFToken($_SESSION["USER_ID"]) ; $_SESSION['DISPLAY_MESSAGE'] = tl('social_component_thread_created'); - return $parent->redirectLocation($thread_url); + //return $parent->redirectLocation($thread_url); + return $parent->redirectWithMessage( + tl('social_component_thread_created')); break; case "status": $data['REFRESH'] = "feedstatus"; @@ -1741,23 +1743,30 @@ class SocialComponent extends Component implements CrawlConstants $pub_clause]; $for_group = ($just_group_id) ? $just_group_id : (($just_thread) ? -2 : -1); + if (!empty($just_thread) ) { + $data['JUST_THREAD'] = $just_thread; + } list($item_count, $pages) = $this->initializeFeedItems($data, $pages, $user_id, $search_array, $for_group, $sort, $limit, $results_per_page); $data['SUBTITLE'] = ""; $type = ""; $type_id = ""; - if ($just_thread != "" && isset($pages[0][self::TITLE])) { - $title = $pages[0][self::TITLE]; + if (!empty($just_thread) ) { + $thread_start_item = $group_model->getGroupItem($just_thread); + if (empty($thread_start_item) || + empty($thread_start_item["TITLE"])) { + $data['NO_POSTS_IN_THREAD'] = true; + } + $title = $thread_start_item["TITLE"]; $data['SUBTITLE'] = trim($title, "\- \t\n\r\0\x0B"); - $data['JUST_THREAD'] = $just_thread; $type = "thread"; $type_id = $just_thread; - $group = $group_model->getGroupById($pages[0]['GROUP_ID'], + $group = $group_model->getGroupById($thread_start_item['GROUP_ID'], $user_id); + $data["GROUP_ID"] = $group["GROUP_ID"]; + $data["GROUP_NAME"] = $group["GROUP_NAME"]; $data['GROUP_STATUS'] = $group['STATUS']; - } else if ($just_thread != "" && !isset($page[self::TITLE])) { - $data['NO_POSTS_IN_THREAD'] = true; } if (!$just_group_id && !$just_thread) { $data['GROUP_STATUS'] = C\ACTIVE_STATUS; @@ -1805,17 +1814,38 @@ class SocialComponent extends Component implements CrawlConstants } $this->calculateRecentFeedsAndThread($data, $user_id); $data['TOTAL_ROWS'] = $item_count + $groups_count; - $data['LIMIT'] = $limit; $data['RESULTS_PER_PAGE'] = $results_per_page; - $data['PAGES'] = $pages; + $token_string = ($user_id != C\PUBLIC_USER_ID )? C\CSRF_TOKEN. "=". + $this->parent->generateCSRFToken($user_id) : ""; + $data['PAGING_QUERY'] = htmlentities(B\feedsUrl($type, $type_id, + true, $controller_name)); + $data['SCRIPT'] .= " let nextPage = initNextResultsPage($limit," . + " {$data['TOTAL_ROWS']}, $results_per_page, ". + "'{$data['PAGING_QUERY']}$token_string', '', 'results-container', ". + "'result-batch');\n"; + if ($limit > 0) { + $data['SCRIPT'] .= " let previousPage = initPreviousResultsPage(". + "$limit, {$data['TOTAL_ROWS']}, $results_per_page, ". + "'{$data['PAGING_QUERY']}$token_string', 'results-container', ". + "'result-batch');\n"; + } if (!empty($data['REFRESH_TIMESTAMP']) && !empty($pages)) { $max_pubdate = 0; - foreach ($pages as $page) { - if (isset($page['PUBDATE']) && - $page['PUBDATE'] > $max_pubdate) { + $num_pages = count($pages); + for ($i = 0; $i < $num_pages; $i++) { + $page = $pages[$i]; + if (empty($page['PUBDATE']) || + ($page['PUBDATE'] <= $data['REFRESH_TIMESTAMP'] && + !empty($page['EDIT_DATE']) && + $page['EDIT_DATE'] > $max_pubdate)) { + unset($pages[$i]); + $limit++; + continue; + } + if ($page['PUBDATE'] > $max_pubdate) { $max_pubdate = $page['PUBDATE']; } - if (isset($page['EDIT_DATE']) && + if (!empty($page['EDIT_DATE']) && $page['EDIT_DATE'] > $max_pubdate) { $max_pubdate = $page['EDIT_DATE']; } @@ -1824,8 +1854,8 @@ class SocialComponent extends Component implements CrawlConstants \seekquarry\yioop\library\webExit(); } } - $data['PAGING_QUERY'] = htmlentities(B\feedsUrl($type, $type_id, - true, $controller_name)); + $data['PAGES'] = array_values($pages); + $data['LIMIT'] = $limit; $this->initializeWikiEditor($data, -1); return $data; } @@ -2041,7 +2071,7 @@ class SocialComponent extends Component implements CrawlConstants * for */ private function initializeFeedItems(&$data, $pages, $user_id, - $search_array, $for_group, $sort, $limit, $results_per_page) + $search_array, $for_group, $sort, &$limit, $results_per_page) { $parent = $this->parent; $group_model = $parent->model("group"); @@ -2049,6 +2079,17 @@ class SocialComponent extends Component implements CrawlConstants $user_model = $parent->model("user"); $item_count = $group_model->getGroupItemCount($search_array, $user_id, $for_group); + $updatable = false; + if (!empty($data["JUST_THREAD"]) && $data["JUST_THREAD"] >= 0) { + if ($_SESSION['DISPLAY_MESSAGE'] ?? "" == + tl('social_component_comment_added')) { + $limit = floor($item_count / $results_per_page) * + $results_per_page; + } + if ($limit > $item_count - $results_per_page) { + $updatable = true; + } + } $group_items = $group_model->getGroupItems(0, $limit + $results_per_page, $search_array, $user_id, $for_group); $recent_found = false; @@ -2120,7 +2161,8 @@ class SocialComponent extends Component implements CrawlConstants if ($item['OWNER_ID'] == $user_id || $user_id == C\ROOT_ID) { $page['MEMBER_ACCESS'] = C\GROUP_READ_WIKI; } - if (!$recent_found && !$math && $time - $item["PUBDATE"] < + if ($updatable && + !$recent_found && !$math && $time - $item["PUBDATE"] < 5 * C\ONE_MINUTE) { $recent_found = true; $data['SCRIPT'] .= 'doUpdate();'; @@ -2150,9 +2192,9 @@ class SocialComponent extends Component implements CrawlConstants $parent = $this->parent; $group_model = $parent->model("group"); $thread_ids = $parent->model("impression")->recent($user_id, - C\THREAD_IMPRESSION, 3); + C\THREAD_IMPRESSION, 5); $group_ids = $parent->model("impression")->recent($user_id, - C\GROUP_IMPRESSION, 3); + C\GROUP_IMPRESSION, 5); if (!empty($thread_ids)) { $data['RECENT_THREADS'] = []; foreach ($thread_ids as $recent_thread_id) { @@ -2286,7 +2328,7 @@ class SocialComponent extends Component implements CrawlConstants $group_model->getGroupThreadCount($group_id); $data['GROUPS'][$i]['NUM_PAGES'] = $group_model->getGroupPageCount( $data['GROUPS'][$i]['GROUP_ID']); - if (isset($item[0]['TITLE'])) { + if (isset($item['TITLE'])) { $data['GROUPS'][$i]["ITEM_TITLE"] = $item['TITLE']; $data['GROUPS'][$i]["THREAD_ID"] = $item['PARENT_ID']; } else { @@ -3031,6 +3073,7 @@ EOD; if ($data['TOTAL_ROWS'] == 0) { $data['NO_POSTS_YET'] = true; } + $data['INCLUDE_SCRIPTS'][] = "wiki"; $data['LIMIT'] = $limit; $data['RESULTS_PER_PAGE'] = $results_per_page; $data['PAGES'] = $pages; @@ -3040,6 +3083,12 @@ EOD; true, $data['CONTROLLER'], $group_id)) . C\CSRF_TOKEN . '='. $data[C\CSRF_TOKEN] . "&page_type=page_and_feedback"; + if ($data['VIEW'] != 'api') { + $data['SCRIPT'] .= " let nextPage = initNextResultsPage(" . + "$limit, {$data['TOTAL_ROWS']}, $results_per_page, ". + "'{$data['PAGING_QUERY']}', '', " . + "'results-container', 'result-batch');\n"; + } } else if ($data["HEAD"]['page_type'] == 'media_list') { $data['RESOURCES_INFO'] = $group_model->getGroupPageResourceUrls($group_id, @@ -3075,7 +3124,7 @@ EOD; } if ($user_id != C\PUBLIC_USER_ID) { $page_ids = $parent->model("impression")->recent($user_id, - C\WIKI_IMPRESSION, 3); + C\WIKI_IMPRESSION, 5); if (!empty($page_ids)) { $data['RECENT_PAGES'] = []; foreach ($page_ids as $recent_page_id) { @@ -3086,20 +3135,20 @@ EOD; if (!empty($page_info) && ($page_info['PAGE_NAME'] != $data['PAGE_NAME'])) { $data['RECENT_PAGES'][ - $group_name . "@". $page_info['PAGE_NAME']] = + $page_info['PAGE_NAME']. "@". $group_name] = htmlentities(B\wikiUrl($page_info['PAGE_NAME'], true, $data['CONTROLLER'], $page_info['GROUP_ID'])); if ($data['MODE'] == 'edit') { - $data['RECENT_PAGES'][$group_name . "@" . - $page_info['PAGE_NAME']] .= + $data['RECENT_PAGES'][$page_info['PAGE_NAME'] + . "@" . $group_name] .= "&arg=edit&"; } } } } $group_ids = $parent->model("impression")->recent($user_id, - C\GROUP_IMPRESSION, 3); + C\GROUP_IMPRESSION, 5); if (!empty($group_ids)) { $data['RECENT_GROUPS'] = []; foreach ($group_ids as $recent_group_id) { @@ -3916,10 +3965,15 @@ EOD; $data['ORIGINAL_SUB_PATH'] = $sub_path; $data["CAN_EDIT"] = false; if ((isset($_REQUEST['c'])) && $_REQUEST['c'] == "api") { + //wiki help request $data['MODE'] = 'api'; $data['VIEW'] = 'api'; } else { $data["MODE"] = "read"; + // additional feed data on page_and_feedback page + if (!empty($_REQUEST['f']) && $_REQUEST['f'] == "api") { + $data['VIEW'] = 'api'; + } } $data['page_types'] = [ "standard" => tl('social_component_standard_page'), diff --git a/src/css/search.css b/src/css/search.css index fd84ab378..364371097 100755 --- a/src/css/search.css +++ b/src/css/search.css @@ -99,14 +99,6 @@ p { display:none; } -.small -{ - font-size:9.5pt; -} -.medium-large -{ - font-size:20pt; -} .no-bold { font-weight:normal; @@ -219,7 +211,7 @@ span.indent5 } .html-ltr .align-opposite { - text-align: right + text-align: right; } .html-rtl .align-opposite { @@ -235,37 +227,53 @@ span.indent5 margin-left: 25px; margin-right: 25px; } +.tiny-font +{ + font-size:9.5pt !important; +} +.medium-large +{ + font-size:20pt !important; +} .small-font { - font-size:12pt; + font-size:12pt !important; +} +.smaller-font +{ + font-size:smaller !important; } .medium-font { - font-size:16pt; + font-size:16pt !important; } .big-font { - font-size:20pt; + font-size:20pt !important; +} +.bigger-font +{ + font-size:bigger !important; } .huge-font { - font-size:26pt; + font-size:26pt !important; } .mobile .small-font { - font-size:10pt; + font-size:10pt !important; } .mobile .medium-font { - font-size:12pt; + font-size:12pt !important; } .mobile .big-font { - font-size:14pt; + font-size:14pt !important; } .mobile .huge-font { - font-size:20pt; + font-size:20pt !important; } .black { @@ -284,14 +292,47 @@ span.indent5 { background-color: red; } +.back-aliceblue +{ + background-color: aliceblue; +} +.back-ghostwhite +{ + background-color: ghostwhite; +} +.back-ivory +{ + background-color: ivory; +} +.back-honeydew +{ + background-color: honeydew; +} +.back-floralwhite +{ + background-color: floralwhite; +} +.back-lavender +{ + background-color: lavender; +} .back-green { background-color: green; } +.back-light-coral +{ + background-color: lightcoral; +} +.back-light-blue +{ + background-color: lightblue; +} .back-light-green { background-color: lightgreen; } +.back-light-gray, .back-gray { background-color: lightgray; @@ -787,7 +828,8 @@ body.mobile } /* controls */ .anchor-button, -.anchor-button-consent +.anchor-button-consent, +.vote-button { background-color: #F0F0F0; border: ridge 1px #DDD; @@ -800,6 +842,15 @@ body.mobile text-align: center; text-decoration: none; } +.vote-button +{ + background-color: #DDD; + border-radius: 5px; + color: gray; + margin: 1px; + min-width:.15in; + padding: 1px; +} .anchor-button-consent { background-color: #AAA; @@ -807,11 +858,12 @@ body.mobile color: #EEE; } .anchor-button:hover, -.anchor-button-consent:hover +.anchor-button-consent:hover, { text-decoration: underline; } -.anchor-button-consent:hover +.anchor-button-consent:hover, +.vote-button:hover { background-color: #888; color: #FFF; @@ -1195,6 +1247,10 @@ body.mobile margin-top: 25px; text-align:center; } +.mobile .footer-element +{ + margin-top: 60px; +} .signin-exit { clear: both; @@ -1596,33 +1652,53 @@ body.mobile padding: 5px; margin:10px; } +#results-container +{ + padding-top: 20px; + max-height: 6in; + overflow-y: scroll; +} .group-result { + border-radius:5px; box-shadow: 0px 0px 3px 3px #ccc; - padding: .1in .1in .25in .1in; + padding: 0.05in .1in .25in .1in; + margin: 8px auto 8px auto; +} +.small-group-result +{ + border-radius:5px; + box-shadow: 0px 0px 2px 2px #ccc; + padding: 0.02in .1in .02in .1in; + margin: 7px auto 7px auto; + min-height:.52in; } .button-group-result { padding: .1in .1in .25in .1in; + margin:auto; } .button-group-result h2, .result h2, .news-result h2, +.small-group-result h2, .group-result h2 { font-size: 14pt; font-weight: normal; } div.button-group-result, +div.small-group-result, div.group-result { font-size: 12pt; width:7in; } .mobile div.button-group-result, +.mobile div.small-group-result, .mobile div.group-result { - margin: auto; + margin: 8px auto 8px auto; width: auto; } .spell @@ -2856,19 +2932,37 @@ td.instruct } .feed-user-icon { + padding-top: 0.15in; width: 70px; } +.small-feed-user-icon +{ + padding-top: 0.1in; + width: 25px; +} .html-ltr .feed-item-body { margin-left:.8in; - min-height:.7in; - overflow:scroll; + overflow: scroll; + padding-top: .1in; +} +.html-ltr .small-feed-item-body +{ + margin: 0 0.3in 0 0; + overflow: scroll; + padding: 0.1in; + } -.html-rtl .feed-item-body +.html-rtl .feed-item-body, +.html-rtl .small-feed-item-body { margin-right:.8in; + overflow: scroll; + padding-top: .1in; +} +.feed-item-body +{ min-height:.7in; - overflow:scroll; } .feed-item-body img, .feed-item-body video diff --git a/src/library/UrlParser.php b/src/library/UrlParser.php index 4d92a3529..1bef222b9 100755 --- a/src/library/UrlParser.php +++ b/src/library/UrlParser.php @@ -837,6 +837,7 @@ class UrlParser } $i = 0; $cache[$name]["domains"] = []; + $cache[$name]["regexes"] = []; $cache[$name]["hosts"] = []; $cache[$name]["paths"] = []; $cache[$name]["sites"] = []; @@ -845,6 +846,10 @@ class UrlParser $cache[$name]["domains"][] = substr($site, 7); continue; } + if (strncmp($site, "regex:", 6) == 0) { + $cache[$name]["regexes"][] = substr($site, 6); + continue; + } list($site_host, $site_path) = UrlParser::getHostAndPath($site, true, true); $cache[$name]["hosts"][] = $site_host; @@ -857,9 +862,18 @@ class UrlParser } $flag = false; $domains = & $cache[$name]["domains"]; + $regexes = & $cache[$name]["regexes"]; $hosts = & $cache[$name]["hosts"]; $paths = & $cache[$name]["paths"]; $sites = & $cache[$name]["sites"]; + foreach ($regexes as $regex) { + if (preg_match($regex, $url)) { + if ($return_rule) { + return "regex:$regex"; + } + return true; + } + } list($host, $path) = UrlParser::getHostAndPath($url, true, true); foreach ($domains as $domain) { $pos = strrpos($host, $domain); diff --git a/src/library/WikiParser.php b/src/library/WikiParser.php index e5d619ced..18888b47a 100644 --- a/src/library/WikiParser.php +++ b/src/library/WikiParser.php @@ -183,8 +183,10 @@ class WikiParser implements CrawlConstants ['/(\A|\n)::::\s/', "\n<span class='indent4'> </span>\t"], ['/(\A|\n)(:)+::::\s/', "\n<span class='indent5'> </span>\t"], - ['/{{smallcaps\|(.+?)}}/s', "<small>$1</small>\t"], - ["/{{fraction\|(.+?)\|(.+?)}}/si", "<small>$1/$2</small>\t"], + ['/{{smallcaps\|(.+?)}}/s', + "<span class='smaller-font'>$1</span>\t"], + ["/{{fraction\|(.+?)\|(.+?)}}/si", + "<span class='smaller-font'>$1/$2</span>\t"], ['/(\A|\n)----/', "$1<hr />"], ['/\r/', ""], ]; diff --git a/src/locale/ar/configure.ini b/src/locale/ar/configure.ini index a79ce219d..2869882ca 100755 --- a/src/locale/ar/configure.ini +++ b/src/locale/ar/configure.ini @@ -238,6 +238,7 @@ social_component_post_edited_elsewhere = "بعد تحريرها فقط في مك social_component_no_update_access = "لا يمكن تحديث آخر!" social_component_post_updated = "آخر تحديث!" social_component_no_group_access = "ليس عضوا أو أن&#039;t قراءة تلك المجموعة. التحول إلى مجموعة عامة!" +social_component_end_results = "" social_component_no_posts_yet = "لا وظيفة حتى الآن" social_component_signin_to_access = "يرجى تسجيل الدخول إلى حساب مع الوصول إلى هذه المجموعة!" social_component_back = "مرة أخرى" @@ -1071,7 +1072,6 @@ wiki_element_use_form_below = "أو يمكنك استخدام النموذج أ wiki_element_submit = "تقدم" wiki_element_syntax_summary = "ويكي الجملة دليل" wiki_element_signin_edit = "إذا كان لديك ما يكفي من الوصول كنت قد تكون قادرة على إنشاء صفحة تسجيل الدخول والتنقل إلى هنا." -wiki_element_user_feedback = "ردود الفعل المستخدم" wiki_element_locale_name = "الإعدادات المحلية: %s" wiki_element_page = "الصفحة: %s" wiki_element_resource_name = "الموارد: %s" @@ -1144,13 +1144,11 @@ editlocales_element_save = "حفظ" ; GroupbarElement.php groupbar_element_skip_nav = "تخطي الملاحة" groupbar_element_page_list = "صفحة قائمة" +groupbar_element_groups = "" +groupbar_element_feeds = "" groupbar_element_page_thread = " %s صفحة %s مناقشة جماعية" -groupbar_element_groupfeed = "%s تغذية" groupbar_element_no_path_info = "لا معلومات المسار" groupbar_element_userfeed = "المستخدم: %s" -groupbar_element_myfeeds = "بي إس" -groupbar_element_ungrouped_icon = "مجمعة رمز" -groupbar_element_grouped_icon = "تجميع رمز" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "في انتظار الحالات آلات..." @@ -1343,10 +1341,6 @@ serversettings_element_save = "حفظ" ; GroupfeedElement.php groupfeed_element_add_group = "إضافة مجموعة" groupfeed_element_request_add = "طلب إضافة مجموعة" -groupfeed_element_add_comment = "إضافة تعليق" -groupfeed_element_drag_textarea = "اسحب العناصر في النص لإضافة لهم..." -groupfeed_element_click_textarea = "أو انقر فوق إلى حدد لهم." -groupfeed_element_save = "حفظ" groupfeed_element_group_wiki = "ويكي" groupfeed_element_group_stats = "%s وظائف %s المواضيع" groupfeed_element_last_post = "آخر مشاركة:" @@ -1358,25 +1352,24 @@ groupfeed_element_delete = "حذف" groupfeed_element_usericon = "رمز المستخدم" groupfeed_element_num_posts = "%s المشاركات" groupfeed_element_num_views = "%s وجهات النظر" -groupfeed_element_last_edited = "آخر تحرير: %s" -groupfeed_element_post_vote = "التصويت:" +groupfeed_element_edited = "" groupfeed_element_last_post_info = "آخر مشاركة:" groupfeed_element_start_thread = "بدء موضوع جديد" groupfeed_element_subject = "الموضوع" groupfeed_element_post = "بعد" +groupfeed_element_drag_textarea = "اسحب العناصر في النص لإضافة لهم..." +groupfeed_element_click_textarea = "أو انقر فوق إلى حدد لهم." +groupfeed_element_save = "حفظ" groupfeed_element_feedplaces = "تغذية الأماكن" groupfeed_element_mygroups = "جميع الأعلاف" groupfeed_element_userplaces = "المستخدم الأماكن" groupfeed_element_groupplaces = "%s المجموعة الأماكن" groupfeed_element_wiki_name = "%s ويكي" groupfeed_element_recent_threads = "المواضيع الأخيرة" -groupfeed_element_recent_groupfeeds = "الأعلاف الأخيرة" +groupfeed_element_recent_groups = "" groupfeed_element_edit_post = "تحرير آخر" groupfeed_element_no_longer_update = "مجموعة يغذي لم يعد تحديث!" ; -; PaginationElement.php -pagination_helper_next = "القادم" -; ; MediajobsElement.php mediajobs_element_configure_media_jobs = "تكوين وظائف وسائل الإعلام" mediajobs_element_mode = "وضع" @@ -1416,14 +1409,14 @@ groupmenu_element_admin_menu = "القائمة المشرف" groupmenu_element_welcome = "مرحبا بك" groupmenu_element_signin = "تسجيل الدخول" groupmenu_element_create_account = "إنشاء حساب" -groupmenu_element_page_places = "%s صفحة %s المجموعة الأماكن" -groupmenu_element_read_page = "%s صفحة %s المجموعة" -groupmenu_element_edit_page = " تحرير صفحة %s" -groupmenu_element_page_history = "%s صفحة التاريخ" -groupmenu_element_page_source = "%s صفحة المصدر" -groupmenu_element_page_relationships = "%s صفحة العلاقات" -groupmenu_element_page_discuss = " %s صفحة النقاش" -groupmenu_element_page_list = "%s صفحة المجموعة قائمة" +groupmenu_element_page = "" +groupmenu_element_view = "" +groupmenu_element_edit = "" +groupmenu_element_history = "" +groupmenu_element_source = "" +groupmenu_element_relationships = "" +groupmenu_element_discussion = "" +groupmenu_element_page_list = "" groupmenu_element_group_feed = "%s تغذية" groupmenu_element_page_thread = "%s صفحة %s مناقشة جماعية" groupmenu_element_page_thread_rss = "%s صفحة %s مناقشة جماعية" @@ -1829,8 +1822,8 @@ feeds_helper_view_minsecs = "%s م %s s مضت" feeds_helper_view_hourdate = "قبل ساعات %s" ; ; PaginationHelper.php -pagination_helper_previous = "السابق" pagination_helper_next = "القادم" +pagination_helper_previous = "السابق" ; ; ToggleHelper.php toggle_helper_on = "على" diff --git a/src/locale/ar/statistics.txt b/src/locale/ar/statistics.txt index 5a165df53..b6bef56f0 100755 --- a/src/locale/ar/statistics.txt +++ b/src/locale/ar/statistics.txt @@ -1 +1 @@ -d:100; \ No newline at end of file +d:99; \ No newline at end of file diff --git a/src/locale/bn/configure.ini b/src/locale/bn/configure.ini index 9abcca48e..0357ed3f7 100755 --- a/src/locale/bn/configure.ini +++ b/src/locale/bn/configure.ini @@ -238,6 +238,7 @@ social_component_post_edited_elsewhere = "পোস্ট ছিল মাত্ social_component_no_update_access = "না আপডেট পোস্ট!" social_component_post_updated = "পোস্ট আপডেট করা হয়েছে!" social_component_no_group_access = "সদস্য না, বা করতে পারেন,&#039;t পড়তে যে গ্রুপ. সুইচিং পাবলিক গ্রুপ!" +social_component_end_results = "" social_component_no_posts_yet = "কোন পোস্ট এখনো" social_component_signin_to_access = "দয়া করে লগ ইন করুন একটি অ্যাকাউন্ট অ্যাক্সেস সঙ্গে এই গ্রুপ!" social_component_back = "ফিরে" @@ -1071,7 +1072,6 @@ wiki_element_use_form_below = "অথবা আপনি ব্যবহার wiki_element_submit = "জমা" wiki_element_syntax_summary = "উইকি সিনট্যাক্স গাইড" wiki_element_signin_edit = "আপনি যদি যথেষ্ট এক্সেস আপনি তৈরি করতে সক্ষম হতে পারে, পাতা লগ ইন করে এবং নেভিগেট ফিরে আছেন." -wiki_element_user_feedback = "ব্যবহারকারী প্রতিক্রিয়া" wiki_element_locale_name = "লোকেল: %s" wiki_element_page = "পৃষ্ঠা: %s" wiki_element_resource_name = "সম্পদ: %s" @@ -1144,13 +1144,11 @@ editlocales_element_save = "সংরক্ষণ করুন" ; GroupbarElement.php groupbar_element_skip_nav = "এড়িয়ে যাও গৌণ" groupbar_element_page_list = "পৃষ্ঠা তালিকা" +groupbar_element_groups = "" +groupbar_element_feeds = "" groupbar_element_page_thread = " %s পৃষ্ঠার এ %s গ্রুপ আলোচনা" -groupbar_element_groupfeed = "%s ফিড" groupbar_element_no_path_info = "কোন পথ তথ্য" groupbar_element_userfeed = "ব্যবহারকারী: %s" -groupbar_element_myfeeds = "আমার ফিড" -groupbar_element_ungrouped_icon = "আলাদা হয়ে গেছে আইকন" -groupbar_element_grouped_icon = "দলবদ্ধ আইকন" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "অপেক্ষা স্থিতিগুলিকে-মেশিন..." @@ -1343,10 +1341,6 @@ serversettings_element_save = "সংরক্ষণ করুন" ; GroupfeedElement.php groupfeed_element_add_group = "গ্রুপ যোগ করুন" groupfeed_element_request_add = "অনুরোধ গ্রুপ যোগ করুন" -groupfeed_element_add_comment = "একটি মন্তব্য যোগ করুন" -groupfeed_element_drag_textarea = "ড্র্যাগ আইটেম মধ্যে textarea তাদের যোগ করার জন্য..." -groupfeed_element_click_textarea = "বা ক্লিক করার জন্য তাদের নির্বাচন করুন." -groupfeed_element_save = "সংরক্ষণ করুন" groupfeed_element_group_wiki = "উইকি" groupfeed_element_group_stats = "%s পোস্ট, থ্রেড %s" groupfeed_element_last_post = "সর্বশেষ পোস্ট:" @@ -1358,25 +1352,24 @@ groupfeed_element_delete = "মুছে দিন" groupfeed_element_usericon = "ব্যবহারকারী আইকন" groupfeed_element_num_posts = "%s পোস্ট" groupfeed_element_num_views = "%s দেখেছে" -groupfeed_element_last_edited = "সর্বশেষ সম্পাদনা: %s" -groupfeed_element_post_vote = "ভোট:" +groupfeed_element_edited = "" groupfeed_element_last_post_info = "সর্বশেষ পোস্ট:" groupfeed_element_start_thread = "নতুন থ্রেড শুরু" groupfeed_element_subject = "বিষয়" groupfeed_element_post = "পোস্ট" +groupfeed_element_drag_textarea = "ড্র্যাগ আইটেম মধ্যে textarea তাদের যোগ করার জন্য..." +groupfeed_element_click_textarea = "বা ক্লিক করার জন্য তাদের নির্বাচন করুন." +groupfeed_element_save = "সংরক্ষণ করুন" groupfeed_element_feedplaces = "ফিড স্থান" groupfeed_element_mygroups = "সব ফিড" groupfeed_element_userplaces = "ব্যবহারকারী স্থান" groupfeed_element_groupplaces = "%s গ্রুপ জায়গা" groupfeed_element_wiki_name = "%s উইকি" groupfeed_element_recent_threads = "সাম্প্রতিক থ্রেড" -groupfeed_element_recent_groupfeeds = "সাম্প্রতিক ফিড" +groupfeed_element_recent_groups = "" groupfeed_element_edit_post = "সম্পাদনা পোস্ট" groupfeed_element_no_longer_update = "গ্রুপ ফীড আর আপডেট!" ; -; PaginationElement.php -pagination_helper_next = "পরবর্তী" -; ; MediajobsElement.php mediajobs_element_configure_media_jobs = "কনফিগার মিডিয়া চাকরি" mediajobs_element_mode = "মোড" @@ -1416,14 +1409,14 @@ groupmenu_element_admin_menu = "অ্যাডমিন মেনু" groupmenu_element_welcome = "স্বাগতম" groupmenu_element_signin = "সাইন ইন" groupmenu_element_create_account = "অ্যাকাউন্ট তৈরি করুন" -groupmenu_element_page_places = "%s পৃষ্ঠার এ %s গ্রুপ জায়গা" -groupmenu_element_read_page = "%s পৃষ্ঠার এ %s গ্রুপ" -groupmenu_element_edit_page = " সম্পাদনা %s পৃষ্ঠা" -groupmenu_element_page_history = "%s পৃষ্ঠা ইতিহাস" -groupmenu_element_page_source = "%s পৃষ্ঠা উত্স" -groupmenu_element_page_relationships = "%s পৃষ্ঠা সম্পর্ক" -groupmenu_element_page_discuss = " %s পৃষ্ঠা আলোচনা" -groupmenu_element_page_list = "%s গ্রুপ পৃষ্ঠা তালিকা" +groupmenu_element_page = "" +groupmenu_element_view = "" +groupmenu_element_edit = "" +groupmenu_element_history = "" +groupmenu_element_source = "" +groupmenu_element_relationships = "" +groupmenu_element_discussion = "" +groupmenu_element_page_list = "" groupmenu_element_group_feed = "%s ফিড" groupmenu_element_page_thread = "%s পৃষ্ঠার এ %s গ্রুপ আলোচনা" groupmenu_element_page_thread_rss = "%s পৃষ্ঠার এ %s গ্রুপ আলোচনা" @@ -1829,8 +1822,8 @@ feeds_helper_view_minsecs = "%s এম %s এর আগে" feeds_helper_view_hourdate = "%s ঘন্টা আগে" ; ; PaginationHelper.php -pagination_helper_previous = "পূর্ববর্তী" pagination_helper_next = "পরবর্তী" +pagination_helper_previous = "পূর্ববর্তী" ; ; ToggleHelper.php toggle_helper_on = "উপর" diff --git a/src/locale/bn/statistics.txt b/src/locale/bn/statistics.txt index 5a165df53..b6bef56f0 100755 --- a/src/locale/bn/statistics.txt +++ b/src/locale/bn/statistics.txt @@ -1 +1 @@ -d:100; \ No newline at end of file +d:99; \ No newline at end of file diff --git a/src/locale/de/configure.ini b/src/locale/de/configure.ini index 9a83bd79a..d4c815a3f 100755 --- a/src/locale/de/configure.ini +++ b/src/locale/de/configure.ini @@ -238,6 +238,7 @@ social_component_post_edited_elsewhere = "Beitrag wurde gerade bearbeitet an and social_component_no_update_access = "Kann Nicht Update-Post!" social_component_post_updated = "Post Aktualisiert!" social_component_no_group_access = "Nicht Mitglied ist oder werden kann&#039;t gelesen, dass Gruppe. Den Umstieg auf den öffentlichen Gruppe!" +social_component_end_results = "" social_component_no_posts_yet = "Keine Beiträge, Die Noch" social_component_signin_to_access = "Bitte melden Sie sich für ein Konto mit Zugriff auf diese Gruppe!" social_component_back = "Zurück" @@ -1071,7 +1072,6 @@ wiki_element_use_form_below = "Oder können Sie das Formular unten, um erste wiki_element_submit = "Senden" wiki_element_syntax_summary = "Wiki Syntax Guide" wiki_element_signin_edit = "Wenn Sie ausreichende Zugriffsrechte, die Sie vielleicht in der Lage sein, um die Seite zu erstellen, indem Sie sich einloggen und die Navigation wieder hier." -wiki_element_user_feedback = "Benutzer-Feedback" wiki_element_locale_name = "Gebietsschema: %s" wiki_element_page = "Seite: %s" wiki_element_resource_name = "Ressource: %s" @@ -1144,13 +1144,11 @@ editlocales_element_save = "Speichern" ; GroupbarElement.php groupbar_element_skip_nav = "Navigation Überspringen" groupbar_element_page_list = "Seite Liste" +groupbar_element_groups = "" +groupbar_element_feeds = "" groupbar_element_page_thread = " %s Seite %s Gruppe Diskussion" -groupbar_element_groupfeed = "%s-Feed" groupbar_element_no_path_info = "Keine Pfad-Info" groupbar_element_userfeed = "Benutzer: %s" -groupbar_element_myfeeds = "Meine Feeds" -groupbar_element_ungrouped_icon = "Gruppierung Symbol" -groupbar_element_grouped_icon = "Gruppiert Symbol" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "Warten auf den Status von Maschinen..." @@ -1343,10 +1341,6 @@ serversettings_element_save = "Speichern" ; GroupfeedElement.php groupfeed_element_add_group = "Gruppe Hinzufügen" groupfeed_element_request_add = "Anfrage Gruppe Hinzufügen" -groupfeed_element_add_comment = "Fügen Sie einen Kommentar hinzu" -groupfeed_element_drag_textarea = "Ziehen Sie Elemente in die textarea-Komponente, um Sie hinzuzufügen..." -groupfeed_element_click_textarea = "oder klicken Sie auf, um Sie auszuwählen." -groupfeed_element_save = "Speichern" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s Beiträge, %s threads" groupfeed_element_last_post = "Letzter Beitrag:" @@ -1358,25 +1352,24 @@ groupfeed_element_delete = "Löschen" groupfeed_element_usericon = "User Icon" groupfeed_element_num_posts = "%s Beiträge" groupfeed_element_num_views = "%s Ansichten" -groupfeed_element_last_edited = "Zuletzt Bearbeitet: %s" -groupfeed_element_post_vote = "Abstimmung:" +groupfeed_element_edited = "" groupfeed_element_last_post_info = "Letzter Beitrag:" groupfeed_element_start_thread = "Starten Sie Einen Neuen Thread" groupfeed_element_subject = "Thema" groupfeed_element_post = "Post" +groupfeed_element_drag_textarea = "Ziehen Sie Elemente in die textarea-Komponente, um Sie hinzuzufügen..." +groupfeed_element_click_textarea = "oder klicken Sie auf, um Sie auszuwählen." +groupfeed_element_save = "Speichern" groupfeed_element_feedplaces = "Feed Stellen" groupfeed_element_mygroups = "Alle Feeds" groupfeed_element_userplaces = "Benutzer Stellen" groupfeed_element_groupplaces = "%s Gruppe Stellen" groupfeed_element_wiki_name = "%s Wiki" groupfeed_element_recent_threads = "Den Letzten Threads" -groupfeed_element_recent_groupfeeds = "Aktuelle Feeds" +groupfeed_element_recent_groups = "" groupfeed_element_edit_post = "Edit Post" groupfeed_element_no_longer_update = "Gruppe-Feeds Nicht Mehr Aktualisiert!" ; -; PaginationElement.php -pagination_helper_next = "Weiter" -; ; MediajobsElement.php mediajobs_element_configure_media_jobs = "Konfigurieren Von Media Jobs" mediajobs_element_mode = "Modus" @@ -1416,14 +1409,14 @@ groupmenu_element_admin_menu = "Admin-Menü" groupmenu_element_welcome = "Willkommen" groupmenu_element_signin = "Signin" groupmenu_element_create_account = "Konto Erstellen" -groupmenu_element_page_places = "%s Seite %s Gruppe Stellen" -groupmenu_element_read_page = "%s Seite %s Gruppe" -groupmenu_element_edit_page = " Edit %s Seite" -groupmenu_element_page_history = "%s Seite Geschichte" -groupmenu_element_page_source = "%s Quelltext Der Seite" -groupmenu_element_page_relationships = "%s Seite Beziehungen" -groupmenu_element_page_discuss = " %s Seite Diskussion" -groupmenu_element_page_list = "%s Gruppe Seite Liste" +groupmenu_element_page = "" +groupmenu_element_view = "" +groupmenu_element_edit = "" +groupmenu_element_history = "" +groupmenu_element_source = "" +groupmenu_element_relationships = "" +groupmenu_element_discussion = "" +groupmenu_element_page_list = "" groupmenu_element_group_feed = "%s-Feed" groupmenu_element_page_thread = "%s Seite %s Gruppe Diskussion" groupmenu_element_page_thread_rss = "%s Seite %s Gruppe Diskussion" @@ -1829,8 +1822,8 @@ feeds_helper_view_minsecs = "%s m %s s her" feeds_helper_view_hourdate = "%s Stunden" ; ; PaginationHelper.php -pagination_helper_previous = "Prev" pagination_helper_next = "Weiter" +pagination_helper_previous = "Prev" ; ; ToggleHelper.php toggle_helper_on = "Auf" diff --git a/src/locale/de/statistics.txt b/src/locale/de/statistics.txt index 5a165df53..b6bef56f0 100755 --- a/src/locale/de/statistics.txt +++ b/src/locale/de/statistics.txt @@ -1 +1 @@ -d:100; \ No newline at end of file +d:99; \ No newline at end of file diff --git a/src/locale/en_US/configure.ini b/src/locale/en_US/configure.ini index d2eb71e68..d9efcb291 100644 --- a/src/locale/en_US/configure.ini +++ b/src/locale/en_US/configure.ini @@ -238,6 +238,7 @@ social_component_post_edited_elsewhere = "Post was just edited elsewhere (anothe social_component_no_update_access = "Cannot Update Post!" social_component_post_updated = "Post Updated!" social_component_no_group_access = "Not a member or can't read that group. Switching to public group!" +social_component_end_results = "Post or Comment to Continue the Discussion" social_component_no_posts_yet = "No Posts Yet" social_component_signin_to_access = "Please log in to an account with access to this group!" social_component_back = "Back" @@ -1071,7 +1072,6 @@ wiki_element_use_form_below = "Or you can use the form below to create or edit a wiki_element_submit = "Submit" wiki_element_syntax_summary = "Wiki Syntax Guide" wiki_element_signin_edit = "If you have sufficient access you might be able to create the page by logging in and navigating back here." -wiki_element_user_feedback = "User Feedback" wiki_element_locale_name = "Locale: %s" wiki_element_page = "Page: %s" wiki_element_resource_name = "Resource: %s" @@ -1144,13 +1144,11 @@ editlocales_element_save = "Save" ; GroupbarElement.php groupbar_element_skip_nav = "Skip Navigation" groupbar_element_page_list = "Page List" +groupbar_element_groups = "Groups" +groupbar_element_feeds = "Feeds" groupbar_element_page_thread = " %s Page at %s Group Discussion" -groupbar_element_groupfeed = "%s Feed" groupbar_element_no_path_info = "No Path Info" groupbar_element_userfeed = "User: %s" -groupbar_element_myfeeds = "My Feeds" -groupbar_element_ungrouped_icon = "Ungrouped Icon" -groupbar_element_grouped_icon = "Grouped Icon" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "Awaiting statuses of machines..." @@ -1343,10 +1341,6 @@ serversettings_element_save = "Save" ; GroupfeedElement.php groupfeed_element_add_group = "Add Group" groupfeed_element_request_add = "Request Add Group" -groupfeed_element_add_comment = "Add a Comment" -groupfeed_element_drag_textarea = "Drag items into the textarea to add them..." -groupfeed_element_click_textarea = "or click to select them." -groupfeed_element_save = "Save" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s posts, %s threads" groupfeed_element_last_post = "Last Post:" @@ -1358,25 +1352,24 @@ groupfeed_element_delete = "Delete" groupfeed_element_usericon = "User Icon" groupfeed_element_num_posts = "%s posts" groupfeed_element_num_views = "%s views" -groupfeed_element_last_edited = "Last Edited: %s" -groupfeed_element_post_vote = "Vote:" +groupfeed_element_edited = "Edited: %s" groupfeed_element_last_post_info = "Last Post:" groupfeed_element_start_thread = "Start New Thread" groupfeed_element_subject = "Subject" groupfeed_element_post = "Post" +groupfeed_element_drag_textarea = "Drag items into the textarea to add them..." +groupfeed_element_click_textarea = "or click to select them." +groupfeed_element_save = "Save" groupfeed_element_feedplaces = "Feed Places" groupfeed_element_mygroups = "All Feeds" groupfeed_element_userplaces = "User Places" groupfeed_element_groupplaces = "%s Group Places" groupfeed_element_wiki_name = "%s Wiki" groupfeed_element_recent_threads = "Recent Threads" -groupfeed_element_recent_groupfeeds = "Recent Feeds" +groupfeed_element_recent_groups = "Recent Groups" groupfeed_element_edit_post = "Edit Post" groupfeed_element_no_longer_update = "Group Feeds No Longer Updating!" ; -; PaginationElement.php -pagination_helper_next = "Next" -; ; MediajobsElement.php mediajobs_element_configure_media_jobs = "Configure Media Jobs" mediajobs_element_mode = "Mode" @@ -1416,14 +1409,14 @@ groupmenu_element_admin_menu = "Admin Menu" groupmenu_element_welcome = "Welcome" groupmenu_element_signin = "Signin" groupmenu_element_create_account = "Create Account" -groupmenu_element_page_places = "%s Page at %s Group Places" -groupmenu_element_read_page = "%s Page at %s Group" -groupmenu_element_edit_page = " Edit %s Page" -groupmenu_element_page_history = "%s Page History" -groupmenu_element_page_source = "%s Page Source" -groupmenu_element_page_relationships = "%s Page Relationships" -groupmenu_element_page_discuss = " %s Page Discussion" -groupmenu_element_page_list = "%s Group Page List" +groupmenu_element_page = "%s@%s" +groupmenu_element_view = "View" +groupmenu_element_edit = "Edit" +groupmenu_element_history = "History" +groupmenu_element_source = "Source" +groupmenu_element_relationships = "Relationships" +groupmenu_element_discussion = "Discussion" +groupmenu_element_page_list = "%s Page List" groupmenu_element_group_feed = "%s Feed" groupmenu_element_page_thread = "%s Page at %s Group Discussion" groupmenu_element_page_thread_rss = "%s Page at %s Group Discussion" @@ -1829,8 +1822,8 @@ feeds_helper_view_minsecs = "%s m %s s ago" feeds_helper_view_hourdate = "%s hours ago" ; ; PaginationHelper.php -pagination_helper_previous = "Prev" pagination_helper_next = "Next" +pagination_helper_previous = "Prev" ; ; ToggleHelper.php toggle_helper_on = "On" diff --git a/src/locale/es/configure.ini b/src/locale/es/configure.ini index 6f91bea60..4fd1d6be1 100755 --- a/src/locale/es/configure.ini +++ b/src/locale/es/configure.ini @@ -238,6 +238,7 @@ social_component_post_edited_elsewhere = "Post se acaba de editar en otro lugar social_component_no_update_access = "No Puede Actualizar El Post!!!" social_component_post_updated = "Post Actualizado!" social_component_no_group_access = "No es miembro, o puede&#039;t leer ese grupo. El cambio a grupo público!" +social_component_end_results = "" social_component_no_posts_yet = "Aún No Hay Mensajes" social_component_signin_to_access = "Por favor, iniciar sesión en una cuenta con acceso a este grupo!" social_component_back = "De vuelta" @@ -1071,7 +1072,6 @@ wiki_element_use_form_below = "O puedes usar el formulario de abajo para crear o wiki_element_submit = "Enviar" wiki_element_syntax_summary = "La Sintaxis Wiki Guía" wiki_element_signin_edit = "Si usted tiene acceso suficiente, usted podría ser capaz de crear la página de inicio de sesión y navegar de vuelta aquí." -wiki_element_user_feedback = "Comentarios De Los Usuarios" wiki_element_locale_name = "Configuración regional: %s" wiki_element_page = "Página: %s" wiki_element_resource_name = "Recursos: %s" @@ -1144,13 +1144,11 @@ editlocales_element_save = "Guardar" ; GroupbarElement.php groupbar_element_skip_nav = "Skip Navigation" groupbar_element_page_list = "Página De La Lista" +groupbar_element_groups = "" +groupbar_element_feeds = "" groupbar_element_page_thread = " %s Página %s Discusión de Grupo" -groupbar_element_groupfeed = "%s de Alimentación" groupbar_element_no_path_info = "No Hay Un Camino Info" groupbar_element_userfeed = "Usuario: %s" -groupbar_element_myfeeds = "Mis Feeds" -groupbar_element_ungrouped_icon = "Desagrupado Icono" -groupbar_element_grouped_icon = "Agrupados Icono" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "A la espera de los estados de las máquinas..." @@ -1343,10 +1341,6 @@ serversettings_element_save = "Guardar" ; GroupfeedElement.php groupfeed_element_add_group = "Agregar Grupo" groupfeed_element_request_add = "Solicitud De Agregar Grupo" -groupfeed_element_add_comment = "Agregar un Comentario" -groupfeed_element_drag_textarea = "Arrastre los elementos en el textarea para agregarlos..." -groupfeed_element_click_textarea = "o haga clic en seleccionar." -groupfeed_element_save = "Guardar" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s puestos, %s hilos" groupfeed_element_last_post = "Último Post:" @@ -1358,25 +1352,24 @@ groupfeed_element_delete = "Eliminar" groupfeed_element_usericon = "Icono De Usuario" groupfeed_element_num_posts = "%s puestos" groupfeed_element_num_views = "%s opiniones" -groupfeed_element_last_edited = "Última Edición: %s" -groupfeed_element_post_vote = "Voto:" +groupfeed_element_edited = "" groupfeed_element_last_post_info = "Último Post:" groupfeed_element_start_thread = "Inicio Nuevo Hilo" groupfeed_element_subject = "Tema" groupfeed_element_post = "Post" +groupfeed_element_drag_textarea = "Arrastre los elementos en el textarea para agregarlos..." +groupfeed_element_click_textarea = "o haga clic en seleccionar." +groupfeed_element_save = "Guardar" groupfeed_element_feedplaces = "Alimentar A Los Lugares" groupfeed_element_mygroups = "Todas Las Fuentes" groupfeed_element_userplaces = "Usuario Lugares" groupfeed_element_groupplaces = "%s Lugares Del Grupo" groupfeed_element_wiki_name = "%s Wiki" groupfeed_element_recent_threads = "Los Últimos Hilos" -groupfeed_element_recent_groupfeeds = "Los Últimos Feeds" +groupfeed_element_recent_groups = "" groupfeed_element_edit_post = "Editar El Post" groupfeed_element_no_longer_update = "Grupo Alimenta Dejado De Actualizar!" ; -; PaginationElement.php -pagination_helper_next = "Siguiente" -; ; MediajobsElement.php mediajobs_element_configure_media_jobs = "Configurar Los Empleos De Medios" mediajobs_element_mode = "Modo de" @@ -1416,14 +1409,14 @@ groupmenu_element_admin_menu = "Menú De Administración" groupmenu_element_welcome = "Bienvenido" groupmenu_element_signin = "Signin" groupmenu_element_create_account = "Crear Cuenta" -groupmenu_element_page_places = "%s Página en %s Lugares del Grupo" -groupmenu_element_read_page = "%s Página %s Grupo" -groupmenu_element_edit_page = " Editar Página %s" -groupmenu_element_page_history = "%s Página De La Historia" -groupmenu_element_page_source = "%s Fuente De La Página" -groupmenu_element_page_relationships = "%s Página De Relaciones" -groupmenu_element_page_discuss = " %s Página De Discusión" -groupmenu_element_page_list = "%s Grupo De La Lista De La Página" +groupmenu_element_page = "" +groupmenu_element_view = "" +groupmenu_element_edit = "" +groupmenu_element_history = "" +groupmenu_element_source = "" +groupmenu_element_relationships = "" +groupmenu_element_discussion = "" +groupmenu_element_page_list = "" groupmenu_element_group_feed = "%s de Alimentación" groupmenu_element_page_thread = "%s Página %s Discusión de Grupo" groupmenu_element_page_thread_rss = "%s Página %s Discusión de Grupo" @@ -1829,8 +1822,8 @@ feeds_helper_view_minsecs = "%s m %s s hace" feeds_helper_view_hourdate = "%s horas" ; ; PaginationHelper.php -pagination_helper_previous = "Prev" pagination_helper_next = "Siguiente" +pagination_helper_previous = "Prev" ; ; ToggleHelper.php toggle_helper_on = "En" diff --git a/src/locale/es/statistics.txt b/src/locale/es/statistics.txt index 5a165df53..b6bef56f0 100755 --- a/src/locale/es/statistics.txt +++ b/src/locale/es/statistics.txt @@ -1 +1 @@ -d:100; \ No newline at end of file +d:99; \ No newline at end of file diff --git a/src/locale/fa/configure.ini b/src/locale/fa/configure.ini index 94c818d1e..8dc1f6cd4 100755 --- a/src/locale/fa/configure.ini +++ b/src/locale/fa/configure.ini @@ -238,6 +238,7 @@ social_component_post_edited_elsewhere = "ارسال شد فقط ویرایش د social_component_no_update_access = "نمی تواند به روز رسانی پست!" social_component_post_updated = "پست به روز شد!" social_component_no_group_access = "نه یک عضو و یا می&#039;t خواندن آن گروه. تعویض به سکس!" +social_component_end_results = "" social_component_no_posts_yet = "هیچ پست و در عین حال" social_component_signin_to_access = "لطفا برای ورود به یک حساب کاربری با دسترسی به این گروه!" social_component_back = "بازگشت" @@ -1071,7 +1072,6 @@ wiki_element_use_form_below = "و یا شما می توانید از فرم زی wiki_element_submit = "ارسال" wiki_element_syntax_summary = "ویکی نحو راهنمای" wiki_element_signin_edit = "اگر شما دسترسی کافی شما ممکن است قادر به ایجاد صفحه ورود و مرور به اینجا." -wiki_element_user_feedback = "بازخورد کاربر" wiki_element_locale_name = "Locale: %s" wiki_element_page = "صفحه: %s" wiki_element_resource_name = "منبع: %s" @@ -1144,13 +1144,11 @@ editlocales_element_save = "صرفه جویی در" ; GroupbarElement.php groupbar_element_skip_nav = "Skip Navigation" groupbar_element_page_list = "صفحه فهرست" +groupbar_element_groups = "" +groupbar_element_feeds = "" groupbar_element_page_thread = " %s صفحه %s بحث گروهی" -groupbar_element_groupfeed = "%s خوراک" groupbar_element_no_path_info = "هیچ راه Info" groupbar_element_userfeed = "کاربر: %s" -groupbar_element_myfeeds = "من فید" -groupbar_element_ungrouped_icon = "Ungrouped آیکون" -groupbar_element_grouped_icon = "گروه بندی آیکون" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "منتظر وضعیت دستگاه‌ها..." @@ -1343,10 +1341,6 @@ serversettings_element_save = "صرفه جویی در" ; GroupfeedElement.php groupfeed_element_add_group = "اضافه کردن گروه" groupfeed_element_request_add = "درخواست اضافه کردن گروه" -groupfeed_element_add_comment = "اضافه کردن نظر" -groupfeed_element_drag_textarea = "کشیدن آیتم ها به ناحیه ی متن به آنها اضافه..." -groupfeed_element_click_textarea = "و یا کلیک کنید تا آنها را انتخاب کنید." -groupfeed_element_save = "صرفه جویی در" groupfeed_element_group_wiki = "ویکی" groupfeed_element_group_stats = "%s پست %s موضوعات" groupfeed_element_last_post = "آخرین ارسال:" @@ -1358,25 +1352,24 @@ groupfeed_element_delete = "حذف" groupfeed_element_usericon = "نماد کاربر" groupfeed_element_num_posts = "%s پست" groupfeed_element_num_views = "%s views" -groupfeed_element_last_edited = "آخرین ویرایش: %s" -groupfeed_element_post_vote = "رای:" +groupfeed_element_edited = "" groupfeed_element_last_post_info = "آخرین ارسال:" groupfeed_element_start_thread = "شروع موضوع جدید" groupfeed_element_subject = "موضوع" groupfeed_element_post = "پست" +groupfeed_element_drag_textarea = "کشیدن آیتم ها به ناحیه ی متن به آنها اضافه..." +groupfeed_element_click_textarea = "و یا کلیک کنید تا آنها را انتخاب کنید." +groupfeed_element_save = "صرفه جویی در" groupfeed_element_feedplaces = "خوراک مکان" groupfeed_element_mygroups = "همه تغذیه" groupfeed_element_userplaces = "مکان کاربر" groupfeed_element_groupplaces = "%s گروه" groupfeed_element_wiki_name = "%s ویکی" groupfeed_element_recent_threads = "موضوعات اخیر" -groupfeed_element_recent_groupfeeds = "اخیر تغذیه" +groupfeed_element_recent_groups = "" groupfeed_element_edit_post = "ویرایش پست" groupfeed_element_no_longer_update = "گروه تغذیه و دیگر به روز رسانی!" ; -; PaginationElement.php -pagination_helper_next = "بعد" -; ; MediajobsElement.php mediajobs_element_configure_media_jobs = "پیکربندی رسانه های مشاغل" mediajobs_element_mode = "حالت" @@ -1416,14 +1409,14 @@ groupmenu_element_admin_menu = "منوی مدیریت" groupmenu_element_welcome = "خوش آمدید" groupmenu_element_signin = "Signin" groupmenu_element_create_account = "ایجاد حساب کاربری" -groupmenu_element_page_places = "%s صفحه %s گروه" -groupmenu_element_read_page = "%s صفحه %s گروه" -groupmenu_element_edit_page = " ویرایش %s صفحه" -groupmenu_element_page_history = "%s صفحه تاریخچه" -groupmenu_element_page_source = "%s صفحه منبع" -groupmenu_element_page_relationships = "%s صفحه روابط" -groupmenu_element_page_discuss = " %s صفحه بحث" -groupmenu_element_page_list = "%s گروه صفحه فهرست" +groupmenu_element_page = "" +groupmenu_element_view = "" +groupmenu_element_edit = "" +groupmenu_element_history = "" +groupmenu_element_source = "" +groupmenu_element_relationships = "" +groupmenu_element_discussion = "" +groupmenu_element_page_list = "" groupmenu_element_group_feed = "%s خوراک" groupmenu_element_page_thread = "%s صفحه %s بحث گروهی" groupmenu_element_page_thread_rss = "%s صفحه %s بحث گروهی" @@ -1829,8 +1822,8 @@ feeds_helper_view_minsecs = "%s m %s s پیش" feeds_helper_view_hourdate = "%s ساعت پیش" ; ; PaginationHelper.php -pagination_helper_previous = "قبل" pagination_helper_next = "بعد" +pagination_helper_previous = "قبل" ; ; ToggleHelper.php toggle_helper_on = "روشن" diff --git a/src/locale/fa/statistics.txt b/src/locale/fa/statistics.txt index 5a165df53..b6bef56f0 100755 --- a/src/locale/fa/statistics.txt +++ b/src/locale/fa/statistics.txt @@ -1 +1 @@ -d:100; \ No newline at end of file +d:99; \ No newline at end of file diff --git a/src/locale/fr_FR/configure.ini b/src/locale/fr_FR/configure.ini index 5832cae33..bb6a3d687 100755 --- a/src/locale/fr_FR/configure.ini +++ b/src/locale/fr_FR/configure.ini @@ -238,6 +238,7 @@ social_component_post_edited_elsewhere = "Post a été publié social_component_no_update_access = "Impossible me mettre à jour le post!" social_component_post_updated = "Post mis à jour!" social_component_no_group_access = "Pas un membre ou peut't lu que groupe. De commutation de groupe public!" +social_component_end_results = "" social_component_no_posts_yet = "Pas de postes encore" social_component_signin_to_access = "Veuillez vous connecter à un compte ayant accès à ce groupe!" social_component_back = "De retour" @@ -1071,7 +1072,6 @@ wiki_element_use_form_below = "Ou vous pouvez utiliser le formulaire ci-dessous wiki_element_submit = "Soumettre" wiki_element_syntax_summary = "La syntaxe wiki guide" wiki_element_signin_edit = "Si vous avez un accès suffisant, vous pourriez être en mesure de créer la page en vous connectant et de naviguer de nouveau ici." -wiki_element_user_feedback = "Les commentaires des utilisateurs" wiki_element_locale_name = "Paramètres régionaux: %s" wiki_element_page = "Page: %s" wiki_element_resource_name = "Ressources: %s" @@ -1144,13 +1144,11 @@ editlocales_element_save = "Enregistrer" ; GroupbarElement.php groupbar_element_skip_nav = "Skip Navigation" groupbar_element_page_list = "La page liste" +groupbar_element_groups = "" +groupbar_element_feeds = "" groupbar_element_page_thread = " %s page %s groupe de discussion" -groupbar_element_groupfeed = "%s alimentation" groupbar_element_no_path_info = "Aucune information de chemin" groupbar_element_userfeed = "Utilisateur: %s" -groupbar_element_myfeeds = "Mes flux" -groupbar_element_ungrouped_icon = "Icône non groupée" -groupbar_element_grouped_icon = "Icône groupée" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "En attendant, les statuts de machines..." @@ -1343,10 +1341,6 @@ serversettings_element_save = "Enregistrer" ; GroupfeedElement.php groupfeed_element_add_group = "Ajouter un groupe" groupfeed_element_request_add = "Demande d'ajouter un groupe" -groupfeed_element_add_comment = "Ajouter un commentaire" -groupfeed_element_drag_textarea = "Faites glisser les éléments dans le textarea pour les ajouter..." -groupfeed_element_click_textarea = "ou cliquez sur pour sélectionner." -groupfeed_element_save = "Enregistrer" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s postes, %s fils" groupfeed_element_last_post = "Dernier post:" @@ -1358,25 +1352,24 @@ groupfeed_element_delete = "Supprimer" groupfeed_element_usericon = "Icône d'utilisateur" groupfeed_element_num_posts = "%s messages" groupfeed_element_num_views = "%s vues" -groupfeed_element_last_edited = "Dernière édition: %s" -groupfeed_element_post_vote = "Vote:" +groupfeed_element_edited = "" groupfeed_element_last_post_info = "Dernier post:" groupfeed_element_start_thread = "Commencer à Nouveau Thread" groupfeed_element_subject = "Sujet" groupfeed_element_post = "Post" +groupfeed_element_drag_textarea = "Faites glisser les éléments dans le textarea pour les ajouter..." +groupfeed_element_click_textarea = "ou cliquez sur pour sélectionner." +groupfeed_element_save = "Enregistrer" groupfeed_element_feedplaces = "Lieux de flux" groupfeed_element_mygroups = "Tous les flux" groupfeed_element_userplaces = "L'utilisateur place" groupfeed_element_groupplaces = "%s groupe lieux" groupfeed_element_wiki_name = "%s wiki" groupfeed_element_recent_threads = "Récente fils" -groupfeed_element_recent_groupfeeds = "Les récents flux" +groupfeed_element_recent_groups = "" groupfeed_element_edit_post = "Modifier post" groupfeed_element_no_longer_update = "Le groupe se nourrit plus de la mise à Jour!" ; -; PaginationElement.php -pagination_helper_next = "Proch." -; ; MediajobsElement.php mediajobs_element_configure_media_jobs = "Configurer les métiers des médias" mediajobs_element_mode = "Mode" @@ -1416,14 +1409,14 @@ groupmenu_element_admin_menu = "Menu Admin" groupmenu_element_welcome = "Bienvenue" groupmenu_element_signin = "Connexion" groupmenu_element_create_account = "Créer un compte" -groupmenu_element_page_places = "%s page %s groupe lieux" -groupmenu_element_read_page = "%s page %s groupe" -groupmenu_element_edit_page = "Modifier la page %s" -groupmenu_element_page_history = "%s l'historique de la page" -groupmenu_element_page_source = "%s source de la page" -groupmenu_element_page_relationships = "%s page des relations" -groupmenu_element_page_discuss = " %s page de discussion" -groupmenu_element_page_list = "%s groupe à la page liste" +groupmenu_element_page = "" +groupmenu_element_view = "" +groupmenu_element_edit = "" +groupmenu_element_history = "" +groupmenu_element_source = "" +groupmenu_element_relationships = "" +groupmenu_element_discussion = "" +groupmenu_element_page_list = "" groupmenu_element_group_feed = "%s alimentation" groupmenu_element_page_thread = "%s Page %s Groupe de discussion" groupmenu_element_page_thread_rss = "%s Page %s Groupe de discussion" @@ -1829,8 +1822,8 @@ feeds_helper_view_minsecs = "%s m %s s ago" feeds_helper_view_hourdate = "il y a %s heures" ; ; PaginationHelper.php -pagination_helper_previous = "Préc." pagination_helper_next = "Proch." +pagination_helper_previous = "Préc." ; ; ToggleHelper.php toggle_helper_on = "Marche" diff --git a/src/locale/fr_FR/statistics.txt b/src/locale/fr_FR/statistics.txt index 5a165df53..b6bef56f0 100755 --- a/src/locale/fr_FR/statistics.txt +++ b/src/locale/fr_FR/statistics.txt @@ -1 +1 @@ -d:100; \ No newline at end of file +d:99; \ No newline at end of file diff --git a/src/locale/he/configure.ini b/src/locale/he/configure.ini index e6bbfe1d8..e117d4499 100755 --- a/src/locale/he/configure.ini +++ b/src/locale/he/configure.ini @@ -238,6 +238,7 @@ social_component_post_edited_elsewhere = "הפוסט היה רק לערוך במ social_component_no_update_access = "אין אפשרות לעדכן את הפוסט!" social_component_post_updated = "פוסט מתעדכן!" social_component_no_group_access = "לא חבר או יכול&#039;לא קראתי את הקבוצה הזאת. מיתוג ציבורי קבוצה!" +social_component_end_results = "" social_component_no_posts_yet = "לא עוד פוסטים" social_component_signin_to_access = "אנא היכנס לחשבון עם גישה לקבוצה זו!" social_component_back = "חזרה" @@ -1071,7 +1072,6 @@ wiki_element_use_form_below = "או שאתה יכול להשתמש בטופס ש wiki_element_submit = "להגיש" wiki_element_syntax_summary = "תחביר ויקי מדריך" wiki_element_signin_edit = "אם יש לך גישה מספקת, אתה יכול להיות מסוגל ליצור את הדף על-ידי כניסה וניווט חזרה לכאן." -wiki_element_user_feedback = "משוב משתמש" wiki_element_locale_name = "אזור: %s" wiki_element_page = "עמוד: %s" wiki_element_resource_name = "משאב: %s" @@ -1144,13 +1144,11 @@ editlocales_element_save = "להציל" ; GroupbarElement.php groupbar_element_skip_nav = "דלג ניווט" groupbar_element_page_list = "בדף הרשימה." +groupbar_element_groups = "" +groupbar_element_feeds = "" groupbar_element_page_thread = " %s עמוד %s קבוצת דיון" -groupbar_element_groupfeed = "%s להאכיל" groupbar_element_no_path_info = "אין דרך מידע" groupbar_element_userfeed = "משתמש: %s" -groupbar_element_myfeeds = "את הזנות" -groupbar_element_ungrouped_icon = "Ungrouped סמל" -groupbar_element_grouped_icon = "מקובצים סמל" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "ממתין סטטוסים של מכונות..." @@ -1343,10 +1341,6 @@ serversettings_element_save = "להציל" ; GroupfeedElement.php groupfeed_element_add_group = "הוספת קבוצה" groupfeed_element_request_add = "בקשה להוסיף קבוצה" -groupfeed_element_add_comment = "הוסף תגובה" -groupfeed_element_drag_textarea = "גרור פריטים לתוך אזור טקסט. כדי להוסיף אותם..." -groupfeed_element_click_textarea = "או לחץ על כדי לבחור אותם." -groupfeed_element_save = "להציל" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s פוסטים, %s חוטים" groupfeed_element_last_post = "הודעה אחרונה:" @@ -1358,25 +1352,24 @@ groupfeed_element_delete = "למחוק" groupfeed_element_usericon = "סמל משתמש" groupfeed_element_num_posts = "%s הודעות" groupfeed_element_num_views = "%s צפיות" -groupfeed_element_last_edited = "אתמול נערך: %s" -groupfeed_element_post_vote = "הצבעה:" +groupfeed_element_edited = "" groupfeed_element_last_post_info = "הודעה אחרונה:" groupfeed_element_start_thread = "התחל שרשור חדש" groupfeed_element_subject = "הנושא" groupfeed_element_post = "פוסט" +groupfeed_element_drag_textarea = "גרור פריטים לתוך אזור טקסט. כדי להוסיף אותם..." +groupfeed_element_click_textarea = "או לחץ על כדי לבחור אותם." +groupfeed_element_save = "להציל" groupfeed_element_feedplaces = "להאכיל מקומות" groupfeed_element_mygroups = "כל הזנות" groupfeed_element_userplaces = "המשתמש מקומות" groupfeed_element_groupplaces = "%s קבוצה מקומות" groupfeed_element_wiki_name = "%s Wiki" groupfeed_element_recent_threads = "לאחרונה אשכולות" -groupfeed_element_recent_groupfeeds = "לאחרונה הזנות" +groupfeed_element_recent_groups = "" groupfeed_element_edit_post = "עריכת פוסט" groupfeed_element_no_longer_update = "קבוצת הזנות כבר לא מעדכן!" ; -; PaginationElement.php -pagination_helper_next = "הבא" -; ; MediajobsElement.php mediajobs_element_configure_media_jobs = "להגדיר מדיה עבודות" mediajobs_element_mode = "מצב" @@ -1416,14 +1409,14 @@ groupmenu_element_admin_menu = "ניהול תפריט" groupmenu_element_welcome = "ברוך הבא" groupmenu_element_signin = "Signin" groupmenu_element_create_account = "צור חשבון" -groupmenu_element_page_places = "%s עמוד %s קבוצה מקומות" -groupmenu_element_read_page = "%s עמוד %s קבוצה" -groupmenu_element_edit_page = " עריכה %s דף" -groupmenu_element_page_history = "%s דף ההיסטוריה" -groupmenu_element_page_source = "%s דף המקור." -groupmenu_element_page_relationships = "%s עמוד יחסים" -groupmenu_element_page_discuss = " %s דף דיון" -groupmenu_element_page_list = "%s קבוצה דף הרשימה" +groupmenu_element_page = "" +groupmenu_element_view = "" +groupmenu_element_edit = "" +groupmenu_element_history = "" +groupmenu_element_source = "" +groupmenu_element_relationships = "" +groupmenu_element_discussion = "" +groupmenu_element_page_list = "" groupmenu_element_group_feed = "%s להאכיל" groupmenu_element_page_thread = "%s עמוד %s קבוצת דיון" groupmenu_element_page_thread_rss = "%s עמוד %s קבוצת דיון" @@ -1829,8 +1822,8 @@ feeds_helper_view_minsecs = "%s מ ' רוחב %s ס לפני" feeds_helper_view_hourdate = "%s שעות" ; ; PaginationHelper.php -pagination_helper_previous = "קודם" pagination_helper_next = "הבא" +pagination_helper_previous = "קודם" ; ; ToggleHelper.php toggle_helper_on = "על" diff --git a/src/locale/he/statistics.txt b/src/locale/he/statistics.txt index 5a165df53..b6bef56f0 100755 --- a/src/locale/he/statistics.txt +++ b/src/locale/he/statistics.txt @@ -1 +1 @@ -d:100; \ No newline at end of file +d:99; \ No newline at end of file diff --git a/src/locale/hi/configure.ini b/src/locale/hi/configure.ini index 1243eda9f..28f6160bb 100755 --- a/src/locale/hi/configure.ini +++ b/src/locale/hi/configure.ini @@ -238,6 +238,7 @@ social_component_post_edited_elsewhere = "पोस्ट सिर्फ सं social_component_no_update_access = "अद्यतन नहीं कर सकता पोस्ट!" social_component_post_updated = "पोस्ट अद्यतन!" social_component_no_group_access = "नहीं एक सदस्य या कर सकते हैं&#039;टी पढ़ें । स्विच करने के लिए समूह!" +social_component_end_results = "" social_component_no_posts_yet = "कोई पोस्ट नहीं अभी तक" social_component_signin_to_access = "कृपया लॉग इन करने के लिए एक खाता के साथ उपयोग करने के लिए इस समूह!" social_component_back = "वापस" @@ -1071,7 +1072,6 @@ wiki_element_use_form_below = "या आप उपयोग कर सकते wiki_element_submit = "प्रस्तुत" wiki_element_syntax_summary = "विकी वाक्य रचना गाइड" wiki_element_signin_edit = "यदि आप पर्याप्त तुम तक पहुँचने में सक्षम हो सकता है बनाने के लिए पृष्ठ में प्रवेश करके और नेविगेट यहाँ वापस." -wiki_element_user_feedback = "उपयोगकर्ता प्रतिक्रिया" wiki_element_locale_name = "वातावरण: %s" wiki_element_page = "पेज: %s" wiki_element_resource_name = "संसाधन: %s" @@ -1144,13 +1144,11 @@ editlocales_element_save = "बचाने के लिए" ; GroupbarElement.php groupbar_element_skip_nav = "छोड़ें नेविगेशन" groupbar_element_page_list = "पृष्ठ सूची" +groupbar_element_groups = "" +groupbar_element_feeds = "" groupbar_element_page_thread = " %s पृष्ठ पर %s समूह चर्चा" -groupbar_element_groupfeed = "%s फ़ीड" groupbar_element_no_path_info = "कोई पथ जानकारी" groupbar_element_userfeed = "उपयोगकर्ता: %s" -groupbar_element_myfeeds = "मेरे फ़ीड" -groupbar_element_ungrouped_icon = "अनग्रुप हो जाते आइकन" -groupbar_element_grouped_icon = "वर्गीकृत चिह्न" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "इंतजार की स्थितियों की मशीन,..." @@ -1343,10 +1341,6 @@ serversettings_element_save = "बचाने के लिए" ; GroupfeedElement.php groupfeed_element_add_group = "समूह जोड़ें" groupfeed_element_request_add = "अनुरोध समूह जोड़ें" -groupfeed_element_add_comment = "एक टिप्पणी जोड़ें" -groupfeed_element_drag_textarea = "खींचें आइटम में textarea के लिए उन्हें जोड़ने..." -groupfeed_element_click_textarea = "या करने के लिए क्लिक करें उन्हें चुनें." -groupfeed_element_save = "बचाने के लिए" groupfeed_element_group_wiki = "विकी" groupfeed_element_group_stats = "%s पदों, %s सूत्र" groupfeed_element_last_post = "पिछले पोस्ट:" @@ -1358,25 +1352,24 @@ groupfeed_element_delete = "हटाना" groupfeed_element_usericon = "उपयोगकर्ता आइकन" groupfeed_element_num_posts = "%s पद" groupfeed_element_num_views = "%s दर्शनों की संख्या" -groupfeed_element_last_edited = "अंतिम संपादित: %s" -groupfeed_element_post_vote = "मतदान:" +groupfeed_element_edited = "" groupfeed_element_last_post_info = "पिछले पोस्ट:" groupfeed_element_start_thread = "नया धागा शुरू" groupfeed_element_subject = "विषय" groupfeed_element_post = "पोस्ट" +groupfeed_element_drag_textarea = "खींचें आइटम में textarea के लिए उन्हें जोड़ने..." +groupfeed_element_click_textarea = "या करने के लिए क्लिक करें उन्हें चुनें." +groupfeed_element_save = "बचाने के लिए" groupfeed_element_feedplaces = "फ़ीड स्थानों" groupfeed_element_mygroups = "सभी फ़ीड" groupfeed_element_userplaces = "उपयोगकर्ता स्थानों" groupfeed_element_groupplaces = "%s समूह स्थानों" groupfeed_element_wiki_name = "%s विकी" groupfeed_element_recent_threads = "हाल के धागे" -groupfeed_element_recent_groupfeeds = "हाल ही में फ़ीड" +groupfeed_element_recent_groups = "" groupfeed_element_edit_post = "पोस्ट को संपादित" groupfeed_element_no_longer_update = "समूह फ़ीड नहीं रह अद्यतन!" ; -; PaginationElement.php -pagination_helper_next = "अगले" -; ; MediajobsElement.php mediajobs_element_configure_media_jobs = "कॉन्फ़िगर मीडिया नौकरियां" mediajobs_element_mode = "मोड" @@ -1416,14 +1409,14 @@ groupmenu_element_admin_menu = "व्यवस्थापक मेनू" groupmenu_element_welcome = "आपका स्वागत है" groupmenu_element_signin = "साइन इन" groupmenu_element_create_account = "खाता बनाएँ" -groupmenu_element_page_places = "%s पृष्ठ पर %s समूह स्थानों" -groupmenu_element_read_page = "%s पृष्ठ पर %s समूह" -groupmenu_element_edit_page = " संपादित करें पृष्ठ %s" -groupmenu_element_page_history = "%s पृष्ठ इतिहास" -groupmenu_element_page_source = "%s पृष्ठ स्रोत" -groupmenu_element_page_relationships = "%s पेज के रिश्तों" -groupmenu_element_page_discuss = " %s पृष्ठ पर चर्चा" -groupmenu_element_page_list = "%s समूह पृष्ठ सूची" +groupmenu_element_page = "" +groupmenu_element_view = "" +groupmenu_element_edit = "" +groupmenu_element_history = "" +groupmenu_element_source = "" +groupmenu_element_relationships = "" +groupmenu_element_discussion = "" +groupmenu_element_page_list = "" groupmenu_element_group_feed = "%s फ़ीड" groupmenu_element_page_thread = "%s पृष्ठ पर %s समूह चर्चा" groupmenu_element_page_thread_rss = "%s पृष्ठ पर %s समूह चर्चा" @@ -1829,8 +1822,8 @@ feeds_helper_view_minsecs = "%s एम एस %s पहले" feeds_helper_view_hourdate = "%s घंटे पहले" ; ; PaginationHelper.php -pagination_helper_previous = "पिछला" pagination_helper_next = "अगले" +pagination_helper_previous = "पिछला" ; ; ToggleHelper.php toggle_helper_on = "पर" diff --git a/src/locale/hi/statistics.txt b/src/locale/hi/statistics.txt index 5a165df53..b6bef56f0 100755 --- a/src/locale/hi/statistics.txt +++ b/src/locale/hi/statistics.txt @@ -1 +1 @@ -d:100; \ No newline at end of file +d:99; \ No newline at end of file diff --git a/src/locale/id/configure.ini b/src/locale/id/configure.ini index 95ab05493..154e6bea7 100755 --- a/src/locale/id/configure.ini +++ b/src/locale/id/configure.ini @@ -238,6 +238,7 @@ social_component_post_edited_elsewhere = "Posting itu hanya diedit di tempat lai social_component_no_update_access = "Tidak Bisa Update Post!" social_component_post_updated = "Posting Diperbarui!" social_component_no_group_access = "Bukan anggota atau dapat&#039;t baca bahwa kelompok. Beralih ke grup publik!" +social_component_end_results = "" social_component_no_posts_yet = "Tidak Ada Posting Yang Belum" social_component_signin_to_access = "Silahkan log in ke akun dengan akses ke grup ini!" social_component_back = "Kembali" @@ -1071,7 +1072,6 @@ wiki_element_use_form_below = "Atau anda dapat menggunakan formulir di bawah ini wiki_element_submit = "Kirim" wiki_element_syntax_summary = "Sintaks Wiki Guide" wiki_element_signin_edit = "Jika anda memiliki akses yang cukup anda mungkin dapat membuat halaman dengan masuk dan menavigasi kembali ke sini." -wiki_element_user_feedback = "Umpan Balik Pengguna" wiki_element_locale_name = "Lokal: %s" wiki_element_page = "Halaman: %s" wiki_element_resource_name = "Sumber: %s" @@ -1144,13 +1144,11 @@ editlocales_element_save = "Simpan" ; GroupbarElement.php groupbar_element_skip_nav = "Loncat Navigasi" groupbar_element_page_list = "Halaman Daftar" +groupbar_element_groups = "" +groupbar_element_feeds = "" groupbar_element_page_thread = " %s Halaman %s Diskusi Kelompok" -groupbar_element_groupfeed = "%s Pakan" groupbar_element_no_path_info = "Tidak Ada Jalan Info" groupbar_element_userfeed = "Pengguna: %s" -groupbar_element_myfeeds = "Feed Saya" -groupbar_element_ungrouped_icon = "Groupnya Ikon" -groupbar_element_grouped_icon = "Dikelompokkan Ikon" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "Menunggu status dari mesin..." @@ -1343,10 +1341,6 @@ serversettings_element_save = "Simpan" ; GroupfeedElement.php groupfeed_element_add_group = "Tambahkan Group" groupfeed_element_request_add = "Permintaan Tambahkan Group" -groupfeed_element_add_comment = "Tambahkan Komentar" -groupfeed_element_drag_textarea = "Drag item ke dalam textarea untuk menambahkan mereka..." -groupfeed_element_click_textarea = "atau klik untuk memilih mereka." -groupfeed_element_save = "Simpan" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s posting, %s benang" groupfeed_element_last_post = "Posting Terakhir:" @@ -1358,25 +1352,24 @@ groupfeed_element_delete = "Menghapus" groupfeed_element_usericon = "Pengguna Ikon" groupfeed_element_num_posts = "%s posting" groupfeed_element_num_views = "%s views" -groupfeed_element_last_edited = "Terakhir Diedit: %s" -groupfeed_element_post_vote = "Suara:" +groupfeed_element_edited = "" groupfeed_element_last_post_info = "Posting Terakhir:" groupfeed_element_start_thread = "Mulai Thread Baru" groupfeed_element_subject = "Subjek" groupfeed_element_post = "Post" +groupfeed_element_drag_textarea = "Drag item ke dalam textarea untuk menambahkan mereka..." +groupfeed_element_click_textarea = "atau klik untuk memilih mereka." +groupfeed_element_save = "Simpan" groupfeed_element_feedplaces = "Makan Tempat" groupfeed_element_mygroups = "Semua Feed" groupfeed_element_userplaces = "Pengguna Tempat" groupfeed_element_groupplaces = "%s Kelompok Tempat" groupfeed_element_wiki_name = "%s Wiki" groupfeed_element_recent_threads = "Baru-Baru Ini Thread" -groupfeed_element_recent_groupfeeds = "Feed Baru-Baru Ini" +groupfeed_element_recent_groups = "" groupfeed_element_edit_post = "Edit Post" groupfeed_element_no_longer_update = "Kelompok Feed Tidak Lagi Memperbarui!" ; -; PaginationElement.php -pagination_helper_next = "Sesudah" -; ; MediajobsElement.php mediajobs_element_configure_media_jobs = "Mengkonfigurasi Media Lowongan" mediajobs_element_mode = "Mode" @@ -1416,14 +1409,14 @@ groupmenu_element_admin_menu = "Menu Admin" groupmenu_element_welcome = "Selamat datang" groupmenu_element_signin = "Signin" groupmenu_element_create_account = "Buat Akun" -groupmenu_element_page_places = "%s Halaman %s Kelompok Tempat" -groupmenu_element_read_page = "%s Halaman %s Group" -groupmenu_element_edit_page = " Mengedit Halaman %s" -groupmenu_element_page_history = "%s Halaman Sejarah" -groupmenu_element_page_source = "%s Halaman Sumber" -groupmenu_element_page_relationships = "%s Halaman Hubungan" -groupmenu_element_page_discuss = " %s Halaman Diskusi" -groupmenu_element_page_list = "%s Group Halaman Daftar" +groupmenu_element_page = "" +groupmenu_element_view = "" +groupmenu_element_edit = "" +groupmenu_element_history = "" +groupmenu_element_source = "" +groupmenu_element_relationships = "" +groupmenu_element_discussion = "" +groupmenu_element_page_list = "" groupmenu_element_group_feed = "%s Pakan" groupmenu_element_page_thread = "%s Halaman %s Diskusi Kelompok" groupmenu_element_page_thread_rss = "%s Halaman %s Diskusi Kelompok" @@ -1829,8 +1822,8 @@ feeds_helper_view_minsecs = "%s m %s s yang lalu" feeds_helper_view_hourdate = "%s jam yang lalu" ; ; PaginationHelper.php -pagination_helper_previous = "Sebelum" pagination_helper_next = "Sesudah" +pagination_helper_previous = "Sebelum" ; ; ToggleHelper.php toggle_helper_on = "Pada" diff --git a/src/locale/id/statistics.txt b/src/locale/id/statistics.txt index 5a165df53..b6bef56f0 100755 --- a/src/locale/id/statistics.txt +++ b/src/locale/id/statistics.txt @@ -1 +1 @@ -d:100; \ No newline at end of file +d:99; \ No newline at end of file diff --git a/src/locale/it/configure.ini b/src/locale/it/configure.ini index 00f241af0..d330ec370 100755 --- a/src/locale/it/configure.ini +++ b/src/locale/it/configure.ini @@ -238,6 +238,7 @@ social_component_post_edited_elsewhere = "Il Post è stato editato altrove social_component_no_update_access = "Impossibile Aggiornare Il Post!" social_component_post_updated = "Post Aggiornato!" social_component_no_group_access = "Non un membro o di un possibile&#039;t di lettura che di gruppo. Di commutazione per gruppo pubblico!" +social_component_end_results = "" social_component_no_posts_yet = "Ancora Posts" social_component_signin_to_access = "Si prega di accedere a un account con accesso a questo gruppo!" social_component_back = "Indietro" @@ -1071,7 +1072,6 @@ wiki_element_use_form_below = "Oppure potete usare il modulo sottostante per cre wiki_element_submit = "Invia" wiki_element_syntax_summary = "La Sintassi Wiki, Guida" wiki_element_signin_edit = "Se si dispone di diritti di accesso sufficienti si potrebbe essere in grado di creare la pagina di registrazione e la navigazione di ritorno qui." -wiki_element_user_feedback = "Il Feedback Degli Utenti" wiki_element_locale_name = "Impostazioni locali: %s" wiki_element_page = "Pagina: %s" wiki_element_resource_name = "Risorsa: %s" @@ -1144,13 +1144,11 @@ editlocales_element_save = "Salva" ; GroupbarElement.php groupbar_element_skip_nav = "Salta Il Menu Di Navigazione" groupbar_element_page_list = "Pagina Elenco" +groupbar_element_groups = "" +groupbar_element_feeds = "" groupbar_element_page_thread = " %s Pagina %s di Discussione di Gruppo" -groupbar_element_groupfeed = "%s Alimentazione" groupbar_element_no_path_info = "Nessun Percorso Info" groupbar_element_userfeed = "Utente: %s" -groupbar_element_myfeeds = "I Miei Feed" -groupbar_element_ungrouped_icon = "Separate Icona" -groupbar_element_grouped_icon = "Raggruppati Icona" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "In attesa stato Macchine..." @@ -1343,10 +1341,6 @@ serversettings_element_save = "Salva" ; GroupfeedElement.php groupfeed_element_add_group = "Aggiungi Gruppo" groupfeed_element_request_add = "Richiesta Aggiungi Gruppo" -groupfeed_element_add_comment = "Aggiungi un Commento" -groupfeed_element_drag_textarea = "Trascinare gli elementi nella textarea per aggiungerli..." -groupfeed_element_click_textarea = "o fare clic per selezionarlo." -groupfeed_element_save = "Salva" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s posti, %s thread" groupfeed_element_last_post = "Ultimo Post:" @@ -1358,25 +1352,24 @@ groupfeed_element_delete = "Eliminare" groupfeed_element_usericon = "Icona Utente" groupfeed_element_num_posts = "%s posti" groupfeed_element_num_views = "%s visualizzazioni" -groupfeed_element_last_edited = "Ultima Modifica: %s" -groupfeed_element_post_vote = "Voto:" +groupfeed_element_edited = "" groupfeed_element_last_post_info = "Ultimo Post:" groupfeed_element_start_thread = "Avviare Una Nuova Discussione" groupfeed_element_subject = "Soggetto" groupfeed_element_post = "Post" +groupfeed_element_drag_textarea = "Trascinare gli elementi nella textarea per aggiungerli..." +groupfeed_element_click_textarea = "o fare clic per selezionarlo." +groupfeed_element_save = "Salva" groupfeed_element_feedplaces = "Feed Luoghi" groupfeed_element_mygroups = "Tutti I Feed" groupfeed_element_userplaces = "Utente Posti" groupfeed_element_groupplaces = "%s Gruppo" groupfeed_element_wiki_name = "%s Wiki" groupfeed_element_recent_threads = "Ultimi Thread" -groupfeed_element_recent_groupfeeds = "Recenti Feed" +groupfeed_element_recent_groups = "" groupfeed_element_edit_post = "Modifica Post" groupfeed_element_no_longer_update = "Gruppo Di Feed Non È Più L'Aggiornamento!" ; -; PaginationElement.php -pagination_helper_next = "Prossimo" -; ; MediajobsElement.php mediajobs_element_configure_media_jobs = "Configurare La Media Di Posti Di Lavoro" mediajobs_element_mode = "Modalità di" @@ -1416,14 +1409,14 @@ groupmenu_element_admin_menu = "Admin Menu" groupmenu_element_welcome = "Benvenuto" groupmenu_element_signin = "Signin" groupmenu_element_create_account = "Crea Un Account" -groupmenu_element_page_places = "%s Pagina %s di Gruppo Posti" -groupmenu_element_read_page = "%s Pagina %s di Gruppo" -groupmenu_element_edit_page = " Edit %s Pagina" -groupmenu_element_page_history = "%s Pagina Di Storia" -groupmenu_element_page_source = "%s Sorgente Della Pagina" -groupmenu_element_page_relationships = "%s Pagina Relazioni" -groupmenu_element_page_discuss = " %s Pagina Di Discussione" -groupmenu_element_page_list = "%s Gruppo Pagina Elenco" +groupmenu_element_page = "" +groupmenu_element_view = "" +groupmenu_element_edit = "" +groupmenu_element_history = "" +groupmenu_element_source = "" +groupmenu_element_relationships = "" +groupmenu_element_discussion = "" +groupmenu_element_page_list = "" groupmenu_element_group_feed = "%s Alimentazione" groupmenu_element_page_thread = "%s Pagina %s di Discussione di Gruppo" groupmenu_element_page_thread_rss = "%s Pagina %s di Discussione di Gruppo" @@ -1829,8 +1822,8 @@ feeds_helper_view_minsecs = "%s m %s s fa" feeds_helper_view_hourdate = "%s ore fa" ; ; PaginationHelper.php -pagination_helper_previous = "Precedente" pagination_helper_next = "Prossimo" +pagination_helper_previous = "Precedente" ; ; ToggleHelper.php toggle_helper_on = "Acceso" diff --git a/src/locale/it/statistics.txt b/src/locale/it/statistics.txt index 5a165df53..b6bef56f0 100755 --- a/src/locale/it/statistics.txt +++ b/src/locale/it/statistics.txt @@ -1 +1 @@ -d:100; \ No newline at end of file +d:99; \ No newline at end of file diff --git a/src/locale/ja/configure.ini b/src/locale/ja/configure.ini index 3029cb6a8..d8c0e7cbe 100755 --- a/src/locale/ja/configure.ini +++ b/src/locale/ja/configure.ini @@ -238,6 +238,7 @@ social_component_post_edited_elsewhere = "後で編集し他の場所で別の social_component_no_update_access = "な更新。" social_component_post_updated = "ポストの商品が紹介されました。" social_component_no_group_access = "会員以外の方です&#039;t読していただきました。 切り替えるパブリックグループ!" +social_component_end_results = "" social_component_no_posts_yet = "せんだい" social_component_signin_to_access = "ログインしてくださいアカウントにアクセス！" social_component_back = "裏" @@ -1071,7 +1072,6 @@ wiki_element_use_form_below = "または利用できる下記のフォームの wiki_element_submit = "提出" wiki_element_syntax_summary = "Wiki構文ガイド" wiki_element_signin_edit = "ていれば十分なアクセスできるかもしれなのページを作成するログインとナビゲート、およびます。" -wiki_element_user_feedback = "ユーザからのフィードバック" wiki_element_locale_name = "ロケール:%s" wiki_element_page = "ページ:%s" wiki_element_resource_name = "資源%s" @@ -1144,13 +1144,11 @@ editlocales_element_save = "保存" ; GroupbarElement.php groupbar_element_skip_nav = "スキップナビ" groupbar_element_page_list = "ページのリスト" +groupbar_element_groups = "" +groupbar_element_feeds = "" groupbar_element_page_thread = " %sページ%sグループ討論" -groupbar_element_groupfeed = "%s飼料" groupbar_element_no_path_info = "な経路情報" groupbar_element_userfeed = "ユーザ%s" -groupbar_element_myfeeds = "私のフィード" -groupbar_element_ungrouped_icon = "未分類アイコン" -groupbar_element_grouped_icon = "グループ化のアイコン" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "待ち状態機械の..." @@ -1343,10 +1341,6 @@ serversettings_element_save = "保存" ; GroupfeedElement.php groupfeed_element_add_group = "グループの追加" groupfeed_element_request_add = "請求グループの追加" -groupfeed_element_add_comment = "必要に応じて、コメントを追加" -groupfeed_element_drag_textarea = "ドラッグ項目のtextareaとして追加しようとすると..." -groupfeed_element_click_textarea = "またはをクリックし選択します。" -groupfeed_element_save = "保存" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s、スレッド%s" groupfeed_element_last_post = "前回の投稿:" @@ -1358,25 +1352,24 @@ groupfeed_element_delete = "削除" groupfeed_element_usericon = "ユーザーのアイコン" groupfeed_element_num_posts = "ポス%s" groupfeed_element_num_views = "%sの景色" -groupfeed_element_last_edited = "最終編集:%s" -groupfeed_element_post_vote = "投票:" +groupfeed_element_edited = "" groupfeed_element_last_post_info = "前回の投稿:" groupfeed_element_start_thread = "新規スレッド" groupfeed_element_subject = "対象" groupfeed_element_post = "ポスト" +groupfeed_element_drag_textarea = "ドラッグ項目のtextareaとして追加しようとすると..." +groupfeed_element_click_textarea = "またはをクリックし選択します。" +groupfeed_element_save = "保存" groupfeed_element_feedplaces = "送りの場所" groupfeed_element_mygroups = "すべてのフィード" groupfeed_element_userplaces = "ユーザーの場所" groupfeed_element_groupplaces = "%sグループ" groupfeed_element_wiki_name = "%sWiki" groupfeed_element_recent_threads = "最近のスレッド" -groupfeed_element_recent_groupfeeds = "最近のフィード" +groupfeed_element_recent_groups = "" groupfeed_element_edit_post = "編集後" groupfeed_element_no_longer_update = "グループフィードな更新!" ; -; PaginationElement.php -pagination_helper_next = "次の" -; ; MediajobsElement.php mediajobs_element_configure_media_jobs = "設定メディアの仕事" mediajobs_element_mode = "モード" @@ -1416,14 +1409,14 @@ groupmenu_element_admin_menu = "管理者メニュー" groupmenu_element_welcome = "歓迎" groupmenu_element_signin = "Signin" groupmenu_element_create_account = "アカウントを作成する" -groupmenu_element_page_places = "%sページでのグループでは%s" -groupmenu_element_read_page = "%sページでのグループ%s" -groupmenu_element_edit_page = " 編集ページ%s" -groupmenu_element_page_history = "%sページの歴史" -groupmenu_element_page_source = "%sページのソース" -groupmenu_element_page_relationships = "%sページ関係" -groupmenu_element_page_discuss = " %sページの議論" -groupmenu_element_page_list = "%sグループのページにリスト" +groupmenu_element_page = "" +groupmenu_element_view = "" +groupmenu_element_edit = "" +groupmenu_element_history = "" +groupmenu_element_source = "" +groupmenu_element_relationships = "" +groupmenu_element_discussion = "" +groupmenu_element_page_list = "" groupmenu_element_group_feed = "%s飼料" groupmenu_element_page_thread = "%sページ%sグループ討論" groupmenu_element_page_thread_rss = "%sページ%sグループ討論" @@ -1829,8 +1822,8 @@ feeds_helper_view_minsecs = "%sm%ss前" feeds_helper_view_hourdate = "%s時間前" ; ; PaginationHelper.php -pagination_helper_previous = "前に" pagination_helper_next = "次の" +pagination_helper_previous = "前に" ; ; ToggleHelper.php toggle_helper_on = "月" diff --git a/src/locale/ja/statistics.txt b/src/locale/ja/statistics.txt index 5a165df53..b6bef56f0 100755 --- a/src/locale/ja/statistics.txt +++ b/src/locale/ja/statistics.txt @@ -1 +1 @@ -d:100; \ No newline at end of file +d:99; \ No newline at end of file diff --git a/src/locale/kn/configure.ini b/src/locale/kn/configure.ini index 9d5196ea1..042d30b66 100755 --- a/src/locale/kn/configure.ini +++ b/src/locale/kn/configure.ini @@ -238,6 +238,7 @@ social_component_post_edited_elsewhere = "ಪೋಸ್ಟ್ ಕೇವಲ ಸಂ social_component_no_update_access = "ಸಾಧ್ಯವಿಲ್ಲ ಅಪ್ಡೇಟ್ ಪೋಸ್ಟ್!" social_component_post_updated = "ಪೋಸ್ಟ್ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ!" social_component_no_group_access = "ಸದಸ್ಯ ಅಲ್ಲ ಅಥವಾ ಮಾಡಬಹುದು&#039;ಟಿ ಓದಲು ಎಂದು ಗುಂಪು. ಸ್ವಿಚಿಂಗ್ ಸಾರ್ವಜನಿಕ ಗುಂಪು!" +social_component_end_results = "" social_component_no_posts_yet = "ಯಾವುದೇ ಪೋಸ್ಟ್ಗಳು ಇನ್ನೂ" social_component_signin_to_access = "Please log in to ಖಾತೆಯನ್ನು ಪ್ರವೇಶಿಸಲು ಈ ಗುಂಪು!" social_component_back = "ಮತ್ತೆ" @@ -1071,7 +1072,6 @@ wiki_element_use_form_below = "ಅಥವಾ ನೀವು ಕೆಳಗಿನ ಫ wiki_element_submit = "ಸಲ್ಲಿಸಿ" wiki_element_syntax_summary = "ವಿಕಿ ವಾಕ್ಯ ಗೈಡ್" wiki_element_signin_edit = "ನೀವು ಸಾಕಷ್ಟು ಪ್ರವೇಶ ನೀವು ಸಾಧ್ಯವಾಗುತ್ತದೆ ಪುಟ ರಚಿಸಲು ಲಾಗಿನ್ ಆಗುವ ಮೂಲಕ ಮತ್ತು ನ್ಯಾವಿಗೇಟ್ ಮತ್ತೆ ಇಲ್ಲಿ." -wiki_element_user_feedback = "ಬಳಕೆದಾರರ ಪ್ರತಿಕ್ರಿಯೆ" wiki_element_locale_name = "ಲೊಕೇಲ್: %s" wiki_element_page = "ಪುಟ: %s" wiki_element_resource_name = "ಸಂಪನ್ಮೂಲ: %s" @@ -1144,13 +1144,11 @@ editlocales_element_save = "ಉಳಿಸಲು" ; GroupbarElement.php groupbar_element_skip_nav = "ಬಿಟ್ಟು ಸಂಚರಣೆ" groupbar_element_page_list = "ಪುಟ ಪಟ್ಟಿ" +groupbar_element_groups = "" +groupbar_element_feeds = "" groupbar_element_page_thread = " %s ಪುಟ ನಲ್ಲಿ %s ಗುಂಪು ಚರ್ಚೆ" -groupbar_element_groupfeed = "%s ಫೀಡ್" groupbar_element_no_path_info = "ಯಾವುದೇ ಮಾರ್ಗವನ್ನು ಮಾಹಿತಿ" groupbar_element_userfeed = "ಬಳಕೆದಾರ: %s" -groupbar_element_myfeeds = "ನನ್ನ ಫೀಡ್ಗಳನ್ನು" -groupbar_element_ungrouped_icon = "ಗುಂಪು ಮಾಡದ ಐಕಾನ್" -groupbar_element_grouped_icon = "ಗುಂಪು ಐಕಾನ್" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "ಕಾಯುತ್ತಿವೆ ಸ್ಥಿತಿಗಳನ್ನು ಯಂತ್ರಗಳು..." @@ -1343,10 +1341,6 @@ serversettings_element_save = "ಉಳಿಸಲು" ; GroupfeedElement.php groupfeed_element_add_group = "ಗುಂಪು ಸೇರಿಸಿ" groupfeed_element_request_add = "ವಿನಂತಿಯನ್ನು ಗುಂಪು ಸೇರಿಸಿ" -groupfeed_element_add_comment = "ಒಂದು ಕಾಮೆಂಟ್ ಸೇರಿಸಿ" -groupfeed_element_drag_textarea = "ಡ್ರ್ಯಾಗ್ ಐಟಂಗಳನ್ನು ಒಳಗೆ textarea to add them..." -groupfeed_element_click_textarea = "ಅಥವಾ ಕ್ಲಿಕ್ ಮಾಡಿ ಅವುಗಳನ್ನು ಆಯ್ಕೆ." -groupfeed_element_save = "ಉಳಿಸಲು" groupfeed_element_group_wiki = "ವಿಕಿ" groupfeed_element_group_stats = "%s ಪೋಸ್ಟ್ಗಳನ್ನು, %s ಎಳೆಗಳನ್ನು" groupfeed_element_last_post = "ಕೊನೆಯ ಪೋಸ್ಟ್:" @@ -1358,25 +1352,24 @@ groupfeed_element_delete = "ಅಳಿಸಿ" groupfeed_element_usericon = "ಬಳಕೆದಾರ ಐಕಾನ್" groupfeed_element_num_posts = "%s ಪೋಸ್ಟ್ಗಳು" groupfeed_element_num_views = "%s ವೀಕ್ಷಣೆಗಳು" -groupfeed_element_last_edited = "ಕೊನೆಯ ಸಂಪಾದನೆ: %s" -groupfeed_element_post_vote = "ಮತ:" +groupfeed_element_edited = "" groupfeed_element_last_post_info = "ಕೊನೆಯ ಪೋಸ್ಟ್:" groupfeed_element_start_thread = "ಹೊಸ ಥ್ರೆಡ್ ಆರಂಭಿಸಲು" groupfeed_element_subject = "ವಿಷಯ" groupfeed_element_post = "ಪೋಸ್ಟ್" +groupfeed_element_drag_textarea = "ಡ್ರ್ಯಾಗ್ ಐಟಂಗಳನ್ನು ಒಳಗೆ textarea to add them..." +groupfeed_element_click_textarea = "ಅಥವಾ ಕ್ಲಿಕ್ ಮಾಡಿ ಅವುಗಳನ್ನು ಆಯ್ಕೆ." +groupfeed_element_save = "ಉಳಿಸಲು" groupfeed_element_feedplaces = "ಆಹಾರ ಸ್ಥಳಗಳು" groupfeed_element_mygroups = "ಎಲ್ಲಾ ಫೀಡ್ಸ್" groupfeed_element_userplaces = "ಬಳಕೆದಾರ ಸ್ಥಳಗಳು" groupfeed_element_groupplaces = "%s ಗುಂಪು ಸ್ಥಳಗಳು" groupfeed_element_wiki_name = "%s ವಿಕಿ" groupfeed_element_recent_threads = "ಇತ್ತೀಚಿನ ಎಳೆಗಳನ್ನು" -groupfeed_element_recent_groupfeeds = "ಇತ್ತೀಚಿನ ಫೀಡ್ಗಳನ್ನು" +groupfeed_element_recent_groups = "" groupfeed_element_edit_post = "ಸಂಪಾದಿಸಿ ಪೋಸ್ಟ್" groupfeed_element_no_longer_update = "ಗುಂಪು ಫೀಡ್ಸ್ ಇನ್ನು ಮುಂದೆ ಅಪ್ಡೇಟ್!" ; -; PaginationElement.php -pagination_helper_next = "ಮುಂದಿನ" -; ; MediajobsElement.php mediajobs_element_configure_media_jobs = "ಸಂರಚಿಸಲು ಮಾಧ್ಯಮ ಉದ್ಯೋಗಗಳು" mediajobs_element_mode = "ಮೋಡ್" @@ -1416,14 +1409,14 @@ groupmenu_element_admin_menu = "ನಿರ್ವಹಣೆ ಮೆನು" groupmenu_element_welcome = "ಸ್ವಾಗತ" groupmenu_element_signin = "ಸೈನ್ ಇನ್" groupmenu_element_create_account = "ಖಾತೆಯನ್ನು ರಚಿಸಿ" -groupmenu_element_page_places = "%s ಪುಟ ನಲ್ಲಿ %s ಗುಂಪು ಸ್ಥಳಗಳು" -groupmenu_element_read_page = "%s ಪುಟ ನಲ್ಲಿ %s ಗುಂಪು" -groupmenu_element_edit_page = " ಸಂಪಾದಿಸಿ ಪುಟ %s" -groupmenu_element_page_history = "%s ಪುಟ ಇತಿಹಾಸ" -groupmenu_element_page_source = "%s ಪುಟ ಮೂಲ" -groupmenu_element_page_relationships = "%s ಪುಟ ಸಂಬಂಧಗಳು" -groupmenu_element_page_discuss = " %s ಪುಟ ಚರ್ಚೆ" -groupmenu_element_page_list = "%s ಗುಂಪು ಪುಟ ಪಟ್ಟಿ" +groupmenu_element_page = "" +groupmenu_element_view = "" +groupmenu_element_edit = "" +groupmenu_element_history = "" +groupmenu_element_source = "" +groupmenu_element_relationships = "" +groupmenu_element_discussion = "" +groupmenu_element_page_list = "" groupmenu_element_group_feed = "%s ಫೀಡ್" groupmenu_element_page_thread = "%s ಪುಟ ನಲ್ಲಿ %s ಗುಂಪು ಚರ್ಚೆ" groupmenu_element_page_thread_rss = "%s ಪುಟ ನಲ್ಲಿ %s ಗುಂಪು ಚರ್ಚೆ" @@ -1829,8 +1822,8 @@ feeds_helper_view_minsecs = "%s ಮೀ %s ಎಸ್ ಹಿಂದೆ" feeds_helper_view_hourdate = "%s ಗಂಟೆಗಳ ಹಿಂದೆ" ; ; PaginationHelper.php -pagination_helper_previous = "ಹಿಂದಿನ" pagination_helper_next = "ಮುಂದಿನ" +pagination_helper_previous = "ಹಿಂದಿನ" ; ; ToggleHelper.php toggle_helper_on = "ಮೇಲೆ" diff --git a/src/locale/kn/statistics.txt b/src/locale/kn/statistics.txt index 5a165df53..b6bef56f0 100755 --- a/src/locale/kn/statistics.txt +++ b/src/locale/kn/statistics.txt @@ -1 +1 @@ -d:100; \ No newline at end of file +d:99; \ No newline at end of file diff --git a/src/locale/ko/configure.ini b/src/locale/ko/configure.ini index d06443f7c..46146f6ce 100755 --- a/src/locale/ko/configure.ini +++ b/src/locale/ko/configure.ini @@ -238,6 +238,7 @@ social_component_post_edited_elsewhere = "게시 그냥 편집 다른 곳에서( social_component_no_update_access = "업데이트할 수 없습니다." social_component_post_updated = "게시 업데이트!" social_component_no_group_access = "회원 또는&#039;t 읽는 그룹이다. 스위칭을 공공 그룹!" +social_component_end_results = "" social_component_no_posts_yet = "게시물이 없직" social_component_signin_to_access = "시기 바랍에 로그인하여 액세스할 수 있는 계정이다." social_component_back = "시" @@ -1071,7 +1072,6 @@ wiki_element_use_form_below = "할 수 있습니다 또는 아래의 양식을 wiki_element_submit = "제출" wiki_element_syntax_summary = "Wiki Syntax 가이드" wiki_element_signin_edit = "이 있는 경우는 충분한 액세스할 수 있습을 만드는 페이지에 로그인하여 이동합니다." -wiki_element_user_feedback = "사용자 의견" wiki_element_locale_name = "로캘:%s" wiki_element_page = "페이지:%s" wiki_element_resource_name = "리소스:%s" @@ -1144,13 +1144,11 @@ editlocales_element_save = "저장" ; GroupbarElement.php groupbar_element_skip_nav = "탐색 건너뛰기" groupbar_element_page_list = "페이지 목록" +groupbar_element_groups = "" +groupbar_element_feeds = "" groupbar_element_page_thread = " %s 페이지에 %s 그룹 토론" -groupbar_element_groupfeed = "%s 피드" groupbar_element_no_path_info = "경로 정보" groupbar_element_userfeed = "사용자:%s" -groupbar_element_myfeeds = "내 피드" -groupbar_element_ungrouped_icon = "화되지 않은 아이콘" -groupbar_element_grouped_icon = "그룹화 아이콘" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "을 기다리는 상태 기계의..." @@ -1343,10 +1341,6 @@ serversettings_element_save = "저장" ; GroupfeedElement.php groupfeed_element_add_group = "그룹 추가" groupfeed_element_request_add = "요청을 그룹 추가" -groupfeed_element_add_comment = "추가 코멘트" -groupfeed_element_drag_textarea = "드래그는 항목으로 텍스트 영역을 추가한다." -groupfeed_element_click_textarea = "거나 클릭하여 선택합니다." -groupfeed_element_save = "저장" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s 게시물,%s 스레드" groupfeed_element_last_post = "마지막 게시물:" @@ -1358,25 +1352,24 @@ groupfeed_element_delete = "삭제" groupfeed_element_usericon = "사용자 아이콘" groupfeed_element_num_posts = "%s 게시물" groupfeed_element_num_views = "%s 보기" -groupfeed_element_last_edited = "마지막 수정:%s" -groupfeed_element_post_vote = "투표:" +groupfeed_element_edited = "" groupfeed_element_last_post_info = "마지막 게시물:" groupfeed_element_start_thread = "시작하는 새로운 실" groupfeed_element_subject = "주제" groupfeed_element_post = "게시" +groupfeed_element_drag_textarea = "드래그는 항목으로 텍스트 영역을 추가한다." +groupfeed_element_click_textarea = "거나 클릭하여 선택합니다." +groupfeed_element_save = "저장" groupfeed_element_feedplaces = "피드 명소" groupfeed_element_mygroups = "모든 피드" groupfeed_element_userplaces = "용 장소" groupfeed_element_groupplaces = "%s 그룹소" groupfeed_element_wiki_name = "%sWiki" groupfeed_element_recent_threads = "최근 스레드" -groupfeed_element_recent_groupfeeds = "최근 피드" +groupfeed_element_recent_groups = "" groupfeed_element_edit_post = "후 편집" groupfeed_element_no_longer_update = "그룹 피드 더 이상 업데이트!" ; -; PaginationElement.php -pagination_helper_next = "다음" -; ; MediajobsElement.php mediajobs_element_configure_media_jobs = "구성 미디어 작업" mediajobs_element_mode = "모" @@ -1416,14 +1409,14 @@ groupmenu_element_admin_menu = "관리자 메뉴" groupmenu_element_welcome = "영" groupmenu_element_signin = "로그인" groupmenu_element_create_account = "계정 만들기" -groupmenu_element_page_places = "%s 페이지에 %s 그룹소" -groupmenu_element_read_page = "%s 페이지에 그룹 %s" -groupmenu_element_edit_page = " 편집 %s 페이지" -groupmenu_element_page_history = "%s 페이지의 역사" -groupmenu_element_page_source = "%s 페이지 소스" -groupmenu_element_page_relationships = "%s 페이지의 관계" -groupmenu_element_page_discuss = " %s 페이지 토론" -groupmenu_element_page_list = "%s 그룹 페이지 목록" +groupmenu_element_page = "" +groupmenu_element_view = "" +groupmenu_element_edit = "" +groupmenu_element_history = "" +groupmenu_element_source = "" +groupmenu_element_relationships = "" +groupmenu_element_discussion = "" +groupmenu_element_page_list = "" groupmenu_element_group_feed = "%s 피드" groupmenu_element_page_thread = "%s 페이지에 %s 그룹 토론" groupmenu_element_page_thread_rss = "%s 페이지에 %s 그룹 토론" @@ -1829,8 +1822,8 @@ feeds_helper_view_minsecs = "%sm%s 전 s" feeds_helper_view_hourdate = "%s 시간 전에" ; ; PaginationHelper.php -pagination_helper_previous = "이전" pagination_helper_next = "다음" +pagination_helper_previous = "이전" ; ; ToggleHelper.php toggle_helper_on = "에" diff --git a/src/locale/ko/statistics.txt b/src/locale/ko/statistics.txt index 5a165df53..b6bef56f0 100755 --- a/src/locale/ko/statistics.txt +++ b/src/locale/ko/statistics.txt @@ -1 +1 @@ -d:100; \ No newline at end of file +d:99; \ No newline at end of file diff --git a/src/locale/nl/configure.ini b/src/locale/nl/configure.ini index d52cef184..9bc07dd22 100644 --- a/src/locale/nl/configure.ini +++ b/src/locale/nl/configure.ini @@ -238,6 +238,7 @@ social_component_post_edited_elsewhere = "Bericht was gewoon elders bewerkt (een social_component_no_update_access = "Kan niet bijwerken Post!" social_component_post_updated = "Bericht Bijgewerkt!" social_component_no_group_access = "Geen lid is of kan die groep niet lezen. Overschakelen op openbare groep!" +social_component_end_results = "" social_component_no_posts_yet = "Nog Geen Berichten" social_component_signin_to_access = "Log in om een account met toegang tot deze groep!" social_component_back = "terug" @@ -1071,7 +1072,6 @@ wiki_element_use_form_below = "Of u kunt het onderstaande formulier gebruiken vo wiki_element_submit = "voorleggen" wiki_element_syntax_summary = "Wiki-Syntaxis Gids" wiki_element_signin_edit = "Als u voldoende toegangsrechten hebt u misschien in staat zijn om de pagina te maken door in te loggen en navigeren hier terug." -wiki_element_user_feedback = "Feedback Van Gebruikers" wiki_element_locale_name = "Locale: %s" wiki_element_page = "Pagina: %s" wiki_element_resource_name = "Bron: %s" @@ -1144,13 +1144,11 @@ editlocales_element_save = "Opslaan" ; GroupbarElement.php groupbar_element_skip_nav = "Navigatie Overslaan" groupbar_element_page_list = "Pagina Lijst" +groupbar_element_groups = "" +groupbar_element_feeds = "" groupbar_element_page_thread = " %s Pagina op %s-Groep Discussie" -groupbar_element_groupfeed = "%s Feed" groupbar_element_no_path_info = "Geen Pad Info" groupbar_element_userfeed = "Gebruiker: %s" -groupbar_element_myfeeds = "Mijn Feeds" -groupbar_element_ungrouped_icon = "Ongegroepeerde Pictogram" -groupbar_element_grouped_icon = "Gegroepeerd Pictogram" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "In afwachting van statussen van machines ..." @@ -1343,10 +1341,6 @@ serversettings_element_save = "Opslaan" ; GroupfeedElement.php groupfeed_element_add_group = "Groep toevoegen" groupfeed_element_request_add = "Verzoek Groep toevoegen" -groupfeed_element_add_comment = "Voeg een reactie toe" -groupfeed_element_drag_textarea = "Sleep items in de textarea om ze toe te voegen..." -groupfeed_element_click_textarea = "of klik op om ze te selecteren." -groupfeed_element_save = "Opslaan" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s berichten, %s threads" groupfeed_element_last_post = "Laatste Post:" @@ -1358,25 +1352,24 @@ groupfeed_element_delete = "verwijderen" groupfeed_element_usericon = "Pictogram Gebruiker" groupfeed_element_num_posts = " %s berichten" groupfeed_element_num_views = "uitzicht %s" -groupfeed_element_last_edited = "Laatst gewijzigd: %s" -groupfeed_element_post_vote = "stem:" +groupfeed_element_edited = "" groupfeed_element_last_post_info = "Laatste bericht:" groupfeed_element_start_thread = "Start nieuw onderwerp" groupfeed_element_subject = "onderwerp" groupfeed_element_post = "post" +groupfeed_element_drag_textarea = "Sleep items in de textarea om ze toe te voegen..." +groupfeed_element_click_textarea = "of klik op om ze te selecteren." +groupfeed_element_save = "Opslaan" groupfeed_element_feedplaces = "Invoer Plaatsen" groupfeed_element_mygroups = "Alle Feeds" groupfeed_element_userplaces = "Gebruiker" groupfeed_element_groupplaces = "%s Groep Plaatsen" groupfeed_element_wiki_name = "%s Wiki" groupfeed_element_recent_threads = "Recente Threads" -groupfeed_element_recent_groupfeeds = "Recente Feeds" +groupfeed_element_recent_groups = "" groupfeed_element_edit_post = "Bericht wijzigen" groupfeed_element_no_longer_update = "Groep feeds niet meer updaten!" ; -; PaginationElement.php -pagination_helper_next = "volgende" -; ; MediajobsElement.php mediajobs_element_configure_media_jobs = "Configureren Media Banen" mediajobs_element_mode = "Mode" @@ -1416,14 +1409,14 @@ groupmenu_element_admin_menu = "Admin Menu" groupmenu_element_welcome = "Welkom" groupmenu_element_signin = "Aanmelden" groupmenu_element_create_account = "Account Aanmaken" -groupmenu_element_page_places = "%s Pagina %s Groep Plaatsen" -groupmenu_element_read_page = "%s Pagina %s Groep" -groupmenu_element_edit_page = " Bewerken %s Pagina" -groupmenu_element_page_history = "%s Pagina Geschiedenis" -groupmenu_element_page_source = "%s Pagina ' Bron" -groupmenu_element_page_relationships = "%s Pagina Relaties" -groupmenu_element_page_discuss = " %s Pagina ' Discussie" -groupmenu_element_page_list = "%s Groep Pagina-Lijst" +groupmenu_element_page = "" +groupmenu_element_view = "" +groupmenu_element_edit = "" +groupmenu_element_history = "" +groupmenu_element_source = "" +groupmenu_element_relationships = "" +groupmenu_element_discussion = "" +groupmenu_element_page_list = "" groupmenu_element_group_feed = "%s Feed" groupmenu_element_page_thread = "%s Pagina op %s-Groep Discussie" groupmenu_element_page_thread_rss = "%s Pagina op %s-Groep Discussie" @@ -1829,8 +1822,8 @@ feeds_helper_view_minsecs = " %s m %s s geleden" feeds_helper_view_hourdate = " %s uur geleden" ; ; PaginationHelper.php -pagination_helper_previous = "prev" pagination_helper_next = "volgende" +pagination_helper_previous = "prev" ; ; ToggleHelper.php toggle_helper_on = "op" diff --git a/src/locale/nl/statistics.txt b/src/locale/nl/statistics.txt index 5a165df53..b6bef56f0 100644 --- a/src/locale/nl/statistics.txt +++ b/src/locale/nl/statistics.txt @@ -1 +1 @@ -d:100; \ No newline at end of file +d:99; \ No newline at end of file diff --git a/src/locale/pl/configure.ini b/src/locale/pl/configure.ini index 7bcba611c..c882b11e2 100755 --- a/src/locale/pl/configure.ini +++ b/src/locale/pl/configure.ini @@ -238,6 +238,7 @@ social_component_post_edited_elsewhere = "Post był edytowany w innym miejscu i social_component_no_update_access = "Nie Mogę Zaktualizować Post!" social_component_post_updated = "Post Zaktualizowany!" social_component_no_group_access = "Nie jest członkiem lub można&#039;t czytać tę grupę. Przejście do publicznej grupie!" +social_component_end_results = "" social_component_no_posts_yet = "Odpowiedzi Na Razie Nie Ma" social_component_signin_to_access = "Zaloguj się na konto z dostępem do tej grupy!" social_component_back = "Temu" @@ -1071,7 +1072,6 @@ wiki_element_use_form_below = "Lub możesz skorzystać z formularza poniżej, ab wiki_element_submit = "Przedstawić" wiki_element_syntax_summary = "Instrukcja Składni Wiki " wiki_element_signin_edit = "Jeśli masz wystarczający dostęp, można utworzyć stronę logowania i wrócić tutaj." -wiki_element_user_feedback = "Opinie Użytkowników " wiki_element_locale_name = "Język: %s" wiki_element_page = "Stron: %s" wiki_element_resource_name = "Źródło: %s" @@ -1144,13 +1144,11 @@ editlocales_element_save = "Zapisz" ; GroupbarElement.php groupbar_element_skip_nav = "Pomiń Nawigację" groupbar_element_page_list = "Lista Stron " +groupbar_element_groups = "" +groupbar_element_feeds = "" groupbar_element_page_thread = " %s strona %s w dyskusji grupowej" -groupbar_element_groupfeed = "%s karmić" groupbar_element_no_path_info = "Nie Sposób Informacje" groupbar_element_userfeed = "Użytkowników: %s" -groupbar_element_myfeeds = "Moje Kanały" -groupbar_element_ungrouped_icon = "Ikona Rozgrupuj " -groupbar_element_grouped_icon = "Ikony Są Pogrupowane " ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "W oczekiwaniu na stan auta..." @@ -1343,10 +1341,6 @@ serversettings_element_save = "Zapisz" ; GroupfeedElement.php groupfeed_element_add_group = "Dodaj Grupę" groupfeed_element_request_add = "Należy Dodać Grupę" -groupfeed_element_add_comment = "Dodaj komentarz" -groupfeed_element_drag_textarea = "Przeciągnij elementy w textarea, aby dodać im..." -groupfeed_element_click_textarea = "lub naciśnij przycisk, aby je wybrać." -groupfeed_element_save = "Zapisz" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s stanowisk, %s wątków" groupfeed_element_last_post = "Ostatni Post:" @@ -1358,25 +1352,24 @@ groupfeed_element_delete = "Usunąć" groupfeed_element_usericon = "Ikona Użytkownika " groupfeed_element_num_posts = "%s wiadomości" groupfeed_element_num_views = "%s wyświetleń" -groupfeed_element_last_edited = "Ostatnio Edytowane: %s" -groupfeed_element_post_vote = "Głosy:" +groupfeed_element_edited = "" groupfeed_element_last_post_info = "Ostatni Post:" groupfeed_element_start_thread = "Rozpocząć Nowy Temat" groupfeed_element_subject = "Temat" groupfeed_element_post = "Post" +groupfeed_element_drag_textarea = "Przeciągnij elementy w textarea, aby dodać im..." +groupfeed_element_click_textarea = "lub naciśnij przycisk, aby je wybrać." +groupfeed_element_save = "Zapisz" groupfeed_element_feedplaces = "Откормочных Miejsc" groupfeed_element_mygroups = "Wszystkich Karmi" groupfeed_element_userplaces = "Użytkownik" groupfeed_element_groupplaces = "%s Grupa" groupfeed_element_wiki_name = "%s Wiki" groupfeed_element_recent_threads = "Najnowsze Tematy" -groupfeed_element_recent_groupfeeds = "Ostatnie Karmi" +groupfeed_element_recent_groups = "" groupfeed_element_edit_post = "Edytuj Post" groupfeed_element_no_longer_update = "Grupa Nie Aktualizacja!" ; -; PaginationElement.php -pagination_helper_next = "Dalej" -; ; MediajobsElement.php mediajobs_element_configure_media_jobs = "Dostosować Pracę MEDIÓW " mediajobs_element_mode = "Tryb" @@ -1416,14 +1409,14 @@ groupmenu_element_admin_menu = "Menu Administratora " groupmenu_element_welcome = "Witamy" groupmenu_element_signin = "Zalogować się" groupmenu_element_create_account = "Utwórz Konto" -groupmenu_element_page_places = "%s strona %s grupy" -groupmenu_element_read_page = "%s strona %s grupie" -groupmenu_element_edit_page = " Edytować %s Strona" -groupmenu_element_page_history = "%s Strona Historii " -groupmenu_element_page_source = "%s Kod Źródłowy Strony " -groupmenu_element_page_relationships = "%s Stosunki Strony " -groupmenu_element_page_discuss = " %s Stronę Dyskusji " -groupmenu_element_page_list = "%s Lista Grupy Stron " +groupmenu_element_page = "" +groupmenu_element_view = "" +groupmenu_element_edit = "" +groupmenu_element_history = "" +groupmenu_element_source = "" +groupmenu_element_relationships = "" +groupmenu_element_discussion = "" +groupmenu_element_page_list = "" groupmenu_element_group_feed = "%s karmić" groupmenu_element_page_thread = "%s strona %s w dyskusji grupowej" groupmenu_element_page_thread_rss = "%s strona %s w dyskusji grupowej" @@ -1829,8 +1822,8 @@ feeds_helper_view_minsecs = "%s m %s temu" feeds_helper_view_hourdate = "%s godzin temu" ; ; PaginationHelper.php -pagination_helper_previous = "Przed'" pagination_helper_next = "Dalej" +pagination_helper_previous = "Przed'" ; ; ToggleHelper.php toggle_helper_on = "Na" diff --git a/src/locale/pl/statistics.txt b/src/locale/pl/statistics.txt index 5a165df53..b6bef56f0 100755 --- a/src/locale/pl/statistics.txt +++ b/src/locale/pl/statistics.txt @@ -1 +1 @@ -d:100; \ No newline at end of file +d:99; \ No newline at end of file diff --git a/src/locale/pt/configure.ini b/src/locale/pt/configure.ini index 42a9d8aaa..35e0706ad 100755 --- a/src/locale/pt/configure.ini +++ b/src/locale/pt/configure.ini @@ -238,6 +238,7 @@ social_component_post_edited_elsewhere = "O Post foi editado apenas em outro lug social_component_no_update_access = "Não É Possível Atualizar O Post!" social_component_post_updated = "Post Atualizado!" social_component_no_group_access = "Não é um membro ou pode&#039;t ler esse grupo. Alternar para o grupo público!" +social_component_end_results = "" social_component_no_posts_yet = "Não Há Posts Ainda" social_component_signin_to_access = "Por favor faça login para uma conta com acesso a este grupo!" social_component_back = "De volta" @@ -1071,7 +1072,6 @@ wiki_element_use_form_below = "Ou você pode usar o formulário abaix wiki_element_submit = "Enviar" wiki_element_syntax_summary = "A Sintaxe Wiki Guia" wiki_element_signin_edit = "Se você tem acesso suficiente, você pode ser capaz de criar a página de login e navegar de volta aqui." -wiki_element_user_feedback = "Comentários Do Usuário" wiki_element_locale_name = "Localidade: %s" wiki_element_page = "Página: %s" wiki_element_resource_name = "Recurso: %s" @@ -1144,13 +1144,11 @@ editlocales_element_save = "Salvar" ; GroupbarElement.php groupbar_element_skip_nav = "Pular A Navegação" groupbar_element_page_list = "Página Da Lista" +groupbar_element_groups = "" +groupbar_element_feeds = "" groupbar_element_page_thread = " %s Página %s de Grupo de Discussão" -groupbar_element_groupfeed = "%s Feed" groupbar_element_no_path_info = "Nenhum Caminho Info" groupbar_element_userfeed = "Usuário: %s" -groupbar_element_myfeeds = "Meus Feeds" -groupbar_element_ungrouped_icon = "Desagrupados Ícone" -groupbar_element_grouped_icon = "Agrupados Ícone" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "Aguardando status de máquinas..." @@ -1343,10 +1341,6 @@ serversettings_element_save = "Salvar" ; GroupfeedElement.php groupfeed_element_add_group = "Adicionar Grupo" groupfeed_element_request_add = "Pedido Adicionar Grupo" -groupfeed_element_add_comment = "Adicionar um Comentário" -groupfeed_element_drag_textarea = "Arraste os itens em textarea para adicioná-los..." -groupfeed_element_click_textarea = "ou clique para selecioná-los." -groupfeed_element_save = "Salvar" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s posts, %s threads" groupfeed_element_last_post = "Último Post:" @@ -1358,25 +1352,24 @@ groupfeed_element_delete = "Apagar" groupfeed_element_usericon = "Ícone De Usuário" groupfeed_element_num_posts = "%s posts" groupfeed_element_num_views = "%s pontos de vista" -groupfeed_element_last_edited = "Editado Pela Última Vez: %s" -groupfeed_element_post_vote = "Votar:" +groupfeed_element_edited = "" groupfeed_element_last_post_info = "Último Post:" groupfeed_element_start_thread = "Iniciar Novo Segmento" groupfeed_element_subject = "Assunto" groupfeed_element_post = "Post" +groupfeed_element_drag_textarea = "Arraste os itens em textarea para adicioná-los..." +groupfeed_element_click_textarea = "ou clique para selecioná-los." +groupfeed_element_save = "Salvar" groupfeed_element_feedplaces = "Alimentação Lugares" groupfeed_element_mygroups = "Todos Os Feeds" groupfeed_element_userplaces = "Usuário Lugares" groupfeed_element_groupplaces = "%s Grupo Lugares" groupfeed_element_wiki_name = "%s Wiki" groupfeed_element_recent_threads = "Mensagens Recentes" -groupfeed_element_recent_groupfeeds = "Últimos Feeds" +groupfeed_element_recent_groups = "" groupfeed_element_edit_post = "Editar Post" groupfeed_element_no_longer_update = "Grupo De Feeds Não Atualizar!" ; -; PaginationElement.php -pagination_helper_next = "Próximo" -; ; MediajobsElement.php mediajobs_element_configure_media_jobs = "Configurar Trabalhos De Mídia" mediajobs_element_mode = "Modo de" @@ -1416,14 +1409,14 @@ groupmenu_element_admin_menu = "Que Bloqueio Do Menu Admin" groupmenu_element_welcome = "Bem-vindo" groupmenu_element_signin = "Signin" groupmenu_element_create_account = "Criar Conta" -groupmenu_element_page_places = "%s Página %s Grupo Lugares" -groupmenu_element_read_page = "%s Página %s de Grupo" -groupmenu_element_edit_page = " Editar Página %s" -groupmenu_element_page_history = "%s História Da Página" -groupmenu_element_page_source = "%s-Fonte Da Página" -groupmenu_element_page_relationships = "%s Página De Relacionamentos" -groupmenu_element_page_discuss = " %s Página De Discussão" -groupmenu_element_page_list = "%s Página De Grupo De Lista" +groupmenu_element_page = "" +groupmenu_element_view = "" +groupmenu_element_edit = "" +groupmenu_element_history = "" +groupmenu_element_source = "" +groupmenu_element_relationships = "" +groupmenu_element_discussion = "" +groupmenu_element_page_list = "" groupmenu_element_group_feed = "%s Feed" groupmenu_element_page_thread = "%s Página %s de Grupo de Discussão" groupmenu_element_page_thread_rss = "%s Página %s de Grupo de Discussão" @@ -1829,8 +1822,8 @@ feeds_helper_view_minsecs = "%s m %s s atrás" feeds_helper_view_hourdate = "%s horas atrás" ; ; PaginationHelper.php -pagination_helper_previous = "Anterior" pagination_helper_next = "Próximo" +pagination_helper_previous = "Anterior" ; ; ToggleHelper.php toggle_helper_on = "No" diff --git a/src/locale/pt/statistics.txt b/src/locale/pt/statistics.txt index 5a165df53..b6bef56f0 100755 --- a/src/locale/pt/statistics.txt +++ b/src/locale/pt/statistics.txt @@ -1 +1 @@ -d:100; \ No newline at end of file +d:99; \ No newline at end of file diff --git a/src/locale/ru/configure.ini b/src/locale/ru/configure.ini index 3a49dc73e..00c92a655 100755 --- a/src/locale/ru/configure.ini +++ b/src/locale/ru/configure.ini @@ -238,6 +238,7 @@ social_component_post_edited_elsewhere = "Пост был просто отре social_component_no_update_access = "Не Могу Обновить Пост!" social_component_post_updated = "Пост Обновлен!" social_component_no_group_access = "Не является членом или можете&#039;t читать эту группу. Переход к публичной группе!" +social_component_end_results = "" social_component_no_posts_yet = "Ответов Пока Нет" social_component_signin_to_access = "Пожалуйста, войдите в аккаунт с доступом к этой группе!" social_component_back = "Назад" @@ -1071,7 +1072,6 @@ wiki_element_use_form_below = "Или вы можете использовать wiki_element_submit = "Представить" wiki_element_syntax_summary = "Руководство По Синтаксису Вики " wiki_element_signin_edit = "Если у вас есть достаточный доступ, вы сможете создать страницу входа в систему и возвращаетесь сюда." -wiki_element_user_feedback = "Отзывы Пользователей " wiki_element_locale_name = "Язык: %s" wiki_element_page = "Страницы: %s" wiki_element_resource_name = "Ресурс: %s" @@ -1144,13 +1144,11 @@ editlocales_element_save = "Сохранить" ; GroupbarElement.php groupbar_element_skip_nav = "Пропустить Навигацию" groupbar_element_page_list = "Список Страниц " +groupbar_element_groups = "" +groupbar_element_feeds = "" groupbar_element_page_thread = " %s страница %s в групповой дискуссии" -groupbar_element_groupfeed = "%s кормить" groupbar_element_no_path_info = "Нет Пути Информация" groupbar_element_userfeed = "Пользователей: %s" -groupbar_element_myfeeds = "Мои Каналы" -groupbar_element_ungrouped_icon = "Значок Разгруппировать " -groupbar_element_grouped_icon = "Иконки Сгруппированы " ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "В ожидании статусы машины..." @@ -1343,10 +1341,6 @@ serversettings_element_save = "Сохранить" ; GroupfeedElement.php groupfeed_element_add_group = "Добавить Группу" groupfeed_element_request_add = "Просьба Добавить Группу" -groupfeed_element_add_comment = "Добавить комментарий" -groupfeed_element_drag_textarea = "Перетащите элементы в textarea, чтобы добавить им..." -groupfeed_element_click_textarea = "или нажмите кнопку, чтобы выбрать их." -groupfeed_element_save = "Сохранить" groupfeed_element_group_wiki = "Вики" groupfeed_element_group_stats = "%s должностей, %s потоков" groupfeed_element_last_post = "Последний Пост:" @@ -1358,25 +1352,24 @@ groupfeed_element_delete = "Удалить" groupfeed_element_usericon = "Значок Пользователя " groupfeed_element_num_posts = "%s сообщений" groupfeed_element_num_views = "%s просмотров" -groupfeed_element_last_edited = "Последний Раз Редактировалось: %s" -groupfeed_element_post_vote = "Голоса:" +groupfeed_element_edited = "" groupfeed_element_last_post_info = "Последний Пост:" groupfeed_element_start_thread = "Начать Новую Тему" groupfeed_element_subject = "Тема" groupfeed_element_post = "Пост" +groupfeed_element_drag_textarea = "Перетащите элементы в textarea, чтобы добавить им..." +groupfeed_element_click_textarea = "или нажмите кнопку, чтобы выбрать их." +groupfeed_element_save = "Сохранить" groupfeed_element_feedplaces = "Откормочных Мест" groupfeed_element_mygroups = "Всех Кормит" groupfeed_element_userplaces = "Пользователь" groupfeed_element_groupplaces = "%s Группа" groupfeed_element_wiki_name = "%s Вики" groupfeed_element_recent_threads = "Последние Темы" -groupfeed_element_recent_groupfeeds = "Последние Кормит" +groupfeed_element_recent_groups = "" groupfeed_element_edit_post = "Редактировать Пост" groupfeed_element_no_longer_update = "Группа Для Не Обновление!" ; -; PaginationElement.php -pagination_helper_next = "Далее" -; ; MediajobsElement.php mediajobs_element_configure_media_jobs = "Настроить Работу СМИ " mediajobs_element_mode = "Режим" @@ -1416,14 +1409,14 @@ groupmenu_element_admin_menu = "Меню Администратора " groupmenu_element_welcome = "Добро пожаловать" groupmenu_element_signin = "Авторизоваться" groupmenu_element_create_account = "Создать Учетную Запись" -groupmenu_element_page_places = "%s страница на %s группы" -groupmenu_element_read_page = "%s страница в %s группе" -groupmenu_element_edit_page = " Редактировать %s Страница" -groupmenu_element_page_history = "%s Страница Истории " -groupmenu_element_page_source = "%s Исходный Код Страницы " -groupmenu_element_page_relationships = "%s Отношения Страницы " -groupmenu_element_page_discuss = " %s Страницу Обсуждения " -groupmenu_element_page_list = "%s Список Группы Страниц " +groupmenu_element_page = "" +groupmenu_element_view = "" +groupmenu_element_edit = "" +groupmenu_element_history = "" +groupmenu_element_source = "" +groupmenu_element_relationships = "" +groupmenu_element_discussion = "" +groupmenu_element_page_list = "" groupmenu_element_group_feed = "%s кормить" groupmenu_element_page_thread = "%s страница %s в групповой дискуссии" groupmenu_element_page_thread_rss = "%s страница %s в групповой дискуссии" @@ -1829,8 +1822,8 @@ feeds_helper_view_minsecs = "%s м %s назад" feeds_helper_view_hourdate = "%s часов назад" ; ; PaginationHelper.php -pagination_helper_previous = "Пред'" pagination_helper_next = "Далее" +pagination_helper_previous = "Пред'" ; ; ToggleHelper.php toggle_helper_on = "На" diff --git a/src/locale/ru/statistics.txt b/src/locale/ru/statistics.txt index 5a165df53..b6bef56f0 100755 --- a/src/locale/ru/statistics.txt +++ b/src/locale/ru/statistics.txt @@ -1 +1 @@ -d:100; \ No newline at end of file +d:99; \ No newline at end of file diff --git a/src/locale/te/configure.ini b/src/locale/te/configure.ini index 55de2c904..6aafcdff2 100644 --- a/src/locale/te/configure.ini +++ b/src/locale/te/configure.ini @@ -238,6 +238,7 @@ social_component_post_edited_elsewhere = "పోస్ట్ వేరే చో social_component_no_update_access = "పోస్ట్ ని అప్డేట్ చేయలేరు!" social_component_post_updated = "పోస్ట్ అప్డేట్ చేయబడినది!" social_component_no_group_access = "సభ్యుడు కాదు లేదా ఆ గ్రూప్ ని చదవలేరు.పబ్లిక్ గ్రూప్ కి మార్చండి!" +social_component_end_results = "" social_component_no_posts_yet = "No Posts Yet" social_component_signin_to_access = "దయచేసి లోనికి ప్రవేశించండి. ఒక ఖాతాను యాక్సెస్ తో ఈ గుంపు!" social_component_back = "వెనుకకు" @@ -1071,7 +1072,6 @@ wiki_element_use_form_below = "లేదా మీరు క్రింద ర wiki_element_submit = "Submit" wiki_element_syntax_summary = "వికీ సింటాక్స్ గైడ్" wiki_element_signin_edit = "ఉంటే, మీరు తగినంత యాక్సెస్ మీరు చేయగలరు సృష్టించడానికి ఈ పేజీ లాగింగ్ ద్వారా నావిగేట్ మరియు తిరిగి ఇక్కడ." -wiki_element_user_feedback = "యూజర్ చూడు" wiki_element_locale_name = "లొకేల్: %s" wiki_element_page = "పేజ్: %s" wiki_element_resource_name = "వనరు: %s" @@ -1144,13 +1144,11 @@ editlocales_element_save = "సేవ్" ; GroupbarElement.php groupbar_element_skip_nav = "Skip Navigation" groupbar_element_page_list = "పేజీ జాబితా" +groupbar_element_groups = "" +groupbar_element_feeds = "" groupbar_element_page_thread = " %s పేజీ వద్ద %s గ్రూప్ డిస్కషన్" -groupbar_element_groupfeed = "%s ఫీడ్" groupbar_element_no_path_info = "ఏ మార్గం సమాచారం" groupbar_element_userfeed = "వాడుకరి: %s" -groupbar_element_myfeeds = "నా ఫీడ్లు" -groupbar_element_ungrouped_icon = "Ungrouped చిహ్నం" -groupbar_element_grouped_icon = "సమూహం చిహ్నం" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "మెషిన్ స్టేటస్ కోసం వేచి ఉన్నాము..." @@ -1343,10 +1341,6 @@ serversettings_element_save = "సేవ్" ; GroupfeedElement.php groupfeed_element_add_group = "ఆడ్ గ్రూప్" groupfeed_element_request_add = "రిక్వెస్ట్ ఆడ్ గ్రూప్" -groupfeed_element_add_comment = "వ్యాఖ్యను జోడించండి" -groupfeed_element_drag_textarea = "డ్రాగ్ అంశాలను లోకి టెక్స్ట్ఏరియా వాటిని జోడించడానికి..." -groupfeed_element_click_textarea = "లేదా క్లిక్ ఎంచుకోండి them." -groupfeed_element_save = "సేవ్" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s పోస్ట్లు, %s థ్రెడ్లు" groupfeed_element_last_post = "ఆఖరి పోస్ట్:" @@ -1358,25 +1352,24 @@ groupfeed_element_delete = "డిలీట్" groupfeed_element_usericon = "యూజర్ చిహ్నం" groupfeed_element_num_posts = "%s పోస్ట్లు" groupfeed_element_num_views = "%s వ్యూస్" -groupfeed_element_last_edited = "చివరిగా సవరించబడింది: %s" -groupfeed_element_post_vote = "వోట్:" +groupfeed_element_edited = "" groupfeed_element_last_post_info = "ఆఖరి పోస్ట్:" groupfeed_element_start_thread = "క్రొత్త థ్రెడ్ మొదలుపెట్టండి" groupfeed_element_subject = "విషయం" groupfeed_element_post = "పోస్ట్" +groupfeed_element_drag_textarea = "డ్రాగ్ అంశాలను లోకి టెక్స్ట్ఏరియా వాటిని జోడించడానికి..." +groupfeed_element_click_textarea = "లేదా క్లిక్ ఎంచుకోండి them." +groupfeed_element_save = "సేవ్" groupfeed_element_feedplaces = "Feed ప్రదేశాలు" groupfeed_element_mygroups = "అన్ని ఫీడ్లు" groupfeed_element_userplaces = "యూజర్ ప్రదేశాలు" groupfeed_element_groupplaces = "%s గ్రూప్ ప్రదేశాలు" groupfeed_element_wiki_name = "%s వికీ" groupfeed_element_recent_threads = "ఇటీవలి థ్రెడ్లు" -groupfeed_element_recent_groupfeeds = "ఇటీవల ఫీడ్లు" +groupfeed_element_recent_groups = "" groupfeed_element_edit_post = "పోస్ట్ లను సవరించు" groupfeed_element_no_longer_update = "గ్రూప్ ఫీడ్స్ అప్డేట్ అవడంలేదు!" ; -; PaginationElement.php -pagination_helper_next = "తర్వాత" -; ; MediajobsElement.php mediajobs_element_configure_media_jobs = "ఆకృతీకరించుటకు మీడియా ఉద్యోగాలు" mediajobs_element_mode = "మోడ్" @@ -1416,14 +1409,14 @@ groupmenu_element_admin_menu = "అడ్మిన్ మెను" groupmenu_element_welcome = "స్వాగతం" groupmenu_element_signin = "సైన్ఇన్" groupmenu_element_create_account = "ఖాతా సృష్టించుకోండి" -groupmenu_element_page_places = "%s పేజీ వద్ద %s గ్రూప్ ప్రదేశాలు" -groupmenu_element_read_page = "%s పేజీ వద్ద %s గ్రూప్" -groupmenu_element_edit_page = " మార్చు పేజీ %s" -groupmenu_element_page_history = "%s పేజీ చరిత్ర" -groupmenu_element_page_source = "%s పేజీ మూలం" -groupmenu_element_page_relationships = "%s పేజీ సంబంధాలు" -groupmenu_element_page_discuss = " %s పేజీ చర్చ" -groupmenu_element_page_list = "%s గ్రూప్ పేజీ జాబితా" +groupmenu_element_page = "" +groupmenu_element_view = "" +groupmenu_element_edit = "" +groupmenu_element_history = "" +groupmenu_element_source = "" +groupmenu_element_relationships = "" +groupmenu_element_discussion = "" +groupmenu_element_page_list = "" groupmenu_element_group_feed = "%s ఫీడ్" groupmenu_element_page_thread = "%s పేజీ వద్ద %s గ్రూప్ డిస్కషన్" groupmenu_element_page_thread_rss = "%s పేజీ వద్ద %s గ్రూప్ డిస్కషన్" @@ -1829,8 +1822,8 @@ feeds_helper_view_minsecs = "%s m %s s ago" feeds_helper_view_hourdate = "%s hours ago" ; ; PaginationHelper.php -pagination_helper_previous = "మునుపటి" pagination_helper_next = "తర్వాత" +pagination_helper_previous = "మునుపటి" ; ; ToggleHelper.php toggle_helper_on = "న" diff --git a/src/locale/te/statistics.txt b/src/locale/te/statistics.txt index 5a165df53..b6bef56f0 100755 --- a/src/locale/te/statistics.txt +++ b/src/locale/te/statistics.txt @@ -1 +1 @@ -d:100; \ No newline at end of file +d:99; \ No newline at end of file diff --git a/src/locale/th/configure.ini b/src/locale/th/configure.ini index 7711f2717..bbd1be42c 100755 --- a/src/locale/th/configure.ini +++ b/src/locale/th/configure.ini @@ -238,6 +238,7 @@ social_component_post_edited_elsewhere = "โพสแค่ได้แก้ social_component_no_update_access = "ไม่สามารถปรับปรุงโพสต์!" social_component_post_updated = "โพสอัพเดท!" social_component_no_group_access = "ไม่เป็นสมาชิกหรือสามารถ&#039;ทีอ่านกลุ่มนั้น เปลี่ยนกลับสาธารณะชนกลุ่ม!" +social_component_end_results = "" social_component_no_posts_yet = "ไม่มีกัปตัน..เสาทางนี้รึยัง" social_component_signin_to_access = "ได้โปรดปูมบันทึกในการบัญชีผู้ใช้เข้าถึงกลุ่มนี้!" social_component_back = "กลับมา" @@ -1071,7 +1072,6 @@ wiki_element_use_form_below = "หรือคุณสามารถใช้ wiki_element_submit = "ส่ง" wiki_element_syntax_summary = "Wiki ไวยากรณ์นำทาง" wiki_element_signin_edit = "ถ้าคุณมีสิทธิ์คุณอาจจะสามารถสร้างหน้าโดยการทำปูมบันทึกและ navigating กลับมาที่นี่" -wiki_element_user_feedback = "การแจ้งเตือนการเริ่มทำงานของผู้ใช้" wiki_element_locale_name = "ค่าท้องถิ่น:ทั้งหมด %s" wiki_element_page = "หน้า:ทั้งหมด %s" wiki_element_resource_name = "ทรัพยากร:ทั้งหมด %s" @@ -1144,13 +1144,11 @@ editlocales_element_save = "บันทึก" ; GroupbarElement.php groupbar_element_skip_nav = "ข้ามเรื่องการนำทาง" groupbar_element_page_list = "หน้ารายการ" +groupbar_element_groups = "" +groupbar_element_feeds = "" groupbar_element_page_thread = " ทั้งหมด %s หน้าที่ %s องกลุ่มกัน" -groupbar_element_groupfeed = "แหล่งป้อนทั้งหมด %s" groupbar_element_no_path_info = "ไม่มีข้อมูลเส้นทาง" groupbar_element_userfeed = "ของผู้ใช้:ทั้งหมด %s" -groupbar_element_myfeeds = "แหล่งป้อนของฉัน" -groupbar_element_ungrouped_icon = "Ungrouped ภาพไอคอน" -groupbar_element_grouped_icon = "รวมกลุ่มภาพไอคอน" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "รอ statuses เครื่องไม้เครื่องมือ..." @@ -1343,10 +1341,6 @@ serversettings_element_save = "บันทึก" ; GroupfeedElement.php groupfeed_element_add_group = "เพิ่มกลุ่ม" groupfeed_element_request_add = "การร้องขอเพิ่มกลุ่ม" -groupfeed_element_add_comment = "เพิ่มความคิดเห็น" -groupfeed_element_drag_textarea = "ลากรายการเข้าไปใน textarea เพื่อเพิ่มพวกเขา..." -groupfeed_element_click_textarea = "หรือคลิกเพื่อเลือกพวกเขา" -groupfeed_element_save = "บันทึก" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "ทั้งหมด %s กัปตัน..เสาทางนี้,เธรดข่าวทั้งหมด %s" groupfeed_element_last_post = "คือการโพสครั้งสุดท้าย:" @@ -1358,25 +1352,24 @@ groupfeed_element_delete = "ลบ" groupfeed_element_usericon = "ของผู้ใช้ภาพไอคอน" groupfeed_element_num_posts = "ทั้งหมด %s กัปตัน..เสาทางนี้" groupfeed_element_num_views = "มุมมองทั้งหมด %s" -groupfeed_element_last_edited = "เมื่อแก้ไข:ทั้งหมด %s" -groupfeed_element_post_vote = "ลงคะแนน:" +groupfeed_element_edited = "" groupfeed_element_last_post_info = "คือการโพสครั้งสุดท้าย:" groupfeed_element_start_thread = "เริ่มต้นใหม่เธรด" groupfeed_element_subject = "เรื่อง" groupfeed_element_post = "โพสต์" +groupfeed_element_drag_textarea = "ลากรายการเข้าไปใน textarea เพื่อเพิ่มพวกเขา..." +groupfeed_element_click_textarea = "หรือคลิกเพื่อเลือกพวกเขา" +groupfeed_element_save = "บันทึก" groupfeed_element_feedplaces = "แหล่งป้อนสถานที่" groupfeed_element_mygroups = "แหล่งป้อนทั้งหมด" groupfeed_element_userplaces = "สถานที่ของผู้ใช้" groupfeed_element_groupplaces = "%s องกลุ่มที่" groupfeed_element_wiki_name = "ทั้งหมด %s Wiki" groupfeed_element_recent_threads = "ล่าสุดเธรดข่าว" -groupfeed_element_recent_groupfeeds = "ล่าสุดแหล่งป้อน" +groupfeed_element_recent_groups = "" groupfeed_element_edit_post = "แก้ไขโพสต์" groupfeed_element_no_longer_update = "กลุ่มแหล่งป้อนไม่ได้กำลังปรับปรุง!" ; -; PaginationElement.php -pagination_helper_next = "ต่อไป" -; ; MediajobsElement.php mediajobs_element_configure_media_jobs = "ปรับแต่งงานสื่อ" mediajobs_element_mode = "โหมด" @@ -1416,14 +1409,14 @@ groupmenu_element_admin_menu = "แอดมินเมนู" groupmenu_element_welcome = "ยินดีต้อนรั" groupmenu_element_signin = "Signin" groupmenu_element_create_account = "สร้างบัญชีผู้ใช้" -groupmenu_element_page_places = "ทั้งหมด %s หน้าที่ %s องกลุ่มที่" -groupmenu_element_read_page = "ทั้งหมด %s หน้าที่ %s องกลุ่ม" -groupmenu_element_edit_page = " แก้ไขทั้งหมด %s หน้า" -groupmenu_element_page_history = "%s องหน้าประวัติศาสตร์" -groupmenu_element_page_source = "%s องหน้าแหล่งข่าว" -groupmenu_element_page_relationships = "%s องหน้าความสัมพันธ์" -groupmenu_element_page_discuss = " %s องหน้ากัน" -groupmenu_element_page_list = "%s องกลุ่มหน้ารายการ" +groupmenu_element_page = "" +groupmenu_element_view = "" +groupmenu_element_edit = "" +groupmenu_element_history = "" +groupmenu_element_source = "" +groupmenu_element_relationships = "" +groupmenu_element_discussion = "" +groupmenu_element_page_list = "" groupmenu_element_group_feed = "แหล่งป้อนทั้งหมด %s" groupmenu_element_page_thread = "ทั้งหมด %s หน้าที่ %s องกลุ่มกัน" groupmenu_element_page_thread_rss = "ทั้งหมด %s หน้าที่ %s องกลุ่มกัน" @@ -1829,8 +1822,8 @@ feeds_helper_view_minsecs = "ทั้งหมด %s เอ็มทั้ง feeds_helper_view_hourdate = "%s องชั่วโมงก่อน" ; ; PaginationHelper.php -pagination_helper_previous = "ก่อนหน้า@action" pagination_helper_next = "ต่อไป" +pagination_helper_previous = "ก่อนหน้า@action" ; ; ToggleHelper.php toggle_helper_on = "บ" diff --git a/src/locale/th/statistics.txt b/src/locale/th/statistics.txt index 5a165df53..b6bef56f0 100755 --- a/src/locale/th/statistics.txt +++ b/src/locale/th/statistics.txt @@ -1 +1 @@ -d:100; \ No newline at end of file +d:99; \ No newline at end of file diff --git a/src/locale/tl/configure.ini b/src/locale/tl/configure.ini index 2c7a57929..568e42beb 100644 --- a/src/locale/tl/configure.ini +++ b/src/locale/tl/configure.ini @@ -238,6 +238,7 @@ social_component_post_edited_elsewhere = "Post na ito ay lamang na-edit sa ibang social_component_no_update_access = "Hindi Maaaring I-Update Ang Post Na Ito!" social_component_post_updated = "Mag-Post Ng Update!" social_component_no_group_access = "Hindi isang miyembro o maaari&#039;t basahin ang mga pangkat na iyon. Paglipat sa pampublikong grupo!" +social_component_end_results = "" social_component_no_posts_yet = "Walang Mga Post Pa" social_component_signin_to_access = "Mangyaring mag-log in sa isang account na may access sa group na ito!" social_component_back = "Bumalik" @@ -1071,7 +1072,6 @@ wiki_element_use_form_below = "O maaari mong gamitin ang form sa ibaba upang lum wiki_element_submit = "Isumite" wiki_element_syntax_summary = "Wiki Syntax Gabay" wiki_element_signin_edit = "Kung mayroon kang sapat na pag-access sa iyo ay maaaring maging magagawang upang lumikha ng mga pahina sa pamamagitan ng pag-log in at pag-navigate pabalik dito." -wiki_element_user_feedback = "Feedback Ng User" wiki_element_locale_name = "Locale: %s" wiki_element_page = "Pahina: %s" wiki_element_resource_name = "Mapagkukunan: %s" @@ -1144,13 +1144,11 @@ editlocales_element_save = "I-Save ang" ; GroupbarElement.php groupbar_element_skip_nav = "Laktawan Sa Nabigasyon" groupbar_element_page_list = "Pahina Ng Listahan" +groupbar_element_groups = "" +groupbar_element_feeds = "" groupbar_element_page_thread = " %s Pahina sa %s mga Grupo ng Talakayan" -groupbar_element_groupfeed = "%s Feed" groupbar_element_no_path_info = "Walang Mga Landas Ng Impormasyon" groupbar_element_userfeed = "User: %s" -groupbar_element_myfeeds = "Aking Mga Feed" -groupbar_element_ungrouped_icon = "Hindi Nakapangkat Icon" -groupbar_element_grouped_icon = "Nakapangkat Na Mga Icon" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "Naghihintay ng katayuan ng machine..." @@ -1343,10 +1341,6 @@ serversettings_element_save = "I-Save ang" ; GroupfeedElement.php groupfeed_element_add_group = "Magdagdag Ng Mga Grupo" groupfeed_element_request_add = "Kahilingan Magdagdag Ng Mga Grupo" -groupfeed_element_add_comment = "Magdagdag ng isang Komento" -groupfeed_element_drag_textarea = "I-Drag ang mga item sa textarea upang idagdag ang mga ito..." -groupfeed_element_click_textarea = "o i-click upang piliin ang mga ito." -groupfeed_element_save = "I-Save ang" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s post, %s thread" groupfeed_element_last_post = "Huling Post:" @@ -1358,25 +1352,24 @@ groupfeed_element_delete = "Tanggalin ang" groupfeed_element_usericon = "Gumagamit Ng Mga Icon" groupfeed_element_num_posts = "%s post" groupfeed_element_num_views = "%s mga tanawin" -groupfeed_element_last_edited = "Huling Edit: %s" -groupfeed_element_post_vote = "Bumoto:" +groupfeed_element_edited = "" groupfeed_element_last_post_info = "Huling Post:" groupfeed_element_start_thread = "Magsimula Ng Bagong Thread" groupfeed_element_subject = "Paksa" groupfeed_element_post = "Post" +groupfeed_element_drag_textarea = "I-Drag ang mga item sa textarea upang idagdag ang mga ito..." +groupfeed_element_click_textarea = "o i-click upang piliin ang mga ito." +groupfeed_element_save = "I-Save ang" groupfeed_element_feedplaces = "Feed Lugar" groupfeed_element_mygroups = "Ang Lahat Ng Mga Feed" groupfeed_element_userplaces = "Gumagamit Ng Mga Lugar" groupfeed_element_groupplaces = "%s Grupo Na Lugar" groupfeed_element_wiki_name = "%s Wiki" groupfeed_element_recent_threads = "Kamakailang Mga Thread" -groupfeed_element_recent_groupfeeds = "Kamakailang Mga Feed" +groupfeed_element_recent_groups = "" groupfeed_element_edit_post = "I-Edit Ang Post Na Ito" groupfeed_element_no_longer_update = "Grupo Ng Mga Feed Ay Hindi Na-Update!" ; -; PaginationElement.php -pagination_helper_next = "Sa susunod na" -; ; MediajobsElement.php mediajobs_element_configure_media_jobs = "I-Configure Ang Mga Media Trabaho" mediajobs_element_mode = "Mode" @@ -1416,14 +1409,14 @@ groupmenu_element_admin_menu = "Admin Menu" groupmenu_element_welcome = "Maligayang pagdating" groupmenu_element_signin = "Pag-Signin" groupmenu_element_create_account = "Lumikha Ng Account" -groupmenu_element_page_places = "%s Pahina sa %s Grupo na Lugar" -groupmenu_element_read_page = "%s Pahina sa %s Grupo" -groupmenu_element_edit_page = " I-Edit Ang Pahina %s" -groupmenu_element_page_history = "%s Pahina Ng Kasaysayan" -groupmenu_element_page_source = "%s Ang Pinagmulan Ng Pahina" -groupmenu_element_page_relationships = "%s Page Relasyon" -groupmenu_element_page_discuss = " %s Mga Pahina Ng Talakayan" -groupmenu_element_page_list = "%s Mga Grupo Sa Pahina Ng Listahan" +groupmenu_element_page = "" +groupmenu_element_view = "" +groupmenu_element_edit = "" +groupmenu_element_history = "" +groupmenu_element_source = "" +groupmenu_element_relationships = "" +groupmenu_element_discussion = "" +groupmenu_element_page_list = "" groupmenu_element_group_feed = "%s Feed" groupmenu_element_page_thread = "%s Pahina sa %s mga Grupo ng Talakayan" groupmenu_element_page_thread_rss = "%s Pahina sa %s mga Grupo ng Talakayan" @@ -1829,8 +1822,8 @@ feeds_helper_view_minsecs = "%s m %s s nakaraan" feeds_helper_view_hourdate = "%s oras na nakalipas" ; ; PaginationHelper.php -pagination_helper_previous = "Nakaraan" pagination_helper_next = "Sa susunod na" +pagination_helper_previous = "Nakaraan" ; ; ToggleHelper.php toggle_helper_on = "Sa" diff --git a/src/locale/tl/statistics.txt b/src/locale/tl/statistics.txt index 5a165df53..b6bef56f0 100644 --- a/src/locale/tl/statistics.txt +++ b/src/locale/tl/statistics.txt @@ -1 +1 @@ -d:100; \ No newline at end of file +d:99; \ No newline at end of file diff --git a/src/locale/tr/configure.ini b/src/locale/tr/configure.ini index fbae9402f..d5e30468c 100755 --- a/src/locale/tr/configure.ini +++ b/src/locale/tr/configure.ini @@ -238,6 +238,7 @@ social_component_post_edited_elsewhere = "Yazı sadece (başka bir sekme)başka social_component_no_update_access = "Güncelleme Sonrası Olamaz!" social_component_post_updated = "Güncelleme Sonrası!" social_component_no_group_access = "Üye değil ya&#039;t grup okuyun. Genel grup için geçiş!" +social_component_end_results = "" social_component_no_posts_yet = "Henüz Hiçbir Mesaj " social_component_signin_to_access = "Bir hesap, bu grup için erişim ile giriş yapın!" social_component_back = "Geri" @@ -1071,7 +1072,6 @@ wiki_element_use_form_below = "Ya da oluşturmak veya farklı bir sayfa düz wiki_element_submit = "Gönder" wiki_element_syntax_summary = "Wiki Sözdizimi Kılavuzu" wiki_element_signin_edit = "Eğer yeterli erişim varsa giriş yapıp buraya gelerek sayfası oluşturmak mümkün olabilir." -wiki_element_user_feedback = "Kullanıcı Yorumu" wiki_element_locale_name = "Yerel ayar: %s" wiki_element_page = "Sayfa: %s" wiki_element_resource_name = "Kaynak: %s" @@ -1144,13 +1144,11 @@ editlocales_element_save = "Kaydet" ; GroupbarElement.php groupbar_element_skip_nav = "Atla Gezinti" groupbar_element_page_list = "Sayfa Listesi" +groupbar_element_groups = "" +groupbar_element_feeds = "" groupbar_element_page_thread = " %s Grup tartışmasında %s Sayfa " -groupbar_element_groupfeed = "%s Besleme" groupbar_element_no_path_info = "Yol Bilgisi Yok" groupbar_element_userfeed = "Kullanıcı: %s" -groupbar_element_myfeeds = "Benim Beslemeleri" -groupbar_element_ungrouped_icon = "Grubu Simgesi" -groupbar_element_grouped_icon = "Gruplandırılmış Simgesi" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "Makinelerin durumları bekliyor..." @@ -1343,10 +1341,6 @@ serversettings_element_save = "Kaydet" ; GroupfeedElement.php groupfeed_element_add_group = "Grup Ekle " groupfeed_element_request_add = "İstek Grup Ekle " -groupfeed_element_add_comment = "Bir Yorum ekle " -groupfeed_element_drag_textarea = "Sürükle button içine eklemek için öğeleri..." -groupfeed_element_click_textarea = "ya da onları seçmek için tıklayın." -groupfeed_element_save = "Kaydet" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s mesajlar, %s konuları" groupfeed_element_last_post = "Son Mesaj:" @@ -1358,25 +1352,24 @@ groupfeed_element_delete = "Sil" groupfeed_element_usericon = "Kullanıcı Simgesi" groupfeed_element_num_posts = "%s mesaj" groupfeed_element_num_views = "%s manzaralı" -groupfeed_element_last_edited = "Son Düzenleyen: %s" -groupfeed_element_post_vote = "Oylama:" +groupfeed_element_edited = "" groupfeed_element_last_post_info = "Son Mesaj:" groupfeed_element_start_thread = "Yeni Bir Konu Başlatmak" groupfeed_element_subject = "Konu" groupfeed_element_post = "Post" +groupfeed_element_drag_textarea = "Sürükle button içine eklemek için öğeleri..." +groupfeed_element_click_textarea = "ya da onları seçmek için tıklayın." +groupfeed_element_save = "Kaydet" groupfeed_element_feedplaces = "Yem Yerler" groupfeed_element_mygroups = "Tüm Yayınları" groupfeed_element_userplaces = "Kullanım Yerleri" groupfeed_element_groupplaces = "%s Grup Yerler" groupfeed_element_wiki_name = "%s Wiki" groupfeed_element_recent_threads = "Son Konuları" -groupfeed_element_recent_groupfeeds = "Son Beslemeleri" +groupfeed_element_recent_groups = "" groupfeed_element_edit_post = "Edit Post" groupfeed_element_no_longer_update = "Grup Artık Güncelleme Beslemeleri!" ; -; PaginationElement.php -pagination_helper_next = "Gelecek" -; ; MediajobsElement.php mediajobs_element_configure_media_jobs = "Yapılandırmak Medya İşleri" mediajobs_element_mode = "Mod" @@ -1416,14 +1409,14 @@ groupmenu_element_admin_menu = "Yönetici Menüsü" groupmenu_element_welcome = "Hoşgeldiniz" groupmenu_element_signin = "İmzalıyorum" groupmenu_element_create_account = "Hesap Oluştur " -groupmenu_element_page_places = "%s Grup %s Sayfaya Yerleştirir" -groupmenu_element_read_page = "%s Grup %s Sayfa " -groupmenu_element_edit_page = " Edit %s Sayfa" -groupmenu_element_page_history = "%s Sayfa Tarih" -groupmenu_element_page_source = "Sayfa %s Kaynak" -groupmenu_element_page_relationships = "Sayfa %s İlişkileri" -groupmenu_element_page_discuss = " %s Sayfa Tartışma" -groupmenu_element_page_list = "%s Grup Sayfa Listesi" +groupmenu_element_page = "" +groupmenu_element_view = "" +groupmenu_element_edit = "" +groupmenu_element_history = "" +groupmenu_element_source = "" +groupmenu_element_relationships = "" +groupmenu_element_discussion = "" +groupmenu_element_page_list = "" groupmenu_element_group_feed = "%s Besleme" groupmenu_element_page_thread = "%s Grup tartışmasında %s Sayfa " groupmenu_element_page_thread_rss = "%s Grup tartışmasında %s Sayfa " @@ -1829,8 +1822,8 @@ feeds_helper_view_minsecs = "%s m %s s önce" feeds_helper_view_hourdate = "%s saat önce" ; ; PaginationHelper.php -pagination_helper_previous = "Önceki yıl" pagination_helper_next = "Gelecek" +pagination_helper_previous = "Önceki yıl" ; ; ToggleHelper.php toggle_helper_on = "Üzerinde" diff --git a/src/locale/tr/statistics.txt b/src/locale/tr/statistics.txt index 5a165df53..b6bef56f0 100755 --- a/src/locale/tr/statistics.txt +++ b/src/locale/tr/statistics.txt @@ -1 +1 @@ -d:100; \ No newline at end of file +d:99; \ No newline at end of file diff --git a/src/locale/vi_VN/configure.ini b/src/locale/vi_VN/configure.ini index a36c5cf17..0292dd75f 100755 --- a/src/locale/vi_VN/configure.ini +++ b/src/locale/vi_VN/configure.ini @@ -238,6 +238,7 @@ social_component_post_edited_elsewhere = "Bài vừa sửa ở nơi kh&aac social_component_no_update_access = "Không Thể Viết Bài!" social_component_post_updated = "Gửi Cập Nhật!" social_component_no_group_access = "Không phải là một thành viên hoặc có thể' \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\" +social_component_end_results = "" social_component_no_posts_yet = "Chưa Có Bài Nào Sơ" social_component_signin_to_access = "Xin vui lòng nhập vào một tài khoản truy cập vào nhóm này!" social_component_back = "Trở lại" @@ -1071,7 +1072,6 @@ wiki_element_use_form_below = "Hoặc anh có thể sử dụng các wiki_element_submit = "Gửi" wiki_element_syntax_summary = "Cú Pháp Wiki Hướng Dẫn" wiki_element_signin_edit = "Nếu anh có đủ quyền truy cập, bạn có thể tạo ra những trang bằng cách đăng nhập và hướng về đây." -wiki_element_user_feedback = "Dùng Hồi" wiki_element_locale_name = "Địa: %s" wiki_element_page = "Trang: %s" wiki_element_resource_name = "Tài nguyên: %s" @@ -1144,13 +1144,11 @@ editlocales_element_save = "Tiết kiệm" ; GroupbarElement.php groupbar_element_skip_nav = "Bỏ Qua Hướng" groupbar_element_page_list = "Trang Sách" +groupbar_element_groups = "" +groupbar_element_feeds = "" groupbar_element_page_thread = " %s Trang tại %s Nhóm cuộc Thảo luận" -groupbar_element_groupfeed = "%s thức Ăn" groupbar_element_no_path_info = "Không Có Con Đường Thông Tin" groupbar_element_userfeed = "Dùng: %s" -groupbar_element_myfeeds = "Thức Ăn Của Tôi" -groupbar_element_ungrouped_icon = "Rã Nhóm Biểu Tượng" -groupbar_element_grouped_icon = "Nhóm Biểu Tượng" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "Chờ trạng thái của máy móc..." @@ -1343,10 +1341,6 @@ serversettings_element_save = "Tiết kiệm" ; GroupfeedElement.php groupfeed_element_add_group = "Thêm Nhóm" groupfeed_element_request_add = "Yêu Cầu Thêm Nhóm" -groupfeed_element_add_comment = "Thêm một nhận Xét" -groupfeed_element_drag_textarea = "Kéo mục vào các vùng văn thêm họ..." -groupfeed_element_click_textarea = "hoặc nhấp để chọn họ." -groupfeed_element_save = "Tiết kiệm" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s bài, %s chủ đề" groupfeed_element_last_post = "Bài Cuối:" @@ -1358,25 +1352,24 @@ groupfeed_element_delete = "Xóa" groupfeed_element_usericon = "Sử Dụng Biểu Tượng" groupfeed_element_num_posts = "%s bài" groupfeed_element_num_views = "%s xem" -groupfeed_element_last_edited = "Cuối Cùng Biên Tập: %s" -groupfeed_element_post_vote = "Bỏ phiếu:" +groupfeed_element_edited = "" groupfeed_element_last_post_info = "Bài Cuối:" groupfeed_element_start_thread = "Bắt Đầu Mới Chủ Đề" groupfeed_element_subject = "Chủ đề" groupfeed_element_post = "Bài" +groupfeed_element_drag_textarea = "Kéo mục vào các vùng văn thêm họ..." +groupfeed_element_click_textarea = "hoặc nhấp để chọn họ." +groupfeed_element_save = "Tiết kiệm" groupfeed_element_feedplaces = "Thức Ăn Nơi" groupfeed_element_mygroups = "Tất Cả Thức Ăn" groupfeed_element_userplaces = "Dùng Nơi" groupfeed_element_groupplaces = "%s Nhóm Nơi" groupfeed_element_wiki_name = "%s Wiki" groupfeed_element_recent_threads = "Gần Đây Đề" -groupfeed_element_recent_groupfeeds = "Ăn Gần Đây" +groupfeed_element_recent_groups = "" groupfeed_element_edit_post = "Chỉnh Sửa Bài" groupfeed_element_no_longer_update = "Nhóm Thức Ăn Không Còn Cập Nhật!" ; -; PaginationElement.php -pagination_helper_next = "Trang kế tiếp" -; ; MediajobsElement.php mediajobs_element_configure_media_jobs = "Cấu Hình Công Việc Truyền Thông" mediajobs_element_mode = "Chế độ" @@ -1416,14 +1409,14 @@ groupmenu_element_admin_menu = "Quản Trị Thực Đơn" groupmenu_element_welcome = "Chào mừng" groupmenu_element_signin = "Đăng nhập" groupmenu_element_create_account = "Tạo Tài Khoản" -groupmenu_element_page_places = "%s Trang tại %s Nhóm Nơi" -groupmenu_element_read_page = "%s Trang tại %s Nhóm" -groupmenu_element_edit_page = " Chỉnh Sửa %s Trang" -groupmenu_element_page_history = "%s Trang Lịch Sử" -groupmenu_element_page_source = "%s Trang Nguồn" -groupmenu_element_page_relationships = "%s Trang Mối Quan Hệ" -groupmenu_element_page_discuss = " %s Trang Cuộc Thảo Luận" -groupmenu_element_page_list = "%s Nhóm Trang Sách" +groupmenu_element_page = "" +groupmenu_element_view = "" +groupmenu_element_edit = "" +groupmenu_element_history = "" +groupmenu_element_source = "" +groupmenu_element_relationships = "" +groupmenu_element_discussion = "" +groupmenu_element_page_list = "" groupmenu_element_group_feed = "%s thức Ăn" groupmenu_element_page_thread = "%s Trang tại %s Nhóm cuộc Thảo luận" groupmenu_element_page_thread_rss = "%s Trang tại %s Nhóm cuộc Thảo luận" @@ -1829,8 +1822,8 @@ feeds_helper_view_minsecs = "%s m %s s trước" feeds_helper_view_hourdate = "%s giờ trước" ; ; PaginationHelper.php -pagination_helper_previous = "Trang trước" pagination_helper_next = "Trang kế tiếp" +pagination_helper_previous = "Trang trước" ; ; ToggleHelper.php toggle_helper_on = "Trên" diff --git a/src/locale/vi_VN/statistics.txt b/src/locale/vi_VN/statistics.txt index 5a165df53..b6bef56f0 100755 --- a/src/locale/vi_VN/statistics.txt +++ b/src/locale/vi_VN/statistics.txt @@ -1 +1 @@ -d:100; \ No newline at end of file +d:99; \ No newline at end of file diff --git a/src/locale/zh_CN/configure.ini b/src/locale/zh_CN/configure.ini index 7a39e7af1..931bf6bb9 100755 --- a/src/locale/zh_CN/configure.ini +++ b/src/locale/zh_CN/configure.ini @@ -238,6 +238,7 @@ social_component_post_edited_elsewhere = "后只是编辑的其他地方(另一 social_component_no_update_access = "无法更新后！" social_component_post_updated = "布更新后的!" social_component_no_group_access = "没有一个成员或者可以&#039;t读组。 切换到公共组！" +social_component_end_results = "" social_component_no_posts_yet = "没有职位呢" social_component_signin_to_access = "请登录在一个帐户访问这一组！" social_component_back = "回" @@ -1071,7 +1072,6 @@ wiki_element_use_form_below = "或者你可以用下面的表格创建或编辑 wiki_element_submit = "提交" wiki_element_syntax_summary = "Wiki语法指南" wiki_element_signin_edit = "如果你有足够的访问，你可能可以创建网页，可登录以及引导回到这里。" -wiki_element_user_feedback = "用户反馈" wiki_element_locale_name = "区域设置：%s" wiki_element_page = "页：%s" wiki_element_resource_name = "资源：%s" @@ -1144,13 +1144,11 @@ editlocales_element_save = "保存" ; GroupbarElement.php groupbar_element_skip_nav = "跳过导航" groupbar_element_page_list = "页面列表" +groupbar_element_groups = "" +groupbar_element_feeds = "" groupbar_element_page_thread = " %s页至%s小组讨论" -groupbar_element_groupfeed = "%s料" groupbar_element_no_path_info = "没有路径的信息" groupbar_element_userfeed = "用户：%s" -groupbar_element_myfeeds = "我的摘要" -groupbar_element_ungrouped_icon = "未分组的图标" -groupbar_element_grouped_icon = "分组的标" ; ; ManagemachinesElement.php managemachines_element_awaiting_status = "等待状态的机器..." @@ -1343,10 +1341,6 @@ serversettings_element_save = "保存" ; GroupfeedElement.php groupfeed_element_add_group = "添加组" groupfeed_element_request_add = "请求增加组" -groupfeed_element_add_comment = "添加评论" -groupfeed_element_drag_textarea = "将项目成textarea增加他们..." -groupfeed_element_click_textarea = "或者点击选择。" -groupfeed_element_save = "保存" groupfeed_element_group_wiki = "维基" groupfeed_element_group_stats = "%s个员额中，有%s线" groupfeed_element_last_post = "最后一个员额：" @@ -1358,25 +1352,24 @@ groupfeed_element_delete = "删除" groupfeed_element_usericon = "用户的图标" groupfeed_element_num_posts = "%s个员额" groupfeed_element_num_views = "%s景" -groupfeed_element_last_edited = "最后编辑：%s" -groupfeed_element_post_vote = "投票：" +groupfeed_element_edited = "" groupfeed_element_last_post_info = "最后一个员额：" groupfeed_element_start_thread = "开始新的螺纹" groupfeed_element_subject = "受" groupfeed_element_post = "后" +groupfeed_element_drag_textarea = "将项目成textarea增加他们..." +groupfeed_element_click_textarea = "或者点击选择。" +groupfeed_element_save = "保存" groupfeed_element_feedplaces = "饲料的地方" groupfeed_element_mygroups = "所有的饲料" groupfeed_element_userplaces = "用户的地方" groupfeed_element_groupplaces = "%s团的地方" groupfeed_element_wiki_name = "%sWiki" groupfeed_element_recent_threads = "最近线" -groupfeed_element_recent_groupfeeds = "最近的饲料" +groupfeed_element_recent_groups = "" groupfeed_element_edit_post = "编辑后" groupfeed_element_no_longer_update = "小组摘要不再更新!" ; -; PaginationElement.php -pagination_helper_next = "下一页" -; ; MediajobsElement.php mediajobs_element_configure_media_jobs = "配置媒体的工作" mediajobs_element_mode = "模式" @@ -1416,14 +1409,14 @@ groupmenu_element_admin_menu = "管理菜单" groupmenu_element_welcome = "欢迎光临" groupmenu_element_signin = "签到" groupmenu_element_create_account = "创建的帐户" -groupmenu_element_page_places = "%s页至%s团的地方" -groupmenu_element_read_page = "%s页至%s组" -groupmenu_element_edit_page = " 编辑%s页" -groupmenu_element_page_history = "%s页历史" -groupmenu_element_page_source = "%s页源" -groupmenu_element_page_relationships = "%s页的关系" -groupmenu_element_page_discuss = " %s页讨论" -groupmenu_element_page_list = "%s组页列表" +groupmenu_element_page = "" +groupmenu_element_view = "" +groupmenu_element_edit = "" +groupmenu_element_history = "" +groupmenu_element_source = "" +groupmenu_element_relationships = "" +groupmenu_element_discussion = "" +groupmenu_element_page_list = "" groupmenu_element_group_feed = "%s料" groupmenu_element_page_thread = "%s页至%s小组讨论" groupmenu_element_page_thread_rss = "%s页至%s小组讨论" @@ -1829,8 +1822,8 @@ feeds_helper_view_minsecs = "%sm%ss前" feeds_helper_view_hourdate = "%s小时前" ; ; PaginationHelper.php -pagination_helper_previous = "上一页" pagination_helper_next = "下一页" +pagination_helper_previous = "上一页" ; ; ToggleHelper.php toggle_helper_on = "上" diff --git a/src/locale/zh_CN/statistics.txt b/src/locale/zh_CN/statistics.txt index 5a165df53..b6bef56f0 100755 --- a/src/locale/zh_CN/statistics.txt +++ b/src/locale/zh_CN/statistics.txt @@ -1 +1 @@ -d:100; \ No newline at end of file +d:99; \ No newline at end of file diff --git a/src/models/GroupModel.php b/src/models/GroupModel.php index 2b9d6992f..1071c32b4 100644 --- a/src/models/GroupModel.php +++ b/src/models/GroupModel.php @@ -1122,7 +1122,7 @@ class GroupModel extends Model implements MediaConstants return ""; } $row = $db->fetchArray($result); - if (empty($row)) { + if (empty($row) || empty($row["PUBDATE"])) { return ""; } $sql = "SELECT DISTINCT GI.ID AS ID, GI.PARENT_ID AS PARENT_ID, diff --git a/src/scripts/basic.js b/src/scripts/basic.js index 36627af5e..c8d73bddf 100755 --- a/src/scripts/basic.js +++ b/src/scripts/basic.js @@ -83,10 +83,10 @@ function getPage(tag, url) { var request = makeRequest(); if (request) { - var self = this; - var success_callback = (typeof arguments[2] == 'undefined') ? + let self = this; + let success_callback = (typeof arguments[2] == 'undefined') ? null : arguments[2]; - var fail_callback = (typeof arguments[3] == 'undefined') ? + let fail_callback = (typeof arguments[3] == 'undefined') ? null : arguments[3]; request.onreadystatechange = function() { @@ -313,8 +313,8 @@ function equalFormSaveState(form) return true; } /* - * Create a callback function used to get the next group of search results - * when continuous scrolling based search is used. + * Create a callback function used to get the next group of search/feed results + * when continuous scrolling based reulst displaying is used. * * @param int limit what is ranked position of first result to get * @param int total_results total number of search results for query @@ -322,16 +322,31 @@ function equalFormSaveState(form) * @param String base_url url to process query at * @param String end_result_string human language string to write if no * more results + * @param String container_id of the div tag used for all results + * @param String next_results_id of tag to use forr the next block of + * results within this container */ -function initNextSearchPage(limit, total_results, results_per_page, - base_url, end_result_string) +function initNextResultsPage(limit, total_results, results_per_page, + base_url, end_result_string, container_id, results_id) { - var can_add_state = true; - window.scrollTo(0, 0); - return function () { - if (limit < total_results && can_add_state) { - can_add_state = false; - var tmp_hr = elt("limit-" + limit); + let can_add_state = 1; + let scroll_obj = null; + if (container_id === undefined) { + container_id = "search-body"; + scroll_obj = window; + scroll_body = document.body; + } else { + scroll_obj = document.getElementById(container_id); + scroll_body = scroll_obj; + } + scroll_obj.scrollTo(0, 0); + if (results_id === undefined) { + results_id = "search-results"; + } + let nextPage = function () { + if (limit < total_results && can_add_state > 0) { + can_add_state = 0; + let tmp_hr = elt("limit-" + limit); if (tmp_hr != null) { var tmp_total = tmp_hr.getAttribute('data-total'); if (tmp_total > 0) { @@ -341,32 +356,148 @@ function initNextSearchPage(limit, total_results, results_per_page, limit += results_per_page; getPage(null, base_url + "&limit=" + limit + "&f=api", function(text) { - var search_body = document.getElementById( - 'search-body'); - var search_results = document.createElement("div"); - search_results.setAttribute("class", "search-results"); - search_results.innerHTML = text; - search_body.appendChild(search_results); - if (search_results.children.length < - results_per_page + 2 && (search_results.children.length - != 3 || search_results.children[2].children.length < + let container_body = document.getElementById( + container_id); + let next_results = document.createElement("div"); + let button_parent = null; + next_results.setAttribute("class", results_id); + next_results.innerHTML = text; + let next_button = elt('next-button'); + if (next_button && next_button.parentNode && + next_button.parentNode.parentNode && + next_button.parentNode.parentNode == container_body) { + button_parent = container_body.removeChild( + next_button.parentNode); + } + container_body.appendChild(next_results); + if (button_parent != null) { + container_body.appendChild(button_parent); + } + if (results_id == 'search-results' && + next_results.children.length < results_per_page + 2 && + (next_results.children.length != 3 || + next_results.children[2].children.length < results_per_page)) { total_results = limit - (results_per_page + 2 - - search_results.children.length); + next_results.children.length); + } + can_add_state = 1; + }); + } + if (limit >= total_results && can_add_state >= 0) { + can_add_state = -1; + setDisplay('next-button', false); + if (end_result_string != "") { + var end_results = document.createElement("h3"); + end_results.setAttribute("class", "center"); + end_results.innerHTML = end_result_string; + end_results.style.background = '#F8F8F8'; + elt(container_id).appendChild(end_results); + } + } + } + scroll_obj.addEventListener("scroll", function() { + if ((scroll_obj.scrollTop !== undefined && scroll_obj.scrollTop >= + scroll_body.scrollHeight - scroll_obj.clientHeight) || + (scroll_obj.scrollY !== undefined && scroll_obj.scrollY >= + scroll_body.scrollHeight - scroll_obj.innerHeight)) { + nextPage(); + } + }); + return nextPage; +} +/* + * Create a callback function used to get the previous group of + * search/feed results when continuous scrolling based reulst displaying is + * used. + * + * @param int limit what is ranked position of first result to get + * @param int total_results total number of search results for query + * @param int results_per_page number of results which should be returned + * @param String base_url url to process query at + * @param String end_result_string human language string to write if no + * more results + * @param String container_id of the div tag used for all results + * @param String next_results_id of tag to use forr the next block of + * results within this container + */ +function initPreviousResultsPage(limit, total_results, results_per_page, + base_url, container_id, results_id) +{ + let can_add_state = true; + let scroll_obj = null; + if (container_id === undefined) { + container_id = "search-body"; + scroll_obj = window; + scroll_body = document.body; + } else { + scroll_obj = document.getElementById(container_id); + scroll_body = scroll_obj; + } + if (results_id === undefined) { + results_id = "search-results"; + } + let previousPage = function () { + if (limit > 0 && can_add_state) { + can_add_state = false; + let tmp_hr = elt("limit-" + limit); + if (tmp_hr != null) { + var tmp_total = tmp_hr.getAttribute('data-total'); + if (tmp_total > 0) { + total_results = parseInt(tmp_total); + } + } + let top = (scroll_obj.scrollTop !== undefined) ? + scroll_obj.scrollTop : scroll_obj.scrollY; + limit -= results_per_page; + limit = (limit > 0) ? limit : 0; + getPage(null, base_url + "&limit=" + limit + + "&f=api", function(text) { + let container_body = document.getElementById( + container_id); + let previous_results = document.createElement("div"); + let button_parent = null; + previous_results.setAttribute("class", results_id); + previous_results.innerHTML = text; + let previous_button = elt('previous-button'); + if (previous_button && previous_button.parentNode && + previous_button.parentNode.parentNode && + previous_button.parentNode.parentNode == container_body) { + container_body.insertBefore(previous_results, + previous_button.parentNode); + button_parent = container_body.removeChild( + previous_button.parentNode); + } + if (button_parent != null) { + container_body.insertBefore(button_parent, + previous_results); + } + scroll_obj.scrollTo(0, top + previous_results.clientHeight); + if (previous_results.children.length < + results_per_page + 2 && (previous_results.children.length + != 3 || previous_results.children[2].children.length < + results_per_page)) { + total_results = limit - (results_per_page + 2 - + previous_results.children.length); } can_add_state = true; }); } - if (limit >= total_results && can_add_state) { + if (limit <= 0 && can_add_state) { can_add_state = false; - var end_results = document.createElement("h3"); - end_results.setAttribute("class", "center"); - end_results.innerHTML = end_result_string; - end_results.style.background = '#F8F8F8'; - elt('search-body').appendChild(end_results); - setDisplay('next-button', false); + setDisplay('previous-button', false); } } + if (total_results - limit < results_per_page) { + previousPage(); + } + scroll_obj.addEventListener("scroll", function() { + if ((scroll_obj.scrollTop !== undefined && scroll_obj.scrollTop <= 10)|| + (scroll_obj.scrollY !== undefined && scroll_obj.scrollY <= 10)) { + previousPage(); + } + }); + return previousPage; } /* * Used to set up a listener for a right-to-left swipe event diff --git a/src/views/ApiView.php b/src/views/ApiView.php index 07a6e8368..cbeee7826 100644 --- a/src/views/ApiView.php +++ b/src/views/ApiView.php @@ -52,9 +52,20 @@ class ApiView extends View */ public function renderView($data) { - if (!empty($data['ELEMENT']) && in_array($data['ELEMENT'], ['search'])){ - $data['API'] = true; - $this->element("search")->render($data); + if (!empty($data['ELEMENT']) && + (empty($data['MODE']) || $data['MODE'] != 'api')) { + switch ($data['ELEMENT']) + { + case 'search': + $data['API'] = true; + $this->element("search")->render($data); + break; + case 'wiki': + case 'groupfeed': + $data['API'] = true; + $this->element("groupfeed")->render($data); + break; + } } else { $this->element("api")->render($data); } diff --git a/src/views/CrawlstatusView.php b/src/views/CrawlstatusView.php index 4e3286354..a64359a69 100755 --- a/src/views/CrawlstatusView.php +++ b/src/views/CrawlstatusView.php @@ -128,8 +128,9 @@ class CrawlstatusView extends View if (!$_SERVER["MOBILE"]) { ?> <td><?php e("<b>{$crawl['CRAWL_TIME']}</b><br />"); - e("<small>".date("r", $crawl['CRAWL_TIME']). - "</small>"); ?></td><?php + e("<span class='smaller-font'>" . + date("r", $crawl['CRAWL_TIME']) . "</span>"); + ?></td><?php $visited_urls_count = (empty($crawl["QUERY_VISITED_URLS_COUNT"])) ? (isset($crawl["VISITED_URLS_COUNT"]) ? diff --git a/src/views/MachinestatusView.php b/src/views/MachinestatusView.php index 3fa3db378..5c18c05c5 100644 --- a/src/views/MachinestatusView.php +++ b/src/views/MachinestatusView.php @@ -178,7 +178,8 @@ class MachinestatusView extends View ?>' onclick='javascript:return confirm("<?= tl('machinestatus_view_confirm') ?>");' ><?= tl('machinestatus_view_delete') ?></a>]</div> - <h3 class="no-margin"><?php e($m['NAME']); ?><small + <h3 class="no-margin"><?php e($m['NAME']); ?><span + class='smaller-font' style="position:relative;top:-3px;font-weight: normal;"><?php if (empty($m['CHANNEL'])) { ?> [<?= @@ -188,7 +189,7 @@ class MachinestatusView extends View [<?= tl('machinestatus_view_parent', $m['PARENT']) ?>]<?php - }?>[<?= $m['URL']?>]</small> + }?>[<?= $m['URL']?>]</span> </h3> <table class="machine-table"> <?php diff --git a/src/views/elements/GroupbarElement.php b/src/views/elements/GroupbarElement.php index da0151ba6..c63e952a7 100644 --- a/src/views/elements/GroupbarElement.php +++ b/src/views/elements/GroupbarElement.php @@ -106,38 +106,41 @@ class GroupbarElement extends Element ?>' target='preview'><?=$page_name; ?></a> <?php } - } else if (isset($data['JUST_THREAD'])) { - if (isset($data['WIKI_PAGE_NAME'])) { - $group_name = $data['PAGES'][0][L\CrawlConstants::SOURCE_NAME]; - e(tl('groupbar_element_page_thread', - $data['WIKI_PAGE_NAME'], $group_name)); - } else { - e($data['SUBTITLE']); - } - } else if (isset($data['JUST_GROUP_ID'])){ - e(tl("groupbar_element_groupfeed", $data['SUBTITLE'])); - } else if (isset($data['JUST_USER_ID'])) { - if (empty($data['PAGES'][0]["USER_NAME"])) { - e(tl("groupbar_element_no_path_info")); - } else { - e(tl("groupbar_element_userfeed", - $data['PAGES'][0]["USER_NAME"])); - } - } else { - e(tl('groupbar_element_myfeeds')); - } - if (!isset($data['JUST_THREAD']) && !isset($data['JUST_GROUP_ID']) && - !isset($data['JUST_USER_ID']) && !$is_wiki) { - ?><span style="position:relative;top:5px;" > - <a href="<?= $base_query. '&v=ungrouped&'. $token_string - ?>" ><img alt="<?=tl('groupbar_element_ungrouped_icon')?>" - src="<?=C\SHORT_BASE_URL ?>resources/list.png" /></a> + } else {?> + <span style="position:relative;top:5px;" > <a href="<?= $base_query. '&v=grouped&' . $token_string - ?>" ><img alt="<?=tl('groupbar_element_grouped_icon')?>" + ?>" ><img alt="<?=tl('groupbar_element_groups')?>" src="<?=C\SHORT_BASE_URL ?>resources/grouped.png" /></a> + <a href="<?= $base_query. '&v=ungrouped&'. $token_string + ?>" ><img alt="<?=tl('groupbar_element_feeds')?>" + src="<?=C\SHORT_BASE_URL ?>resources/list.png" /></a> </span><?php - } - ?></span> + if (!empty($data['JUST_THREAD']) && + !empty($data['WIKI_PAGE_NAME'])) { + $group_name = + $data['PAGES'][0][L\CrawlConstants::SOURCE_NAME]; + e(tl('groupbar_element_page_thread', + $data['WIKI_PAGE_NAME'], $group_name)); + } else if (!empty($data['JUST_GROUP_ID'])) { + e($data['SUBTITLE']); + } else if (!empty($data['JUST_USER_ID'])) { + if (empty($data['PAGES'][0]["USER_NAME"])) { + e(tl("groupbar_element_no_path_info")); + } else { + e(tl("groupbar_element_userfeed", + $data['PAGES'][0]["USER_NAME"])); + } + } else if (!empty($data['JUST_THREAD'])) { + if (!empty($data['GROUP_NAME'])) { + e( "<a href='".htmlentities( + B\feedsUrl("group", $data["GROUP_ID"], + true, 'group')) . $token_string ."'>" . + $data['GROUP_NAME'] . "</a>:" . $data['SUBTITLE']); + } else { + e($data['SUBTITLE']); + } + } + }?></span> </h1> </div> </div> diff --git a/src/views/elements/GroupfeedElement.php b/src/views/elements/GroupfeedElement.php index 08ebbcc8c..289b68d61 100644 --- a/src/views/elements/GroupfeedElement.php +++ b/src/views/elements/GroupfeedElement.php @@ -53,16 +53,14 @@ class GroupfeedElement extends Element implements CrawlConstants { $logged_in = !empty($data["ADMIN"]); $is_status = isset($data['STATUS']); + $is_api = !empty($data['API']); $token_string = ($logged_in) ? C\CSRF_TOKEN . "=". $data[C\CSRF_TOKEN] : ""; $base_query = B\feedsUrl("", "", true, $data['CONTROLLER']) . $token_string; $paging_query = $data['PAGING_QUERY'] . $token_string; - if (!$is_status) { - ?> - <div id="feedstatus" class="small-margin-current-activity - no-min-height" > - <?php + if (!$is_status && !$is_api) {?> + <div class="small-margin-current-activity no-min-height" ><?php if ($logged_in) { if (isset($data['SUBSCRIBE_LINK'])) { ?><div class="float-same group-request-add"><?php @@ -86,95 +84,17 @@ class GroupfeedElement extends Element implements CrawlConstants <?php } } - ?> - <div> - <span id="feedtime" data-time="<?=time() ?>" class='none'> </span> - </div> - <?php + $data['TOTAL_ROWS'] = empty($data['TOTAL_ROWS']) ? 0 : + $data['TOTAL_ROWS']; if (isset($data['MODE']) && $data['MODE'] == 'grouped') { $this->renderGroupedView($paging_query, $data); - $page = false; } else { - $page = $this->renderUngroupedView($logged_in, $base_query, + $this->renderUngroupedView($logged_in, $base_query, $paging_query, $data); } - $data['TOTAL_ROWS'] = empty($data['TOTAL_ROWS']) ? 0 : - $data['TOTAL_ROWS']; - $this->view->helper("pagination")->render($paging_query, - $data['LIMIT'], $data['RESULTS_PER_PAGE'], $data['TOTAL_ROWS'], - false, $logged_in); ?> - </div><?php - $data['FRAGMENT'] = ""; - if (isset($data['JUST_THREAD']) && $logged_in && $page && !$is_status && - isset($data['GROUP_STATUS']) && - $data['GROUP_STATUS'] == C\ACTIVE_STATUS) { - $data['FRAGMENT'] = '#result-' . $page['ID']; - $just_fields = ["LIMIT" => "limit", "RESULTS_PER_PAGE" => "num", - "JUST_THREAD" => 'just_thread']; - $hidden_form = "\n"; - foreach ($just_fields as $field => $form_field) { - if (isset($data[$field])) { - $hidden_form .= "<input type=\"hidden\" ". - "name=\"$form_field\" value=\"{$data[$field]}\" />\n"; - } - } - ?> - <div class='small-margin-current-activity button-group-result'> - <form method="post" ><?= $hidden_form ?> - <input type="hidden" name="c" value="<?= - $data['CONTROLLER'] ?>" /> - <input type="hidden" name="a" value="groupFeeds" /> - <input type="hidden" name="arg" value="addcomment" /> - <input type="hidden" name="parent_id" value="<?= - $data['PAGES'][0]['PARENT_ID']; ?>" /> - <input type="hidden" name="group_id" value="<?= - $data['PAGES'][0]['GROUP_ID']?>" /> - <input type="hidden" name="<?= C\CSRF_TOKEN ?>" - value="<?= $data[C\CSRF_TOKEN] ?>" /> - <h2><b><label for="comment-add-comment" ><?= - tl("groupfeed_element_add_comment") - ?></label></b></h2> - <textarea class="short-text-area" - id="comment-add-comment" name="description" - data-buttons="all,!wikibtn-search,!wikibtn-heading, - !wikibtn-slide" ></textarea> - <script> - document.write('<div class="upload-gray-box center black">' + - '<input type="file" id="file-add-comment" ' + - 'name="file_add-comment" class="none" multiple="multiple" />' + - '<?= tl('groupfeed_element_drag_textarea') ?>' + - '<a href="javascript:elt(\'file-add-comment\').click()"><?= - tl('groupfeed_element_click_textarea') ?></a></div>'); - </script> - <button class="button-box float-opposite" - type="submit"><?= tl("groupfeed_element_save") ?> - </button><div> <br /><br /></div> - </form><?php - if ($data['ELEMENT'] != 'wiki') { - ?> - <div id='add-comment'></div> - <?php - }?> - </div> - <script> - if (typeof yioop_post_scripts !== 'object' ) { - yioop_post_scripts = {}; - } - yioop_post_scripts['comment-add-comment'] = function() - { - var comment_id = 'comment-add-comment'; - initializeFileHandler(comment_id, "file-add-comment", - <?= min(L\metricToInt(ini_get('upload_max_filesize')), - L\metricToInt(ini_get('post_max_size'))) - ?>, "textarea", null, true); - editorize(comment_id); - elt(comment_id).focus(); - } - </script> - <?php - } - if (!$is_status) { - $this->renderScripts($data); + if (!$is_api && !$is_status) {?> + </div><?php + $this->renderScripts($data, ($data['JUST_THREAD'] ?? 0) > 0); } } /** @@ -186,7 +106,7 @@ class GroupfeedElement extends Element implements CrawlConstants */ public function renderGroupedView($paging_query, &$data) { - $token_string = (!empty($data['ADMIN'])) ? C\CSRF_TOKEN."=". + $token_string = (!empty($data['ADMIN'])) ? C\CSRF_TOKEN . "=". $data[C\CSRF_TOKEN] : ""; foreach ($data['GROUPS'] as $group) { e("<div class=\"access-result\">" . @@ -206,12 +126,15 @@ class GroupfeedElement extends Element implements CrawlConstants "</div>" . "<div class=\"slight-pad\">" . "<b>" . tl('groupfeed_element_last_post') - . "</b> " . - "<a href=\"" . B\feedsUrl("thread", $group['THREAD_ID'], true, - $data['CONTROLLER']) . $token_string . "\">" . - $group['ITEM_TITLE'] . "</a>" . - "</div>" . - "</div>"); + . "</b> "); + if ($group['THREAD_ID'] >= 0) { + e("<a href=\"" . B\feedsUrl("thread", $group['THREAD_ID'], + true, $data['CONTROLLER']) . $token_string . "\">" . + $group['ITEM_TITLE'] . "</a>"); + } else { + e($group['ITEM_TITLE']); + } + e("</div></div>"); $data['TOTAL_ROWS'] = $data['NUM_GROUPS']; } } @@ -228,8 +151,9 @@ class GroupfeedElement extends Element implements CrawlConstants public function renderUngroupedView($logged_in, $base_query, $paging_query, &$data) { + $is_api = !empty($data['API']); + $is_status = !empty($data['STATUS']); $open_in_tabs = $data['OPEN_IN_TABS']; - $is_wiki_page_with_feedback = ($data['ELEMENT'] == 'wiki'); $time = time(); $can_comment = [C\GROUP_READ_COMMENT, C\GROUP_READ_WRITE, C\GROUP_READ_WIKI]; @@ -239,7 +163,7 @@ class GroupfeedElement extends Element implements CrawlConstants $can_comment = []; $start_thread = []; } - $token_string = ($logged_in) ? C\CSRF_TOKEN."=". + $token_string = ($logged_in) ? C\CSRF_TOKEN . "=". $data[C\CSRF_TOKEN] : ""; $no_follow = ($token_string) ? " rel='nofollow' " : ""; $page = []; @@ -255,52 +179,89 @@ class GroupfeedElement extends Element implements CrawlConstants $data['WIKI_GROUP_ID'] : ( (empty($data['PAGES'][0]["GROUP_ID"])) ? -1 : $data['PAGES'][0]["GROUP_ID"]); - if (in_array($member_access, $can_comment)) { - if (isset($data['JUST_GROUP_ID']) && - in_array($member_access, $start_thread)) { + $is_thread = !empty($data['JUST_THREAD']); + $is_group = !empty($data['JUST_GROUP_ID']); + $is_page_with_comments = ($data['ELEMENT'] == 'wiki'); + $is_all_feed = !$is_thread && !$is_group && !$is_page_with_comments; + if (!$is_api && !$is_status && + in_array($member_access, $can_comment)) { + if ($is_group && in_array($member_access, $start_thread)) { $this->drawStartThreadForm($data['JUST_GROUP_ID'], $data); + } else if ($is_page_with_comments) { + $this->drawCommentForm($parent_id, $group_id, $data); } } - if (isset($data['NO_POSTS_YET'])) { + if (!$is_api && !$is_status && isset($data['NO_POSTS_YET'])) { if (isset($data['NO_POSTS_START_THREAD'])) { //no read case where no posts yet $this->drawStartThreadForm($data['JUST_GROUP_ID'], $data); } ?> - <p class="red"><?= tl('groupfeed_element_no_posts_yet') ?></p> + <div class="button-group-result red medium-font" ><?= + tl('groupfeed_element_no_posts_yet') ?></div> <?php + if ($is_thread) { + $this->drawCommentForm($parent_id, $group_id, $data); + } + } + if (!$is_api && !$is_status) {?> + <div id='results-container' data-time="<?=time() ?>"><?php + if ($data['LIMIT'] > 0) { + $this->view->helper("pagination")->singleButtonPagination( + $paging_query, $data['LIMIT'], $data['RESULTS_PER_PAGE'], + $data['TOTAL_ROWS'], false, $logged_in, true); + } + } + if (!$is_api) {?> + <div class="result-batch" data-time='<?=time() ?>' ><?php } if (isset($data['NO_POSTS_IN_THREAD'])) { ?> - <p class="red"><?=tl('groupfeed_element_thread_no_exist') ?></p> + <div class="button-group-result red medium-font" ><?= + tl('groupfeed_element_thread_no_exist') ?></div> <?php } + $first_page = !$is_page_with_comments && $data['LIMIT'] == 0; + $old_pubdate = -1; + $now = time(); foreach ($data['PAGES'] as $page) { $pub_date = $page['PUBDATE']; + $pub_date_diff = abs($page['PUBDATE'] - $old_pubdate); + $pub_date_age = $now - $page['PUBDATE']; + $pub_data_change = ($pub_date_age < C\ONE_HOUR && + $pub_date_diff > 5 * C\ONE_MINUTE) || ($pub_date_age < C\ONE_DAY + && $pub_date_diff > C\ONE_HOUR) || ($pub_date_diff > C\ONE_DAY); + $old_pubdate = ($pub_data_change) ? $pub_date : $old_pubdate; $pub_date = $this->view->helper("feeds")->getPubdateString( $time, $pub_date); $edit_date = false; + $user_background = "white"; if (isset($page['EDIT_DATE']) && $page['EDIT_DATE'] && $page['EDIT_DATE'] != $page['PUBDATE']) { $edit_date = $this->view->helper("feeds")->getPubdateString( $time, $page['EDIT_DATE']); } $encode_source = urlencode(urlencode($page[self::SOURCE_NAME])); - ?> - <div class='group-result'> - <?php - if ($is_wiki_page_with_feedback) { ?> - <div class='gray float-opposite' - style="position:relative; top:-32px;height:0;" - ><?=$pub_date?></div> + $group_result = "small-group-result"; + $has_voting = $logged_in && isset($page["VOTE_ACCESS"]) && + in_array($page["VOTE_ACCESS"], [C\UP_DOWN_VOTING_GROUP, + C\UP_VOTING_GROUP]); + $has_up_voting = $has_voting && + ($page["VOTE_ACCESS"] == C\UP_VOTING_GROUP); + $has_up_down_voting = $has_voting && + ($page["VOTE_ACCESS"] == C\UP_DOWN_VOTING_GROUP); + if ($pub_data_change) { ?> + <div class='gray align-opposite' ><?=$pub_date?></div> <?php } + ?> + <div class='<?="$group_result $user_background"?>'> + <?php $subsearch = (isset($data["SUBSEARCH"])) ? $data["SUBSEARCH"] : ""; $edit_list = ($page['ID'] == $page['PARENT_ID']) ? $start_thread : $can_comment; if (in_array($page["MEMBER_ACCESS"], $edit_list) && - !isset($data['JUST_GROUP_ID']) && - isset($_SESSION['USER_ID']) && + !$is_group && isset($_SESSION['USER_ID']) && (($page['USER_ID'] != "" && $page['USER_ID'] == $_SESSION['USER_ID']) || $_SESSION['USER_ID'] == C\ROOT_ID || (!empty($page['OWNER_ID']) @@ -308,9 +269,25 @@ class GroupfeedElement extends Element implements CrawlConstants isset($page['TYPE']) && $page['TYPE'] != C\WIKI_GROUP_ITEM) { ?> <div class="float-opposite"><?php - if (!isset($data['JUST_GROUP_ID']) && - in_array($page["MEMBER_ACCESS"], $can_comment) && - !isset($data['JUST_THREAD'])){?> + if ($has_voting) { + $up_vote = $paging_query . "&post_id=".$page['ID'] . + "&arg=upvote&group_id=".$page['GROUP_ID']; + $down_vote = $paging_query ."&post_id=".$page['ID']. + "&arg=downvote&group_id=".$page['GROUP_ID']; + if ($has_up_down_voting) { + e(" <span class='gray bigger-font'>(". + "<a class='vote-button' ". + "href='$up_vote'>+</a>{$page['UPS']}/<a ". + "class='vote-button' href='$down_vote'>-</a>". + "{$page['DOWNS']})</span>"); + } else if ($has_up_voting) { + e(" <span class='gray bigger-font'>(". + "<a class='vote-button' ". + "href='$up_vote'>+</a>{$page['UPS']})</span>"); + } + } + if ($is_all_feed && in_array($page["MEMBER_ACCESS"], + $can_comment)) { ?> <script> document.write("[<a href='javascript:commentForm(" + '<?= "{$page['ID']}, {$page['PARENT_ID']}, " . @@ -319,13 +296,17 @@ class GroupfeedElement extends Element implements CrawlConstants </script><?php } if (!isset($page['NO_EDIT'])) { - ?> - <script> - document.write('[<a href="javascript:updatePostForm(<?= - $page['ID']?>)"><?=tl('groupfeed_element_edit') - ?></a>]'); - </script> - <?php + if ($is_api || $is_status) { ?> + [<a href="javascript:updatePostForm(<?= + $page['ID']?>)"><?=tl('groupfeed_element_edit') + ?></a>]<?php + } else {?> + <script> + document.write('[<a href="javascript:updatePostForm(<?= + $page['ID']?>)"><?=tl('groupfeed_element_edit') + ?></a>]'); + </script><?php + } } ?> [<a href="<?=$paging_query.'&arg=deletepost&'. @@ -337,68 +318,75 @@ class GroupfeedElement extends Element implements CrawlConstants if (!empty($data['DISCUSS_THREAD'])) { $title_class = ' class="none" '; } + $feed_user_icon = "small-feed-user-icon"; + $feed_item_body = "small-feed-item-body"; + $feed_item_body_first = (($is_thread && $first_page) || + !$is_thread) ? " style='padding-top:0' " :""; ?> <div id='result-<?= $page['ID'] ?>' > <div class="float-same center" > - <img class="feed-user-icon" src="<?=$page['USER_ICON'] ?>" + <img class="<?= $feed_user_icon?>" src="<?=$page['USER_ICON'] ?>" alt="<?=tl('groupfeed_element_usericon') ?>"/><br /> <a class="feed-user-link echo-link" <?= $no_follow ?> href="<?= $this->formatHref(B\feedsUrl("user", $page['USER_ID'], true, $data['CONTROLLER']) . $token_string); ?>" ><?=$page['USER_NAME'] ?></a> </div> - <div class="feed-item-body"> - <h2><a href="<?= $this->formatHref(B\feedsUrl('thread', - $page['PARENT_ID'], true, $data['CONTROLLER']) . $token_string) - ?>" <?= $no_follow ?> <?=$title_class ?> - id='title<?=$page['ID']?>' <?php - if ($open_in_tabs) { ?> target="_blank" rel="noopener"<?php } - ?>><?= $page[self::TITLE] ?></a><?php - if (!$is_wiki_page_with_feedback) { - if (isset($page['NUM_POSTS'])) { - e(" ("); - e(tl('groupfeed_element_num_posts', - $page['NUM_POSTS'])); - if (!$_SERVER["MOBILE"] && - $data['RESULTS_PER_PAGE'] < $page['NUM_POSTS']) { - $thread_query = htmlentities(B\feedsUrl("thread", - $page['PARENT_ID'], true, $data['CONTROLLER'])); - $this->view->helper("pagination")->render($thread_query. - $token_string, 0, $data['RESULTS_PER_PAGE'], - $page['NUM_POSTS'], true, $logged_in); + <div class="<?=$feed_item_body ?>" <?=$feed_item_body_first + ?> ><?php + if (!$is_thread || $first_page) {?> + <h2><a href="<?= $this->formatHref(B\feedsUrl('thread', + $page['PARENT_ID'], true, $data['CONTROLLER']) . + $token_string) ?>" <?= $no_follow ?> <?=$title_class ?> + id='title<?=$page['ID']?>' <?php + if ($open_in_tabs) { + ?> target="_blank" rel="noopener"<?php } - e(", " . tl('groupfeed_element_num_views', - $page['NUM_VIEWS'])); - e(") "); - } else if (!isset($data['JUST_GROUP_ID'])) { - if (isset($page["VOTE_ACCESS"]) && - $page["VOTE_ACCESS"] == C\UP_DOWN_VOTING_GROUP ) { - e(' (+'.$page['UPS'].'/'.($page['UPS'] + - $page['DOWNS']).')'); - } else if (isset($page["VOTE_ACCESS"]) && - $page["VOTE_ACCESS"] == C\UP_VOTING_GROUP) { - e(' (+'.$page['UPS'].')'); - } - } - ?>. - <?= "<span class='gray'> - $pub_date</span>" ?> - <b><a class="gray-link" <?= $no_follow ?> href="<?= - $this->formatHref( - B\feedsUrl('group', $page['GROUP_ID'], true, - $data['CONTROLLER']). $token_string) ?>" ><?php - e($page[self::SOURCE_NAME]."</a></b>"); + ?>><?= $page[self::TITLE] ?></a><?php + if (!$is_page_with_comments) { + if (isset($page['NUM_POSTS'])) { + e(" ("); + e(tl('groupfeed_element_num_posts', + $page['NUM_POSTS'])); + if (!$_SERVER["MOBILE"] && + $data['RESULTS_PER_PAGE'] < + $page['NUM_POSTS']) { + $thread_query = htmlentities( + B\feedsUrl("thread", + $page['PARENT_ID'], true, + $data['CONTROLLER'])); + $this->view->helper("pagination")->render( + $thread_query . $token_string, 0, + $data['RESULTS_PER_PAGE'], + $page['NUM_POSTS'], true, $logged_in); + } + e(", " . tl('groupfeed_element_num_views', + $page['NUM_VIEWS'])); + e(") "); + } + e("."); + if (!$is_group && !$is_thread) { ?> + <b><a class="gray-link" <?= $no_follow ?> href="<?= + $this->formatHref( + B\feedsUrl('group', $page['GROUP_ID'], true, + $data['CONTROLLER']) . $token_string) ?>" ><?= + $page[self::SOURCE_NAME] ?></a></b><?php + } + } ?> + </h2><?php + $first_page = false; + } else { ?> + <div id="hidden-title<?=$page['ID']?>" class="none"><?= + $page[self::TITLE] ?></div><?php } - ?> - </h2> - <?php - if (!isset($data['JUST_GROUP_ID'])) { + if (!$is_group) { $description = $page[self::DESCRIPTION] ?? "";?> <div id='description<?= $page['ID']?>'><?php e($description); if ($edit_date) { - e("<br /><b>". - tl('groupfeed_element_last_edited', $edit_date)."</b>"); - } ?> + e("(<b>". tl('groupfeed_element_edited', $edit_date). + "</b>)"); + }?> </div> <?php if (!isset($page['NO_EDIT']) && @@ -408,32 +396,7 @@ class GroupfeedElement extends Element implements CrawlConstants class='none'><?=$page['OLD_DESCRIPTION'] ?></div> <?php } - if ($logged_in && isset($page["VOTE_ACCESS"]) && - in_array($page["VOTE_ACCESS"], [C\UP_DOWN_VOTING_GROUP, - C\UP_VOTING_GROUP])) { - ?> - <div class="gray"><b> - <?php - e(tl('groupfeed_element_post_vote')); - $up_vote = $paging_query."&post_id=".$page['ID']. - "&arg=upvote&group_id=".$page['GROUP_ID']; - $down_vote = $paging_query."&post_id=".$page['ID']. - "&arg=downvote&group_id=".$page['GROUP_ID']; - if ($page["VOTE_ACCESS"] == C\UP_DOWN_VOTING_GROUP) { - ?> - <a class='anchor-button' href='<?= $up_vote ?>'>+</a> - <a class='anchor-button' href='<?= - $down_vote ?>"'>-</a> - <?php - } else if ($page["VOTE_ACCESS"] == C\UP_VOTING_GROUP) { - ?> - <a class='anchor-button' href='<?=$up_vote ?>'>+</a> - <?php - } - ?> - </b></div> - <?php - } + } else if (isset($page['LAST_POSTER']) ){ ?> <div id='description<?= $page['ID'] ?>'><?php @@ -452,12 +415,25 @@ class GroupfeedElement extends Element implements CrawlConstants </div> <div id='<?= $page["ID"] ?>'></div> </div> - <div> - - </div> <?php } //end foreach - return $page; + if (!$is_api) {?> + </div><?php + } + if (!$is_api && !$is_status) { + $this->view->helper("pagination")->singleButtonPagination( + $paging_query, $data['LIMIT'], $data['RESULTS_PER_PAGE'], + $data['TOTAL_ROWS'], false, $logged_in);?> + </div><?php + } + if (!$is_api && !$is_status) { + if ($is_thread && $logged_in && !$is_status && + !$is_page_with_comments && isset($data['GROUP_STATUS']) && + $data['GROUP_STATUS'] == C\ACTIVE_STATUS) { + $this->drawCommentForm($data['JUST_THREAD'], $data["GROUP_ID"], + $data); + } + } } /** * Used to draw the form to start a new thread in a group @@ -488,7 +464,7 @@ class GroupfeedElement extends Element implements CrawlConstants </noscript> <div id='start-thread' class="light-gray-box top-bottom-margin"> <br /> - <form method="post" ><?= + <form method="post" action="<?=C\SHORT_BASE_URL?>" ><?= $hidden_form ?> <input type="hidden" name="c" value="<?= $data['CONTROLLER'] ?>" /> @@ -545,6 +521,81 @@ class GroupfeedElement extends Element implements CrawlConstants </div> <?php } + /** + * Used to draw the add comment form to add a comment to an + * existing thread + * + * @param int $thread_id of thread to draw form for + * @param int $group_id of group to draw form for + * @param array $data containing other field needed to draw the form + */ + private function drawCommentForm($thread_id, $group_id, $data) + { + $just_fields = ["LIMIT" => "limit", "RESULTS_PER_PAGE" => "num", + "JUST_THREAD" => 'just_thread']; + $hidden_form = "\n"; + foreach ($just_fields as $field => $form_field) { + if (isset($data[$field])) { + $hidden_form .= "<input type=\"hidden\" ". + "name=\"$form_field\" value=\"{$data[$field]}\" />\n"; + } + } ?> + <div class="button-group-result"> + <script> + document.write('<button class="button-box" onclick=' + "'" + + "toggleDisplay(\"add-comment\")'><label " + + "for=\"comment-add-comment\" ><?= + tl('groupfeed_element_comment') ?></label></button>"); + </script> + <noscript> + <h2><label for="comment-add-comment" ><b><?= + tl('groupfeed_element_comment') ?></b></label></h2> + </noscript> + <div id="add-comment"> + <form method="post" action="<?=C\SHORT_BASE_URL?>"><?= $hidden_form ?> + <input type="hidden" name="c" value="<?= + $data['CONTROLLER'] ?>" /> + <input type="hidden" name="a" value="groupFeeds" /> + <input type="hidden" name="arg" value="addcomment" /> + <input type="hidden" name="parent_id" value="<?=$thread_id; ?>" /> + <input type="hidden" name="group_id" value="<?= $group_id?>" /> + <input type="hidden" name="<?= C\CSRF_TOKEN ?>" + value="<?= $data[C\CSRF_TOKEN] ?>" /> + <textarea class="short-text-area" + id="comment-add-comment" name="description" + data-buttons="all,!wikibtn-search,!wikibtn-heading, + !wikibtn-slide" ></textarea> + <script> + document.write('<div class="upload-gray-box center black">' + + '<input type="file" id="file-add-comment" ' + + 'name="file_add-comment" class="none" multiple="multiple" />' + + '<?= tl('groupfeed_element_drag_textarea') ?>' + + '<a href="javascript:elt(\'file-add-comment\').click()"><?= + tl('groupfeed_element_click_textarea') ?></a></div>'); + </script> + <button class="button-box float-opposite" + type="submit"><?= tl("groupfeed_element_save") ?> + </button><div> <br /><br /></div> + </form> + </div> + <script> + if (typeof yioop_post_scripts !== 'object' ) { + yioop_post_scripts = {}; + } + yioop_post_scripts['comment-add-comment'] = function() + { + var comment_id = 'comment-add-comment'; + initializeFileHandler(comment_id, "file-add-comment", + <?= min(L\metricToInt(ini_get('upload_max_filesize')), + L\metricToInt(ini_get('post_max_size'))) + ?>, "textarea", null, true); + editorize(comment_id); + setDisplay('add-comment', false); + } + </script> + </div> + <?php + } /** * Used to slightly clean up hypertext links before drawing them * (get rid of empty queries, avoid double encoding) @@ -613,7 +664,7 @@ class GroupfeedElement extends Element implements CrawlConstants } if (!empty($data['RECENT_GROUPS'])) { $token_string = C\CSRF_TOKEN . "=". $data[C\CSRF_TOKEN]; - $options[tl('groupfeed_element_recent_groupfeeds')] = ""; + $options[tl('groupfeed_element_recent_groups')] = ""; foreach ($data['RECENT_GROUPS'] as $group_name => $url) { $options[$url . $token_string] = $group_name; } @@ -627,7 +678,7 @@ class GroupfeedElement extends Element implements CrawlConstants * * @param array $data contains arguments needs to draw urls correctly. */ - public function renderScripts($data) + public function renderScripts($data, $with_status_update = false) { $data['TOTAL_ROWS'] = empty($data['TOTAL_ROWS']) ? 0 : $data['TOTAL_ROWS']; @@ -669,7 +720,7 @@ class GroupfeedElement extends Element implements CrawlConstants $drag_above_text = tl('groupfeed_element_drag_textarea'); $click_link_text = tl('groupfeed_element_click_textarea'); ?> - var feed_update_id = null; + let feed_update_id = null; function commentForm(id, parent_id, group_id) { tmp = '<div class="post<?= $clear ?>"></div>'; @@ -677,8 +728,7 @@ class GroupfeedElement extends Element implements CrawlConstants if (start_elt != tmp) { elt(id).innerHTML = tmp + - '<form action="./<?= $data['FRAGMENT'] - ?>" method="post" >' + <?= $hidden_form ?> + '<form method="post" >' + <?= $hidden_form ?> '<input type="hidden" name="c" value="<?= $data['CONTROLLER'] ?>" />' + '<input type="hidden" name="a" value="groupFeeds" />' + @@ -690,7 +740,7 @@ class GroupfeedElement extends Element implements CrawlConstants '<input type="hidden" name="<?= C\CSRF_TOKEN ?>" '+ 'value="<?= $data[C\CSRF_TOKEN] ?>" />' + '<h2><b><label for="comment-'+ id +'" ><?= - tl("groupfeed_element_add_comment") + tl("groupfeed_element_comment") ?></label></b></h2>'+ '<textarea class="short-text-area" '+ 'id="comment-'+ id +'" name="description" '+ @@ -707,7 +757,7 @@ class GroupfeedElement extends Element implements CrawlConstants 'type="submit"><?= tl("groupfeed_element_save") ?>'+ '</button><div> <br /><br /></div>' + '</form>'; - var comment_id = 'comment-' + id; + let comment_id = 'comment-' + id; initializeFileHandler(comment_id , "file-" + id, <?= min(L\metricToInt(ini_get('upload_max_filesize')), L\metricToInt(ini_get('post_max_size'))) @@ -721,16 +771,18 @@ class GroupfeedElement extends Element implements CrawlConstants function updatePostForm(id) { clearInterval(feed_update_id); - var title = elt('title' + id).innerHTML; - var description = elt('old-description'+id).innerHTML; - var tmp = '<div class="post<?= $clear ?>"></div>'; + let title_elt = elt('title' + id); + let title = null; + if (title_elt) { + title = elt('title' + id).innerHTML; + } + let description = elt('old-description'+id).innerHTML; + let tmp = '<div class="post<?= $clear ?>"></div>'; start_elt = elt(id).innerHTML.substr(0, tmp.length) if (start_elt != tmp) { - setDisplay('result-'+id, false); - elt(id).innerHTML = - tmp + - '<form action="./<?= $data['FRAGMENT'] - ?>" method="post" >' + <?= $hidden_form ?> + setDisplay('result-' + id, false); + tmp += + '<form method="post" >' + <?= $hidden_form ?> '<input type="hidden" name="c" value="<?= $data['CONTROLLER'] ?>" />' + '<input type="hidden" name="a" value="groupFeeds" />' + @@ -738,17 +790,26 @@ class GroupfeedElement extends Element implements CrawlConstants '<input type="hidden" name="post_id" value="' + id + '" />' + '<input type="hidden" name="<?= C\CSRF_TOKEN ?>" '+ - 'value="<?= $data[C\CSRF_TOKEN] ?>" />' + - '<h2><b><?= - tl("groupfeed_element_edit_post") - ?></b></h2>'+ - '<p <?=$hide_title ?>><b><label for="title-'+ id +'" ><?= - tl("groupfeed_element_subject") - ?></label></b></p>' + - '<p <?= $hide_title - ?>><input type="text" name="title" value="'+title+'" '+ - ' maxlength="<?= C\TITLE_LEN ?>" class="wide-field"/></p>' + - '<p><b><label for="description-'+ id +'" ><?= + 'value="<?= $data[C\CSRF_TOKEN] ?>" />'; + if (title) { + tmp += '<h2><b><?= + tl("groupfeed_element_edit_post") + ?></b></h2><p <?=$hide_title + ?>><b><label for="title-'+ id +'" ><?= + tl("groupfeed_element_subject") + ?></label></b></p>' + + '<p <?= $hide_title + ?>><input type="text" name="title" value="'+title+'" '+ + ' maxlength="<?= C\TITLE_LEN + ?>" class="wide-field"/></p>'; + } else { + let hidden_title = elt('hidden-title' + id); + if (hidden_title) { + tmp += '<input type="hidden" name="title" '+ + 'value="' + hidden_title.innerHtml + '" />'; + } + } + tmp += '<p><b><label for="description-'+ id +'" ><?= tl("groupfeed_element_post") ?></label></b></p>' + '<textarea class="short-text-area" '+ @@ -764,9 +825,10 @@ class GroupfeedElement extends Element implements CrawlConstants '<button class="button-box float-opposite" ' + 'type="submit"><?= tl("groupfeed_element_save") ?></button>' + - '<div> </div>'+ + '<div><br /><br /></div>'+ '</form>'; - var description_id = 'description-' + id; + elt(id).innerHTML = tmp; + let description_id = 'description-' + id; initializeFileHandler(description_id , "file-" + id, <?= min(L\metricToInt(ini_get('upload_max_filesize')), L\metricToInt(ini_get('post_max_size'))) @@ -774,40 +836,56 @@ class GroupfeedElement extends Element implements CrawlConstants editorize(description_id); } else { elt(id).innerHTML = ""; - setDisplay('result-'+id, true); + setDisplay('result-' + id, true); doUpdate(); } - } - function feedStatusUpdate() - { - var start_url = "<?=html_entity_decode($paging_query) . - $delim . $token_string . '&arg=status&feed_time=' ?>"; - var feed_time_obj = elt('feedtime'); - var feed_time = parseInt(feed_time_obj.getAttribute('data-time')); - getPage(elt('feedstatus'), start_url + feed_time, function(x) { - elt('feedstatus').style.backgroundColor = "#EEE"; - setTimeout("resetBackground()", 0.5 * sec); - }); - } - function clearUpdate() - { - clearInterval(feed_update_id); - elt('feedstatus').innerHTML= "<h2 class='red'><?= - tl('groupfeed_element_no_longer_update')?></h2>"; - } - function resetBackground() - { - elt('feedstatus').style.backgroundColor = "#FFF"; - } - function doUpdate() - { - var sec = 1000; - var minute = 60 * sec; - feed_update_time = 15; - feed_update_id = setInterval("feedStatusUpdate()", - feed_update_time * sec); - setTimeout("clearUpdate()", 20 * minute + sec); - } + }<?php + if ($with_status_update) { ?> + function feedStatusUpdate() + { + let start_url = "<?=html_entity_decode($paging_query) . + $delim . $token_string . '&arg=status&feed_time=' ?>"; + let results_container_obj = elt('results-container'); + let feed_time = + parseInt(results_container_obj.getAttribute('data-time')); + if (results_container_obj.lastElementChild) { + let tmp_time = + results_container_obj.lastElementChild.getAttribute( + 'data-time'); + if (tmp_time) { + feed_time = parseInt(tmp_time); + } + } + getPage(null, start_url + feed_time, + function(text) { + elt('results-container').style.backgroundColor = "#EEE"; + let tmp_container = document.createElement("div"); + tmp_container.innerHTML = text; + elt('results-container').appendChild( + tmp_container.lastElementChild); + setTimeout("resetBackground()", 0.5 * sec); + }); + } + function clearUpdate() + { + clearInterval(feed_update_id); + elt('results-container').innerHTML= "<h2 class='red'><?= + tl('groupfeed_element_no_longer_update')?></h2>"; + } + function resetBackground() + { + elt('results-container').style.backgroundColor = "#FFF"; + } + function doUpdate() + { + var sec = 1000; + var minute = 60 * sec; + feed_update_time = 15; + feed_update_id = setInterval("feedStatusUpdate()", + feed_update_time * sec); + setTimeout("clearUpdate()", 20 * minute + sec); + }<?php + }?> </script> <?php } diff --git a/src/views/elements/GroupmenuElement.php b/src/views/elements/GroupmenuElement.php index 594b9076d..bca07260e 100644 --- a/src/views/elements/GroupmenuElement.php +++ b/src/views/elements/GroupmenuElement.php @@ -112,35 +112,26 @@ class GroupmenuElement extends Element implements CrawlConstants } else { $full_human_page_name = $human_page_name; } - $options = [ tl('groupmenu_element_page_places', + $options = [ tl('groupmenu_element_page', $full_human_page_name, $data['GROUP']['GROUP_NAME']) => ""]; if ($data["MODE"] != 'pages') { if ($can_edit) { $modes = [ - "read" => tl('groupmenu_element_read_page', - $full_human_page_name, - $data['GROUP']['GROUP_NAME']), - "edit" => tl('groupmenu_element_edit_page', - $full_human_page_name), - "history" => tl('groupmenu_element_page_history', - $human_page_name), + "read" => tl('groupmenu_element_view'), + "edit" => tl('groupmenu_element_edit'), + "history" => tl('groupmenu_element_history'), ]; } else { $modes = [ - "read" => tl('groupmenu_element_read_page', - $full_human_page_name, - $data['GROUP']['GROUP_NAME']), - "source" => tl('groupmenu_element_page_source', - $full_human_page_name), - "history" => tl('groupmenu_element_page_history', - $human_page_name), + "read" => tl('groupmenu_element_view'), + "source" => tl('groupmenu_element_source'), + "history" => tl('groupmenu_element_history'), ]; } if (!empty($data['PAGE_HAS_RELATIONSHIPS']) ) { $relationship_mode = [ "relationships" => - tl('groupmenu_element_page_relationships', - $human_page_name), + tl('groupmenu_element_relationships'), ]; $modes = array_merge($modes, $relationship_mode); } @@ -148,8 +139,7 @@ class GroupmenuElement extends Element implements CrawlConstants $modes[htmlentities(B\feedsUrl("thread", $data['DISCUSS_THREAD'], true, "group")) . $token_string] = - tl('groupmenu_element_page_discuss', - $human_page_name); + tl('groupmenu_element_discussion'); } } $modes["pages"] = tl('groupmenu_element_page_list', diff --git a/src/views/elements/ManageaccountElement.php b/src/views/elements/ManageaccountElement.php index dd2c4802d..e506508e2 100755 --- a/src/views/elements/ManageaccountElement.php +++ b/src/views/elements/ManageaccountElement.php @@ -76,12 +76,12 @@ class ManageaccountElement extends Element <h2><?= tl('manageaccount_element_welcome', $data['USERNAME']) ?></h2> <p><?= tl('manageaccount_element_what_can_do') ?></p> - <h2><?=tl('manageaccount_element_account_details') ?> <small><a - href="<?=$edit_or_no_url ?>" + <h2><?=tl('manageaccount_element_account_details') + ?><span class='smaller-font'><a href="<?=$edit_or_no_url ?>" style="position:relative; top:3px;" ><img src="<?= $edit_or_no_img?>" title='<?=$edit_or_no_text ?>' alt='<?= $edit_or_no_text ?>' /></a> - </small></h2> + </span></h2> <form id="changeUserForm" method="post" autocomplete="off" enctype="multipart/form-data"><?php $row_col_span = 'rowspan="4"'; diff --git a/src/views/elements/ManageadvertisementsElement.php b/src/views/elements/ManageadvertisementsElement.php index 2cac61033..0253c3793 100644 --- a/src/views/elements/ManageadvertisementsElement.php +++ b/src/views/elements/ManageadvertisementsElement.php @@ -322,7 +322,8 @@ class ManageadvertisementsElement extends Element <?php if (isset($data['AD_MIN_BID'])) { e(' readonly="readonly"'); - } ?> /> <small class="gray" id="ad-name-count" ></small> + } ?> /><span class="gray smaller-font" + id="ad-name-count" ></span> </td> </tr> <tr><th class="table-label"><label for="ad-description"><?= @@ -341,7 +342,8 @@ class ManageadvertisementsElement extends Element e(' readonly="readonly"'); } ?>><?=(empty($data['DESCRIPTION'])) ? "" : $data['DESCRIPTION'] - ?></textarea> <small class="gray" id="ad-desc-count" ></small> + ?></textarea> <span class="gray smaller-font" + id="ad-desc-count" ></small> </td></tr> <tr> <th class="table-label"><label for="ad-destination"><?= @@ -363,7 +365,8 @@ class ManageadvertisementsElement extends Element if (isset($data['AD_MIN_BID'])) { e(' readonly="readonly"'); } - ?> /> <small class="gray" id="ad-dest-count" ></small> + ?> /> <span class="gray smaller-font" + id="ad-dest-count" ></span> </td></tr> <tr><th class="table-label"><label for="ad-duration"><?= tl('manageeadvertisement_element_ad_duration') ?>: diff --git a/src/views/elements/ManageclassifiersElement.php b/src/views/elements/ManageclassifiersElement.php index f588f4dc5..4ec5f9748 100644 --- a/src/views/elements/ManageclassifiersElement.php +++ b/src/views/elements/ManageclassifiersElement.php @@ -113,8 +113,8 @@ class ManageclassifiersElement extends Element foreach ($data['classifiers'] as $label => $classifier) { ?> <tr> <td><b><?= $label ?></b><br /> - <small><?= date("d M Y H:i:s", - $classifier->timestamp) ?></small> + <span class='smaller-font'><?= date("d M Y H:i:s", + $classifier->timestamp) ?></span> </td> <?php if (!$_SERVER["MOBILE"]) { ?> diff --git a/src/views/elements/ManagecreditsElement.php b/src/views/elements/ManagecreditsElement.php index a8b535672..6422a09c5 100644 --- a/src/views/elements/ManagecreditsElement.php +++ b/src/views/elements/ManagecreditsElement.php @@ -170,7 +170,7 @@ class ManagecreditsElement extends Element </td></tr> <tr> <td></td> - <td><div class="narrow-field green small"><?= + <td><div class="narrow-field green tiny-font"><?= tl('managecredits_element_charge_warning') ?> <a target="_blank" rel="noopener" href="<?=B\wikiUrl( 'ad_program_terms') ?>"><?= diff --git a/src/views/elements/MixcrawlsElement.php b/src/views/elements/MixcrawlsElement.php index d0ce407a3..809aec108 100644 --- a/src/views/elements/MixcrawlsElement.php +++ b/src/views/elements/MixcrawlsElement.php @@ -103,9 +103,9 @@ class MixcrawlsElement extends Element <?php foreach ($data['available_mixes'] as $mix) { ?> <tr><td><b><?= $mix['NAME'] ?></b><br /> - <?= $mix['TIMESTAMP'] ?><br /><small><?= + <?= $mix['TIMESTAMP'] ?><br /><span class='smaller-font'><?= date("d M Y H:i:s", $mix['TIMESTAMP']) - ?></small></td> + ?></span></td> <?php if (!$_SERVER["MOBILE"]) { ?> <td><?php diff --git a/src/views/elements/PaginationElement.php b/src/views/elements/PaginationElement.php index 62c99e740..772d11b42 100644 --- a/src/views/elements/PaginationElement.php +++ b/src/views/elements/PaginationElement.php @@ -53,36 +53,18 @@ class PaginationElement extends Element } $base_url = (empty($data['PAGING_QUERY'])) ? "" : "?" . http_build_query($data['PAGING_QUERY'], '', '&'); - if ($data['RESULTS_PER_PAGE'] == -1) { - $results_per_page = C\NUM_RESULTS_PER_PAGE; + if ($data['RESULTS_PER_PAGE'] < 0) { + $results_per_page = $data['RESULTS_PER_PAGE']; if (!empty($data['SUBSEARCH']) && !empty($data["SUBSEARCHES"])) { foreach ($data["SUBSEARCHES"] as $search) { if ($search['FOLDER_NAME'] == $data['SUBSEARCH']) { - $results_per_page = $search['PER_PAGE']; + $results_per_page = -$search['PER_PAGE']; break; } } } - $next_limit = $data['LIMIT'] + C\NUM_RESULTS_PER_PAGE; - if( $next_limit < $data['TOTAL_ROWS']) { - ?><div class="center"><span class="none">[</span> - <a id="next-button" - class="anchor-button" - style="margin:10px; width:60%;" - onclick='javascript:nextPage();' - href="<?="$base_url . &limit=next_limit" ?>" - ><?= - tl('pagination_helper_next') ?></a> - <span class="none">]</span> - <script> - document.getElementById('next-button').addEventListener( - "click", function(event) { - nextPage(); - event.preventDefault() - }, true); - </script> - </div><?php - } + $this->view->helper("pagination")->render($base_url, $data['LIMIT'], + $results_per_page, $data['TOTAL_ROWS']); } else { $this->view->helper("pagination")->render($base_url, $data['LIMIT'], $data['RESULTS_PER_PAGE'], $data['TOTAL_ROWS']); diff --git a/src/views/elements/WikiElement.php b/src/views/elements/WikiElement.php index cd4372b39..b8031bc44 100644 --- a/src/views/elements/WikiElement.php +++ b/src/views/elements/WikiElement.php @@ -139,7 +139,31 @@ class WikiElement extends Element implements CrawlConstants // no break case "show": default: - $this->renderReadPage($data, $can_edit, $logged_in); + $is_page_and_feedback = (!empty($data["HEAD"]['page_type']) && + $data["HEAD"]['page_type'] == 'page_and_feedback'); + $is_api = ($data['VIEW'] == 'api'); + if (!$is_page_and_feedback || !$is_api) { + $this->renderReadPage($data, $can_edit, $logged_in); + } + if ($is_page_and_feedback) { + if ($is_api) { + $data['API'] = true; + } else { + ?><hr /><?php + } + $base_query = htmlentities(B\wikiUrl("", true, + $data['CONTROLLER'], $data["GROUP"]["GROUP_ID"])); + if ($logged_in) { + $csrf_token = C\CSRF_TOKEN . "=" . $data[C\CSRF_TOKEN]; + $base_query .= $csrf_token; + } + $data['FRAGMENT'] = '#result-' . $data['DISCUSS_THREAD']; + $this->view->element('groupfeed')->renderUngroupedView( + $can_edit, $base_query, $data['PAGING_QUERY'], $data); + if (!$is_api) { + $this->view->element('groupfeed')->renderScripts($data); + } + } break; } e('</div>'); @@ -335,18 +359,6 @@ class WikiElement extends Element implements CrawlConstants "\n", true)) . "</h2>"); } - if (!empty($data["HEAD"]['page_type']) && - $data["HEAD"]['page_type'] == 'page_and_feedback') { - ?><hr /><h2><?=tl('wiki_element_user_feedback'); ?></h2> - <?php - $data['FRAGMENT'] = '#result-'.$data['DISCUSS_THREAD']; - $this->view->element('groupfeed')->renderUngroupedView( - $can_edit, $base_query, $data['PAGING_QUERY'], $data); - $this->view->helper("pagination")->render($data['PAGING_QUERY'], - $data['LIMIT'], $data['RESULTS_PER_PAGE'], $data['TOTAL_ROWS'], - false, $logged_in); - $this->view->element('groupfeed')->renderScripts($data); - } } /** * Used to drawn the form that let's someone edit a wiki page @@ -1167,7 +1179,7 @@ class WikiElement extends Element implements CrawlConstants $token_string : ""; if (empty($options[$url . $out_token])) { $add_options[$url . $out_token] = - $group_name . "@Main"; + $group_name ; $found_new = true; } } diff --git a/src/views/helpers/PaginationHelper.php b/src/views/helpers/PaginationHelper.php index 92ec2bc1c..d4226029c 100755 --- a/src/views/helpers/PaginationHelper.php +++ b/src/views/helpers/PaginationHelper.php @@ -78,6 +78,52 @@ class PaginationHelper extends Helper if ($_SERVER["MOBILE"] && $micro) { return; } + if ($results_per_page < 0) { + $results_per_page = -$results_per_page; + $this->singleButtonPagination($base_url, $limit, $results_per_page, + $total_results, $micro, $no_follow); + } else { + $this->multiPagePagination($base_url, $limit, $results_per_page, + $total_results, $micro, $no_follow); + } + } + /** + * + */ + public function singleButtonPagination($base_url, $limit, $results_per_page, + $total_results, $micro, $no_follow, $is_previous = false) + { + $next_limit = $limit + $results_per_page; + $previous_limit = max(0, $limit - $results_per_page); + $button_id = ($is_previous) ? "previous-button" : "next-button"; + $button_method = ($is_previous) ? "previousPage": "nextPage"; + if( (!$is_previous && $next_limit < $total_results) || + ($is_previous && $previous_limit >=0 && $limit > 0)) { + ?><div class="center"><span class="none">[</span> + <a id="<?=$button_id ?>" + class="anchor-button" + style="margin:10px; width:60%;" + onclick='javascript:<?=$button_method?>();' + href="<?="$base_url&limit=$next_limit" ?>" + ><?=($is_previous) ? tl('pagination_helper_previous') : + tl('pagination_helper_next') ?></a> + <span class="none">]</span> + <script> + document.getElementById('<?=$button_id ?>').addEventListener( + "click", function(event) { + <?=$button_method?>(); + event.preventDefault(); + }, true); + </script> + </div><?php + } + } + /** + * + */ + public function multiPagePagination($base_url, $limit, $results_per_page, + $total_results, $micro = false, $no_follow = true) + { $results_per_page = max(self::MIN_RESULTS_PER_PAGE, $results_per_page); $no_follow = ($no_follow) ? " rel='nofollow' " : ""; $num_earlier_pages = ceil($limit/$results_per_page); @@ -129,8 +175,7 @@ class PaginationHelper extends Helper tl('pagination_helper_next')."</a>»</span></li>"); } ?> - </ul> - </<?=$tag ?>> - <?php + </ul> + </<?=$tag ?>><?php } } diff --git a/src/views/layouts/WebLayout.php b/src/views/layouts/WebLayout.php index 76ded7ec3..8b0007c30 100755 --- a/src/views/layouts/WebLayout.php +++ b/src/views/layouts/WebLayout.php @@ -315,7 +315,7 @@ class WebLayout extends Layout </div><?php } if (isset($_SERVER["COOKIE_CONSENT"]) && !$_SERVER["COOKIE_CONSENT"]) { - $consent_url = $_SERVER["REQUEST_URI"]; + $consent_url = htmlentities($_SERVER["REQUEST_URI"]); $separator = (strpos($consent_url, "?") !== false) ? "&" : "?"; if (strpos($consent_url, "cookieconsent=true") === false) {