diff --git a/.gitignore b/.gitignore index 95d44c86f8..fcdaca12ca 100644 --- a/.gitignore +++ b/.gitignore @@ -4,8 +4,6 @@ # or operating system, you probably want to add a global ignore instead: # git config --global core.excludesfile ~/.gitignore_global -tags - .DS_Store ._.DS_Store dump.rdb diff --git a/.mention-bot b/.mention-bot new file mode 100644 index 0000000000..16c45ceb88 --- /dev/null +++ b/.mention-bot @@ -0,0 +1,5 @@ +{ + "maxReviewers": 2, + "message": "Thanks @pullRequester for your pull request :+1:. By analyzing the blame information on this pull request, I identified @reviewers to be potential reviewers.", + "requiredOrgs": ["discourse"] +} diff --git a/Gemfile b/Gemfile index fbe22c895f..d5d1c06179 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ gem 'ember-source', '1.12.2' gem 'barber' gem 'babel-transpiler' -gem 'message_bus', '2.0.0.beta.5' +gem 'message_bus', '2.0.0.beta.8' gem 'rails_multisite' @@ -61,7 +61,7 @@ gem 'fast_xs' gem 'fast_xor' # while we sort out https://github.com/sdsykes/fastimage/pull/46 -gem 'fastimage_discourse', require: 'fastimage' +gem 'discourse_fastimage', require: 'fastimage' gem 'aws-sdk', require: false gem 'excon', require: false gem 'unf', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 19ac560327..be5294173a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -73,6 +73,7 @@ GEM diff-lcs (1.2.5) discourse-qunit-rails (0.0.9) railties + discourse_fastimage (2.0.0) docile (1.1.5) domain_name (0.5.25) unf (>= 0.0.5, < 1.0.0) @@ -107,7 +108,6 @@ GEM rake rake-compiler fast_xs (0.8.0) - fastimage_discourse (1.6.6) ffi (1.9.10) flamegraph (0.1.0) fast_stack @@ -156,7 +156,7 @@ GEM mail (2.6.4) mime-types (>= 1.16, < 4) memory_profiler (0.9.6) - message_bus (2.0.0.beta.5) + message_bus (2.0.0.beta.8) rack (>= 1.1.3) metaclass (0.0.4) method_source (0.8.2) @@ -213,7 +213,7 @@ GEM omniauth-twitter (1.2.1) json (~> 1.3) omniauth-oauth (~> 1.1) - onebox (1.5.38) + onebox (1.5.39) htmlentities (~> 4.3.4) moneta (~> 0.8) multi_json (~> 1.11) @@ -413,6 +413,7 @@ DEPENDENCIES byebug certified discourse-qunit-rails + discourse_fastimage email_reply_trimmer (= 0.1.3) ember-rails (= 0.18.5) ember-source (= 1.12.2) @@ -422,7 +423,6 @@ DEPENDENCIES fast_blank fast_xor fast_xs - fastimage_discourse flamegraph foreman gctools @@ -437,7 +437,7 @@ DEPENDENCIES lru_redux mail memory_profiler - message_bus (= 2.0.0.beta.5) + message_bus (= 2.0.0.beta.8) mime-types minitest mocha diff --git a/app/assets/javascripts/admin/controllers/admin-api.js.es6 b/app/assets/javascripts/admin/controllers/admin-api.js.es6 index 1bb0a7dc2f..82366d3bd7 100644 --- a/app/assets/javascripts/admin/controllers/admin-api.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-api.js.es6 @@ -63,6 +63,6 @@ export default Ember.ArrayController.extend({ **/ hasMasterKey: function() { return !!this.get('model').findBy('user', null); - }.property('model.@each') + }.property('model.[]') }); diff --git a/app/assets/javascripts/admin/controllers/admin-email-bounced.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-bounced.js.es6 new file mode 100644 index 0000000000..ae75d18715 --- /dev/null +++ b/app/assets/javascripts/admin/controllers/admin-email-bounced.js.es6 @@ -0,0 +1,9 @@ +import AdminEmailLogsController from 'admin/controllers/admin-email-logs'; +import debounce from 'discourse/lib/debounce'; +import EmailLog from 'admin/models/email-log'; + +export default AdminEmailLogsController.extend({ + filterEmailLogs: debounce(function() { + EmailLog.findAll(this.get("filter")).then(logs => this.set("model", logs)); + }, 250).observes("filter.{user,address,type,skipped_reason}") +}); diff --git a/app/assets/javascripts/admin/controllers/admin-emojis.js.es6 b/app/assets/javascripts/admin/controllers/admin-emojis.js.es6 index 619d08c36f..5277f2feb2 100644 --- a/app/assets/javascripts/admin/controllers/admin-emojis.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-emojis.js.es6 @@ -3,7 +3,8 @@ export default Ember.ArrayController.extend({ actions: { emojiUploaded(emoji) { - this.pushObject(Em.Object.create(emoji)); + emoji.url += "?t=" + new Date().getTime(); + this.pushObject(Ember.Object.create(emoji)); }, destroy(emoji) { diff --git a/app/assets/javascripts/admin/controllers/admin-reports.js.es6 b/app/assets/javascripts/admin/controllers/admin-reports.js.es6 index 17d0c1243f..61b46740ac 100644 --- a/app/assets/javascripts/admin/controllers/admin-reports.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-reports.js.es6 @@ -26,6 +26,11 @@ export default Ember.Controller.extend({ return arr.concat(this.site.groups.map((i) => {return {name: i['name'], value: i['id']};})); }, + @computed('model.type') + showCategoryOptions(modelType) { + return !modelType.match(/_private_messages$/); + }, + @computed('model.type') showGroupOptions(modelType) { return modelType === "visits" || modelType === "signups" || modelType === "profile_views"; diff --git a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6 index 8d919e5f26..c8c0ba6219 100644 --- a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6 @@ -40,7 +40,7 @@ export default Ember.ArrayController.extend({ return _(expanded).sortBy(group => group.granted_at).reverse().value(); - }.property('model', 'model.@each', 'model.expandedBadges.@each'), + }.property('model', 'model.[]', 'model.expandedBadges.[]'), /** Array of badges that have not been granted to this user. @@ -62,7 +62,7 @@ export default Ember.ArrayController.extend({ }); return _.sortBy(badges, badge => badge.get('name')); - }.property('badges.@each', 'model.@each'), + }.property('badges.[]', 'model.[]'), /** Whether there are any badges that can be granted. diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 index 454aa96f84..a5e34fc257 100644 --- a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 @@ -27,7 +27,7 @@ export default Ember.Controller.extend(CanCheckEmails, { }); } return []; - }.property('model.user_fields.@each'), + }.property('model.user_fields.[]'), actions: { toggleTitleEdit() { diff --git a/app/assets/javascripts/admin/routes/admin-email-bounced.js.es6 b/app/assets/javascripts/admin/routes/admin-email-bounced.js.es6 new file mode 100644 index 0000000000..027a6c0f30 --- /dev/null +++ b/app/assets/javascripts/admin/routes/admin-email-bounced.js.es6 @@ -0,0 +1,2 @@ +import AdminEmailLogs from 'admin/routes/admin-email-logs'; +export default AdminEmailLogs.extend({ status: "bounced" }); diff --git a/app/assets/javascripts/admin/routes/admin-route-map.js.es6 b/app/assets/javascripts/admin/routes/admin-route-map.js.es6 index 64a8e393a0..8c1f988af3 100644 --- a/app/assets/javascripts/admin/routes/admin-route-map.js.es6 +++ b/app/assets/javascripts/admin/routes/admin-route-map.js.es6 @@ -10,6 +10,7 @@ export default { this.resource('adminEmail', { path: '/email'}, function() { this.route('sent'); this.route('skipped'); + this.route('bounced'); this.route('received'); this.route('rejected'); this.route('previewDigest', { path: '/preview-digest' }); diff --git a/app/assets/javascripts/admin/templates/email-bounced.hbs b/app/assets/javascripts/admin/templates/email-bounced.hbs new file mode 100644 index 0000000000..9c21c428cd --- /dev/null +++ b/app/assets/javascripts/admin/templates/email-bounced.hbs @@ -0,0 +1,49 @@ +{{#load-more selector=".email-list tr" action="loadMore"}} + + + + + + + + + + + + + + + + + + + + {{#each l in model}} + + + + + + + + {{else}} + + {{/each}} + +
{{i18n 'admin.email.time'}}{{i18n 'admin.email.user'}}{{i18n 'admin.email.to_address'}}{{i18n 'admin.email.email_type'}}{{i18n 'admin.email.skipped_reason'}}
{{i18n 'admin.email.logs.filters.title'}}{{text-field value=filter.user placeholderKey="admin.email.logs.filters.user_placeholder"}}{{text-field value=filter.address placeholderKey="admin.email.logs.filters.address_placeholder"}}{{text-field value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}{{text-field value=filter.skipped_reason placeholderKey="admin.email.logs.filters.skipped_reason_placeholder"}}
{{format-date l.created_at}} + {{#if l.user}} + {{#link-to 'adminUser' l.user}}{{avatar l.user imageSize="tiny"}}{{/link-to}} + {{#link-to 'adminUser' l.user}}{{l.user.username}}{{/link-to}} + {{else}} + — + {{/if}} + {{l.to_address}}{{l.email_type}} + {{#if l.post_url}} + {{l.skipped_reason}} + {{else}} + {{l.skipped_reason}} + {{/if}} +
{{i18n 'admin.email.logs.none'}}
+{{/load-more}} + +{{conditional-loading-spinner condition=loading}} diff --git a/app/assets/javascripts/admin/templates/email.hbs b/app/assets/javascripts/admin/templates/email.hbs index 1a7d5bbfe7..509d5d2081 100644 --- a/app/assets/javascripts/admin/templates/email.hbs +++ b/app/assets/javascripts/admin/templates/email.hbs @@ -4,6 +4,7 @@ {{nav-item route='adminCustomizeEmailTemplates' label='admin.email.templates'}} {{nav-item route='adminEmail.sent' label='admin.email.sent'}} {{nav-item route='adminEmail.skipped' label='admin.email.skipped'}} + {{nav-item route='adminEmail.bounced' label='admin.email.bounced'}} {{nav-item route='adminEmail.received' label='admin.email.received'}} {{nav-item route='adminEmail.rejected' label='admin.email.rejected'}} {{/admin-nav}} diff --git a/app/assets/javascripts/admin/templates/reports.hbs b/app/assets/javascripts/admin/templates/reports.hbs index 7f0363a2f3..12303f27ef 100644 --- a/app/assets/javascripts/admin/templates/reports.hbs +++ b/app/assets/javascripts/admin/templates/reports.hbs @@ -3,7 +3,9 @@
{{i18n 'admin.dashboard.reports.start_date'}} {{date-picker-past value=startDate}} {{i18n 'admin.dashboard.reports.end_date'}} {{date-picker-past value=endDate}} - {{combo-box valueAttribute="value" content=categoryOptions value=categoryId}} + {{#if showCategoryOptions}} + {{combo-box valueAttribute="value" content=categoryOptions value=categoryId}} + {{/if}} {{#if showGroupOptions}} {{combo-box valueAttribute="value" content=groupOptions value=groupId}} {{/if}} diff --git a/app/assets/javascripts/admin/views/admin-backups-logs.js.es6 b/app/assets/javascripts/admin/views/admin-backups-logs.js.es6 index c5ba44e27e..cb838a48fc 100644 --- a/app/assets/javascripts/admin/views/admin-backups-logs.js.es6 +++ b/app/assets/javascripts/admin/views/admin-backups-logs.js.es6 @@ -27,7 +27,7 @@ export default Ember.View.extend({ // force rerender this.rerender(); } - }, 150).observes("controller.model.@each"), + }, 150).observes("controller.model.[]"), render(buffer) { const formattedLogs = this.get("formattedLogs"); diff --git a/app/assets/javascripts/discourse.js b/app/assets/javascripts/discourse.js index f791de454c..063b805a49 100644 --- a/app/assets/javascripts/discourse.js +++ b/app/assets/javascripts/discourse.js @@ -8,9 +8,10 @@ define('ember', ['exports'], function(__exports__) { var _pluginCallbacks = []; -window.Discourse = Ember.Application.createWithMixins(Discourse.Ajax, { +window.Discourse = Ember.Application.extend(Discourse.Ajax, { rootElement: '#main', _docTitle: document.title, + __TAGS_INCLUDED__: true, getURL: function(url) { if (!url) return url; @@ -106,7 +107,7 @@ window.Discourse = Ember.Application.createWithMixins(Discourse.Ajax, { $('noscript').remove(); - Ember.keys(requirejs._eak_seen).forEach(function(key) { + Object.keys(requirejs._eak_seen).forEach(function(key) { if (/\/pre\-initializers\//.test(key)) { var module = require(key, null, null, true); if (!module) { throw new Error(key + ' must export an initializer.'); } @@ -114,7 +115,7 @@ window.Discourse = Ember.Application.createWithMixins(Discourse.Ajax, { } }); - Ember.keys(requirejs._eak_seen).forEach(function(key) { + Object.keys(requirejs._eak_seen).forEach(function(key) { if (/\/initializers\//.test(key)) { var module = require(key, null, null, true); if (!module) { throw new Error(key + ' must export an initializer.'); } @@ -167,7 +168,7 @@ window.Discourse = Ember.Application.createWithMixins(Discourse.Ajax, { return this.get("currentAssetVersion"); } }) -}); +}).create(); function RemovedObject(name) { this._removedName = name; diff --git a/app/assets/javascripts/discourse/adapters/tag-notification.js.es6 b/app/assets/javascripts/discourse/adapters/tag-notification.js.es6 new file mode 100644 index 0000000000..7df07c2b39 --- /dev/null +++ b/app/assets/javascripts/discourse/adapters/tag-notification.js.es6 @@ -0,0 +1,7 @@ +import RESTAdapter from 'discourse/adapters/rest'; + +export default RESTAdapter.extend({ + pathFor(store, type, id) { + return "/tags/" + id + "/notifications"; + } +}); diff --git a/app/assets/javascripts/discourse/components/basic-topic-list.js.es6 b/app/assets/javascripts/discourse/components/basic-topic-list.js.es6 index 53ebb014b6..75c4d370c0 100644 --- a/app/assets/javascripts/discourse/components/basic-topic-list.js.es6 +++ b/app/assets/javascripts/discourse/components/basic-topic-list.js.es6 @@ -13,7 +13,7 @@ export default Ember.Component.extend({ _topicListChanged: function() { this._initFromTopicList(this.get('topicList')); - }.observes('topicList.@each'), + }.observes('topicList.[]'), _initFromTopicList(topicList) { if (topicList !== null) { diff --git a/app/assets/javascripts/discourse/components/combo-box.js.es6 b/app/assets/javascripts/discourse/components/combo-box.js.es6 index 83b9290bf6..e023ad267c 100644 --- a/app/assets/javascripts/discourse/components/combo-box.js.es6 +++ b/app/assets/javascripts/discourse/components/combo-box.js.es6 @@ -46,7 +46,7 @@ export default Ember.Component.extend({ } }, - @observes('content.@each') + @observes('content.[]') _rerenderOnChange() { this.rerender(); }, diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6 index 816a7e37de..89a45660d5 100644 --- a/app/assets/javascripts/discourse/components/composer-editor.js.es6 +++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6 @@ -2,6 +2,7 @@ import userSearch from 'discourse/lib/user-search'; import { default as computed, on } from 'ember-addons/ember-computed-decorators'; import { linkSeenMentions, fetchUnseenMentions } from 'discourse/lib/link-mentions'; import { linkSeenCategoryHashtags, fetchUnseenCategoryHashtags } from 'discourse/lib/link-category-hashtags'; +import { fetchUnseenTagHashtags, linkSeenTagHashtags } from 'discourse/lib/link-tag-hashtag'; export default Ember.Component.extend({ classNames: ['wmd-controls'], @@ -27,6 +28,22 @@ export default Ember.Component.extend({ return showPreview ? I18n.t('composer.hide_preview') : I18n.t('composer.show_preview'); }, + _renderUnseenTagHashtags($preview, unseen) { + fetchUnseenTagHashtags(unseen).then(() => { + linkSeenTagHashtags($preview); + }); + }, + + @on('previewRefreshed') + paintTagHashtags($preview) { + if (!this.siteSettings.tagging_enabled) { return; } + + const unseenTagHashtags = linkSeenTagHashtags($preview); + if (unseenTagHashtags.length) { + Ember.run.debounce(this, this._renderUnseenTagHashtags, $preview, unseenTagHashtags, 500); + } + }, + @computed markdownOptions() { return { diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6 index 47c6c068d0..01afbacd91 100644 --- a/app/assets/javascripts/discourse/components/d-editor.js.es6 +++ b/app/assets/javascripts/discourse/components/d-editor.js.es6 @@ -3,9 +3,10 @@ import loadScript from 'discourse/lib/load-script'; import { default as computed, on, observes } from 'ember-addons/ember-computed-decorators'; import { showSelector } from "discourse/lib/emoji/emoji-toolbar"; import Category from 'discourse/models/category'; -import { SEPARATOR as categoryHashtagSeparator, - categoryHashtagTriggerRule - } from 'discourse/lib/category-hashtags'; +import { categoryHashtagTriggerRule } from 'discourse/lib/category-hashtags'; +import { TAG_HASHTAG_POSTFIX } from 'discourse/lib/tag-hashtags'; +import { search as searchCategoryTag } from 'discourse/lib/category-tag-search'; +import { SEPARATOR } from 'discourse/lib/category-hashtags'; // Our head can be a static string or a function that returns a string // based on input (like for numbered lists). @@ -217,7 +218,7 @@ export default Ember.Component.extend({ const mouseTrap = Mousetrap(this.$('.d-editor-input')[0]); const shortcuts = this.get('toolbar.shortcuts'); - Ember.keys(shortcuts).forEach(sc => { + Object.keys(shortcuts).forEach(sc => { const button = shortcuts[sc]; mouseTrap.bind(sc, () => { this.send(button.action, button); @@ -243,7 +244,7 @@ export default Ember.Component.extend({ this.appEvents.off('composer:insert-text'); const mouseTrap = this._mouseTrap; - Ember.keys(this.get('toolbar.shortcuts')).forEach(sc => mouseTrap.unbind(sc)); + Object.keys(this.get('toolbar.shortcuts')).forEach(sc => mouseTrap.unbind(sc)); this.$('.d-editor-preview').off('click.preview'); }, @@ -278,17 +279,22 @@ export default Ember.Component.extend({ Ember.run.debounce(this, this._updatePreview, 30); }, - _applyCategoryHashtagAutocomplete(container, $editorInput) { - const template = container.lookup('template:category-group-autocomplete.raw'); + _applyCategoryHashtagAutocomplete(container) { + const template = container.lookup('template:category-tag-autocomplete.raw'); + const siteSettings = this.siteSettings; - $editorInput.autocomplete({ + this.$('.d-editor-input').autocomplete({ template: template, key: '#', - transformComplete(category) { - return Category.slugFor(category, categoryHashtagSeparator); + transformComplete(obj) { + if (obj.model) { + return Category.slugFor(obj.model, SEPARATOR); + } else { + return `${obj.text}${TAG_HASHTAG_POSTFIX}`; + } }, dataSource(term) { - return Category.search(term); + return searchCategoryTag(term, siteSettings); }, triggerRule(textarea, opts) { return categoryHashtagTriggerRule(textarea, opts); diff --git a/app/assets/javascripts/discourse/components/date-picker.js.es6 b/app/assets/javascripts/discourse/components/date-picker.js.es6 index 21825d2ed8..ea86648784 100644 --- a/app/assets/javascripts/discourse/components/date-picker.js.es6 +++ b/app/assets/javascripts/discourse/components/date-picker.js.es6 @@ -9,24 +9,28 @@ export default Em.Component.extend({ @on("didInsertElement") _loadDatePicker() { const input = this.$(".date-picker")[0]; + const container = $("#" + this.get("containerId"))[0]; loadScript("/javascripts/pikaday.js").then(() => { - let default_opts = { - field: input, - container: this.$()[0], - format: "YYYY-MM-DD", - firstDay: moment.localeData().firstDayOfWeek(), - i18n: { - previousMonth: I18n.t('dates.previous_month'), - nextMonth: I18n.t('dates.next_month'), - months: moment.months(), - weekdays: moment.weekdays(), - weekdaysShort: moment.weekdaysShort() - }, - onSelect: date => this.set("value", moment(date).format("YYYY-MM-DD")) - }; + Ember.run.next(() => { + let default_opts = { + field: input, + container: container || this.$()[0], + bound: container === undefined, + format: "YYYY-MM-DD", + firstDay: moment.localeData().firstDayOfWeek(), + i18n: { + previousMonth: I18n.t('dates.previous_month'), + nextMonth: I18n.t('dates.next_month'), + months: moment.months(), + weekdays: moment.weekdays(), + weekdaysShort: moment.weekdaysShort() + }, + onSelect: date => this.set("value", moment(date).format("YYYY-MM-DD")) + }; - this._picker = new Pikaday(_.merge(default_opts, this._opts())); + this._picker = new Pikaday(_.merge(default_opts, this._opts())); + }); }); }, diff --git a/app/assets/javascripts/discourse/components/discourse-tag-bound.js.es6 b/app/assets/javascripts/discourse/components/discourse-tag-bound.js.es6 new file mode 100644 index 0000000000..08f0143256 --- /dev/null +++ b/app/assets/javascripts/discourse/components/discourse-tag-bound.js.es6 @@ -0,0 +1,13 @@ +export default Ember.Component.extend({ + tagName: 'a', + classNameBindings: [':discourse-tag', 'style', 'tagClass'], + attributeBindings: ['href'], + + tagClass: function() { + return "tag-" + this.get('tagRecord.id'); + }.property('tagRecord.id'), + + href: function() { + return '/tags/' + this.get('tagRecord.id'); + }.property('tagRecord.id'), +}); diff --git a/app/assets/javascripts/discourse/views/discovery-categories.js.es6 b/app/assets/javascripts/discourse/components/discovery-categories.js.es6 similarity index 82% rename from app/assets/javascripts/discourse/views/discovery-categories.js.es6 rename to app/assets/javascripts/discourse/components/discovery-categories.js.es6 index ee4b13d7dc..d4b969b56d 100644 --- a/app/assets/javascripts/discourse/views/discovery-categories.js.es6 +++ b/app/assets/javascripts/discourse/components/discovery-categories.js.es6 @@ -3,7 +3,9 @@ import { on } from 'ember-addons/ember-computed-decorators'; const CATEGORIES_LIST_BODY_CLASS = "categories-list"; -export default Ember.View.extend(UrlRefresh, { +export default Ember.Component.extend(UrlRefresh, { + classNames: ['contents'], + @on("didInsertElement") addBodyClass() { $('body').addClass(CATEGORIES_LIST_BODY_CLASS); diff --git a/app/assets/javascripts/discourse/views/discovery-topics.js.es6 b/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6 similarity index 68% rename from app/assets/javascripts/discourse/views/discovery-topics.js.es6 rename to app/assets/javascripts/discourse/components/discovery-topics-list.js.es6 index ef5e3712c8..5a154ca745 100644 --- a/app/assets/javascripts/discourse/views/discovery-topics.js.es6 +++ b/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6 @@ -1,27 +1,13 @@ -import UrlRefresh from 'discourse/mixins/url-refresh'; -import LoadMore from "discourse/mixins/load-more"; import { on, observes } from "ember-addons/ember-computed-decorators"; +import LoadMore from "discourse/mixins/load-more"; +import UrlRefresh from 'discourse/mixins/url-refresh'; -export default Ember.View.extend(LoadMore, UrlRefresh, { +const DiscoveryTopicsListComponent = Ember.Component.extend(UrlRefresh, LoadMore, { + classNames: ['contents'], eyelineSelector: '.topic-list-item', - actions: { - loadMore() { - const self = this; - Discourse.notifyTitle(0); - this.get('controller').loadMoreTopics().then(hasMoreResults => { - Ember.run.schedule('afterRender', () => self.saveScrollPosition()); - if (!hasMoreResults) { - this.get('eyeline').flushRest(); - } else if ($(window).height() >= $(document).height()) { - this.send("loadMore"); - } - }); - } - }, - @on("didInsertElement") - @observes("controller.model") + @observes("model") _readjustScrollPosition() { const scrollTo = this.session.get('topicListScrollPosition'); if (scrollTo && scrollTo >= 0) { @@ -31,19 +17,33 @@ export default Ember.View.extend(LoadMore, UrlRefresh, { } }, - @observes("controller.topicTrackingState.incomingCount") + @observes("incomingCount") _updateTitle() { - Discourse.notifyTitle(this.get('controller.topicTrackingState.incomingCount')); + Discourse.notifyTitle(this.get('incomingCount')); }, - // Remember where we were scrolled to saveScrollPosition() { this.session.set('topicListScrollPosition', $(window).scrollTop()); }, - // When the topic list is scrolled scrolled() { this._super(); this.saveScrollPosition(); + }, + + actions: { + loadMore() { + Discourse.notifyTitle(0); + this.get('model').loadMore().then(hasMoreResults => { + Ember.run.schedule('afterRender', () => this.saveScrollPosition()); + if (!hasMoreResults) { + this.get('eyeline').flushRest(); + } else if ($(window).height() >= $(document).height()) { + this.send("loadMore"); + } + }); + } } }); + +export default DiscoveryTopicsListComponent; diff --git a/app/assets/javascripts/discourse/components/global-notice.js.es6 b/app/assets/javascripts/discourse/components/global-notice.js.es6 index f61798163f..13994f28fb 100644 --- a/app/assets/javascripts/discourse/components/global-notice.js.es6 +++ b/app/assets/javascripts/discourse/components/global-notice.js.es6 @@ -17,6 +17,14 @@ export default Ember.Component.extend(StringBuffer, { notices.push([I18n.t("emails_are_disabled"), 'alert-emails-disabled']); } + if (this.currentUser && this.currentUser.get('staff') && this.siteSettings.bootstrap_mode_enabled) { + if (this.siteSettings.bootstrap_mode_min_users > 0) { + notices.push([I18n.t("bootstrap_mode_enabled", {min_users: this.siteSettings.bootstrap_mode_min_users}), 'alert-bootstrap-mode']); + } else { + notices.push([I18n.t("bootstrap_mode_disabled"), 'alert-bootstrap-mode']); + } + } + if (!_.isEmpty(this.siteSettings.global_notice)) { notices.push([this.siteSettings.global_notice, 'alert-global-notice']); } diff --git a/app/assets/javascripts/discourse/components/group-post-stream.js.es6 b/app/assets/javascripts/discourse/components/group-post-stream.js.es6 new file mode 100644 index 0000000000..fc83f2dbb6 --- /dev/null +++ b/app/assets/javascripts/discourse/components/group-post-stream.js.es6 @@ -0,0 +1,8 @@ +export default Ember.Component.extend({ + actions: { + // TODO: When on Ember 1.13, use a closure action + loadMore() { + this.sendAction('loadMore'); + } + } +}); diff --git a/app/assets/javascripts/discourse/components/hamburger-menu.js.es6 b/app/assets/javascripts/discourse/components/hamburger-menu.js.es6 deleted file mode 100644 index e00b175819..0000000000 --- a/app/assets/javascripts/discourse/components/hamburger-menu.js.es6 +++ /dev/null @@ -1,76 +0,0 @@ -import computed from 'ember-addons/ember-computed-decorators'; -import mobile from 'discourse/lib/mobile'; - -export default Ember.Component.extend({ - classNames: ['hamburger-panel'], - - @computed('currentUser.read_faq') - prioritizeFaq(readFaq) { - // If it's a custom FAQ never prioritize it - return Ember.isEmpty(this.siteSettings.faq_url) && !readFaq; - }, - - @computed() - showKeyboardShortcuts() { - return !this.site.mobileView && !this.capabilities.touch; - }, - - @computed() - showMobileToggle() { - return this.site.mobileView || (this.siteSettings.enable_mobile_theme && this.capabilities.touch); - }, - - @computed() - mobileViewLinkTextKey() { - return this.site.mobileView ? "desktop_view" : "mobile_view"; - }, - - @computed() - faqUrl() { - return this.siteSettings.faq_url ? this.siteSettings.faq_url : Discourse.getURL('/faq'); - }, - - _lookupCount(type) { - const state = this.get('topicTrackingState'); - return state ? state.lookupCount(type) : 0; - }, - - @computed('topicTrackingState.messageCount') - newCount() { - return this._lookupCount('new'); - }, - - @computed('topicTrackingState.messageCount') - unreadCount() { - return this._lookupCount('unread'); - }, - - @computed() - categories() { - const hideUncategorized = !this.siteSettings.allow_uncategorized_topics; - const showSubcatList = this.siteSettings.show_subcategory_list; - const isStaff = Discourse.User.currentProp('staff'); - - return Discourse.Category.list().reject((c) => { - if (showSubcatList && c.get('parent_category_id')) { return true; } - if (hideUncategorized && c.get('isUncategorizedCategory') && !isStaff) { return true; } - return false; - }); - }, - - @computed() - showUserDirectoryLink() { - if (!this.siteSettings.enable_user_directory) return false; - if (this.siteSettings.hide_user_profiles_from_public && !this.currentUser) return false; - return true; - }, - - actions: { - keyboardShortcuts() { - this.sendAction('showKeyboardAction'); - }, - toggleMobileView() { - mobile.toggleMobileView(); - } - } -}); diff --git a/app/assets/javascripts/discourse/components/header-dropdown.js.es6 b/app/assets/javascripts/discourse/components/header-dropdown.js.es6 deleted file mode 100644 index c747984855..0000000000 --- a/app/assets/javascripts/discourse/components/header-dropdown.js.es6 +++ /dev/null @@ -1,34 +0,0 @@ -import computed from 'ember-addons/ember-computed-decorators'; - -export default Ember.Component.extend({ - tagName: 'li', - classNameBindings: [':header-dropdown-toggle', 'active'], - - @computed('showUser', 'path') - href(showUser, path) { - return showUser ? this.currentUser.get('path') : Discourse.getURL(path); - }, - - active: Ember.computed.alias('toggleVisible'), - - actions: { - toggle() { - - if (this.siteSettings.login_required && !this.currentUser) { - this.sendAction('loginAction'); - } else { - if (this.site.mobileView && this.get('mobileAction')) { - this.sendAction('mobileAction'); - return; - } - - if (this.get('action')) { - this.sendAction('action'); - } else { - this.toggleProperty('toggleVisible'); - } - } - this.appEvents.trigger('dropdowns:closeAll'); - } - } -}); diff --git a/app/assets/javascripts/discourse/components/header-extra-info.js.es6 b/app/assets/javascripts/discourse/components/header-extra-info.js.es6 index 2182f3ea34..66aaf82cb9 100644 --- a/app/assets/javascripts/discourse/components/header-extra-info.js.es6 +++ b/app/assets/javascripts/discourse/components/header-extra-info.js.es6 @@ -1,54 +1,3 @@ -import DiscourseURL from 'discourse/lib/url'; - -const TopicCategoryComponent = Ember.Component.extend({ - needsSecondRow: Ember.computed.gt('secondRowItems.length', 0), - secondRowItems: function() { return []; }.property(), - - pmPath: function() { - var currentUser = this.get('currentUser'); - return currentUser && currentUser.pmPath(this.get('topic')); - }.property('topic'), - - showPrivateMessageGlyph: function() { - return !this.get('topic.is_warning') && this.get('topic.isPrivateMessage'); - }.property('topic.is_warning', 'topic.isPrivateMessage'), - - actions: { - jumpToTopPost() { - const topic = this.get('topic'); - if (topic) { - DiscourseURL.routeTo(topic.get('firstPostUrl')); - } - } - } - -}); - -let id = 0; - -// Allow us (and plugins) to register themselves as needing a second -// row in the header. If there is at least one thing in the second row -// the style changes to accomodate it. -function needsSecondRowIf(prop, cb) { - const rowId = "_second_row_" + (id++), - methodHash = {}; - - methodHash[id] = function() { - const secondRowItems = this.get('secondRowItems'), - propVal = this.get(prop); - if (cb.call(this, propVal)) { - secondRowItems.addObject(rowId); - } else { - secondRowItems.removeObject(rowId); - } - }.observes(prop).on('init'); - - TopicCategoryComponent.reopen(methodHash); +export function needsSecondRowIf() { + Ember.warn("DEPRECATION: `needsSecondRowIf` is deprecated. Use widget hooks on `header-second-row`"); } - -needsSecondRowIf('topic.category', function(cat) { - return cat && (!cat.get('isUncategorizedCategory') || !this.siteSettings.suppress_uncategorized_badge); -}); - -export default TopicCategoryComponent; -export { needsSecondRowIf }; diff --git a/app/assets/javascripts/discourse/components/home-logo.js.es6 b/app/assets/javascripts/discourse/components/home-logo.js.es6 deleted file mode 100644 index 4798205e2e..0000000000 --- a/app/assets/javascripts/discourse/components/home-logo.js.es6 +++ /dev/null @@ -1,58 +0,0 @@ -import DiscourseURL from 'discourse/lib/url'; -import { iconHTML } from 'discourse/helpers/fa-icon'; -import { observes } from 'ember-addons/ember-computed-decorators'; - -export default Ember.Component.extend({ - widget: 'home-logo', - showMobileLogo: null, - linkUrl: null, - classNames: ['title'], - - init() { - this._super(); - this.showMobileLogo = this.site.mobileView && !Ember.isEmpty(this.siteSettings.mobile_logo_url); - this.linkUrl = this.get('targetUrl') || '/'; - }, - - @observes('minimized') - _updateLogo() { - // On mobile we don't minimize the logo - if (!this.site.mobileView) { - this.rerender(); - } - }, - - click(e) { - // if they want to open in a new tab, let it so - if (e.shiftKey || e.metaKey || e.ctrlKey || e.which === 2) { return true; } - - e.preventDefault(); - - DiscourseURL.routeTo(this.linkUrl); - return false; - }, - - render(buffer) { - const { siteSettings } = this; - const logoUrl = siteSettings.logo_url || ''; - const title = siteSettings.title; - - buffer.push(``); - if (!this.site.mobileView && this.get('minimized')) { - const logoSmallUrl = siteSettings.logo_small_url || ''; - if (logoSmallUrl.length) { - buffer.push(``); - } else { - buffer.push(iconHTML('home')); - } - } else if (this.showMobileLogo) { - buffer.push(``); - } else if (logoUrl.length) { - buffer.push(``); - } else { - buffer.push(``); - } - buffer.push(''); - } - -}); diff --git a/app/assets/javascripts/discourse/components/load-more.js.es6 b/app/assets/javascripts/discourse/components/load-more.js.es6 index 4b355a5b0a..ab7591f5e9 100644 --- a/app/assets/javascripts/discourse/components/load-more.js.es6 +++ b/app/assets/javascripts/discourse/components/load-more.js.es6 @@ -1,8 +1,6 @@ import LoadMore from "discourse/mixins/load-more"; export default Ember.Component.extend(LoadMore, { - _viaComponent: true, - init() { this._super(); this.set('eyelineSelector', this.get('selector')); diff --git a/app/assets/javascripts/discourse/components/menu-panel.js.es6 b/app/assets/javascripts/discourse/components/menu-panel.js.es6 deleted file mode 100644 index ca017a1171..0000000000 --- a/app/assets/javascripts/discourse/components/menu-panel.js.es6 +++ /dev/null @@ -1,224 +0,0 @@ -import { default as computed, on, observes } from 'ember-addons/ember-computed-decorators'; -import { headerHeight } from 'discourse/views/header'; - -const PANEL_BODY_MARGIN = 30; -const mutationSupport = !Ember.testing && !!window['MutationObserver']; - -export default Ember.Component.extend({ - classNameBindings: [':menu-panel', 'visible::hidden', 'viewMode'], - _lastVisible: false, - - showClose: Ember.computed.equal('viewMode', 'slide-in'), - - _layoutComponent() { - if (!this.get('visible')) { return; } - - const $window = $(window); - let width = this.get('maxWidth') || 300; - const windowWidth = parseInt($window.width()); - - if ((windowWidth - width) < 50) { - width = windowWidth - 50; - } - - const viewMode = this.get('viewMode'); - const $panelBody = this.$('.panel-body'); - let contentHeight = parseInt(this.$('.panel-body-contents').height()); - - // We use a mutationObserver to check for style changes, so it's important - // we don't set it if it doesn't change. Same goes for the $panelBody! - const style = this.$().prop('style'); - - if (viewMode === 'drop-down') { - const $buttonPanel = $('header ul.icons'); - if ($buttonPanel.length === 0) { return; } - - // These values need to be set here, not in the css file - this is to deal with the - // possibility of the window being resized and the menu changing from .slide-in to .drop-down. - if (style.top !== '100%' || style.height !== 'auto') { - this.$().css({ top: '100%', height: 'auto' }); - } - - // adjust panel height - const fullHeight = parseInt($window.height()); - const offsetTop = this.$().offset().top; - const scrollTop = $window.scrollTop(); - - if (contentHeight + (offsetTop - scrollTop) + PANEL_BODY_MARGIN > fullHeight) { - contentHeight = fullHeight - (offsetTop - scrollTop) - PANEL_BODY_MARGIN; - } - if ($panelBody.height() !== contentHeight) { - $panelBody.height(contentHeight); - } - $('body').addClass('drop-down-visible'); - } else { - const menuTop = headerHeight(); - - let height; - const winHeight = $(window).height() - 16; - if ((menuTop + contentHeight) < winHeight) { - height = contentHeight + "px"; - } else { - height = winHeight - menuTop; - } - - if ($panelBody.prop('style').height !== '100%') { - $panelBody.height('100%'); - } - if (style.top !== menuTop + "px" || style.height !== height) { - this.$().css({ top: menuTop + "px", height }); - } - $('body').removeClass('drop-down-visible'); - } - - this.$().width(width); - }, - - @computed('force') - viewMode() { - const force = this.get('force'); - if (force) { return force; } - - const headerWidth = $('#main-outlet .container').width() || 1100; - const screenWidth = $(window).width(); - const remaining = parseInt((screenWidth - headerWidth) / 2); - - return (remaining < 50) ? 'slide-in' : 'drop-down'; - }, - - @observes('viewMode', 'visible') - _visibleChanged() { - if (this.get('visible')) { - // Allow us to hook into things being shown - if (!this._lastVisible) { - Ember.run.scheduleOnce('afterRender', () => this.sendAction('onVisible')); - this._lastVisible = true; - } - - $('html').on('click.close-menu-panel', (e) => { - const $target = $(e.target); - if ($target.closest('.header-dropdown-toggle').length > 0) { return; } - if ($target.closest('.menu-panel').length > 0) { return; } - this.hide(); - }); - this.performLayout(); - this._watchSizeChanges(); - - // iOS does not handle scroll events well - if (!this.capabilities.isIOS) { - $(window).on('scroll.discourse-menu-panel', () => this.performLayout()); - } - } else if (this._lastVisible) { - this._lastVisible = false; - Ember.run.scheduleOnce('afterRender', () => this.sendAction('onHidden')); - $('html').off('click.close-menu-panel'); - $(window).off('scroll.discourse-menu-panel'); - this._stopWatchingSize(); - $('body').removeClass('drop-down-visible'); - } - }, - - @computed() - showKeyboardShortcuts() { - return !this.site.mobileView && !this.capabilities.touch; - }, - - @computed() - showMobileToggle() { - return this.site.mobileView || (this.siteSettings.enable_mobile_theme && this.capabilities.touch); - }, - - @computed() - mobileViewLinkTextKey() { - return this.site.mobileView ? "desktop_view" : "mobile_view"; - }, - - @computed() - faqUrl() { - return this.siteSettings.faq_url ? this.siteSettings.faq_url : Discourse.getURL('/faq'); - }, - - performLayout() { - Ember.run.scheduleOnce('afterRender', this, this._layoutComponent); - }, - - _watchSizeChanges() { - if (mutationSupport) { - this._observer.disconnect(); - this._observer.observe(this.element, { childList: true, subtree: true, characterData: true, attributes: true }); - } else { - clearInterval(this._resizeInterval); - this._resizeInterval = setInterval(() => { - Ember.run(() => { - const $panelBodyContents = this.$('.panel-body-contents'); - if ($panelBodyContents && $panelBodyContents.length) { - const contentHeight = parseInt($panelBodyContents.height()); - if (contentHeight !== this._lastHeight) { this.performLayout(); } - this._lastHeight = contentHeight; - } - }); - }, 500); - } - }, - - _stopWatchingSize() { - if (mutationSupport) { - this._observer.disconnect(); - } else { - clearInterval(this._resizeInterval); - } - }, - - @on('didInsertElement') - _bindEvents() { - this.$().on('click.discourse-menu-panel', 'a', e => { - if (e.metaKey || e.ctrlKey || e.shiftKey) { return; } - const $target = $(e.target); - if ($target.data('ember-action') || $target.closest('.search-link').length > 0) { return; } - this.hide(); - }); - - this.appEvents.on('dropdowns:closeAll', this, this.hide); - this.appEvents.on('dom:clean', this, this.hide); - - $('body').on('keydown.discourse-menu-panel', e => { - if (e.which === 27) { - this.hide(); - } - }); - - $(window).on('resize.discourse-menu-panel', () => { - this.propertyDidChange('viewMode'); - this.performLayout(); - }); - - if (mutationSupport) { - this._observer = new MutationObserver(() => { - Ember.run.debounce(this, this.performLayout, 50); - }); - } - - this.propertyDidChange('viewMode'); - }, - - @on('willDestroyElement') - _removeEvents() { - this.appEvents.off('dom:clean', this, this.hide); - this.appEvents.off('dropdowns:closeAll', this, this.hide); - this.$().off('click.discourse-menu-panel'); - $('body').off('keydown.discourse-menu-panel'); - $('html').off('click.close-menu-panel'); - $(window).off('resize.discourse-menu-panel'); - $(window).off('scroll.discourse-menu-panel'); - }, - - hide() { - this.set('visible', false); - }, - - actions: { - close() { - this.hide(); - } - } -}); diff --git a/app/assets/javascripts/discourse/components/mount-widget.js.es6 b/app/assets/javascripts/discourse/components/mount-widget.js.es6 index b7a8fdb020..da98973122 100644 --- a/app/assets/javascripts/discourse/components/mount-widget.js.es6 +++ b/app/assets/javascripts/discourse/components/mount-widget.js.es6 @@ -1,5 +1,6 @@ +import { keyDirty } from 'discourse/widgets/widget'; import { diff, patch } from 'virtual-dom'; -import { WidgetClickHook } from 'discourse/widgets/click-hook'; +import { WidgetClickHook } from 'discourse/widgets/hooks'; import { renderedKey, queryRegistry } from 'discourse/widgets/widget'; const _cleanCallbacks = {}; @@ -13,13 +14,20 @@ export default Ember.Component.extend({ _rootNode: null, _timeout: null, _widgetClass: null, - _afterRender: null, + _renderCallback: null, + _childEvents: null, init() { this._super(); const name = this.get('widget'); this._widgetClass = queryRegistry(name) || this.container.lookupFactory(`widget:${name}`); + + if (!this._widgetClass) { + console.error(`Error: Could not find widget: ${name}`); + } + + this._childEvents = []; this._connected = []; }, @@ -42,50 +50,68 @@ export default Ember.Component.extend({ }, willDestroyElement() { + this._childEvents.forEach(evt => this.appEvents.off(evt)); Ember.run.cancel(this._timeout); }, + afterRender() { + }, + + beforePatch() { + }, + + afterPatch() { + }, + + eventDispatched(eventName, key, refreshArg) { + const onRefresh = Ember.String.camelize(eventName.replace(/:/, '-')); + keyDirty(key, { onRefresh, refreshArg }); + this.queueRerender(); + }, + + dispatch(eventName, key) { + this._childEvents.push(eventName); + this.appEvents.on(eventName, refreshArg => { + this.eventDispatched(eventName, key, refreshArg); + }); + }, + queueRerender(callback) { - if (callback && !this._afterRender) { - this._afterRender = callback; + if (callback && !this._renderCallback) { + this._renderCallback = callback; } Ember.run.scheduleOnce('render', this, this.rerenderWidget); }, + buildArgs() { + }, + rerenderWidget() { Ember.run.cancel(this._timeout); if (this._rootNode) { + if (!this._widgetClass) { return; } + const t0 = new Date().getTime(); + const args = this.get('args') || this.buildArgs(); const opts = { model: this.get('model') }; - const newTree = new this._widgetClass(this.get('args'), this.container, opts); + const newTree = new this._widgetClass(args, this.container, opts); newTree._emberView = this; const patches = diff(this._tree || this._rootNode, newTree); - const $body = $(document); - const prevHeight = $body.height(); - const prevScrollTop = $body.scrollTop(); - + this.beforePatch(); this._rootNode = patch(this._rootNode, patches); - - const height = $body.height(); - const scrollTop = $body.scrollTop(); - - // This hack is for when swapping out many cloaked views at once - // when using keyboard navigation. It could suddenly move the - // scroll - if (prevHeight === height && scrollTop !== prevScrollTop) { - $body.scrollTop(prevScrollTop); - } + this.afterPatch(); this._tree = newTree; - if (this._afterRender) { - this._afterRender(); - this._afterRender = null; + if (this._renderCallback) { + this._renderCallback(); + this._renderCallback = null; } + this.afterRender(); renderedKey('*'); if (this.profileWidget) { diff --git a/app/assets/javascripts/discourse/components/notification-item.js.es6 b/app/assets/javascripts/discourse/components/notification-item.js.es6 deleted file mode 100644 index 64411038df..0000000000 --- a/app/assets/javascripts/discourse/components/notification-item.js.es6 +++ /dev/null @@ -1,105 +0,0 @@ -const LIKED_TYPE = 5; -const INVITED_TYPE = 8; -const GROUP_SUMMARY_TYPE = 16; - -export default Ember.Component.extend({ - tagName: 'li', - classNameBindings: ['notification.read', 'notification.is_warning'], - - name: function() { - var notificationType = this.get("notification.notification_type"); - var lookup = this.site.get("notificationLookup"); - return lookup[notificationType]; - }.property("notification.notification_type"), - - scope: function() { - if (this.get("name") === "custom") { - return this.get("notification.data.message"); - } else { - return "notifications." + this.get("name"); - } - }.property("name"), - - url: function() { - const it = this.get('notification'); - const badgeId = it.get("data.badge_id"); - if (badgeId) { - var badgeSlug = it.get("data.badge_slug"); - - if (!badgeSlug) { - const badgeName = it.get("data.badge_name"); - badgeSlug = badgeName.replace(/[^A-Za-z0-9_]+/g, '-').toLowerCase(); - } - - var username = it.get('data.username'); - username = username ? "?username=" + username.toLowerCase() : ""; - return Discourse.getURL('/badges/' + badgeId + '/' + badgeSlug + username); - } - - const topicId = it.get('topic_id'); - if (topicId) { - return Discourse.Utilities.postUrl(it.get("slug"), topicId, it.get("post_number")); - } - - if (it.get('notification_type') === INVITED_TYPE) { - return Discourse.getURL('/users/' + it.get('data.display_username')); - } - - if (it.get('data.group_id')) { - return Discourse.getURL('/users/' + it.get('data.username') + '/messages/group/' + it.get('data.group_name')); - } - - }.property("notification.data.{badge_id,badge_name,display_username}", "model.slug", "model.topic_id", "model.post_number"), - - description: function() { - const badgeName = this.get("notification.data.badge_name"); - if (badgeName) { return Discourse.Utilities.escapeExpression(badgeName); } - - const title = this.get('notification.data.topic_title'); - return Ember.isEmpty(title) ? "" : Discourse.Utilities.escapeExpression(title); - }.property("notification.data.{badge_name,topic_title}"), - - _markRead: function(){ - this.$('a').click(() => { - this.set('notification.read', true); - Discourse.setTransientHeader("Discourse-Clear-Notifications", this.get('notification.id')); - if (document && document.cookie) { - document.cookie = `cn=${this.get('notification.id')}; expires=Fri, 31 Dec 9999 23:59:59 GMT`; - } - return true; - }); - }.on('didInsertElement'), - - render(buffer) { - const notification = this.get('notification'); - // since we are reusing views now sometimes this can be unset - if (!notification) { return; } - const description = this.get('description'); - const username = notification.get('data.display_username'); - var text; - if (notification.get('notification_type') === GROUP_SUMMARY_TYPE) { - const count = notification.get('data.inbox_count'); - const group_name = notification.get('data.group_name'); - text = I18n.t(this.get('scope'), {count, group_name}); - } else if (notification.get('notification_type') === LIKED_TYPE && notification.get("data.count") > 1) { - const count = notification.get('data.count') - 2; - const username2 = notification.get('data.username2'); - if (count===0) { - text = I18n.t('notifications.liked_2', {description, username, username2}); - } else { - text = I18n.t('notifications.liked_many', {description, username, username2, count}); - } - } - else { - text = I18n.t(this.get('scope'), {description, username}); - } - text = Discourse.Emoji.unescape(text); - - const url = this.get('url'); - if (url) { - buffer.push('' + text + ''); - } else { - buffer.push(text); - } - } -}); diff --git a/app/assets/javascripts/discourse/components/preference-checkbox.js.es6 b/app/assets/javascripts/discourse/components/preference-checkbox.js.es6 index 6b76240951..352aeadac3 100644 --- a/app/assets/javascripts/discourse/components/preference-checkbox.js.es6 +++ b/app/assets/javascripts/discourse/components/preference-checkbox.js.es6 @@ -5,10 +5,10 @@ export default Em.Component.extend({ return I18n.t(this.get('labelKey')); }.property('labelKey'), - click() { + change() { const warning = this.get('warning'); - if (warning && !this.get('checked')) { + if (warning && this.get('checked')) { this.sendAction('warning'); return false; } diff --git a/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6 b/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6 index 38ad5fea69..c5625a8109 100644 --- a/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6 +++ b/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6 @@ -37,6 +37,25 @@ export default MountWidget.extend({ 'searchService'); }).volatile(), + beforePatch() { + const $body = $(document); + this.prevHeight = $body.height(); + this.prevScrollTop = $body.scrollTop(); + }, + + afterPatch() { + const $body = $(document); + const height = $body.height(); + const scrollTop = $body.scrollTop(); + + // This hack is for when swapping out many cloaked views at once + // when using keyboard navigation. It could suddenly move the + // scroll + if (this.prevHeight === height && scrollTop !== this.prevScrollTop) { + $body.scrollTop(this.prevScrollTop); + } + }, + scrolled() { if (this.isDestroyed || this.isDestroying) { return; } if (isWorkaroundActive()) { return; } diff --git a/app/assets/javascripts/discourse/components/search-menu.js.es6 b/app/assets/javascripts/discourse/components/search-menu.js.es6 deleted file mode 100644 index be80d20a26..0000000000 --- a/app/assets/javascripts/discourse/components/search-menu.js.es6 +++ /dev/null @@ -1,162 +0,0 @@ -import {searchForTerm, searchContextDescription, isValidSearchTerm } from 'discourse/lib/search'; -import DiscourseURL from 'discourse/lib/url'; -import { default as computed, observes } from 'ember-addons/ember-computed-decorators'; -import showModal from 'discourse/lib/show-modal'; - -let _dontSearch = false; -export default Ember.Component.extend({ - searchService: Ember.inject.service('search'), - classNames: ['search-menu'], - typeFilter: null, - - @observes('searchService.searchContext') - contextChanged: function() { - if (this.get('searchService.searchContextEnabled')) { - _dontSearch = true; - this.set('searchService.searchContextEnabled', false); - _dontSearch = false; - } - }, - - @computed('searchService.searchContext', 'searchService.term', 'searchService.searchContextEnabled') - fullSearchUrlRelative(searchContext, term, searchContextEnabled) { - - if (searchContextEnabled && Ember.get(searchContext, 'type') === 'topic') { - return null; - } - - let url = '/search?q=' + encodeURIComponent(this.get('searchService.term')); - if (searchContextEnabled) { - if (searchContext.id.toString().toLowerCase() === this.get('currentUser.username_lower') && - searchContext.type === "private_messages" - ) { - url += ' in:private'; - } else { - url += encodeURIComponent(" " + searchContext.type + ":" + searchContext.id); - } - } - - return url; - }, - - @computed('fullSearchUrlRelative') - fullSearchUrl(fullSearchUrlRelative) { - if (fullSearchUrlRelative) { - return Discourse.getURL(fullSearchUrlRelative); - } - }, - - @computed('searchService.searchContext') - searchContextDescription(ctx) { - return searchContextDescription(Em.get(ctx, 'type'), Em.get(ctx, 'user.username') || Em.get(ctx, 'category.name')); - }, - - @observes('searchService.searchContextEnabled') - searchContextEnabledChanged() { - if (_dontSearch) { return; } - this.newSearchNeeded(); - }, - - // If we need to perform another search - @observes('searchService.term', 'typeFilter') - newSearchNeeded() { - this.set('noResults', false); - const term = this.get('searchService.term'); - if (isValidSearchTerm(term)) { - this.set('loading', true); - Ember.run.debounce(this, 'searchTerm', term, this.get('typeFilter'), 400); - } else { - this.setProperties({ content: null }); - } - this.set('selectedIndex', 0); - }, - - searchTerm(term, typeFilter) { - // for cancelling debounced search - if (this._cancelSearch){ - this._cancelSearch = null; - return; - } - - if (this._search) { - this._search.abort(); - } - - const searchContext = this.get('searchService.searchContextEnabled') ? this.get('searchService.searchContext') : null; - this._search = searchForTerm(term, { typeFilter, searchContext, fullSearchUrl: this.get('fullSearchUrl') }); - - this._search.then((content) => { - this.setProperties({ noResults: !content, content }); - }).finally(() => { - this.set('loading', false); - this._search = null; - }); - }, - - @computed('typeFilter', 'loading') - showCancelFilter(typeFilter, loading) { - if (loading) { return false; } - return !Ember.isEmpty(typeFilter); - }, - - @observes('searchService.term') - termChanged() { - this.cancelTypeFilter(); - }, - - actions: { - fullSearch() { - const self = this; - - if (this._search) { - this._search.abort(); - } - - // maybe we are debounced and delayed - // stop that as well - this._cancelSearch = true; - Em.run.later(function() { - self._cancelSearch = false; - }, 400); - - const url = this.get('fullSearchUrlRelative'); - if (url) { - DiscourseURL.routeTo(url); - } - }, - - moreOfType(type) { - this.set('typeFilter', type); - }, - - cancelType() { - this.cancelTypeFilter(); - }, - - showedSearch() { - $('#search-term').focus().select(); - }, - - showSearchHelp() { - // TODO: @EvitTrout how do we get a loading indicator here? - Discourse.ajax("/static/search_help.html", { dataType: 'html' }).then((model) => { - showModal('searchHelp', { model }); - }); - }, - - cancelHighlight() { - this.set('searchService.highlightTerm', null); - } - }, - - cancelTypeFilter() { - this.set('typeFilter', null); - }, - - keyDown(e) { - if (e.which === 13 && isValidSearchTerm(this.get('searchService.term'))) { - this.set('visible', false); - this.send('fullSearch'); - } - } -}); diff --git a/app/assets/javascripts/discourse/components/search-result-category.js.es6 b/app/assets/javascripts/discourse/components/search-result-category.js.es6 deleted file mode 100644 index e23284ed16..0000000000 --- a/app/assets/javascripts/discourse/components/search-result-category.js.es6 +++ /dev/null @@ -1,2 +0,0 @@ -import SearchResult from 'discourse/components/search-result'; -export default SearchResult.extend(); diff --git a/app/assets/javascripts/discourse/components/search-result-post.js.es6 b/app/assets/javascripts/discourse/components/search-result-post.js.es6 deleted file mode 100644 index e23284ed16..0000000000 --- a/app/assets/javascripts/discourse/components/search-result-post.js.es6 +++ /dev/null @@ -1,2 +0,0 @@ -import SearchResult from 'discourse/components/search-result'; -export default SearchResult.extend(); diff --git a/app/assets/javascripts/discourse/components/search-result-topic.js.es6 b/app/assets/javascripts/discourse/components/search-result-topic.js.es6 deleted file mode 100644 index e23284ed16..0000000000 --- a/app/assets/javascripts/discourse/components/search-result-topic.js.es6 +++ /dev/null @@ -1,2 +0,0 @@ -import SearchResult from 'discourse/components/search-result'; -export default SearchResult.extend(); diff --git a/app/assets/javascripts/discourse/components/search-result-user.js.es6 b/app/assets/javascripts/discourse/components/search-result-user.js.es6 deleted file mode 100644 index e23284ed16..0000000000 --- a/app/assets/javascripts/discourse/components/search-result-user.js.es6 +++ /dev/null @@ -1,2 +0,0 @@ -import SearchResult from 'discourse/components/search-result'; -export default SearchResult.extend(); diff --git a/app/assets/javascripts/discourse/components/search-result.js.es6 b/app/assets/javascripts/discourse/components/search-result.js.es6 deleted file mode 100644 index dacf1f2696..0000000000 --- a/app/assets/javascripts/discourse/components/search-result.js.es6 +++ /dev/null @@ -1,11 +0,0 @@ -export default Ember.Component.extend({ - tagName: 'ul', - - _highlightOnInsert: function() { - const term = this.get('controller.term'); - if(!_.isEmpty(term)) { - this.$('.blurb').highlight(term.split(/\s+/), {className: 'search-highlight'}); - this.$('.topic-title').highlight(term.split(/\s+/), {className: 'search-highlight'} ); - } - }.on('didInsertElement') -}); diff --git a/app/assets/javascripts/discourse/components/site-header.js.es6 b/app/assets/javascripts/discourse/components/site-header.js.es6 new file mode 100644 index 0000000000..d8e87bb7d8 --- /dev/null +++ b/app/assets/javascripts/discourse/components/site-header.js.es6 @@ -0,0 +1,196 @@ +import MountWidget from 'discourse/components/mount-widget'; +import { observes } from 'ember-addons/ember-computed-decorators'; + +const _flagProperties = []; +function addFlagProperty(prop) { + _flagProperties.pushObject(prop); +} + +const PANEL_BODY_MARGIN = 30; + +const SiteHeaderComponent = MountWidget.extend({ + widget: 'header', + docAt: null, + dockedHeader: null, + _topic: null, + + // profileWidget: true, + // classNameBindings: ['editingTopic'], + + @observes('currentUser.unread_notifications', 'currentUser.unread_private_messages') + _notificationsChanged() { + this.queueRerender(); + }, + + examineDockHeader() { + const $body = $('body'); + + // Check the dock after the current run loop. While rendering, + // it's much slower to calculate `outlet.offset()` + Ember.run.next(() => { + if (this.docAt === null) { + const outlet = $('#main-outlet'); + if (!(outlet && outlet.length === 1)) return; + this.docAt = outlet.offset().top; + } + + const offset = window.pageYOffset || $('html').scrollTop(); + if (offset >= this.docAt) { + if (!this.dockedHeader) { + $body.addClass('docked'); + this.dockedHeader = true; + } + } else { + if (this.dockedHeader) { + $body.removeClass('docked'); + this.dockedHeader = false; + } + } + }); + }, + + setTopic(topic) { + this._topic = topic; + this.queueRerender(); + }, + + didInsertElement() { + this._super(); + $(window).bind('scroll.discourse-dock', () => this.examineDockHeader()); + $(document).bind('touchmove.discourse-dock', () => this.examineDockHeader()); + $(window).on('resize.discourse-menu-panel', () => this.afterRender()); + + this.appEvents.on('header:show-topic', topic => this.setTopic(topic)); + this.appEvents.on('header:hide-topic', () => this.setTopic(null)); + + this.dispatch('notifications:changed', 'user-notifications'); + this.dispatch('header:keyboard-trigger', 'header'); + + this.appEvents.on('dom:clean', () => { + // For performance, only trigger a re-render if any menu panels are visible + if (this.$('.menu-panel').length) { + this.eventDispatched('dom:clean', 'header'); + } + }); + + this.examineDockHeader(); + }, + + willDestroyElement() { + this._super(); + $(window).unbind('scroll.discourse-dock'); + $(document).unbind('touchmove.discourse-dock'); + $('body').off('keydown.header'); + this.appEvents.off('notifications:changed'); + $(window).off('resize.discourse-menu-panel'); + + this.appEvents.off('header:show-topic'); + this.appEvents.off('header:hide-topic'); + this.appEvents.off('dom:clean'); + }, + + buildArgs() { + return { + flagCount: _flagProperties.reduce((prev, cur) => prev + (this.get(cur) || 0), 0), + topic: this._topic, + canSignUp: this.get('canSignUp') + }; + }, + + afterRender() { + const $menuPanels = $('.menu-panel'); + if ($menuPanels.length === 0) { return; } + + const $window = $(window); + const windowWidth = parseInt($window.width()); + + + const headerWidth = $('#main-outlet .container').width() || 1100; + const remaining = parseInt((windowWidth - headerWidth) / 2); + const viewMode = (remaining < 50) ? 'slide-in' : 'drop-down'; + + $menuPanels.each((idx, panel) => { + const $panel = $(panel); + let width = parseInt($panel.attr('data-max-width') || 300); + if ((windowWidth - width) < 50) { + width = windowWidth - 50; + } + + $panel.removeClass('drop-down').removeClass('slide-in').addClass(viewMode); + + const $panelBody = $('.panel-body', $panel); + let contentHeight = parseInt($('.panel-body-contents', $panel).height()); + + // We use a mutationObserver to check for style changes, so it's important + // we don't set it if it doesn't change. Same goes for the $panelBody! + const style = $panel.prop('style'); + + if (viewMode === 'drop-down') { + const $buttonPanel = $('header ul.icons'); + if ($buttonPanel.length === 0) { return; } + + // These values need to be set here, not in the css file - this is to deal with the + // possibility of the window being resized and the menu changing from .slide-in to .drop-down. + if (style.top !== '100%' || style.height !== 'auto') { + $panel.css({ top: '100%', height: 'auto' }); + } + + // adjust panel height + const fullHeight = parseInt($window.height()); + const offsetTop = $panel.offset().top; + const scrollTop = $window.scrollTop(); + + if (contentHeight + (offsetTop - scrollTop) + PANEL_BODY_MARGIN > fullHeight) { + contentHeight = fullHeight - (offsetTop - scrollTop) - PANEL_BODY_MARGIN; + } + if ($panelBody.height() !== contentHeight) { + $panelBody.height(contentHeight); + } + $('body').addClass('drop-down-visible'); + } else { + const menuTop = headerHeight(); + + let height; + const winHeight = $(window).height() - 16; + if ((menuTop + contentHeight) < winHeight) { + height = contentHeight + "px"; + } else { + height = winHeight - menuTop; + } + + if ($panelBody.prop('style').height !== '100%') { + $panelBody.height('100%'); + } + if (style.top !== menuTop + "px" || style.height !== height) { + $panel.css({ top: menuTop + "px", height }); + } + $('body').removeClass('drop-down-visible'); + } + + $panel.width(width); + }); + } +}); + +export default SiteHeaderComponent; + +function applyFlaggedProperties() { + const args = _flagProperties.slice(); + args.push(function() { + this.queueRerender(); + }.on('init')); + + SiteHeaderComponent.reopen({ _flagsChanged: Ember.observer.apply(this, args) }); +} + +addFlagProperty('currentUser.site_flagged_posts_count'); +addFlagProperty('currentUser.post_queue_new_count'); + +export { addFlagProperty, applyFlaggedProperties }; + +export function headerHeight() { + const $header = $('header.d-header'); + const headerOffset = $header.offset(); + const headerOffsetTop = (headerOffset) ? headerOffset.top : 0; + return parseInt($header.outerHeight() + headerOffsetTop - $(window).scrollTop()); +} diff --git a/app/assets/javascripts/discourse/components/tag-chooser.js.es6 b/app/assets/javascripts/discourse/components/tag-chooser.js.es6 new file mode 100644 index 0000000000..c942cf5993 --- /dev/null +++ b/app/assets/javascripts/discourse/components/tag-chooser.js.es6 @@ -0,0 +1,97 @@ +import renderTag from 'discourse/lib/render-tag'; + +function formatTag(t) { + return renderTag(t.id, {count: t.count}); +} + +export default Ember.TextField.extend({ + classNameBindings: [':tag-chooser'], + attributeBindings: ['tabIndex'], + + _setupTags: function() { + const tags = this.get('tags') || []; + this.set('value', tags.join(", ")); + }.on('init'), + + _valueChanged: function() { + const tags = this.get('value').split(',').map(v => v.trim()).reject(v => v.length === 0).uniq(); + this.set('tags', tags); + }.observes('value'), + + _initializeTags: function() { + const site = this.site, + self = this, + filterRegexp = new RegExp(this.site.tags_filter_regexp, "g"); + + this.$().select2({ + tags: true, + placeholder: I18n.t('tagging.choose_for_topic'), + maximumInputLength: this.siteSettings.max_tag_length, + maximumSelectionSize: this.siteSettings.max_tags_per_topic, + initSelection(element, callback) { + const data = []; + + function splitVal(string, separator) { + var val, i, l; + if (string === null || string.length < 1) return []; + val = string.split(separator); + for (i = 0, l = val.length; i < l; i = i + 1) val[i] = $.trim(val[i]); + return val; + } + + $(splitVal(element.val(), ",")).each(function () { + data.push({ + id: this, + text: this + }); + }); + + callback(data); + }, + createSearchChoice: function(term, data) { + term = term.replace(filterRegexp, '').trim(); + + // No empty terms, make sure the user has permission to create the tag + if (!term.length || !site.get('can_create_tag')) { return; } + + if ($(data).filter(function() { + return this.text.localeCompare(term) === 0; + }).length === 0) { + return { id: term, text: term }; + } + }, + createSearchChoicePosition: function(list, item) { + // Search term goes on the bottom + list.push(item); + }, + formatSelection: function (data) { + return data ? renderTag(this.text(data)) : undefined; + }, + formatSelectionCssClass: function(){ + return "discourse-tag-select2"; + }, + formatResult: formatTag, + multiple: true, + ajax: { + quietMillis: 200, + cache: true, + url: Discourse.getURL("/tags/filter/search"), + dataType: 'json', + data: function (term) { + return { q: term, limit: self.siteSettings.max_tag_search_results }; + }, + results: function (data) { + if (self.siteSettings.tags_sort_alphabetically) { + data.results = data.results.sort(function(a,b) { return a.id > b.id; }); + } + return data; + } + }, + }); + }.on('didInsertElement'), + + _destroyTags: function() { + this.$().select2('destroy'); + }.on('willDestroyElement') + +}); diff --git a/app/assets/javascripts/discourse/components/tag-drop-link.js.es6 b/app/assets/javascripts/discourse/components/tag-drop-link.js.es6 new file mode 100644 index 0000000000..8cfad3cd2a --- /dev/null +++ b/app/assets/javascripts/discourse/components/tag-drop-link.js.es6 @@ -0,0 +1,29 @@ +import DiscourseURL from 'discourse/lib/url'; + +export default Ember.Component.extend({ + tagName: 'a', + classNameBindings: [':tag-badge-wrapper', ':badge-wrapper', ':bullet', 'tagClass'], + attributeBindings: ['href'], + + href: function() { + var url = '/tags'; + if (this.get('category')) { + url += this.get('category.url'); + } + return url + '/' + this.get('tagId'); + }.property('tagId', 'category'), + + tagClass: function() { + return "tag-" + this.get('tagId'); + }.property('tagId'), + + render(buffer) { + buffer.push(Handlebars.Utils.escapeExpression(this.get('tagId'))); + }, + + click(e) { + e.preventDefault(); + DiscourseURL.routeTo(this.get('href')); + return true; + } +}); diff --git a/app/assets/javascripts/discourse/components/tag-drop.js.es6 b/app/assets/javascripts/discourse/components/tag-drop.js.es6 new file mode 100644 index 0000000000..23e48091b1 --- /dev/null +++ b/app/assets/javascripts/discourse/components/tag-drop.js.es6 @@ -0,0 +1,113 @@ +import { setting } from 'discourse/lib/computed'; + +export default Ember.Component.extend({ + classNameBindings: [':tag-drop', 'tag::no-category', 'tags:has-drop','categoryStyle','tagClass'], + categoryStyle: setting('category_style'), // match the category-drop style + currentCategory: Em.computed.or('secondCategory', 'firstCategory'), + showFilterByTag: setting('show_filter_by_tag'), + showTagDropdown: Em.computed.and('showFilterByTag', 'tags'), + tagId: null, + + tagName: 'li', + + tags: function() { + if (this.siteSettings.tags_sort_alphabetically && Discourse.Site.currentProp('top_tags')) { + return Discourse.Site.currentProp('top_tags').sort(); + } else { + return Discourse.Site.currentProp('top_tags'); + } + }.property('site.top_tags'), + + iconClass: function() { + if (this.get('expanded')) { return "fa fa-caret-down"; } + return "fa fa-caret-right"; + }.property('expanded'), + + tagClass: function() { + if (this.get('tagId')) { + return "tag-" + this.get('tagId'); + } else { + return "tag_all"; + } + }.property('tagId'), + + allTagsUrl: function() { + if (this.get('currentCategory')) { + return this.get('currentCategory.url') + "?allTags=1"; + } else { + return "/"; + } + }.property('firstCategory', 'secondCategory'), + + allTagsLabel: function() { + return I18n.t("tagging.selector_all_tags"); + }.property('tag'), + + dropdownButtonClass: function() { + var result = 'badge-category category-dropdown-button'; + if (Em.isNone(this.get('tag'))) { + result += ' home'; + } + return result; + }.property('tag'), + + clickEventName: function() { + return "click.tag-drop-" + (this.get('tag') || "all"); + }.property('tag'), + + actions: { + expand: function() { + var self = this; + + if(!this.get('renderTags')){ + this.set('renderTags',true); + Em.run.next(function(){ + self.send('expand'); + }); + return; + } + + if (this.get('expanded')) { + this.close(); + return; + } + + if (this.get('tags')) { + this.set('expanded', true); + } + var $dropdown = this.$()[0]; + + this.$('a[data-drop-close]').on('click.tag-drop', function() { + self.close(); + }); + + Em.run.next(function(){ + self.$('.cat a').add('html').on(self.get('clickEventName'), function(e) { + var $target = $(e.target), + closest = $target.closest($dropdown); + + if ($(e.currentTarget).hasClass('badge-wrapper')){ + self.close(); + } + + return ($(e.currentTarget).hasClass('badge-category') || (closest.length && closest[0] === $dropdown)) ? true : self.close(); + }); + }); + } + }, + + removeEvents: function(){ + $('html').off(this.get('clickEventName')); + this.$('a[data-drop-close]').off('click.tag-drop'); + }, + + close: function() { + this.removeEvents(); + this.set('expanded', false); + }, + + willDestroyElement: function() { + this.removeEvents(); + } + +}); diff --git a/app/assets/javascripts/discourse/components/tag-notifications-button.js.es6 b/app/assets/javascripts/discourse/components/tag-notifications-button.js.es6 new file mode 100644 index 0000000000..b4588df710 --- /dev/null +++ b/app/assets/javascripts/discourse/components/tag-notifications-button.js.es6 @@ -0,0 +1,11 @@ +import NotificationsButton from 'discourse/components/notifications-button'; + +export default NotificationsButton.extend({ + classNames: ['notification-options', 'tag-notification-menu'], + buttonIncludesText: false, + i18nPrefix: 'tagging.notifications', + + clicked(id) { + this.sendAction('action', id); + } +}); diff --git a/app/assets/javascripts/discourse/components/user-menu.js.es6 b/app/assets/javascripts/discourse/components/user-menu.js.es6 deleted file mode 100644 index d864f23ba4..0000000000 --- a/app/assets/javascripts/discourse/components/user-menu.js.es6 +++ /dev/null @@ -1,104 +0,0 @@ -import { url } from 'discourse/lib/computed'; -import { default as computed, observes } from 'ember-addons/ember-computed-decorators'; -import { headerHeight } from 'discourse/views/header'; - -export default Ember.Component.extend({ - classNames: ['user-menu'], - notifications: null, - loadingNotifications: false, - notificationsPath: url('currentUser.path', '%@/notifications'), - bookmarksPath: url('currentUser.path', '%@/activity/bookmarks'), - messagesPath: url('currentUser.path', '%@/messages'), - preferencesPath: url('currentUser.path', '%@/preferences'), - - @computed('allowAnon', 'isAnon') - showEnableAnon(allowAnon, isAnon) { return allowAnon && !isAnon; }, - - @computed('allowAnon', 'isAnon') - showDisableAnon(allowAnon, isAnon) { return allowAnon && isAnon; }, - - @observes('visible') - _loadNotifications() { - if (this.get("visible")) { - this.refreshNotifications(); - } - }, - - @observes('currentUser.lastNotificationChange') - _resetCachedNotifications() { - const visible = this.get('visible'); - - if (!Discourse.get("hasFocus")) { - this.set('visible', false); - this.set('notifications', null); - return; - } - - if (visible) { - this.refreshNotifications(); - } else { - this.set('notifications', null); - } - }, - - refreshNotifications() { - if (this.get('loadingNotifications')) { return; } - - // estimate (poorly) the amount of notifications to return - var limit = Math.round(($(window).height() - headerHeight()) / 55); - // we REALLY don't want to be asking for negative counts of notifications - // less than 5 is also not that useful - if (limit < 5) { limit = 5; } - if (limit > 40) { limit = 40; } - - // TODO: It's a bit odd to use the store in a component, but this one really - // wants to reach out and grab notifications - const store = this.container.lookup('store:main'); - const stale = store.findStale('notification', {recent: true, limit }, {cacheKey: 'recent-notifications'}); - - if (stale.hasResults) { - const results = stale.results; - var content = results.get('content'); - - // we have to truncate to limit, otherwise we will render too much - if (content && (content.length > limit)) { - content = content.splice(0, limit); - results.set('content', content); - results.set('totalRows', limit); - } - - this.set('notifications', results); - } else { - this.set('loadingNotifications', true); - } - - stale.refresh().then((notifications) => { - this.set('currentUser.unread_notifications', 0); - this.set('notifications', notifications); - }).catch(() => { - this.set('notifications', null); - }).finally(() => { - this.set('loadingNotifications', false); - }); - }, - - @computed() - allowAnon() { - return this.siteSettings.allow_anonymous_posting && - (this.get("currentUser.trust_level") >= this.siteSettings.anonymous_posting_min_trust_level || - this.get("isAnon")); - }, - - isAnon: Ember.computed.alias('currentUser.is_anonymous'), - - actions: { - toggleAnon() { - Discourse.ajax("/users/toggle-anon", {method: 'POST'}).then(function(){ - window.location.reload(); - }); - }, - logout() { - this.sendAction('logoutAction'); - } - } -}); diff --git a/app/assets/javascripts/discourse/components/user-notifications-large.js.es6 b/app/assets/javascripts/discourse/components/user-notifications-large.js.es6 new file mode 100644 index 0000000000..bfedea00f7 --- /dev/null +++ b/app/assets/javascripts/discourse/components/user-notifications-large.js.es6 @@ -0,0 +1,16 @@ +import MountWidget from 'discourse/components/mount-widget'; +import { observes } from "ember-addons/ember-computed-decorators"; + +export default MountWidget.extend({ + widget: 'user-notifications-large', + + init() { + this._super(); + this.args = { notifications: this.get('notifications') }; + }, + + @observes('notifications.length') + _triggerRefresh() { + this.queueRerender(); + } +}); diff --git a/app/assets/javascripts/discourse/components/user-stream.js.es6 b/app/assets/javascripts/discourse/components/user-stream.js.es6 new file mode 100644 index 0000000000..2afce0b978 --- /dev/null +++ b/app/assets/javascripts/discourse/components/user-stream.js.es6 @@ -0,0 +1,57 @@ +import LoadMore from "discourse/mixins/load-more"; +import ClickTrack from 'discourse/lib/click-track'; + +export default Ember.Component.extend(LoadMore, { + loading: false, + eyelineSelector: '.user-stream .item', + classNames: ['user-stream'], + + _scrollTopOnModelChange: function() { + Em.run.schedule('afterRender', () => $(document).scrollTop(0)); + }.observes('stream.user.id'), + + _inserted: function() { + this.bindScrolling({name: 'user-stream-view'}); + + $(window).on('resize.discourse-on-scroll', () => this.scrolled()); + + this.$().on('mouseup.discourse-redirect', '.excerpt a', function(e) { + // bypass if we are selecting stuff + const selection = window.getSelection && window.getSelection(); + if (selection.type === "Range" || selection.rangeCount > 0) { + if (Discourse.Utilities.selectedText() !== "") { + return true; + } + } + + const $target = $(e.target); + if ($target.hasClass('mention') || $target.parents('.expanded-embed').length) { return false; } + + return ClickTrack.trackClick(e); + }); + + }.on('didInsertElement'), + + // This view is being removed. Shut down operations + _destroyed: function() { + this.unbindScrolling('user-stream-view'); + $(window).unbind('resize.discourse-on-scroll'); + + // Unbind link tracking + this.$().off('mouseup.discourse-redirect', '.excerpt a'); + + }.on('willDestroyElement'), + + actions: { + loadMore() { + if (this.get('loading')) { return; } + + this.set('loading', true); + const stream = this.get('stream'); + stream.findItems().then(() => { + this.set('loading', false); + this.get('eyeline').flushRest(); + }); + } + } +}); diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6 index 7333f6dd0a..b22330abba 100644 --- a/app/assets/javascripts/discourse/controllers/composer.js.es6 +++ b/app/assets/javascripts/discourse/controllers/composer.js.es6 @@ -81,6 +81,14 @@ export default Ember.Controller.extend({ this.set('similarTopics', []); }.on('init'), + @computed('model.canEditTitle', 'model.creatingPrivateMessage') + canEditTags(canEditTitle, creatingPrivateMessage) { + return !this.site.mobileView && + this.site.get('can_tag_topics') && + canEditTitle && + !creatingPrivateMessage; + }, + @computed('model.action') canWhisper(action) { const currentUser = this.currentUser; @@ -386,7 +394,7 @@ export default Ember.Controller.extend({ let message = this.get('similarTopicsMessage'); if (!message) { message = Discourse.ComposerMessage.create({ - templateName: 'composer/similar_topics', + templateName: 'composer/similar-topics', extraClass: 'similar-topics' }); this.set('similarTopicsMessage', message); diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6 index bc6ccf62a8..9ff65be628 100644 --- a/app/assets/javascripts/discourse/controllers/create-account.js.es6 +++ b/app/assets/javascripts/discourse/controllers/create-account.js.es6 @@ -127,7 +127,7 @@ export default Ember.Controller.extend(ModalFunctionality, { failed: true, reason: I18n.t('user.email.invalid') }); - }.property('accountEmail', 'rejectedEmails.@each'), + }.property('accountEmail', 'rejectedEmails.[]'), emailValidated: function() { return this.get('authOptions.email') === this.get("accountEmail") && this.get('authOptions.email_valid'); @@ -326,7 +326,7 @@ export default Ember.Controller.extend(ModalFunctionality, { ok: true, reason: I18n.t('user.password.ok') }); - }.property('accountPassword', 'rejectedPasswords.@each', 'accountUsername', 'accountEmail', 'isDeveloper'), + }.property('accountPassword', 'rejectedPasswords.[]', 'accountUsername', 'accountEmail', 'isDeveloper'), @on('init') fetchConfirmationValue() { diff --git a/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6 b/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6 index 8786828d7a..5ac8d4b733 100644 --- a/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6 +++ b/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6 @@ -12,7 +12,7 @@ export var queryParams = { // Basic controller options var controllerOpts = { needs: ['discovery/topics'], - queryParams: Ember.keys(queryParams), + queryParams: Object.keys(queryParams), }; // Aliases for the values diff --git a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 index 5e86950634..008ab29a3b 100644 --- a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 +++ b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 @@ -138,14 +138,11 @@ const controllerOpts = { return I18n.t("topics.none.educate." + split[0], { userPrefsUrl: Discourse.getURL("/users/") + (Discourse.User.currentProp("username_lower")) + "/preferences" }); - }.property('allLoaded', 'model.topics.length'), + }.property('allLoaded', 'model.topics.length') - loadMoreTopics() { - return this.get('model').loadMore(); - } }; -Ember.keys(queryParams).forEach(function(p) { +Object.keys(queryParams).forEach(function(p) { // If we don't have a default value, initialize it to null if (typeof controllerOpts[p] === 'undefined') { controllerOpts[p] = null; diff --git a/app/assets/javascripts/discourse/controllers/group-index.js.es6 b/app/assets/javascripts/discourse/controllers/group-index.js.es6 new file mode 100644 index 0000000000..7a5a5bf98f --- /dev/null +++ b/app/assets/javascripts/discourse/controllers/group-index.js.es6 @@ -0,0 +1,27 @@ +import { fmt } from 'discourse/lib/computed'; + +export default Ember.ArrayController.extend({ + needs: ['group'], + loading: false, + emptyText: fmt('type', 'groups.empty.%@'), + + actions: { + loadMore() { + + if (this.get('loading')) { return; } + this.set('loading', true); + const posts = this.get('model'); + if (posts && posts.length) { + const beforePostId = posts[posts.length-1].get('id'); + const group = this.get('controllers.group.model'); + + const opts = { beforePostId, type: this.get('type') }; + group.findPosts(opts).then(newPosts => { + posts.addObjects(newPosts); + this.set('loading', false); + }); + } + } + } +}); + diff --git a/app/assets/javascripts/discourse/controllers/group/index.js.es6 b/app/assets/javascripts/discourse/controllers/group/index.js.es6 deleted file mode 100644 index 60df6a2cdf..0000000000 --- a/app/assets/javascripts/discourse/controllers/group/index.js.es6 +++ /dev/null @@ -1,28 +0,0 @@ -/** - Handles displaying posts within a group -**/ -export default Ember.ArrayController.extend({ - needs: ['group'], - loading: false, - - actions: { - loadMore: function() { - - if (this.get('loading')) { return; } - this.set('loading', true); - var posts = this.get('model'), - self = this; - if (posts && posts.length) { - var lastPostId = posts[posts.length-1].get('id'), - group = this.get('controllers.group.model'); - - var opts = {beforePostId: lastPostId, type: this.get('type')}; - group.findPosts(opts).then(function(newPosts) { - posts.addObjects(newPosts); - self.set('loading', false); - }); - } - } - } -}); - diff --git a/app/assets/javascripts/discourse/controllers/group/members.js.es6 b/app/assets/javascripts/discourse/controllers/group/members.js.es6 index 246a5f80cd..306ff8aa80 100644 --- a/app/assets/javascripts/discourse/controllers/group/members.js.es6 +++ b/app/assets/javascripts/discourse/controllers/group/members.js.es6 @@ -1,12 +1,13 @@ import { popupAjaxError } from 'discourse/lib/ajax-error'; import computed from 'ember-addons/ember-computed-decorators'; +import Group from 'discourse/models/group'; export default Ember.Controller.extend({ loading: false, limit: null, offset: null, - @computed('model.owners.@each') + @computed('model.owners.[]') isOwner(owners) { if (this.get('currentUser.admin')) { return true; @@ -30,10 +31,7 @@ export default Ember.Controller.extend({ }, loadMore() { - const Group = require('discourse/models/group').default; - if (this.get("loading")) { return; } - // we've reached the end if (this.get("model.members.length") >= this.get("model.user_count")) { return; } this.set("loading", true); diff --git a/app/assets/javascripts/discourse/controllers/group/mentions.js.es6 b/app/assets/javascripts/discourse/controllers/group/mentions.js.es6 deleted file mode 100644 index 81fa5a8ffd..0000000000 --- a/app/assets/javascripts/discourse/controllers/group/mentions.js.es6 +++ /dev/null @@ -1,3 +0,0 @@ -import IndexController from 'discourse/controllers/group/index'; - -export default IndexController.extend({type: 'mentions'}); diff --git a/app/assets/javascripts/discourse/controllers/group/topics.js.es6 b/app/assets/javascripts/discourse/controllers/group/topics.js.es6 deleted file mode 100644 index 9423350320..0000000000 --- a/app/assets/javascripts/discourse/controllers/group/topics.js.es6 +++ /dev/null @@ -1,3 +0,0 @@ -import IndexController from 'discourse/controllers/group/index'; - -export default IndexController.extend({type: 'topics'}); diff --git a/app/assets/javascripts/discourse/controllers/header.js.es6 b/app/assets/javascripts/discourse/controllers/header.js.es6 index 57401135df..2665f2afbd 100644 --- a/app/assets/javascripts/discourse/controllers/header.js.es6 +++ b/app/assets/javascripts/discourse/controllers/header.js.es6 @@ -1,77 +1,6 @@ -import DiscourseURL from 'discourse/lib/url'; +import { addFlagProperty as realAddFlagProperty } from 'discourse/components/site-header'; -const HeaderController = Ember.Controller.extend({ - topic: null, - showExtraInfo: null, - hamburgerVisible: false, - searchVisible: false, - userMenuVisible: false, - needs: ['application'], - - canSignUp: Em.computed.alias('controllers.application.canSignUp'), - - showSignUpButton: function() { - return this.get('canSignUp') && !this.get('showExtraInfo'); - }.property('canSignUp', 'showExtraInfo'), - - showStarButton: function() { - return Discourse.User.current() && !this.get('topic.isPrivateMessage'); - }.property('topic.isPrivateMessage'), - - - actions: { - toggleSearch() { - this.toggleProperty('searchVisible'); - }, - showUserMenu() { - if (!this.get('userMenuVisible')) { - this.appEvents.trigger('dropdowns:closeAll'); - this.set('userMenuVisible', true); - } - }, - - fullPageSearch() { - const searchService = this.container.lookup('search-service:main'); - const context = searchService.get('searchContext'); - var params = ""; - - if (context) { - params = `?context=${context.type}&context_id=${context.id}&skip_context=true`; - } - - DiscourseURL.routeTo('/search' + params); - }, - toggleMenuPanel(visibleProp) { - this.toggleProperty(visibleProp); - this.appEvents.trigger('dropdowns:closeAll'); - }, - - toggleStar() { - const topic = this.get('topic'); - if (topic) topic.toggleStar(); - return false; - } - } -}); - -// Allow plugins to add to the sum of "flags" above the site map -const _flagProperties = []; -function addFlagProperty(prop) { - _flagProperties.pushObject(prop); +export function addFlagProperty(prop) { + Ember.warn("importing `addFlagProperty` is deprecated. Use the PluginAPI instead"); + realAddFlagProperty(prop); } - -function applyFlaggedProperties() { - const args = _flagProperties.slice(); - args.push(function() { - let sum = 0; - _flagProperties.forEach((fp) => sum += (this.get(fp) || 0)); - return sum; - }); - HeaderController.reopen({ flaggedPostsCount: Ember.computed.apply(this, args) }); -} - -addFlagProperty('currentUser.site_flagged_posts_count'); -addFlagProperty('currentUser.post_queue_new_count'); - -export { addFlagProperty, applyFlaggedProperties }; -export default HeaderController; diff --git a/app/assets/javascripts/discourse/controllers/history.js.es6 b/app/assets/javascripts/discourse/controllers/history.js.es6 index 52d0d1de8c..973ff24a45 100644 --- a/app/assets/javascripts/discourse/controllers/history.js.es6 +++ b/app/assets/javascripts/discourse/controllers/history.js.es6 @@ -3,6 +3,15 @@ import { categoryBadgeHTML } from 'discourse/helpers/category-link'; import computed from 'ember-addons/ember-computed-decorators'; import { propertyGreaterThan, propertyLessThan } from 'discourse/lib/computed'; +function customTagArray(fieldName) { + return function() { + var val = this.get(fieldName); + if (!val) { return val; } + if (!Array.isArray(val)) { val = [val]; } + return val; + }.property(fieldName); +} + // This controller handles displaying of history export default Ember.Controller.extend(ModalFunctionality, { loading: true, @@ -13,6 +22,9 @@ export default Ember.Controller.extend(ModalFunctionality, { if (this.site.mobileView) { this.set("viewMode", "inline"); } }.on("init"), + previousTagChanges: customTagArray('model.tags_changes.previous'), + currentTagChanges: customTagArray('model.tags_changes.current'), + refresh(postId, postVersion) { this.set("loading", true); diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6 index 02969cf5e1..d85d449ac7 100644 --- a/app/assets/javascripts/discourse/controllers/login.js.es6 +++ b/app/assets/javascripts/discourse/controllers/login.js.es6 @@ -27,7 +27,7 @@ export default Ember.Controller.extend(ModalFunctionality, { **/ hasAtLeastOneLoginButton: function() { return Em.get("Discourse.LoginMethod.all").length > 0; - }.property("Discourse.LoginMethod.all.@each"), + }.property("Discourse.LoginMethod.all.[]"), loginButtonText: function() { return this.get('loggingIn') ? I18n.t('login.logging_in') : I18n.t('login.title'); diff --git a/app/assets/javascripts/discourse/controllers/rename-tag.js.es6 b/app/assets/javascripts/discourse/controllers/rename-tag.js.es6 new file mode 100644 index 0000000000..3c5a7bc292 --- /dev/null +++ b/app/assets/javascripts/discourse/controllers/rename-tag.js.es6 @@ -0,0 +1,25 @@ +import ModalFunctionality from 'discourse/mixins/modal-functionality'; +import BufferedContent from 'discourse/mixins/buffered-content'; + +export default Ember.Controller.extend(ModalFunctionality, BufferedContent, { + + renameDisabled: function() { + const filterRegexp = new RegExp(this.site.tags_filter_regexp, "g"), + newId = this.get('buffered.id').replace(filterRegexp, '').trim(); + + return (newId.length === 0) || (newId === this.get('model.id')); + }.property('buffered.id', 'id'), + + actions: { + performRename() { + const tag = this.get('model'), + self = this; + tag.update({ id: this.get('buffered.id') }).then(function() { + self.send('closeModal'); + self.transitionToRoute('tags.show', tag.get('id')); + }).catch(function() { + self.flash(I18n.t('generic_error'), 'error'); + }); + } + } +}); diff --git a/app/assets/javascripts/discourse/controllers/tags-index.js.es6 b/app/assets/javascripts/discourse/controllers/tags-index.js.es6 new file mode 100644 index 0000000000..e2a49fee20 --- /dev/null +++ b/app/assets/javascripts/discourse/controllers/tags-index.js.es6 @@ -0,0 +1,15 @@ +export default Ember.Controller.extend({ + sortProperties: ['count:desc', 'id'], + + sortedTags: Ember.computed.sort('model', 'sortProperties'), + + actions: { + sortByCount() { + this.set('sortProperties', ['count:desc', 'id']); + }, + + sortById() { + this.set('sortProperties', ['id']); + } + } +}); diff --git a/app/assets/javascripts/discourse/controllers/tags-show.js.es6 b/app/assets/javascripts/discourse/controllers/tags-show.js.es6 new file mode 100644 index 0000000000..34c4729228 --- /dev/null +++ b/app/assets/javascripts/discourse/controllers/tags-show.js.es6 @@ -0,0 +1,133 @@ +import BulkTopicSelection from "discourse/mixins/bulk-topic-selection"; +import { default as NavItem, extraNavItemProperties, customNavItemHref } from 'discourse/models/nav-item'; + +if (extraNavItemProperties) { + extraNavItemProperties(function(text, opts) { + if (opts && opts.tagId) { + return {tagId: opts.tagId}; + } else { + return {}; + } + }); +} + +if (customNavItemHref) { + customNavItemHref(function(navItem) { + if (navItem.get('tagId')) { + var name = navItem.get('name'); + + if ( !Discourse.Site.currentProp('filters').contains(name) ) { + return null; + } + + var path = "/tags/", + category = navItem.get("category"); + + if(category){ + path += "c/"; + path += Discourse.Category.slugFor(category); + if (navItem.get('noSubcategories')) { path += '/none'; } + path += "/"; + } + + path += navItem.get('tagId') + "/l/"; + return path + name.replace(' ', '-'); + } else { + return null; + } + }); +} + + +export default Ember.Controller.extend(BulkTopicSelection, { + needs: ["application"], + + tag: null, + list: null, + canAdminTag: Ember.computed.alias("currentUser.staff"), + filterMode: null, + navMode: 'latest', + loading: false, + canCreateTopic: false, + order: 'default', + ascending: false, + status: null, + state: null, + search: null, + max_posts: null, + q: null, + + queryParams: ['order', 'ascending', 'status', 'state', 'search', 'max_posts', 'q'], + + navItems: function() { + return NavItem.buildList(this.get('category'), {tagId: this.get('tag.id'), filterMode: this.get('filterMode')}); + }.property('category', 'tag.id', 'filterMode'), + + showTagFilter: function() { + return Discourse.SiteSettings.show_filter_by_tag; + }.property('category'), + + categories: function() { + return Discourse.Category.list(); + }.property(), + + showAdminControls: function() { + return this.get('canAdminTag') && !this.get('category'); + }.property('canAdminTag', 'category'), + + loadMoreTopics() { + return this.get("list").loadMore(); + }, + + _showFooter: function() { + this.set("controllers.application.showFooter", !this.get("list.canLoadMore")); + }.observes("list.canLoadMore"), + + footerMessage: function() { + if (this.get('loading') || this.get('list.topics.length') !== 0) { return; } + + if (this.get('list.topics.length') === 0) { + return I18n.t('tagging.topics.none.' + this.get('navMode'), {tag: this.get('tag.id')}); + } else { + return I18n.t('tagging.topics.bottom.' + this.get('navMode'), {tag: this.get('tag.id')}); + } + }.property('navMode', 'list.topics.length', 'loading'), + + actions: { + changeSort(sortBy) { + if (sortBy === this.get('order')) { + this.toggleProperty('ascending'); + } else { + this.setProperties({ order: sortBy, ascending: false }); + } + this.send('invalidateModel'); + }, + + refresh() { + const self = this; + // TODO: this probably doesn't work anymore + return this.store.findFiltered('topicList', {filter: 'tags/' + this.get('tag.id')}).then(function(list) { + self.set("list", list); + self.resetSelected(); + }); + }, + + deleteTag() { + const self = this; + bootbox.confirm(I18n.t("tagging.delete_confirm"), function(result) { + if (!result) { return; } + + self.get("tag").destroyRecord().then(function() { + self.transitionToRoute("tags.index"); + }).catch(function() { + bootbox.alert(I18n.t("generic_error")); + }); + }); + }, + + changeTagNotification(id) { + const tagNotification = this.get("tagNotification"); + tagNotification.update({ notification_level: id }); + } + } +}); diff --git a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6 b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6 index 2dd79219e5..89a6b0e70a 100644 --- a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6 +++ b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6 @@ -14,11 +14,15 @@ addBulkButton('archiveTopics', 'archive_topics'); addBulkButton('showNotificationLevel', 'notification_level'); addBulkButton('resetRead', 'reset_read'); addBulkButton('unlistTopics', 'unlist_topics'); +addBulkButton('showTagTopics', 'change_tags'); // Modal for performing bulk actions on topics export default Ember.ArrayController.extend(ModalFunctionality, { + tags: null, buttonRows: null, + emptyTags: Ember.computed.empty('tags'), + onShow() { this.set('controllers.modal.modalClass', 'topic-bulk-actions-modal small'); @@ -73,6 +77,15 @@ export default Ember.ArrayController.extend(ModalFunctionality, { }, actions: { + showTagTopics() { + this.set('tags', ''); + this.send('changeBulkTemplate', 'bulk-tag'); + }, + + changeTags() { + this.performAndRefresh({type: 'change_tags', tags: this.get('tags')}); + }, + showChangeCategory() { this.send('changeBulkTemplate', 'modal/bulk_change_category'); this.set('controllers.modal.modalClass', 'topic-bulk-actions-modal full'); diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6 index f70f8877bc..1071f6d7f7 100644 --- a/app/assets/javascripts/discourse/controllers/topic.js.es6 +++ b/app/assets/javascripts/discourse/controllers/topic.js.es6 @@ -9,7 +9,7 @@ import Composer from 'discourse/models/composer'; import DiscourseURL from 'discourse/lib/url'; export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { - needs: ['header', 'modal', 'composer', 'quote-button', 'topic-progress', 'application'], + needs: ['modal', 'composer', 'quote-button', 'topic-progress', 'application'], multiSelect: false, allPostsSelected: false, editingTopic: false, @@ -108,6 +108,11 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { return post => this.postSelected(post); }.property(), + @computed('model.isPrivateMessage') + canEditTags(isPrivateMessage) { + return !isPrivateMessage && this.site.get('can_tag_topics'); + }, + actions: { fillGapBefore(args) { @@ -472,11 +477,6 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { this.get('content').toggleStatus('archived'); }, - // Toggle the star on the topic - toggleStar() { - this.get('content').toggleStar(); - }, - clearPin() { this.get('content').clearPin(); }, @@ -509,7 +509,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { }).then(q => { const postUrl = `${location.protocol}//${location.host}${post.get('url')}`; const postLink = `[${Handlebars.escapeExpression(self.get('model.title'))}](${postUrl})`; - composerController.get('model').appendText(`${I18n.t("post.continue_discussion", { postLink })}\n\n${q}`); + composerController.get('model').prependText(`${I18n.t("post.continue_discussion", { postLink })}\n\n${q}`, {new_line: true}); }); }, @@ -545,6 +545,14 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { changePostOwner(post) { this.get('selectedPosts').addObject(post); this.send('changeOwner'); + }, + + convertToPublicTopic() { + this.get('content').convertTopic("public"); + }, + + convertToPrivateMessage() { + this.get('content').convertTopic("private"); } }, @@ -625,10 +633,6 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { return false; }, - showStarButton: function() { - return Discourse.User.current() && !this.get('model.isPrivateMessage'); - }.property('model.isPrivateMessage'), - loadingHTML: function() { return spinnerHTML; }.property(), diff --git a/app/assets/javascripts/discourse/controllers/user-card.js.es6 b/app/assets/javascripts/discourse/controllers/user-card.js.es6 index 39d938b8c7..0001f1c23b 100644 --- a/app/assets/javascripts/discourse/controllers/user-card.js.es6 +++ b/app/assets/javascripts/discourse/controllers/user-card.js.es6 @@ -49,7 +49,7 @@ export default Ember.Controller.extend({ moreBadgesCount: function() { return this.get('user.badge_count') - this.get('user.featured_user_badges.length'); - }.property('user.badge_count', 'user.featured_user_badges.@each'), + }.property('user.badge_count', 'user.featured_user_badges.[]'), hasCardBadgeImage: function() { const img = this.get('user.card_badge.image'); diff --git a/app/assets/javascripts/discourse/controllers/user-notifications.js.es6 b/app/assets/javascripts/discourse/controllers/user-notifications.js.es6 index c06137a9e1..b61c7d45f6 100644 --- a/app/assets/javascripts/discourse/controllers/user-notifications.js.es6 +++ b/app/assets/javascripts/discourse/controllers/user-notifications.js.es6 @@ -5,18 +5,16 @@ export default Ember.ArrayController.extend({ this.set("controllers.application.showFooter", !this.get("model.canLoadMore")); }.observes("model.canLoadMore"), - showDismissButton: Ember.computed.gt('user.total_unread_notifications', 0), - currentPath: Em.computed.alias('controllers.application.currentPath'), actions: { - resetNew: function() { + resetNew() { Discourse.ajax('/notifications/mark-read', { method: 'PUT' }).then(() => { this.setEach('read', true); }); }, - loadMore: function() { + loadMore() { this.get('model').loadMore(); } } diff --git a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6 b/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6 index 06a1be30db..18f010adcc 100644 --- a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6 +++ b/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6 @@ -15,7 +15,7 @@ export default Ember.Controller.extend({ Discourse.User.currentProp('can_send_private_messages'); }.property('controllers.user.viewingSelf'), - @computed('selected.@each', 'bulkSelectEnabled') + @computed('selected.[]', 'bulkSelectEnabled') hasSelection(selected, bulkSelectEnabled){ return bulkSelectEnabled && selected && selected.length > 0; }, diff --git a/app/assets/javascripts/discourse/ember/resolver.js.es6 b/app/assets/javascripts/discourse/ember/resolver.js.es6 index d7124c0900..8f41a2c507 100644 --- a/app/assets/javascripts/discourse/ember/resolver.js.es6 +++ b/app/assets/javascripts/discourse/ember/resolver.js.es6 @@ -70,7 +70,7 @@ export default Ember.DefaultResolver.extend({ // If we end with the name we want, use it. This allows us to define components within plugins. const suffix = parsedName.type + 's/' + parsedName.fullNameWithoutType, dashed = Ember.String.dasherize(suffix), - moduleName = Ember.keys(requirejs.entries).find(function(e) { + moduleName = Object.keys(requirejs.entries).find(function(e) { return (e.indexOf(suffix, e.length - suffix.length) !== -1) || (e.indexOf(dashed, e.length - dashed.length) !== -1); }); @@ -151,11 +151,13 @@ export default Ember.DefaultResolver.extend({ const withoutType = parsedName.fullNameWithoutType, slashedType = withoutType.replace(/\./g, '/'), decamelized = withoutType.decamelize(), + dashed = decamelized.replace(/\./g, '-').replace(/\_/g, '-'), templates = Ember.TEMPLATES; return this._super(parsedName) || templates[slashedType] || templates[withoutType] || + templates[dashed] || templates[decamelized.replace(/\./, '/')] || templates[decamelized.replace(/\_/, '/')] || this.findAdminTemplate(parsedName) || diff --git a/app/assets/javascripts/discourse/helpers/discouse-tag.js.es6 b/app/assets/javascripts/discourse/helpers/discouse-tag.js.es6 new file mode 100644 index 0000000000..b6d9d35524 --- /dev/null +++ b/app/assets/javascripts/discourse/helpers/discouse-tag.js.es6 @@ -0,0 +1,6 @@ +import registerUnbound from 'discourse/helpers/register-unbound'; +import renderTag from 'discourse/lib/render-tag'; + +export default registerUnbound('discourse-tag', function(name, params) { + return new Handlebars.SafeString(renderTag(name, params)); +}); diff --git a/app/assets/javascripts/discourse/helpers/plugin-outlet.js.es6 b/app/assets/javascripts/discourse/helpers/plugin-outlet.js.es6 index 6da20c3423..f55beeba54 100644 --- a/app/assets/javascripts/discourse/helpers/plugin-outlet.js.es6 +++ b/app/assets/javascripts/discourse/helpers/plugin-outlet.js.es6 @@ -60,7 +60,7 @@ function findOutlets(collection, callback) { const disabledPlugins = Discourse.Site.currentProp('disabled_plugins') || []; - Ember.keys(collection).forEach(function(res) { + Object.keys(collection).forEach(function(res) { if (res.indexOf("/connectors/") !== -1) { // Skip any disabled plugins for (let i=0; i { + Object.keys(requirejs.entries).forEach(entry => { if ((/\/helpers\//).test(entry)) { require(entry, null, null, true); } diff --git a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 index 63ef5104b4..406b050d3b 100644 --- a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 +++ b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 @@ -10,7 +10,8 @@ export default { siteSettings = container.lookup('site-settings:main'), bus = container.lookup('message-bus:main'), keyValueStore = container.lookup('key-value-store:main'), - store = container.lookup('store:main'); + store = container.lookup('store:main'), + appEvents = container.lookup('app-events:main'); // clear old cached notifications, we used to store in local storage // TODO 2017 delete this line @@ -30,7 +31,7 @@ export default { }); } - bus.subscribe("/notification/" + user.get('id'), function(data) { + bus.subscribe(`/notification/${user.get('id')}`, function(data) { const oldUnread = user.get('unread_notifications'); const oldPM = user.get('unread_private_messages'); @@ -38,7 +39,7 @@ export default { user.set('unread_private_messages', data.unread_private_messages); if (oldUnread !== data.unread_notifications || oldPM !== data.unread_private_messages) { - user.set('lastNotificationChange', new Date()); + appEvents.trigger('notifications:changed'); } const stale = store.findStale('notification', {}, {cacheKey: 'recent-notifications'}); diff --git a/app/assets/javascripts/discourse/lib/app-events.js.es6 b/app/assets/javascripts/discourse/lib/app-events.js.es6 index 597c21b83d..59257700fd 100644 --- a/app/assets/javascripts/discourse/lib/app-events.js.es6 +++ b/app/assets/javascripts/discourse/lib/app-events.js.es6 @@ -1,25 +1 @@ - -var id = 1; -function newKey() { - return "_view_app_event_" + (id++); -} - -function createViewListener(eventName, cb) { - var extension = {}; - extension[newKey()] = function() { - this.appEvents.on(eventName, this, cb); - }.on('didInsertElement'); - - extension[newKey()] = function() { - this.appEvents.off(eventName, this, cb); - }.on('willDestroyElement'); - - return extension; -} - -function listenForViewEvent(viewClass, eventName, cb) { - viewClass.reopen(createViewListener(eventName, cb)); -} - -export { listenForViewEvent, createViewListener }; export default Ember.Object.extend(Ember.Evented); diff --git a/app/assets/javascripts/discourse/lib/category-tag-search.js.es6 b/app/assets/javascripts/discourse/lib/category-tag-search.js.es6 new file mode 100644 index 0000000000..d7895ff47a --- /dev/null +++ b/app/assets/javascripts/discourse/lib/category-tag-search.js.es6 @@ -0,0 +1,65 @@ +import { CANCELLED_STATUS } from 'discourse/lib/autocomplete'; +import Category from 'discourse/models/category'; + +var cache = {}; +var cacheTime; +var oldSearch; + +function updateCache(term, results) { + cache[term] = results; + cacheTime = new Date(); + return results; +} + +function searchTags(term, categories, limit) { + return new Ember.RSVP.Promise((resolve) => { + const clearPromise = setTimeout(() => { + resolve(CANCELLED_STATUS); + }, 5000); + + const debouncedSearch = _.debounce((q, cats, resultFunc) => { + oldSearch = $.ajax(Discourse.getURL("/tags/filter/search"), { + type: 'GET', + cache: true, + data: { limit: limit, q } + }); + + var returnVal = CANCELLED_STATUS; + + oldSearch.then((r) => { + var tags = r.results.map((tag) => { return { text: tag.text, count: tag.count }; }); + returnVal = cats.concat(tags); + }).always(() => { + oldSearch = null; + resultFunc(returnVal); + }); + }, 300); + + debouncedSearch(term, categories, (result) => { + clearTimeout(clearPromise); + resolve(updateCache(term, result)); + }); + }); +}; + +export function search(term, siteSettings) { + if (oldSearch) { + oldSearch.abort(); + oldSearch = null; + } + + if ((new Date() - cacheTime) > 30000) cache = {}; + const cached = cache[term]; + if (cached) return cached; + + const limit = 5; + var categories = Category.search(term, { limit }); + var numOfCategories = categories.length; + categories = categories.map((category) => { return { model: category }; }); + + if (numOfCategories !== limit && siteSettings.tagging_enabled) { + return searchTags(term, categories, limit - numOfCategories); + } else { + return updateCache(term, categories); + } +}; diff --git a/app/assets/javascripts/discourse/lib/click-track.js.es6 b/app/assets/javascripts/discourse/lib/click-track.js.es6 index 799c26ada8..775a638c7f 100644 --- a/app/assets/javascripts/discourse/lib/click-track.js.es6 +++ b/app/assets/javascripts/discourse/lib/click-track.js.es6 @@ -1,4 +1,5 @@ import DiscourseURL from 'discourse/lib/url'; +import { wantsNewWindow } from 'discourse/lib/intercept-click'; export function isValidLink($link) { return ($link.hasClass("track-link") || @@ -11,15 +12,24 @@ export default { if (Discourse.Utilities.selectedText() !== "") { return false; } var $link = $(e.currentTarget); - if ($link.hasClass('lightbox') || $link.hasClass('mention-group') || $link.hasClass('no-track-link')) { return true; } + + // don't track lightboxes, group mentions or links with disabled tracking + if ($link.hasClass('lightbox') || $link.hasClass('mention-group') || + $link.hasClass('no-track-link') || $link.hasClass('hashtag')) { + return true; + } + + // don't track links in quotes or in elided part + if ($link.parents('aside.quote,.elided').length) { return true; } var href = $link.attr('href') || $link.data('href'), - $article = $link.closest('article'), + $article = $link.closest('article,.excerpt,#revisions'), postId = $article.data('post-id'), - topicId = $('#topic').data('topic-id'), + topicId = $('#topic').data('topic-id') || $article.data('topic-id'), userId = $link.data('user-id'); - if (!href || href.trim().length === 0) { return; } + if (!href || href.trim().length === 0) { return false; } + if (href.indexOf("mailto:") === 0) { return true; } if (!userId) userId = $article.data('user-id'); @@ -52,7 +62,7 @@ export default { } // if they want to open in a new tab, do an AJAX request - if (e.shiftKey || e.metaKey || e.ctrlKey || e.which === 2) { + if (wantsNewWindow(e)) { Discourse.ajax("/clicks/track", { data: { url: href, diff --git a/app/assets/javascripts/discourse/lib/intercept-click.js.es6 b/app/assets/javascripts/discourse/lib/intercept-click.js.es6 index 6ce7a300f3..09367beca2 100644 --- a/app/assets/javascripts/discourse/lib/intercept-click.js.es6 +++ b/app/assets/javascripts/discourse/lib/intercept-click.js.es6 @@ -1,12 +1,16 @@ import DiscourseURL from 'discourse/lib/url'; +export function wantsNewWindow(e) { + return (e.isDefaultPrevented() || e.shiftKey || e.metaKey || e.ctrlKey || (e.button && e.button !== 0)); +} + /** Discourse does some server side rendering of HTML, such as the `cooked` contents of posts. The downside of this in an Ember app is the links will not go through the router. This jQuery code intercepts clicks on those links and routes them properly. **/ export default function interceptClick(e) { - if (e.isDefaultPrevented() || e.shiftKey || e.metaKey || e.ctrlKey) { return; } + if (wantsNewWindow(e)) { return; } const $currentTarget = $(e.currentTarget), href = $currentTarget.attr('href'); @@ -18,6 +22,7 @@ export default function interceptClick(e) { $currentTarget.data('auto-route') || $currentTarget.data('share-url') || $currentTarget.data('user-card') || + $currentTarget.hasClass('widget-link') || $currentTarget.hasClass('mention') || (!$currentTarget.hasClass('d-link') && $currentTarget.hasClass('ember-view')) || $currentTarget.hasClass('lightbox') || diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 index 748099a740..ef505ebe8e 100644 --- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 +++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 @@ -10,8 +10,8 @@ const bindings = { '.': {click: '.alert.alert-info.clickable', anonymous: true}, // show incoming/updated topics 'b': {handler: 'toggleBookmark'}, 'c': {handler: 'createTopic'}, - 'ctrl+f': {handler: 'showBuiltinSearch', anonymous: true}, - 'command+f': {handler: 'showBuiltinSearch', anonymous: true}, + 'ctrl+f': {handler: 'showPageSearch', anonymous: true}, + 'command+f': {handler: 'showPageSearch', anonymous: true}, 'd': {postAction: 'deletePost'}, 'e': {postAction: 'editPost'}, 'end': {handler: 'goToLastPost', anonymous: true}, @@ -142,32 +142,10 @@ export default { this._changeSection(-1); }, - showBuiltinSearch() { - if (this.container.lookup('controller:header').get('searchVisible')) { - this.toggleSearch(); - return true; - } - - this.searchService.set('searchContextEnabled', false); - - const currentPath = this.container.lookup('controller:application').get('currentPath'), - blacklist = [ /^discovery\.categories/ ], - whitelist = [ /^topic\./ ], - check = function(regex) { return !!currentPath.match(regex); }; - let showSearch = whitelist.any(check) && !blacklist.any(check); - - // If we're viewing a topic, only intercept search if there are cloaked posts - if (showSearch && currentPath.match(/^topic\./)) { - showSearch = $('.topic-post .cooked, .small-action:not(.time-gap)').length < this.container.lookup('controller:topic').get('model.postStream.stream.length'); - } - - if (showSearch) { - this.searchService.set('searchContextEnabled', true); - this.toggleSearch(); - return false; - } - - return true; + showPageSearch(event) { + Ember.run(() => { + this.appEvents.trigger('header:keyboard-trigger', {type: 'page-search', event}); + }); }, createTopic() { @@ -182,17 +160,16 @@ export default { this.container.lookup('controller:topic-progress').send('toggleExpansion', {highlight: true}); }, - toggleSearch() { - this.container.lookup('controller:header').send('toggleSearch'); - return false; + toggleSearch(event) { + this.appEvents.trigger('header:keyboard-trigger', {type: 'search', event}); }, - toggleHamburgerMenu() { - this.container.lookup('controller:header').send('toggleMenuPanel', 'hamburgerVisible'); + toggleHamburgerMenu(event) { + this.appEvents.trigger('header:keyboard-trigger', {type: 'hamburger', event}); }, - showCurrentUser() { - this.container.lookup('controller:header').send('toggleMenuPanel', 'userMenuVisible'); + showCurrentUser(event) { + this.appEvents.trigger('header:keyboard-trigger', {type: 'user', event}); }, showHelpModal() { @@ -226,7 +203,13 @@ export default { const post = topicController.get('model.postStream.posts').findBy('id', selectedPostId); if (post) { // TODO: Use ember closure actions - const result = topicController._actions[action].call(topicController, post); + let actionMethod = topicController._actions[action]; + if (!actionMethod) { + const topicRoute = container.lookup('route:topic'); + actionMethod = topicRoute._actions[action]; + } + + const result = actionMethod.call(topicController, post); if (result && result.then) { this.appEvents.trigger('post-stream:refresh', { id: selectedPostId }); } diff --git a/app/assets/javascripts/discourse/lib/link-tag-hashtag.js.es6 b/app/assets/javascripts/discourse/lib/link-tag-hashtag.js.es6 new file mode 100644 index 0000000000..c37610ff03 --- /dev/null +++ b/app/assets/javascripts/discourse/lib/link-tag-hashtag.js.es6 @@ -0,0 +1,52 @@ +import { replaceSpan } from 'discourse/lib/category-hashtags'; +import { TAG_HASHTAG_POSTFIX } from 'discourse/lib/tag-hashtags'; + +const validTagHashtags = {}; +const checkedTagHashtags = []; +const testedClass = 'tag-hashtag-tested'; + +function updateFound($hashtags, tagValues) { + Ember.run.schedule('afterRender', () => { + $hashtags.each((index, hashtag) => { + const tagValue = tagValues[index]; + const link = validTagHashtags[tagValue]; + const $hashtag = $(hashtag); + + if (link) { + replaceSpan($hashtag, tagValue, link); + } else if (checkedTagHashtags.indexOf(tagValue) !== -1) { + $hashtag.addClass(testedClass); + } + }); + }); +} + +export function linkSeenTagHashtags($elem) { + const $hashtags = $(`span.hashtag:not(.${testedClass})`, $elem); + const unseen = []; + + if ($hashtags.length) { + const tagValues = $hashtags.map((_, hashtag) => { + return $(hashtag).text().substr(1).replace(`${TAG_HASHTAG_POSTFIX}`, ""); + }); + + if (tagValues.length) { + _.uniq(tagValues).forEach((tagValue) => { + if (checkedTagHashtags.indexOf(tagValue) === -1) unseen.push(tagValue); + }); + } + updateFound($hashtags, tagValues); + } + + return unseen; +}; + +export function fetchUnseenTagHashtags(tagValues) { + return Discourse.ajax("/tags/check", { data: { tag_values: tagValues } }) + .then((response) => { + response.valid.forEach((tag) => { + validTagHashtags[tag.value] = tag.url; + }); + checkedTagHashtags.push.apply(checkedTagHashtags, tagValues); + }); +} diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6 index 178f48e5a9..028570517d 100644 --- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 +++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6 @@ -9,6 +9,7 @@ import { createWidget, decorateWidget, changeSetting } from 'discourse/widgets/w import { onPageChange } from 'discourse/lib/page-tracker'; import { preventCloak } from 'discourse/widgets/post-stream'; import { h } from 'virtual-dom'; +import { addFlagProperty } from 'discourse/components/site-header'; class PluginApi { constructor(version, container) { @@ -48,7 +49,7 @@ class PluginApi { if (!opts.onlyStream) { decorate(ComposerEditor, 'previewRefreshed', callback); - decorate(this.container.lookupFactory('view:user-stream'), 'didInsertElement', callback); + decorate(this.container.lookupFactory('component:user-stream'), 'didInsertElement', callback); } } @@ -284,11 +285,20 @@ class PluginApi { createWidget(name, args) { return createWidget(name, args); } + + /** + * Adds a property that can be summed for calculating the flag counter + **/ + addFlagProperty(property) { + return addFlagProperty(property); + } + } let _pluginv01; function getPluginApi(version) { - if (version === "0.1" || version === "0.2" || version === "0.3") { + version = parseFloat(version); + if (version <= 0.4) { if (!_pluginv01) { _pluginv01 = new PluginApi(version, Discourse.__container__); } @@ -299,7 +309,7 @@ function getPluginApi(version) { } /** - * withPluginApi(version, apiCode, noApi) + * withPluginApi(version, apiCodeCallback, opts) * * Helper to version our client side plugin API. Pass the version of the API that your * plugin is coded against. If that API is available, the `apiCodeCallback` function will diff --git a/app/assets/javascripts/discourse/lib/render-tag.js.es6 b/app/assets/javascripts/discourse/lib/render-tag.js.es6 new file mode 100644 index 0000000000..5b62798541 --- /dev/null +++ b/app/assets/javascripts/discourse/lib/render-tag.js.es6 @@ -0,0 +1,37 @@ +import { h } from 'virtual-dom'; + +export default function renderTag(tag, params) { + params = params || {}; + tag = Handlebars.Utils.escapeExpression(tag); + const classes = ['tag-' + tag, 'discourse-tag']; + const tagName = params.tagName || "a"; + const href = tagName === "a" ? " href='" + Discourse.getURL("/tags/" + tag) + "' " : ""; + + if (Discourse.SiteSettings.tag_style || params.style) { + classes.push(params.style || Discourse.SiteSettings.tag_style); + } + + let val = "<" + tagName + href + " class='" + classes.join(" ") + "'>" + tag + ""; + + if (params.count) { + val += " x" + params.count + ""; + } + + return val; +}; + +export function tagNode(tag, params) { + const classes = ['tag-' + tag, 'discourse-tag']; + const tagName = params.tagName || "a"; + + if (Discourse.SiteSettings.tag_style || params.style) { + classes.push(params.style || Discourse.SiteSettings.tag_style); + } + + if (tagName === 'a') { + const href = Discourse.getURL(`/tags/${tag}`); + return h(tagName, { className: classes.join(' '), attributes: { href } }, tag); + } else { + return h(tagName, { className: classes.join(' ') }, tag); + } +} diff --git a/app/assets/javascripts/discourse/lib/tag-hashtags.js.es6 b/app/assets/javascripts/discourse/lib/tag-hashtags.js.es6 new file mode 100644 index 0000000000..13eb406545 --- /dev/null +++ b/app/assets/javascripts/discourse/lib/tag-hashtags.js.es6 @@ -0,0 +1 @@ +export const TAG_HASHTAG_POSTFIX = '::tag'; diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6 index e0074df059..50ef5e45f6 100644 --- a/app/assets/javascripts/discourse/lib/url.js.es6 +++ b/app/assets/javascripts/discourse/lib/url.js.es6 @@ -2,7 +2,7 @@ let _jumpScheduled = false; const rewrites = []; -const DiscourseURL = Ember.Object.createWithMixins({ +const DiscourseURL = Ember.Object.extend({ // Used for matching a topic TOPIC_REGEXP: /\/t\/([^\/]+)\/(\d+)\/?(\d+)?/, @@ -327,7 +327,6 @@ const DiscourseURL = Ember.Object.createWithMixins({ } }); } - -}); +}).create(); export default DiscourseURL; diff --git a/app/assets/javascripts/discourse/mixins/load-more.js.es6 b/app/assets/javascripts/discourse/mixins/load-more.js.es6 index 16c8734054..c422e1cd63 100644 --- a/app/assets/javascripts/discourse/mixins/load-more.js.es6 +++ b/app/assets/javascripts/discourse/mixins/load-more.js.es6 @@ -5,14 +5,6 @@ import { on } from 'ember-addons/ember-computed-decorators'; // Provides the ability to load more items for a view which is scrolled to the bottom. export default Ember.Mixin.create(Ember.ViewTargetActionSupport, Scrolling, { - init() { - this._super(); - if (!this._viaComponent) { - console.warn('Using `LoadMore` as a view mixin is deprecated. Use `{{load-more}}` instead'); - } - - }, - scrolled() { const eyeline = this.get('eyeline'); return eyeline && eyeline.update(); diff --git a/app/assets/javascripts/discourse/mixins/url-refresh.js.es6 b/app/assets/javascripts/discourse/mixins/url-refresh.js.es6 index e5ab51cb3d..bf1710d1c1 100644 --- a/app/assets/javascripts/discourse/mixins/url-refresh.js.es6 +++ b/app/assets/javascripts/discourse/mixins/url-refresh.js.es6 @@ -1,12 +1,16 @@ // A Mixin that a view can use to listen for 'url:refresh' when -// it is on screen, and will send an action to the controller to -// refresh its data. +// it is on screen, and will send an action to refresh its data. // // This is useful if you want to get around Ember's default // behavior of not refreshing when navigating to the same place. +export default { + didInsertElement() { + this._super(); + this.appEvents.on('url:refresh', () => this.sendAction('refresh')); + }, -import { createViewListener } from 'discourse/lib/app-events'; - -export default createViewListener('url:refresh', function() { - this.get('controller').send('refresh'); -}); + willDestroyElement() { + this._super(); + this.appEvents.off('url:refresh'); + } +}; diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6 index 9107fe62f1..b7d5a318b5 100644 --- a/app/assets/javascripts/discourse/models/composer.js.es6 +++ b/app/assets/javascripts/discourse/models/composer.js.es6 @@ -28,12 +28,14 @@ const CLOSED = 'closed', archetype: 'archetypeId', target_usernames: 'targetUsernames', typing_duration_msecs: 'typingTime', - composer_open_duration_msecs: 'composerTime' + composer_open_duration_msecs: 'composerTime', + tags: 'tags' }, _edit_topic_serializer = { title: 'topic.title', - categoryId: 'topic.category.id' + categoryId: 'topic.category.id', + tags: 'topic.tags' }; const Composer = RestModel.extend({ @@ -358,6 +360,15 @@ const Composer = RestModel.extend({ return before.length + text.length; }, + prependText(text, opts) { + const reply = (this.get('reply') || ''); + + if (opts && opts.new_line && reply.length > 0) { + text = text.trim() + "\n\n"; + } + this.set('reply', text + reply); + }, + applyTopicTemplate(oldCategoryId, categoryId) { if (this.get('action') !== CREATE_TOPIC) { return; } let reply = this.get('reply'); diff --git a/app/assets/javascripts/discourse/models/post-stream.js.es6 b/app/assets/javascripts/discourse/models/post-stream.js.es6 index 1555118be5..75e9ef2382 100644 --- a/app/assets/javascripts/discourse/models/post-stream.js.es6 +++ b/app/assets/javascripts/discourse/models/post-stream.js.es6 @@ -40,7 +40,7 @@ export default RestModel.extend({ notLoading: Ember.computed.not('loading'), filteredPostsCount: Ember.computed.alias("stream.length"), - @computed('posts.@each') + @computed('posts.[]') hasPosts() { return this.get('posts.length') > 0; }, @@ -53,7 +53,7 @@ export default RestModel.extend({ canAppendMore: Ember.computed.and('notLoading', 'hasPosts', 'lastPostNotLoaded'), canPrependMore: Ember.computed.and('notLoading', 'hasPosts', 'firstPostNotLoaded'), - @computed('hasLoadedData', 'firstPostId', 'posts.@each') + @computed('hasLoadedData', 'firstPostId', 'posts.[]') firstPostPresent(hasLoadedData, firstPostId) { if (!hasLoadedData) { return false; } return !!this.get('posts').findProperty('id', firstPostId); @@ -101,7 +101,7 @@ export default RestModel.extend({ Returns the window of posts above the current set in the stream, bound to the top of the stream. This is the collection we'll ask for when scrolling upwards. **/ - @computed('posts.@each', 'stream.@each') + @computed('posts.[]', 'stream.[]') previousWindow() { // If we can't find the last post loaded, bail const firstPost = _.first(this.get('posts')); @@ -121,7 +121,7 @@ export default RestModel.extend({ Returns the window of posts below the current set in the stream, bound by the bottom of the stream. This is the collection we use when scrolling downwards. **/ - @computed('posts.lastObject', 'stream.@each') + @computed('posts.lastObject', 'stream.[]') nextWindow(lastLoadedPost) { // If we can't find the last post loaded, bail if (!lastLoadedPost) { return []; } diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6 index 37005bc993..c2403aafac 100644 --- a/app/assets/javascripts/discourse/models/post.js.es6 +++ b/app/assets/javascripts/discourse/models/post.js.es6 @@ -108,7 +108,7 @@ const Post = RestModel.extend({ // Put the metaData into the request if (metaData) { data.meta_data = {}; - Ember.keys(metaData).forEach(function(key) { data.meta_data[key] = metaData.get(key); }); + Object.keys(metaData).forEach(function(key) { data.meta_data[key] = metaData.get(key); }); } return data; diff --git a/app/assets/javascripts/discourse/models/site.js.es6 b/app/assets/javascripts/discourse/models/site.js.es6 index 988ba1eac7..37c1299049 100644 --- a/app/assets/javascripts/discourse/models/site.js.es6 +++ b/app/assets/javascripts/discourse/models/site.js.es6 @@ -15,7 +15,7 @@ const Site = RestModel.extend({ return result; }, - @computed("post_action_types.@each") + @computed("post_action_types.[]") flagTypes() { const postActionTypes = this.get('post_action_types'); if (!postActionTypes) return []; @@ -26,7 +26,7 @@ const Site = RestModel.extend({ categoriesByCount: Ember.computed.sort('categories', 'topicCountDesc'), // Sort subcategories under parents - @computed("categoriesByCount", "categories.@each") + @computed("categoriesByCount", "categories.[]") sortedCategories(cats) { const result = [], remaining = {}; @@ -41,7 +41,7 @@ const Site = RestModel.extend({ } }); - Ember.keys(remaining).forEach(parentCategoryId => { + Object.keys(remaining).forEach(parentCategoryId => { const category = result.findBy('id', parseInt(parentCategoryId, 10)), index = result.indexOf(category); diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6 index e6cd21304d..700e07aeb5 100644 --- a/app/assets/javascripts/discourse/models/topic.js.es6 +++ b/app/assets/javascripts/discourse/models/topic.js.es6 @@ -4,6 +4,7 @@ import { propertyEqual } from 'discourse/lib/computed'; import { longDate } from 'discourse/lib/formatter'; import computed from 'ember-addons/ember-computed-decorators'; import ActionSummary from 'discourse/models/action-summary'; +import { popupAjaxError } from 'discourse/lib/ajax-error'; export function loadTopicView(topic, args) { const topicId = topic.get('id'); @@ -32,7 +33,7 @@ const Topic = RestModel.extend({ return poster && poster.user; }, - @computed('posters.@each') + @computed('posters.[]') lastPoster(posters) { var user; if (posters && posters.length > 0) { @@ -72,6 +73,24 @@ const Topic = RestModel.extend({ return this.store.createRecord('postStream', {id: this.get('id'), topic: this}); }.property(), + @computed('tags') + visibleListTags(tags) { + if (!tags || !Discourse.SiteSettings.suppress_overlapping_tags_in_list) { + return tags; + } + + const title = this.get('title'); + const newTags = []; + + tags.forEach(function(tag){ + if (title.toLowerCase().indexOf(tag) === -1 || Discourse.SiteSettings.staff_tags.indexOf(tag) !== -1) { + newTags.push(tag); + } + }); + + return newTags; + }, + replyCount: function() { return this.get('posts_count') - 1; }.property('posts_count'), @@ -428,8 +447,13 @@ const Topic = RestModel.extend({ }).finally(()=>this.set('archiving', false)); return promise; - } + }, + convertTopic(type) { + return Discourse.ajax(`/t/${this.get('id')}/convert-topic/${type}`, {type: 'PUT'}).then(() => { + window.location.reload(); + }).catch(popupAjaxError); + } }); Topic.reopenClass({ diff --git a/app/assets/javascripts/discourse/models/user-action.js.es6 b/app/assets/javascripts/discourse/models/user-action.js.es6 index 50af402544..a4e784bd24 100644 --- a/app/assets/javascripts/discourse/models/user-action.js.es6 +++ b/app/assets/javascripts/discourse/models/user-action.js.es6 @@ -147,10 +147,10 @@ const UserAction = RestModel.extend({ } return rval; }.property("childGroups", - "childGroups.likes.items", "childGroups.likes.items.@each", - "childGroups.stars.items", "childGroups.stars.items.@each", - "childGroups.edits.items", "childGroups.edits.items.@each", - "childGroups.bookmarks.items", "childGroups.bookmarks.items.@each"), + "childGroups.likes.items", "childGroups.likes.items.[]", + "childGroups.stars.items", "childGroups.stars.items.[]", + "childGroups.edits.items", "childGroups.edits.items.[]", + "childGroups.bookmarks.items", "childGroups.bookmarks.items.[]"), switchToActing() { this.setProperties({ diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6 index b74c2cd2cc..55456dfb1a 100644 --- a/app/assets/javascripts/discourse/models/user.js.es6 +++ b/app/assets/javascripts/discourse/models/user.js.es6 @@ -136,7 +136,7 @@ const User = RestModel.extend({ }, copy() { - return Discourse.User.create(this.getProperties(Ember.keys(this))); + return Discourse.User.create(this.getProperties(Object.keys(this))); }, save() { @@ -229,7 +229,7 @@ const User = RestModel.extend({ ua.action_type === UserAction.TYPES.topics; }, - @computed("groups.@each") + @computed("groups.[]") displayGroups() { const groups = this.get('groups'); const filtered = groups.filter(group => { diff --git a/app/assets/javascripts/discourse/router.js.es6 b/app/assets/javascripts/discourse/router.js.es6 index 950e78cb8e..0223dfe41b 100644 --- a/app/assets/javascripts/discourse/router.js.es6 +++ b/app/assets/javascripts/discourse/router.js.es6 @@ -15,7 +15,7 @@ export function mapRoutes() { // will be built automatically. You can supply a `resource` property to // automatically put it in that resource, such as `admin`. That way plugins // can define admin routes. - Ember.keys(requirejs._eak_seen).forEach(function(key) { + Object.keys(requirejs._eak_seen).forEach(function(key) { if (/route-map$/.test(key)) { var module = require(key, null, null, true); if (!module || !module.default) { throw new Error(key + ' must export a route map.'); } diff --git a/app/assets/javascripts/discourse/routes/app-route-map.js.es6 b/app/assets/javascripts/discourse/routes/app-route-map.js.es6 index f8c278db19..adc3436d9b 100644 --- a/app/assets/javascripts/discourse/routes/app-route-map.js.es6 +++ b/app/assets/javascripts/discourse/routes/app-route-map.js.es6 @@ -118,4 +118,16 @@ export default function() { this.resource('queued-posts', { path: '/queued-posts' }); this.route('full-page-search', {path: '/search'}); + + this.resource('tags', function() { + this.route('show', {path: '/:tag_id'}); + this.route('showCategory', {path: '/c/:category/:tag_id'}); + this.route('showParentCategory', {path: '/c/:parent_category/:category/:tag_id'}); + + Discourse.Site.currentProp('filters').forEach(filter => { + this.route('show' + filter.capitalize(), {path: '/:tag_id/l/' + filter}); + this.route('showCategory' + filter.capitalize(), {path: '/c/:category/:tag_id/l/' + filter}); + this.route('showParentCategory' + filter.capitalize(), {path: '/c/:parent_category/:category/:tag_id/l/' + filter}); + }); + }); } diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6 index b057bcba8c..7954ade89f 100644 --- a/app/assets/javascripts/discourse/routes/application.js.es6 +++ b/app/assets/javascripts/discourse/routes/application.js.es6 @@ -3,6 +3,7 @@ import logout from 'discourse/lib/logout'; import showModal from 'discourse/lib/show-modal'; import OpenComposer from "discourse/mixins/open-composer"; import Category from 'discourse/models/category'; +import mobile from 'discourse/lib/mobile'; function unlessReadOnly(method, message) { return function() { @@ -25,6 +26,22 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, { actions: { + showSearchHelp() { + Discourse.ajax("/static/search_help.html", { dataType: 'html' }).then(model => { + showModal('searchHelp', { model }); + }); + }, + + toggleAnonymous() { + Discourse.ajax("/users/toggle-anon", {method: 'POST'}).then(() => { + window.location.reload(); + }); + }, + + toggleMobileView() { + mobile.toggleMobileView(); + }, + logout: unlessReadOnly('_handleLogout', I18n.t("read_only_mode.logout_disabled")), _collectTitleTokens(tokens) { diff --git a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 b/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 index 990a882157..b2e5f3281e 100644 --- a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 +++ b/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 @@ -4,7 +4,7 @@ import { queryParams } from 'discourse/controllers/discovery-sortable'; function filterQueryParams(params, defaultParams) { const findOpts = defaultParams || {}; if (params) { - Ember.keys(queryParams).forEach(function(opt) { + Object.keys(queryParams).forEach(function(opt) { if (params[opt]) { findOpts[opt] = params[opt]; } }); } @@ -38,7 +38,7 @@ function findTopicList(store, tracking, filter, filterParams, extras) { // Clean up any string parameters that might slip through filterParams = filterParams || {}; - Ember.keys(filterParams).forEach(function(k) { + Object.keys(filterParams).forEach(function(k) { const val = filterParams[k]; if (val === "undefined" || val === "null" || val === 'false') { filterParams[k] = undefined; diff --git a/app/assets/javascripts/discourse/routes/discourse.js.es6 b/app/assets/javascripts/discourse/routes/discourse.js.es6 index 5576fb422c..47fd25ed7d 100644 --- a/app/assets/javascripts/discourse/routes/discourse.js.es6 +++ b/app/assets/javascripts/discourse/routes/discourse.js.es6 @@ -75,7 +75,6 @@ const DiscourseRoute = Ember.Route.extend({ }); export function cleanDOM() { - if (window.MiniProfiler) { window.MiniProfiler.pageTransition(); } diff --git a/app/assets/javascripts/discourse/routes/group-index.js.es6 b/app/assets/javascripts/discourse/routes/group-index.js.es6 index bb8ecaeb03..a7baf27a15 100644 --- a/app/assets/javascripts/discourse/routes/group-index.js.es6 +++ b/app/assets/javascripts/discourse/routes/group-index.js.es6 @@ -1,14 +1,24 @@ -export default Discourse.Route.extend({ - actions: { - didTransition() { return true; } - }, +export function buildIndex(type) { + return Discourse.Route.extend({ + type, - model() { - return this.modelFor("group").findPosts(); - }, + model() { + return this.modelFor("group").findPosts({ type }); + }, - setupController(controller, model) { - controller.set("model", model); - this.controllerFor("group").set("showing", "posts"); - } -}); + setupController(controller, model) { + this.controllerFor('group-index').setProperties({ model, type }); + this.controllerFor("group").set("showing", type); + }, + + renderTemplate() { + this.render('group-index'); + }, + + actions: { + didTransition() { return true; } + } + }); +} + +export default buildIndex('posts'); diff --git a/app/assets/javascripts/discourse/routes/group-members.js.es6 b/app/assets/javascripts/discourse/routes/group-members.js.es6 index 22e328cacf..c6e00e8028 100644 --- a/app/assets/javascripts/discourse/routes/group-members.js.es6 +++ b/app/assets/javascripts/discourse/routes/group-members.js.es6 @@ -8,5 +8,4 @@ export default Discourse.Route.extend({ controller.set("model", model); model.findMembers(); } - }); diff --git a/app/assets/javascripts/discourse/routes/group-mentions.js.es6 b/app/assets/javascripts/discourse/routes/group-mentions.js.es6 index 1054fb18d3..d5c7471f51 100644 --- a/app/assets/javascripts/discourse/routes/group-mentions.js.es6 +++ b/app/assets/javascripts/discourse/routes/group-mentions.js.es6 @@ -1,11 +1,3 @@ -export default Discourse.Route.extend({ +import { buildIndex } from 'discourse/routes/group-index'; - model() { - return this.modelFor("group").findPosts({type: 'mentions'}); - }, - - setupController(controller, model) { - controller.set("model", model); - this.controllerFor("group").set("showing", "mentions"); - } -}); +export default buildIndex('mentions'); diff --git a/app/assets/javascripts/discourse/routes/group-messages.js.es6 b/app/assets/javascripts/discourse/routes/group-messages.js.es6 index 34e077e362..df27a3f793 100644 --- a/app/assets/javascripts/discourse/routes/group-messages.js.es6 +++ b/app/assets/javascripts/discourse/routes/group-messages.js.es6 @@ -1,11 +1,3 @@ -export default Discourse.Route.extend({ +import { buildIndex } from 'discourse/routes/group-index'; - model() { - return this.modelFor("group").findPosts({type: 'messages'}); - }, - - setupController(controller, model) { - controller.set("model", model); - this.controllerFor("group").set("showing", "messages"); - } -}); +export default buildIndex('messages'); diff --git a/app/assets/javascripts/discourse/routes/group-topics.js.es6 b/app/assets/javascripts/discourse/routes/group-topics.js.es6 index 397572e77b..991bb7475a 100644 --- a/app/assets/javascripts/discourse/routes/group-topics.js.es6 +++ b/app/assets/javascripts/discourse/routes/group-topics.js.es6 @@ -1,11 +1,3 @@ -export default Discourse.Route.extend({ +import { buildIndex } from 'discourse/routes/group-index'; - model() { - return this.modelFor("group").findPosts({type: 'topics'}); - }, - - setupController(controller, model) { - controller.set("model", model); - this.controllerFor("group").set("showing", "topics"); - } -}); +export default buildIndex('topics'); diff --git a/app/assets/javascripts/discourse/routes/tags-index.js.es6 b/app/assets/javascripts/discourse/routes/tags-index.js.es6 new file mode 100644 index 0000000000..7fbd3d529e --- /dev/null +++ b/app/assets/javascripts/discourse/routes/tags-index.js.es6 @@ -0,0 +1,16 @@ +export default Discourse.Route.extend({ + model() { + return this.store.findAll('tag'); + }, + + titleToken() { + return I18n.t("tagging.tags"); + }, + + actions: { + didTransition() { + this.controllerFor("application").set("showFooter", true); + return true; + } + } +}); diff --git a/app/assets/javascripts/discourse/routes/tags-show.js.es6 b/app/assets/javascripts/discourse/routes/tags-show.js.es6 new file mode 100644 index 0000000000..ea8762745b --- /dev/null +++ b/app/assets/javascripts/discourse/routes/tags-show.js.es6 @@ -0,0 +1,137 @@ +import Composer from 'discourse/models/composer'; +import showModal from "discourse/lib/show-modal"; +import { findTopicList } from 'discourse/routes/build-topic-route'; + +export default Discourse.Route.extend({ + navMode: 'latest', + + renderTemplate() { + const controller = this.controllerFor('tags.show'); + this.render('tags.show', { controller }); + }, + + model(params) { + var tag = this.store.createRecord("tag", { id: Handlebars.Utils.escapeExpression(params.tag_id) }), + f = ''; + + if (params.category) { + f = 'c/'; + if (params.parent_category) { f += params.parent_category + '/'; } + f += params.category + '/l/'; + } + f += this.get('navMode'); + this.set('filterMode', f); + + if (params.category) { this.set('categorySlug', params.category); } + if (params.parent_category) { this.set('parentCategorySlug', params.parent_category); } + + if (this.get("currentUser")) { + // If logged in, we should get the tag"s user settings + return this.store.find("tagNotification", tag.get("id")).then(tn => { + this.set("tagNotification", tn); + return tag; + }); + } + + return tag; + }, + + afterModel(tag) { + const controller = this.controllerFor('tags.show'); + controller.set('loading', true); + + const params = controller.getProperties('order', 'ascending'); + + const categorySlug = this.get('categorySlug'); + const parentCategorySlug = this.get('parentCategorySlug'); + const filter = this.get('navMode'); + + if (categorySlug) { + var category = Discourse.Category.findBySlug(categorySlug, parentCategorySlug); + if (parentCategorySlug) { + params.filter = `tags/c/${parentCategorySlug}/${categorySlug}/${tag.id}/l/${filter}`; + } else { + params.filter = `tags/c/${categorySlug}/${tag.id}/l/${filter}`; + } + + this.set('category', category); + } else { + params.filter = `tags/${tag.id}/l/${filter}`; + this.set('category', null); + } + + return findTopicList(this.store, this.topicTrackingState, params.filter, params, {}).then(function(list) { + controller.set('list', list); + controller.set('canCreateTopic', list.get('can_create_topic')); + if (list.topic_list.tags) { + Discourse.Site.currentProp('top_tags', list.topic_list.tags); + } + controller.set('loading', false); + }); + }, + + titleToken() { + const filterText = I18n.t('filters.' + this.get('navMode').replace('/', '.') + '.title'), + controller = this.controllerFor('tags.show'); + + if (this.get('category')) { + return I18n.t('tagging.filters.with_category', { filter: filterText, tag: controller.get('model.id'), category: this.get('category.name')}); + } else { + return I18n.t('tagging.filters.without_category', { filter: filterText, tag: controller.get('model.id')}); + } + }, + + setupController(controller, model) { + this.controllerFor('tags.show').setProperties({ + model, + tag: model, + category: this.get('category'), + filterMode: this.get('filterMode'), + navMode: this.get('navMode'), + tagNotification: this.get('tagNotification') + }); + }, + + actions: { + invalidateModel() { + this.refresh(); + }, + + renameTag(tag) { + showModal("rename-tag", { model: tag }); + }, + + createTopic() { + var controller = this.controllerFor("tags.show"), + self = this; + + this.controllerFor('composer').open({ + categoryId: controller.get('category.id'), + action: Composer.CREATE_TOPIC, + draftKey: controller.get('list.draft_key'), + draftSequence: controller.get('list.draft_sequence') + }).then(function() { + // Pre-fill the tags input field + if (controller.get('model.id')) { + var c = self.controllerFor('composer').get('model'); + c.set('tags', [controller.get('model.id')]); + } + }); + }, + + didTransition() { + this.controllerFor("tags.show")._showFooter(); + return true; + }, + + willTransition(transition) { + if (!Discourse.SiteSettings.show_filter_by_tag) { return true; } + + if ((transition.targetName.indexOf("discovery.parentCategory") !== -1 || + transition.targetName.indexOf("discovery.category") !== -1) && !transition.queryParams.allTags ) { + this.transitionTo("/tags" + transition.intent.url + "/" + this.currentModel.get("id")); + } + return true; + } + } +}); diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6 index 4297186f07..cd627ce46d 100644 --- a/app/assets/javascripts/discourse/routes/topic.js.es6 +++ b/app/assets/javascripts/discourse/routes/topic.js.es6 @@ -179,8 +179,9 @@ const TopicRoute = Discourse.Route.extend({ this.searchService.set('searchContext', null); this.controllerFor('user-card').set('visible', false); - const topicController = this.controllerFor('topic'), - postStream = topicController.get('model.postStream'); + const topicController = this.controllerFor('topic'); + const postStream = topicController.get('model.postStream'); + postStream.cancelFilter(); topicController.set('multiSelect', false); @@ -188,11 +189,7 @@ const TopicRoute = Discourse.Route.extend({ this.controllerFor('composer').set('topic', null); this.screenTrack.stop(); - const headerController = this.controllerFor('header'); - if (headerController) { - headerController.set('topic', null); - headerController.set('showExtraInfo', false); - } + this.appEvents.trigger('header:hide-topic'); }, setupController(controller, model) { @@ -207,7 +204,6 @@ const TopicRoute = Discourse.Route.extend({ TopicRoute.trigger('setupTopicController', this); - this.controllerFor('header').setProperties({ topic: model, showExtraInfo: false }); this.searchService.set('searchContext', model.get('searchContext')); this.controllerFor('composer').set('topic', model); diff --git a/app/assets/javascripts/discourse/templates/application.hbs b/app/assets/javascripts/discourse/templates/application.hbs index 99ef6ee552..479d0c2925 100644 --- a/app/assets/javascripts/discourse/templates/application.hbs +++ b/app/assets/javascripts/discourse/templates/application.hbs @@ -1,4 +1,11 @@ -{{render "header"}} +{{site-header canSignUp=canSignUp + showCreateAccount="showCreateAccount" + showLogin="showLogin" + showKeyboard="showKeyboardShortcutsHelp" + toggleMobileView="toggleMobileView" + toggleAnonymous="toggleAnonymous" + logout="logout" + showSearchHelp="showSearchHelp"}}
diff --git a/app/assets/javascripts/discourse/templates/bulk-tag.hbs b/app/assets/javascripts/discourse/templates/bulk-tag.hbs new file mode 100644 index 0000000000..1ffe345e30 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/bulk-tag.hbs @@ -0,0 +1,5 @@ +

{{i18n "topics.bulk.choose_new_tags"}}

+ +

{{tag-chooser tags=tags}}

+ +{{d-button action="changeTags" disabled=emptyTags label="topics.bulk.change_tags"}} diff --git a/app/assets/javascripts/discourse/templates/category-tag-autocomplete.raw.hbs b/app/assets/javascripts/discourse/templates/category-tag-autocomplete.raw.hbs new file mode 100644 index 0000000000..886c7bba73 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/category-tag-autocomplete.raw.hbs @@ -0,0 +1,13 @@ +
+ +
diff --git a/app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs b/app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs index 756b976c33..f737c96976 100644 --- a/app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs +++ b/app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs @@ -4,6 +4,10 @@ {{category-drop category=secondCategory parentCategory=firstCategory categories=childCategories subCategory="true" noSubcategories=noSubcategories}} {{/if}} +{{#if siteSettings.tagging_enabled}} + {{tag-drop firstCategory=firstCategory secondCategory=secondCategory tagId=tagId}} +{{/if}} + {{plugin-outlet "bread-crumbs-right" tagName="li"}}
diff --git a/app/assets/javascripts/discourse/templates/components/date-picker.hbs b/app/assets/javascripts/discourse/templates/components/date-picker.hbs index 7d9e48080a..a2c89401ab 100644 --- a/app/assets/javascripts/discourse/templates/components/date-picker.hbs +++ b/app/assets/javascripts/discourse/templates/components/date-picker.hbs @@ -1 +1 @@ - + diff --git a/app/assets/javascripts/discourse/templates/components/discourse-tag-bound.hbs b/app/assets/javascripts/discourse/templates/components/discourse-tag-bound.hbs new file mode 100644 index 0000000000..d7eb83adb9 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/discourse-tag-bound.hbs @@ -0,0 +1 @@ +{{tagRecord.id}} \ No newline at end of file diff --git a/app/assets/javascripts/discourse/templates/components/group-post-stream.js.hbs b/app/assets/javascripts/discourse/templates/components/group-post-stream.js.hbs index 42af3ae454..9ab4c17c68 100644 --- a/app/assets/javascripts/discourse/templates/components/group-post-stream.js.hbs +++ b/app/assets/javascripts/discourse/templates/components/group-post-stream.js.hbs @@ -1,7 +1,9 @@ -
- {{#each posts as |post|}} - {{group-post post=post}} - {{else}} -
{{i18n emptyText}}
- {{/each}} -
+{{#load-more selector=".user-stream .item" action="loadMore"}} +
+ {{#each posts as |post|}} + {{group-post post=post}} + {{else}} +
{{i18n emptyText}}
+ {{/each}} +
+{{/load-more}} diff --git a/app/assets/javascripts/discourse/templates/components/group-post.hbs b/app/assets/javascripts/discourse/templates/components/group-post.hbs index c661dbe345..45a1642281 100644 --- a/app/assets/javascripts/discourse/templates/components/group-post.hbs +++ b/app/assets/javascripts/discourse/templates/components/group-post.hbs @@ -3,7 +3,7 @@
{{avatar post.user imageSize="large" extraClasses="actor" ignoreTitle="true"}}
 {{format-date post.created_at leaveAgo="true"}} - {{post.topic.fancyTitle}} + {{{post.topic.fancyTitle}}} {{category-link post.category}}
diff --git a/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs b/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs deleted file mode 100644 index f0bc9397ab..0000000000 --- a/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs +++ /dev/null @@ -1,94 +0,0 @@ -{{#menu-panel visible=visible}} - {{#if prioritizeFaq}} - {{#menu-links}} -
  • - {{#d-link path=faqUrl class="faq-link"}} - {{i18n "faq"}} - {{i18n "new_item"}} - {{/d-link}} -
    • - {{/menu-links}} - {{/if}} - - {{#if currentUser.staff}} - {{#menu-links}} -
  • {{d-link route="admin" class="admin-link" icon="wrench" label="admin_title"}}
    • -
  • - {{#d-link route="adminFlags" class="flagged-posts-link"}} - {{fa-icon "flag"}} {{i18n 'flags_title'}} - {{#if currentUser.site_flagged_posts_count}} - {{currentUser.site_flagged_posts_count}} - {{/if}} - {{/d-link}} -
    • - - {{#if currentUser.show_queued_posts}} -
  • - {{#d-link route='queued-posts'}} - {{i18n "queue.title"}} - {{#if currentUser.post_queue_new_count}} - {{currentUser.post_queue_new_count}} - {{/if}} - {{/d-link}} -
    • - {{/if}} - {{#if currentUser.admin}} -
  • {{d-link route="adminSiteSettings" icon="gear" label="admin.site_settings.title"}}
    • - {{/if}} - - {{plugin-outlet "hamburger-admin"}} - {{/menu-links}} - {{/if}} - - {{#menu-links}} -
  • {{d-link route="discovery.latest" class="latest-topics-link" label="filters.latest.title"}}
    • - - {{#if currentUser}} -
  • - {{#if newCount}} - {{d-link route="discovery.new" class="new-topics-link" label="filters.new.title_with_count" count=newCount}} - {{else}} - {{d-link route="discovery.new" class="new-topics-link" label="filters.new.title"}} - {{/if}} -
    • -
  • - {{#if unreadCount}} - {{d-link route="discovery.unread" class="unread-topics-link" label="filters.unread.title_with_count" count=unreadCount}} - {{else}} - {{d-link route="discovery.unread" class="unread-topics-link" label="filters.unread.title"}} - {{/if}} -
    • - {{/if}} -
  • {{d-link route="discovery.top" class="top-topics-link" label="filters.top.title"}}
    • - - {{#if siteSettings.enable_badges}} -
  • {{d-link route="badges" class="badge-link" label="badges.title"}}
    • - {{/if}} - - {{#if showUserDirectoryLink}} -
  • {{d-link route="users" class="user-directory-link" label="directory.title"}}
    • - {{/if}} - - {{plugin-outlet "site-map-links"}} - - {{plugin-outlet "site-map-links-last"}} - {{/menu-links}} - - {{mount-widget widget='hamburger-categories' args=(as-hash categories=categories)}} -
    - - {{#menu-links omitRule="true"}} -
  • {{d-link route="about" class="about-link" label="about.simple_title"}}
    • - {{#unless prioritizeFaq}} -
  • {{d-link path=faqUrl class="faq-link" label="faq"}}
    • - {{/unless}} - - {{#if showKeyboardShortcuts}} -
  • {{d-link action="keyboardShortcuts" class="keyboard-shortcuts-link" label="keyboard_shortcuts_help.title"}}
    • - {{/if}} - - {{#if showMobileToggle}} -
  • {{d-link action="toggleMobileView" class="mobile-toggle-link" label=mobileViewLinkTextKey}}
    • - {{/if}} - {{/menu-links}} -{{/menu-panel}} diff --git a/app/assets/javascripts/discourse/templates/components/header-dropdown.hbs b/app/assets/javascripts/discourse/templates/components/header-dropdown.hbs deleted file mode 100644 index 6cb4af742b..0000000000 --- a/app/assets/javascripts/discourse/templates/components/header-dropdown.hbs +++ /dev/null @@ -1,9 +0,0 @@ - - {{#if showUser}} - {{bound-avatar currentUser "medium"}} - {{else}} - {{fa-icon icon}} - {{/if}} - - -{{yield}} diff --git a/app/assets/javascripts/discourse/templates/components/header-extra-info.hbs b/app/assets/javascripts/discourse/templates/components/header-extra-info.hbs deleted file mode 100644 index 4d5b798753..0000000000 --- a/app/assets/javascripts/discourse/templates/components/header-extra-info.hbs +++ /dev/null @@ -1,21 +0,0 @@ -
    -
    -
    -

    - {{#if showPrivateMessageGlyph}} - - {{fa-icon "envelope"}} - - {{/if}} - - {{#if topic.details.loaded}} - {{topic-status topic=topic}} - {{{topic.fancyTitle}}} - {{/if}} -

    - {{#if topic.details.loaded}} - {{topic-category topic=topic}} - {{/if}} -
    -
    -
    diff --git a/app/assets/javascripts/discourse/templates/components/menu-links.hbs b/app/assets/javascripts/discourse/templates/components/menu-links.hbs deleted file mode 100644 index fe9b872fcb..0000000000 --- a/app/assets/javascripts/discourse/templates/components/menu-links.hbs +++ /dev/null @@ -1,7 +0,0 @@ -
      - {{yield}} -
      -
    -{{#unless omitRule}} -
    -{{/unless}} diff --git a/app/assets/javascripts/discourse/templates/components/menu-panel.hbs b/app/assets/javascripts/discourse/templates/components/menu-panel.hbs deleted file mode 100644 index bbb72a5736..0000000000 --- a/app/assets/javascripts/discourse/templates/components/menu-panel.hbs +++ /dev/null @@ -1,7 +0,0 @@ -{{#if visible}} -
    -
    - {{yield}} -
    -
    -{{/if}} diff --git a/app/assets/javascripts/discourse/templates/components/search-menu.hbs b/app/assets/javascripts/discourse/templates/components/search-menu.hbs deleted file mode 100644 index 1f9cc018a9..0000000000 --- a/app/assets/javascripts/discourse/templates/components/search-menu.hbs +++ /dev/null @@ -1,40 +0,0 @@ -{{#menu-panel visible=visible onVisible="showedSearch" onHidden="cancelHighlight" maxWidth="500"}} - {{plugin-outlet "above-search"}} - {{search-text-field value=searchService.term id="search-term"}} - -
    - {{#if searchService.searchContext}} - - {{/if}} - {{i18n "show_help"}} -
    -
    - {{#if loading}} -
    {{loading-spinner}}
    - {{else}} -
    - {{#if noResults}} -
    - {{i18n "search.no_results"}} -
    - {{else}} - {{#each content.resultTypes as |resultType|}} -
      -
    • {{resultType.name}}
      • - {{component resultType.componentName results=resultType.results term=searchService.term}} -
    -
    - {{#if resultType.moreUrl}} - {{i18n "show_more"}} {{fa-icon "chevron-down"}} - {{/if}} - {{#if resultType.more}} - {{i18n "show_more"}} {{fa-icon "chevron-down"}} - {{/if}} -
    - {{/each}} - {{/if}} -
    - {{/if}} -{{/menu-panel}} diff --git a/app/assets/javascripts/discourse/templates/components/search-result-category.hbs b/app/assets/javascripts/discourse/templates/components/search-result-category.hbs deleted file mode 100644 index 071eba1841..0000000000 --- a/app/assets/javascripts/discourse/templates/components/search-result-category.hbs +++ /dev/null @@ -1,7 +0,0 @@ -{{#each results as |result|}} -
  • - - {{category-badge result}} - -
    • -{{/each}} diff --git a/app/assets/javascripts/discourse/templates/components/search-result-post.hbs b/app/assets/javascripts/discourse/templates/components/search-result-post.hbs deleted file mode 100644 index f89090ac24..0000000000 --- a/app/assets/javascripts/discourse/templates/components/search-result-post.hbs +++ /dev/null @@ -1,14 +0,0 @@ -{{#each results as |result|}} -
  • - - - {{i18n 'search.post_format' post_number=result.post_number username=result.username}} - - {{#unless site.mobileView}} - - {{{unbound result.blurb}}} - - {{/unless}} - -
    • -{{/each}} diff --git a/app/assets/javascripts/discourse/templates/components/search-result-topic.hbs b/app/assets/javascripts/discourse/templates/components/search-result-topic.hbs deleted file mode 100644 index 132e56360b..0000000000 --- a/app/assets/javascripts/discourse/templates/components/search-result-topic.hbs +++ /dev/null @@ -1,14 +0,0 @@ -{{#each results as |result|}} -
  • - - - {{topic-status topic=result.topic disableActions=true}}{{{unbound result.topic.fancyTitle}}}{{category-badge result.topic.category}}{{plugin-outlet "search-category"}} - - {{#unless site.mobileView}} - - {{format-age result.created_at}} - {{{unbound result.blurb}}} - - {{/unless}} - -
    • -{{/each}} diff --git a/app/assets/javascripts/discourse/templates/components/search-result-user.hbs b/app/assets/javascripts/discourse/templates/components/search-result-user.hbs deleted file mode 100644 index 9cf46a1519..0000000000 --- a/app/assets/javascripts/discourse/templates/components/search-result-user.hbs +++ /dev/null @@ -1,8 +0,0 @@ -{{#each results as |result|}} -
  • - - {{avatar result imageSize="small"}} - {{unbound result.username}} - -
    • -{{/each}} diff --git a/app/assets/javascripts/discourse/templates/components/stream-item.hbs b/app/assets/javascripts/discourse/templates/components/stream-item.hbs index 4c5609b88d..0018f8a2d8 100644 --- a/app/assets/javascripts/discourse/templates/components/stream-item.hbs +++ b/app/assets/javascripts/discourse/templates/components/stream-item.hbs @@ -13,7 +13,7 @@

    {{actionDescription}}

    {{/if}} -

    {{{item.excerpt}}}

    +

    {{{item.excerpt}}}

    {{#each item.children as |child|}}
    diff --git a/app/assets/javascripts/discourse/templates/components/tag-drop.hbs b/app/assets/javascripts/discourse/templates/components/tag-drop.hbs new file mode 100644 index 0000000000..46e4f66046 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/tag-drop.hbs @@ -0,0 +1,21 @@ +{{#if showTagDropdown}} + {{#if tagId}} + {{tagId}} + {{else}} + {{allTagsLabel}} + {{/if}} + + {{#if tags}} + +
    +
    {{allTagsLabel}}
    + {{#if renderTags}} + {{#each t in tags}} +
    + {{tag-drop-link tagId=t category=currentCategory}} +
    + {{/each}} + {{/if}} +
    + {{/if}} +{{/if}} \ No newline at end of file diff --git a/app/assets/javascripts/discourse/templates/components/topic-category.hbs b/app/assets/javascripts/discourse/templates/components/topic-category.hbs index 8a914440e0..cf70e3e8a8 100644 --- a/app/assets/javascripts/discourse/templates/components/topic-category.hbs +++ b/app/assets/javascripts/discourse/templates/components/topic-category.hbs @@ -2,5 +2,12 @@ {{bound-category-link topic.category.parentCategory}} {{/if}} {{bound-category-link topic.category hideParent=true}} +{{#if siteSettings.tagging_enabled}} +
    + {{#each t in topic.tags}} + {{discourse-tag t}} + {{/each}} +
    +{{/if}} {{plugin-outlet "topic-category"}} diff --git a/app/assets/javascripts/discourse/templates/components/user-menu.hbs b/app/assets/javascripts/discourse/templates/components/user-menu.hbs deleted file mode 100644 index 6f014d80d2..0000000000 --- a/app/assets/javascripts/discourse/templates/components/user-menu.hbs +++ /dev/null @@ -1,48 +0,0 @@ -{{#menu-panel visible=visible}} -
    -
      - - {{#if showDisableAnon}} -
    • {{d-link route='user' model=currentUser class="user-activity-link" icon="user" label="user.profile"}}
      • -
    • {{d-link action="toggleAnon" label="switch_from_anon"}}
      • - {{else}} -
    • {{d-link route='user' model=currentUser class="user-activity-link" icon="user" translateLabel="false" label=currentUser.username}}
      • - {{/if}} -
    • - {{d-link path=bookmarksPath title="user.bookmarks" icon="bookmark"}} - {{#if siteSettings.enable_private_messages}} - {{d-link path=messagesPath title="user.private_messages" icon="envelope"}} - {{/if}} - {{#if showEnableAnon}} - {{d-link action="toggleAnon" title="switch_to_anon" icon="user-secret"}} - {{/if}} - {{d-link path=preferencesPath title="user.preferences" icon="gear"}} -
      • -
    -
    - -
    - {{#conditional-loading-spinner condition=loadingNotifications containerClass="spinner-container"}} - {{#if notifications}} -
    -
      - {{#each notifications as |n|}} - {{notification-item notification=n}} - {{/each}} -
    • - {{#d-link path=notificationsPath}} - {{i18n 'notifications.more'}}… - {{/d-link}} -
      • -
    - {{/if}} - {{/conditional-loading-spinner}} -
    - {{plugin-outlet "user-menu-bottom"}} -
    -
    -
      -
    • {{d-link action="logout" class="logout" icon="sign-out" label="user.log_out"}}
      • -
    -
    -{{/menu-panel}} diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs index 06ebfdfbef..1ecbecab16 100644 --- a/app/assets/javascripts/discourse/templates/composer.hbs +++ b/app/assets/javascripts/discourse/templates/composer.hbs @@ -97,6 +97,9 @@ {{#if currentUser}}
    {{plugin-outlet "composer-fields-below"}} + {{#if canEditTags}} + {{tag-chooser tags=model.tags tabIndex="4"}} + {{/if}} {{i18n 'cancel'}} diff --git a/app/assets/javascripts/discourse/templates/composer/similar_topics.hbs b/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs similarity index 64% rename from app/assets/javascripts/discourse/templates/composer/similar_topics.hbs rename to app/assets/javascripts/discourse/templates/composer/similar-topics.hbs index ed326e488e..257a51ebf1 100644 --- a/app/assets/javascripts/discourse/templates/composer/similar_topics.hbs +++ b/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs @@ -2,5 +2,5 @@

    {{i18n 'composer.similar_topics'}}

      - {{search-result-topic results=similarTopics}} + {{mount-widget widget="search-result-topic" args=(as-hash results=similarTopics)}}
    diff --git a/app/assets/javascripts/discourse/templates/discovery/categories.hbs b/app/assets/javascripts/discourse/templates/discovery/categories.hbs index dcd5c6acfd..7d26d35ba2 100644 --- a/app/assets/javascripts/discourse/templates/discovery/categories.hbs +++ b/app/assets/javascripts/discourse/templates/discovery/categories.hbs @@ -1,5 +1,5 @@ {{#if model.categories}} -
    + {{#discovery-categories refresh="refresh"}} @@ -54,6 +54,6 @@ {{/each}}
    -
    + {{/discovery-categories}}
    {{/if}} diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/discovery/topics.hbs index 9b55d626ae..8bb13926fc 100644 --- a/app/assets/javascripts/discourse/templates/discovery/topics.hbs +++ b/app/assets/javascripts/discourse/templates/discovery/topics.hbs @@ -15,7 +15,7 @@ {{bulk-select-button selected=selected refreshTarget=controller}} -
    +{{#discovery-topics-list model=model refresh="refresh" incomingCount=topicTrackingState.incomingCount}} {{#if top}}
    {{period-chooser period=period action="changePeriod"}} @@ -32,23 +32,23 @@ {{/if}} {{#if hasTopics}} - {{topic-list - showTopicPostBadges=showTopicPostBadges - showPosters=true - currentUser=currentUser - canBulkSelect=canBulkSelect - changeSort="changeSort" - toggleBulkSelect="toggleBulkSelect" - hideCategory=model.hideCategory - order=order - ascending=ascending - bulkSelectEnabled=bulkSelectEnabled - selected=selected - expandGloballyPinned=expandGloballyPinned - expandAllPinned=expandAllPinned - topics=model.topics}} + {{topic-list + showTopicPostBadges=showTopicPostBadges + showPosters=true + currentUser=currentUser + canBulkSelect=canBulkSelect + changeSort="changeSort" + toggleBulkSelect="toggleBulkSelect" + hideCategory=model.hideCategory + order=order + ascending=ascending + bulkSelectEnabled=bulkSelectEnabled + selected=selected + expandGloballyPinned=expandGloballyPinned + expandAllPinned=expandAllPinned + topics=model.topics}} {{/if}} -
    +{{/discovery-topics-list}}
    {{conditional-loading-spinner condition=model.loadingMore}} diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs index e216f7ab3f..7c39f11aa5 100644 --- a/app/assets/javascripts/discourse/templates/full-page-search.hbs +++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs @@ -70,6 +70,9 @@
    {{category-link result.topic.category}} + {{#each result.topic.tags as |tag|}} + {{discourse-tag tag}} + {{/each}} {{plugin-outlet "full-page-search-category"}}
    diff --git a/app/assets/javascripts/discourse/templates/group-index.hbs b/app/assets/javascripts/discourse/templates/group-index.hbs new file mode 100644 index 0000000000..1641286ad7 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/group-index.hbs @@ -0,0 +1 @@ +{{group-post-stream posts=controller emptyText=emptyText loadMore="loadMore"}} diff --git a/app/assets/javascripts/discourse/templates/group-members.hbs b/app/assets/javascripts/discourse/templates/group-members.hbs new file mode 100644 index 0000000000..41ad1fd922 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/group-members.hbs @@ -0,0 +1,45 @@ +{{#if model}} + {{#if isOwner}} +
    +
    + {{user-selector usernames=usernames placeholderKey="groups.selector_placeholder" id="user-search-selector" name="usernames"}} + {{d-button action="addMembers" class="add" icon="plus" label="groups.add"}} +
    +
    + {{/if}} + + {{#load-more selector=".group-members tr" action="loadMore"}} + + + + + {{#if isOwner}} + + {{/if}} + + {{#each model.members as |m|}} + + + + + {{#if isOwner}} + + {{/if}} + + {{/each}} +
    {{i18n 'last_post'}}{{i18n 'last_seen'}}
    + {{user-info user=m}} + {{#if m.owner}}{{i18n "groups.owner"}}{{/if}} + + {{bound-date m.last_posted_at}} + + {{bound-date m.last_seen_at}} + + {{#unless m.owner}} + + {{/unless}} +
    + {{/load-more}} +{{else}} +
    {{i18n "groups.empty.users"}}
    +{{/if}} diff --git a/app/assets/javascripts/discourse/templates/group/index.hbs b/app/assets/javascripts/discourse/templates/group/index.hbs deleted file mode 100644 index 73ba496fa7..0000000000 --- a/app/assets/javascripts/discourse/templates/group/index.hbs +++ /dev/null @@ -1 +0,0 @@ -{{group-post-stream posts=controller emptyText="groups.empty.posts"}} diff --git a/app/assets/javascripts/discourse/templates/group/members.hbs b/app/assets/javascripts/discourse/templates/group/members.hbs deleted file mode 100644 index 2d3c9d80f5..0000000000 --- a/app/assets/javascripts/discourse/templates/group/members.hbs +++ /dev/null @@ -1,42 +0,0 @@ -{{#if model}} - {{#if isOwner}} -
    -
    - {{user-selector usernames=usernames placeholderKey="groups.selector_placeholder" id="user-search-selector" name="usernames"}} - {{d-button action="addMembers" class="add" icon="plus" label="groups.add"}} -
    -
    - {{/if}} - - - - - {{#if isOwner}} - - {{/if}} - - {{#each model.members as |m|}} - - - - - {{#if isOwner}} - - {{/if}} - - {{/each}} -
    {{i18n 'last_post'}}{{i18n 'last_seen'}}
    - {{user-info user=m}} - {{#if m.owner}}{{i18n "groups.owner"}}{{/if}} - - {{bound-date m.last_posted_at}} - - {{bound-date m.last_seen_at}} - - {{#unless m.owner}} - - {{/unless}} -
    -{{else}} -
    {{i18n "groups.empty.users"}}
    -{{/if}} diff --git a/app/assets/javascripts/discourse/templates/group/mentions.hbs b/app/assets/javascripts/discourse/templates/group/mentions.hbs deleted file mode 100644 index 3fa0965f26..0000000000 --- a/app/assets/javascripts/discourse/templates/group/mentions.hbs +++ /dev/null @@ -1 +0,0 @@ -{{group-post-stream posts=controller emptyText="groups.empty.mentions"}} diff --git a/app/assets/javascripts/discourse/templates/group/messages.hbs b/app/assets/javascripts/discourse/templates/group/messages.hbs deleted file mode 100644 index 9b457e64eb..0000000000 --- a/app/assets/javascripts/discourse/templates/group/messages.hbs +++ /dev/null @@ -1 +0,0 @@ -{{group-post-stream posts=controller emptyText="groups.empty.messages"}} diff --git a/app/assets/javascripts/discourse/templates/group/topics.hbs b/app/assets/javascripts/discourse/templates/group/topics.hbs deleted file mode 100644 index 2a9a4eed96..0000000000 --- a/app/assets/javascripts/discourse/templates/group/topics.hbs +++ /dev/null @@ -1 +0,0 @@ -{{group-post-stream posts=controller emptyText="groups.empty.topics"}} diff --git a/app/assets/javascripts/discourse/templates/header.hbs b/app/assets/javascripts/discourse/templates/header.hbs deleted file mode 100644 index ad1af73529..0000000000 --- a/app/assets/javascripts/discourse/templates/header.hbs +++ /dev/null @@ -1,66 +0,0 @@ -
    -
    - {{home-logo minimized=showExtraInfo}} - {{plugin-outlet "header-after-home-logo"}} - -
    - {{#unless currentUser}} - {{#if showSignUpButton}} - {{d-button action="showCreateAccount" class="btn-primary btn-small sign-up-button" label="sign_up"}} - {{/if}} - {{d-button action="showLogin" class="btn-primary btn-small login-button" icon="user" label="log_in"}} - {{/unless}} - - {{plugin-outlet "header-before-dropdowns"}} - {{user-menu visible=userMenuVisible logoutAction="logout"}} - {{hamburger-menu visible=hamburgerVisible showKeyboardAction="showKeyboardShortcutsHelp"}} - {{search-menu visible=searchVisible}} -
    - - {{#if showExtraInfo}} - {{header-extra-info topic=topic}} - {{/if}} -
    -
    -{{plugin-outlet "header-under-content"}} diff --git a/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs b/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs index 67b03cfbd3..6efca18268 100644 --- a/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs +++ b/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs @@ -11,6 +11,13 @@ {{#if controller.showTopicPostBadges}} {{raw "topic-post-badges" unread=topic.unread newPosts=topic.displayNewPosts unseen=topic.unseen url=topic.lastUnreadUrl}} {{/if}} + {{#if topic.tags}} +
    + {{#each tag in topic.visibleListTags}} + {{discourse-tag tag}} + {{/each}} +
    + {{/if}} {{plugin-outlet "topic-list-tags"}} {{#if expandPinned}} {{raw "list/topic-excerpt" topic=topic}} diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs index 3355aef462..5d1a3c8e1b 100644 --- a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs +++ b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs @@ -1,4 +1,4 @@ -
    +{{#discovery-topics-list model=model refresh="refresh" incomingCount=topicTrackingState.incomingCount}} {{#if top}}
    {{period-chooser period=period action="changePeriod"}} @@ -19,7 +19,7 @@ hideCategory=model.hideCategory topics=model.topics}} {{/if}} -
    +{{/discovery-topics-list}}
    {{conditional-loading-spinner condition=model.loadingMore}} diff --git a/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.raw.hbs b/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.raw.hbs index 0c11907039..aff527a690 100644 --- a/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.raw.hbs +++ b/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.raw.hbs @@ -27,6 +27,14 @@
    {{/unless}} + {{#if context.topic.tags}} +
    + {{#each tag in context.topic.visibleListTags}} + {{discourse-tag tag}} + {{/each}} +
    + {{/if}} + {{plugin-outlet "topic-list-tags"}}
    diff --git a/app/assets/javascripts/discourse/templates/modal/change-timestamp.hbs b/app/assets/javascripts/discourse/templates/modal/change-timestamp.hbs index c76c58e124..5114bd9cf9 100644 --- a/app/assets/javascripts/discourse/templates/modal/change-timestamp.hbs +++ b/app/assets/javascripts/discourse/templates/modal/change-timestamp.hbs @@ -1,4 +1,4 @@ -
    +

    {{i18n 'topic.change_timestamp.instructions'}}

    @@ -8,9 +8,11 @@

    - {{input type="date" value=date}} + {{date-picker-past value=date containerId="date-container"}} {{input type="time" value=time}}
    + +
    diff --git a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs index 97f8a0e346..cbe81d04cb 100644 --- a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs +++ b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs @@ -65,7 +65,7 @@

    {{i18n "topic.feature_topic.pin_globally"}} {{fa-icon "clock-o"}} - {{date-picker value=model.pinnedGloballyUntil}} + {{date-picker-future value=model.pinnedGloballyUntil}} {{popup-input-tip validation=pinGloballyValidation shownAt=pinGloballyTipShownAt}}

    diff --git a/app/assets/javascripts/discourse/templates/modal/history.hbs b/app/assets/javascripts/discourse/templates/modal/history.hbs index 21e1662758..8a5303fd0c 100644 --- a/app/assets/javascripts/discourse/templates/modal/history.hbs +++ b/app/assets/javascripts/discourse/templates/modal/history.hbs @@ -44,7 +44,7 @@ {{/if}} {{/unless}}

    -
    +
    {{#if model.title_changes}}

    {{{titleDiff}}}

    @@ -73,6 +73,19 @@
    {{/if}} {{/if}} + {{#if model.tags_changes}} +
    + {{i18n "tagging.changed"}} + {{#each previousTagChanges as |t|}} + {{discourse-tag t}} + {{/each}} + → +   + {{#each currentTagChanges as |t|}} + {{discourse-tag t}} + {{/each}} +
    + {{/if}} {{plugin-outlet "post-revisions"}} diff --git a/app/assets/javascripts/discourse/templates/rename-tag.hbs b/app/assets/javascripts/discourse/templates/rename-tag.hbs new file mode 100644 index 0000000000..0d69f7f65d --- /dev/null +++ b/app/assets/javascripts/discourse/templates/rename-tag.hbs @@ -0,0 +1,13 @@ +
    + +
    + +
    + {{d-button class="btn-primary" + action="performRename" + label="tagging.rename_tag" + disabled=renameDisabled}} +
    diff --git a/app/assets/javascripts/discourse/templates/tags.hbs b/app/assets/javascripts/discourse/templates/tags.hbs new file mode 100644 index 0000000000..3fd70a3f75 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/tags.hbs @@ -0,0 +1,9 @@ +
    +
    +
    +
    + {{outlet}} +
    +
    +
    +
    diff --git a/app/assets/javascripts/discourse/templates/tags/index.hbs b/app/assets/javascripts/discourse/templates/tags/index.hbs new file mode 100644 index 0000000000..27615db1f4 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/tags/index.hbs @@ -0,0 +1,19 @@ +
    + {{discourse-banner user=currentUser banner=site.banner}} +
    + +

    {{i18n "tagging.all_tags"}}

    + +
    + {{i18n "tagging.sort_by"}} + {{i18n "tagging.sort_by_count"}} + {{i18n "tagging.sort_by_name"}} +
    + +
    + {{#each tag in sortedTags}} +
    + {{discourse-tag tag.id}} x {{tag.count}} +
    + {{/each}} +
    diff --git a/app/assets/javascripts/discourse/templates/tags/show.hbs b/app/assets/javascripts/discourse/templates/tags/show.hbs new file mode 100644 index 0000000000..0421c8d032 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/tags/show.hbs @@ -0,0 +1,65 @@ +
    + {{discourse-banner user=currentUser banner=site.banner}} +
    + +
    +
    + {{#if tagNotification}} + {{tag-notifications-button action="changeTagNotification" + notificationLevel=tagNotification.notification_level}} + {{/if}} + + {{#if showAdminControls}} + {{d-button action="deleteTag" label="tagging.delete_tag" icon="trash-o" class="admin-tag btn-danger"}} + {{d-button action="renameTag" actionParam=tag label="tagging.rename_tag" icon="pencil" class="admin-tag"}} + {{else}} + {{#if canCreateTopic}} + + {{/if}} + {{/if}} + + {{#if showTagFilter}} + {{bread-crumbs categories=categories + category=category + tagId=tag.id + noSubcategories=noSubcategories + hideSubcategories=showingSubcategoryList}} + + {{navigation-bar navItems=navItems filterMode=filterMode}} + {{else}} +

    + {{#link-to 'tags'}}{{i18n "tagging.tags"}}{{/link-to}} + {{fa-icon "angle-right"}} + {{discourse-tag-bound tagRecord=tag style="simple"}} +

    + {{/if}} +
    +
    + +
    + {{conditional-loading-spinner condition=loading}} + + {{#unless loading}} + {{#if list.topics}} + {{#discovery-topics-list model=list refresh="refresh"}} + {{bulk-select-button selected=selected refreshTarget=controller}} + + {{topic-list topics=list.topics + canBulkSelect=canBulkSelect + toggleBulkSelect="toggleBulkSelect" + bulkSelectEnabled=bulkSelectEnabled + selected=selected + showPosters=true + currentUser=currentUser + order=order + ascending=ascending + changeSort="changeSort"}} + + {{/discovery-topics-list}} + {{else}} +

    + {{footerMessage}}{{#link-to "discovery.categories"}} {{i18n 'topic.browse_all_categories'}}{{/link-to}} {{i18n 'or'}} {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}} +

    + {{/if}} + {{/unless}} +
    diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs index ab5e84bcbf..d8fc7fd708 100644 --- a/app/assets/javascripts/discourse/templates/topic.hbs +++ b/app/assets/javascripts/discourse/templates/topic.hbs @@ -23,6 +23,10 @@ {{category-chooser valueAttribute="id" value=buffered.category_id source=buffered.category_id}} {{/if}} + {{#if canEditTags}} + {{tag-chooser tags=buffered.tags}} + {{/if}} + {{plugin-outlet "edit-topic"}} {{d-button action="finishedEditingTopic" class="btn-primary btn-small submit-edit" icon="check"}} @@ -252,6 +256,16 @@ {{/if}} + {{#if currentUser.staff}} +
  • + {{#if model.isPrivateMessage}} + {{d-button action="convertToPublicTopic" icon="comment" label="topic.actions.make_public"}} + {{else}} + {{d-button action="convertToPrivateMessage" icon="envelope" label="topic.actions.make_private"}} + {{/if}} +
    • + {{/if}} + {{plugin-outlet "topic-admin-menu-buttons"}} {{/popup-menu}} {{/if}} diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs index 29c37bcb99..f489c089e7 100644 --- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs +++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs @@ -1,100 +1,102 @@ {{#if canInviteToForum}} -
    -

    {{i18n 'user.invited.title'}}

    + {{#load-more class="paginated-topics-list" selector=".paginated-topics-list .user-invite-list tr" action="loadMore"}} +
    +

    {{i18n 'user.invited.title'}}

    - {{#if model.can_see_invite_details}} -
    -
    -
      - {{nav-item route='userInvited.show' routeParam='pending' i18nLabel=pendingLabel}} - {{nav-item route='userInvited.show' routeParam='redeemed' i18nLabel=redeemedLabel}} -
    -
    + {{#if model.can_see_invite_details}} +
    +
    +
      + {{nav-item route='userInvited.show' routeParam='pending' i18nLabel=pendingLabel}} + {{nav-item route='userInvited.show' routeParam='redeemed' i18nLabel=redeemedLabel}} +
    +
    -
    - {{d-button icon="plus" action="showInvite" label="user.invited.create" class="btn"}} - {{#if canBulkInvite}} - {{resumable-upload target="/invites/upload" success="uploadSuccess" error="uploadError" uploadText=uploadText}} - {{/if}} -
    -
    - {{/if}} - - {{#if showSearch}} -
    -
    {{text-field value=searchTerm placeholderKey="user.invited.search"}}
    -
    - {{/if}} - - {{#if model.invites}} - - - {{#if inviteRedeemed}} - - - {{#if model.can_see_invite_details}} - - - - - +
    + {{d-button icon="plus" action="showInvite" label="user.invited.create" class="btn"}} + {{#if canBulkInvite}} + {{resumable-upload target="/invites/upload" success="uploadSuccess" error="uploadError" uploadText=uploadText}} {{/if}} - {{else}} -
    - - {{/if}} - - {{#each invite in model.invites}} + + + {{/if}} + + {{#if showSearch}} +
    +
    {{text-field value=searchTerm placeholderKey="user.invited.search"}} +
    + {{/if}} + + {{#if model.invites}} +
    {{i18n 'user.invited.user'}}{{i18n 'user.invited.redeemed_at'}}{{i18n 'user.last_seen'}}{{i18n 'user.invited.topics_entered'}}{{i18n 'user.invited.posts_read_count'}}{{i18n 'user.invited.time_read'}}{{i18n 'user.invited.days_visited'}}{{i18n 'user.invited.user'}}{{i18n 'user.invited.sent'}}
    - {{#if invite.user}} - - + {{#if inviteRedeemed}} + + {{#if model.can_see_invite_details}} - - - - - + + + + + {{/if}} {{else}} - - - + + {{/if}} - {{/each}} -
    - {{#link-to 'user' invite.user}}{{avatar invite.user imageSize="tiny"}}{{/link-to}} - {{#link-to 'user' invite.user}}{{invite.user.username}}{{/link-to}} - {{format-date invite.redeemed_at}}{{i18n 'user.invited.user'}}{{i18n 'user.invited.redeemed_at'}}{{format-date invite.user.last_seen_at}}{{number invite.user.topics_entered}}{{number invite.user.posts_read_count}}{{{unbound invite.user.time_read}}}{{{unbound invite.user.days_visited}}} - / - {{{unbound invite.user.days_since_created}}}{{i18n 'user.last_seen'}}{{i18n 'user.invited.topics_entered'}}{{i18n 'user.invited.posts_read_count'}}{{i18n 'user.invited.time_read'}}{{i18n 'user.invited.days_visited'}}{{unbound invite.email}}{{format-date invite.created_at}} - {{#if invite.expired}} - {{i18n 'user.invited.expired'}} -      - {{/if}} - {{#if invite.rescinded}} - {{i18n 'user.invited.rescinded'}} - {{else}} - {{d-button icon="times" action="rescind" actionParam=invite class="btn" label="user.invited.rescind"}} - {{/if}} -      - {{#if invite.reinvited}} - {{i18n 'user.invited.reinvited'}} - {{else}} - {{d-button icon="refresh" action="reinvite" actionParam=invite class="btn" label="user.invited.reinvite"}} - {{/if}} - {{i18n 'user.invited.user'}}{{i18n 'user.invited.sent'}}
    - {{conditional-loading-spinner condition=invitesLoading}} + {{#each invite in model.invites}} + + {{#if invite.user}} + + {{#link-to 'user' invite.user}}{{avatar invite.user imageSize="tiny"}}{{/link-to}} + {{#link-to 'user' invite.user}}{{invite.user.username}}{{/link-to}} + + {{format-date invite.redeemed_at}} + {{#if model.can_see_invite_details}} + {{format-date invite.user.last_seen_at}} + {{number invite.user.topics_entered}} + {{number invite.user.posts_read_count}} + {{{unbound invite.user.time_read}}} + {{{unbound invite.user.days_visited}}} + / + {{{unbound invite.user.days_since_created}}} + {{/if}} + {{else}} + {{unbound invite.email}} + {{format-date invite.created_at}} + + {{#if invite.expired}} + {{i18n 'user.invited.expired'}} +      + {{/if}} + {{#if invite.rescinded}} + {{i18n 'user.invited.rescinded'}} + {{else}} + {{d-button icon="times" action="rescind" actionParam=invite class="btn" label="user.invited.rescind"}} + {{/if}} +      + {{#if invite.reinvited}} + {{i18n 'user.invited.reinvited'}} + {{else}} + {{d-button icon="refresh" action="reinvite" actionParam=invite class="btn" label="user.invited.reinvite"}} + {{/if}} + + {{/if}} + + {{/each}} + + {{conditional-loading-spinner condition=invitesLoading}} - {{else}} -
    - {{#if canBulkInvite}} - {{{i18n 'user.invited.bulk_invite.none'}}} - {{else}} - {{i18n 'user.invited.none'}} - {{/if}} -
    - {{/if}} -
    + {{else}} +
    + {{#if canBulkInvite}} + {{{i18n 'user.invited.bulk_invite.none'}}} + {{else}} + {{i18n 'user.invited.none'}} + {{/if}} +
    + {{/if}} +
    + {{/load-more}} {{/if}} diff --git a/app/assets/javascripts/discourse/templates/user-topics-list.hbs b/app/assets/javascripts/discourse/templates/user-topics-list.hbs index 9505009d2e..e1b7a24cef 100644 --- a/app/assets/javascripts/discourse/templates/user-topics-list.hbs +++ b/app/assets/javascripts/discourse/templates/user-topics-list.hbs @@ -1,9 +1,10 @@ - -{{basic-topic-list topicList=model - hideCategory=hideCategory - showParticipants=showParticipants - showPosters=showPosters - canBulkSelect=canBulkSelect - bulkSelectEnabled=bulkSelectEnabled - selected=selected - postsAction="showTopicEntrance"}} +{{#load-more class="paginated-topics-list" selector=".paginated-topics-list .topic-list tr" action="loadMore"}} + {{basic-topic-list topicList=model + hideCategory=hideCategory + showParticipants=showParticipants + showPosters=showPosters + canBulkSelect=canBulkSelect + bulkSelectEnabled=bulkSelectEnabled + selected=selected + postsAction="showTopicEntrance"}} +{{/load-more}} diff --git a/app/assets/javascripts/discourse/templates/user/notifications-index.hbs b/app/assets/javascripts/discourse/templates/user/notifications-index.hbs index 9ca0b0b99b..0ea5830ad6 100644 --- a/app/assets/javascripts/discourse/templates/user/notifications-index.hbs +++ b/app/assets/javascripts/discourse/templates/user/notifications-index.hbs @@ -8,27 +8,16 @@
    {{/if}} -{{#if showDismissButton}} -
    - -
    -{{/if}} +
    + +
    -{{#each n in model}} -
    - {{notification-item notification=n}} - - {{format-date n.created_at leaveAgo="true"}} - -
    -{{/each}} +{{user-notifications-large notifications=model}} {{#conditional-loading-spinner condition=loading}} {{#unless model.canLoadMore}} - {{#if showDismissButton}} -
    - -
    - {{/if}} +
    + +
    {{/unless}} {{/conditional-loading-spinner}} diff --git a/app/assets/javascripts/discourse/templates/user/notifications.hbs b/app/assets/javascripts/discourse/templates/user/notifications.hbs index 385e029b6b..bfdba81bee 100644 --- a/app/assets/javascripts/discourse/templates/user/notifications.hbs +++ b/app/assets/javascripts/discourse/templates/user/notifications.hbs @@ -23,5 +23,7 @@
    - {{outlet}} + {{#load-more class="notification-history user-stream" selector=".user-stream .notification" action="loadMore"}} + {{outlet}} + {{/load-more}}
    diff --git a/app/assets/javascripts/discourse/templates/user/posts.hbs b/app/assets/javascripts/discourse/templates/user/posts.hbs index 285824a59f..3da9819a57 100644 --- a/app/assets/javascripts/discourse/templates/user/posts.hbs +++ b/app/assets/javascripts/discourse/templates/user/posts.hbs @@ -1,28 +1,30 @@ -{{#each p in model.content}} -
    -
    - -
    - {{avatar p imageSize="large" extraClasses="actor" ignoreTitle="true"}} -
    -     - - {{format-date p.created_at leaveAgo="true"}} - - - {{unbound p.topic_title}} - - - {{category-link p.category}} - - {{#if p.deleted}} - - {{avatar p.deleted_by imageSize="tiny" extraClasses="actor" ignoreTitle="true"}} {{format-date p.deleted_at leaveAgo="true"}} +{{#user-stream stream=model}} + {{#each p in model.content}} +
    +
    + +
    + {{avatar p imageSize="large" extraClasses="actor" ignoreTitle="true"}} +
    +     + + {{format-date p.created_at leaveAgo="true"}} - {{/if}} + + {{unbound p.topic_title}} + + + {{category-link p.category}} + + {{#if p.deleted}} + + {{avatar p.deleted_by imageSize="tiny" extraClasses="actor" ignoreTitle="true"}} {{format-date p.deleted_at leaveAgo="true"}} + + {{/if}} +
    +

    + {{{p.excerpt}}} +

    -

    - {{{p.excerpt}}} -

    -
    -{{/each}} + {{/each}} +{{/user-stream}} diff --git a/app/assets/javascripts/discourse/templates/user/stream.hbs b/app/assets/javascripts/discourse/templates/user/stream.hbs index c7b3114470..0a06e728c8 100644 --- a/app/assets/javascripts/discourse/templates/user/stream.hbs +++ b/app/assets/javascripts/discourse/templates/user/stream.hbs @@ -1,3 +1,5 @@ -{{#each model.content as |item|}} - {{stream-item item=item removeBookmark="removeBookmark"}} -{{/each}} +{{#user-stream stream=model}} + {{#each model.content as |item|}} + {{stream-item item=item removeBookmark="removeBookmark"}} + {{/each}} +{{/user-stream}} diff --git a/app/assets/javascripts/discourse/templates/users.hbs b/app/assets/javascripts/discourse/templates/users.hbs index 71aad9499e..86c791e9e9 100644 --- a/app/assets/javascripts/discourse/templates/users.hbs +++ b/app/assets/javascripts/discourse/templates/users.hbs @@ -1,56 +1,58 @@ -
    -
    +{{#load-more selector=".directory tbody tr" action="loadMore"}} +
    +
    + +
    + {{period-chooser period=period}} + {{text-field value=nameInput placeholderKey="directory.filter_name" class="filter-name"}} +
    + + {{#conditional-loading-spinner condition=model.loading}} + {{#if model.length}} +
    {{i18n "directory.total_rows" count=model.totalRows}}
    + + + + + {{directory-toggle field="likes_received" order=order asc=asc icon="heart"}} + {{directory-toggle field="likes_given" order=order asc=asc icon="heart"}} + {{directory-toggle field="topic_count" order=order asc=asc}} + {{directory-toggle field="post_count" order=order asc=asc}} + {{directory-toggle field="topics_entered" order=order asc=asc}} + {{directory-toggle field="posts_read" order=order asc=asc}} + {{directory-toggle field="days_visited" order=order asc=asc}} + {{#if showTimeRead}} + + {{/if}} + + + {{#each ic in model itemController="directory-item"}} + + {{#with ic.model as |it|}} + + + + + + + + + {{#if controller.parentController.showTimeRead}} + + {{/if}} + {{/with}} + + {{/each}} + +
     {{i18n "directory.time_read"}}
    {{user-info user=it.user}}{{number it.likes_received}}{{number it.likes_given}}{{number it.topic_count}}{{number it.post_count}}{{number it.topics_entered}}{{number it.posts_read}}{{number it.days_visited}}{{unbound it.time_read}}
    + + {{conditional-loading-spinner condition=model.loadingMore}} + {{else}} +
    +

    {{i18n "directory.no_results"}}

    + {{/if}} + {{/conditional-loading-spinner}} -
    - {{period-chooser period=period}} - {{text-field value=nameInput placeholderKey="directory.filter_name" class="filter-name"}}
    - - {{#conditional-loading-spinner condition=model.loading}} - {{#if model.length}} -
    {{i18n "directory.total_rows" count=model.totalRows}}
    - - - - - {{directory-toggle field="likes_received" order=order asc=asc icon="heart"}} - {{directory-toggle field="likes_given" order=order asc=asc icon="heart"}} - {{directory-toggle field="topic_count" order=order asc=asc}} - {{directory-toggle field="post_count" order=order asc=asc}} - {{directory-toggle field="topics_entered" order=order asc=asc}} - {{directory-toggle field="posts_read" order=order asc=asc}} - {{directory-toggle field="days_visited" order=order asc=asc}} - {{#if showTimeRead}} - - {{/if}} - - - {{#each ic in model itemController="directory-item"}} - - {{#with ic.model as |it|}} - - - - - - - - - {{#if controller.parentController.showTimeRead}} - - {{/if}} - {{/with}} - - {{/each}} - -
     {{i18n "directory.time_read"}}
    {{user-info user=it.user}}{{number it.likes_received}}{{number it.likes_given}}{{number it.topic_count}}{{number it.post_count}}{{number it.topics_entered}}{{number it.posts_read}}{{number it.days_visited}}{{unbound it.time_read}}
    - - {{conditional-loading-spinner condition=model.loadingMore}} - {{else}} -
    -

    {{i18n "directory.no_results"}}

    - {{/if}} - {{/conditional-loading-spinner}} -
    -
    +{{/load-more}} diff --git a/app/assets/javascripts/discourse/views/composer.js.es6 b/app/assets/javascripts/discourse/views/composer.js.es6 index a08ad2c764..4bc6b5499d 100644 --- a/app/assets/javascripts/discourse/views/composer.js.es6 +++ b/app/assets/javascripts/discourse/views/composer.js.es6 @@ -1,6 +1,6 @@ import afterTransition from 'discourse/lib/after-transition'; import positioningWorkaround from 'discourse/lib/safari-hacks'; -import { headerHeight } from 'discourse/views/header'; +import { headerHeight } from 'discourse/components/site-header'; import { default as computed, on, observes } from 'ember-addons/ember-computed-decorators'; import Composer from 'discourse/models/composer'; diff --git a/app/assets/javascripts/discourse/views/discovery-top.js.es6 b/app/assets/javascripts/discourse/views/discovery-top.js.es6 deleted file mode 100644 index 72d1e7167e..0000000000 --- a/app/assets/javascripts/discourse/views/discovery-top.js.es6 +++ /dev/null @@ -1,4 +0,0 @@ -import UrlRefresh from 'discourse/mixins/url-refresh'; -import ScrollTop from 'discourse/mixins/scroll-top'; - -export default Ember.View.extend(ScrollTop, UrlRefresh); diff --git a/app/assets/javascripts/discourse/views/group-index.js.es6 b/app/assets/javascripts/discourse/views/group-index.js.es6 deleted file mode 100644 index 4e25173395..0000000000 --- a/app/assets/javascripts/discourse/views/group-index.js.es6 +++ /dev/null @@ -1,6 +0,0 @@ -import ScrollTop from 'discourse/mixins/scroll-top'; -import LoadMore from "discourse/mixins/load-more"; - -export default Ember.View.extend(ScrollTop, LoadMore, { - eyelineSelector: '.user-stream .item', -}); diff --git a/app/assets/javascripts/discourse/views/group-members.js.es6 b/app/assets/javascripts/discourse/views/group-members.js.es6 deleted file mode 100644 index cae92ca87e..0000000000 --- a/app/assets/javascripts/discourse/views/group-members.js.es6 +++ /dev/null @@ -1,6 +0,0 @@ -import ScrollTop from 'discourse/mixins/scroll-top'; -import LoadMore from "discourse/mixins/load-more"; - -export default Ember.View.extend(ScrollTop, LoadMore, { - eyelineSelector: '.group-members tr', -}); diff --git a/app/assets/javascripts/discourse/views/group-mentions.js.es6 b/app/assets/javascripts/discourse/views/group-mentions.js.es6 deleted file mode 100644 index 4e25173395..0000000000 --- a/app/assets/javascripts/discourse/views/group-mentions.js.es6 +++ /dev/null @@ -1,6 +0,0 @@ -import ScrollTop from 'discourse/mixins/scroll-top'; -import LoadMore from "discourse/mixins/load-more"; - -export default Ember.View.extend(ScrollTop, LoadMore, { - eyelineSelector: '.user-stream .item', -}); diff --git a/app/assets/javascripts/discourse/views/group-topics.js.es6 b/app/assets/javascripts/discourse/views/group-topics.js.es6 deleted file mode 100644 index 4e25173395..0000000000 --- a/app/assets/javascripts/discourse/views/group-topics.js.es6 +++ /dev/null @@ -1,6 +0,0 @@ -import ScrollTop from 'discourse/mixins/scroll-top'; -import LoadMore from "discourse/mixins/load-more"; - -export default Ember.View.extend(ScrollTop, LoadMore, { - eyelineSelector: '.user-stream .item', -}); diff --git a/app/assets/javascripts/discourse/views/header.js.es6 b/app/assets/javascripts/discourse/views/header.js.es6 deleted file mode 100644 index eb5ebec50f..0000000000 --- a/app/assets/javascripts/discourse/views/header.js.es6 +++ /dev/null @@ -1,55 +0,0 @@ -import { on } from 'ember-addons/ember-computed-decorators'; - -export default Ember.View.extend({ - tagName: 'header', - classNames: ['d-header', 'clearfix'], - classNameBindings: ['editingTopic'], - templateName: 'header', - - examineDockHeader() { - // Check the dock after the current run loop. While rendering, - // it's much slower to calculate `outlet.offset()` - Ember.run.next(() => { - if (this.docAt === undefined) { - const outlet = $('#main-outlet'); - if (!(outlet && outlet.length === 1)) return; - this.docAt = outlet.offset().top; - } - - const offset = window.pageYOffset || $('html').scrollTop(); - if (offset >= this.docAt) { - if (!this.dockedHeader) { - $('body').addClass('docked'); - this.dockedHeader = true; - } - } else { - if (this.dockedHeader) { - $('body').removeClass('docked'); - this.dockedHeader = false; - } - } - }); - }, - - @on('willDestroyElement') - _tearDown() { - $(window).unbind('scroll.discourse-dock'); - $(document).unbind('touchmove.discourse-dock'); - this.$('a.unread-private-messages, a.unread-notifications, a[data-notifications]').off('click.notifications'); - $('body').off('keydown.header'); - }, - - @on('didInsertElement') - _setup() { - $(window).bind('scroll.discourse-dock', () => this.examineDockHeader()); - $(document).bind('touchmove.discourse-dock', () => this.examineDockHeader()); - this.examineDockHeader(); - } -}); - -export function headerHeight() { - const $header = $('header.d-header'); - const headerOffset = $header.offset(); - const headerOffsetTop = (headerOffset) ? headerOffset.top : 0; - return parseInt($header.outerHeight() + headerOffsetTop - $(window).scrollTop()); -} diff --git a/app/assets/javascripts/discourse/views/history.js.es6 b/app/assets/javascripts/discourse/views/history.js.es6 index 7bec4d846e..54e9ab3e3b 100644 --- a/app/assets/javascripts/discourse/views/history.js.es6 +++ b/app/assets/javascripts/discourse/views/history.js.es6 @@ -1,4 +1,5 @@ import ModalBodyView from "discourse/views/modal-body"; +import ClickTrack from 'discourse/lib/click-track'; export default ModalBodyView.extend({ templateName: 'modal/history', @@ -7,5 +8,28 @@ export default ModalBodyView.extend({ resizeModal: function(){ const viewPortHeight = $(window).height(); this.$(".modal-body").css("max-height", Math.floor(0.8 * viewPortHeight) + "px"); - }.on("didInsertElement") + }.on("didInsertElement"), + + _inserted: function() { + this.$().on('mouseup.discourse-redirect', '#revisions a', function(e) { + // bypass if we are selecting stuff + const selection = window.getSelection && window.getSelection(); + if (selection.type === "Range" || selection.rangeCount > 0) { + if (Discourse.Utilities.selectedText() !== "") { + return true; + } + } + + const $target = $(e.target); + if ($target.hasClass('mention') || $target.parents('.expanded-embed').length) { return false; } + + return ClickTrack.trackClick(e); + }); + + }.on('didInsertElement'), + + // This view is being removed. Shut down operations + _destroyed: function() { + this.$().off('mouseup.discourse-redirect', '#revisions a'); + }.on('willDestroyElement') }); diff --git a/app/assets/javascripts/discourse/views/rename-tag.js.es6 b/app/assets/javascripts/discourse/views/rename-tag.js.es6 new file mode 100644 index 0000000000..68a0b12c5c --- /dev/null +++ b/app/assets/javascripts/discourse/views/rename-tag.js.es6 @@ -0,0 +1,5 @@ +import ModalBodyView from 'discourse/views/modal-body'; + +export default ModalBodyView.extend({ + title: I18n.t("tagging.rename_tag") +}); diff --git a/app/assets/javascripts/discourse/views/share.js.es6 b/app/assets/javascripts/discourse/views/share.js.es6 index c15f26d835..29ce3f95c6 100644 --- a/app/assets/javascripts/discourse/views/share.js.es6 +++ b/app/assets/javascripts/discourse/views/share.js.es6 @@ -1,3 +1,4 @@ +import { wantsNewWindow } from 'discourse/lib/intercept-click'; export default Ember.View.extend({ templateName: 'share', @@ -95,7 +96,7 @@ export default Ember.View.extend({ $html.on('click.discoure-share-link', '[data-share-url]', function(e) { // if they want to open in a new tab, let it so - if (e.shiftKey || e.metaKey || e.ctrlKey || e.which === 2) { return true; } + if (wantsNewWindow(e)) { return true; } e.preventDefault(); diff --git a/app/assets/javascripts/discourse/views/topic-progress.js.es6 b/app/assets/javascripts/discourse/views/topic-progress.js.es6 index 7454c99d2d..7d16f99637 100644 --- a/app/assets/javascripts/discourse/views/topic-progress.js.es6 +++ b/app/assets/javascripts/discourse/views/topic-progress.js.es6 @@ -23,7 +23,7 @@ export default Ember.View.extend({ _updateBar: function() { Em.run.scheduleOnce('afterRender', this, '_updateProgressBar'); - }.observes('controller.streamPercentage', 'controller.model.postStream.stream.@each').on('init'), + }.observes('controller.streamPercentage', 'controller.model.postStream.stream.[]').on('init'), _updateProgressBar: function() { // speeds up stuff, bypass jquery slowness and extra checks diff --git a/app/assets/javascripts/discourse/views/topic.js.es6 b/app/assets/javascripts/discourse/views/topic.js.es6 index 96cdf5826d..6ef0621a52 100644 --- a/app/assets/javascripts/discourse/views/topic.js.es6 +++ b/app/assets/javascripts/discourse/views/topic.js.es6 @@ -1,7 +1,6 @@ import AddCategoryClass from 'discourse/mixins/add-category-class'; import AddArchetypeClass from 'discourse/mixins/add-archetype-class'; import ClickTrack from 'discourse/lib/click-track'; -import { listenForViewEvent } from 'discourse/lib/app-events'; import { categoryBadgeHTML } from 'discourse/helpers/category-link'; import Scrolling from 'discourse/mixins/scrolling'; @@ -23,6 +22,8 @@ const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolli postStream: Em.computed.alias('topic.postStream'), archetype: Em.computed.alias('topic.archetype'), + _lastShowTopic: null, + _composeChanged: function() { const composerController = Discourse.get('router.composerController'); composerController.clearState(); @@ -35,6 +36,7 @@ const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolli // prevents scrolled from being called twice. const enteredAt = this.get('controller.enteredAt'); if (enteredAt && (this.get('lastEnteredAt') !== enteredAt)) { + this._lastShowTopic = null; this.scrolled(); this.set('lastEnteredAt', enteredAt); } @@ -60,6 +62,9 @@ const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolli return ClickTrack.trackClick(e); }); + this.appEvents.on('post:highlight', postNumber => { + Ember.run.scheduleOnce('afterRender', null, highlight, postNumber); + }); }.on('didInsertElement'), // This view is being removed. Shut down operations @@ -73,7 +78,8 @@ const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolli this.resetExamineDockCache(); // this happens after route exit, stuff could have trickled in - this.set('controller.controllers.header.showExtraInfo', false); + this.appEvents.trigger('header:hide-topic'); + this.appEvents.off('post:highlight'); }.on('willDestroyElement'), @@ -90,6 +96,14 @@ const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolli offset: 0, hasScrolled: Em.computed.gt("offset", 0), + showTopicInHeader(topic, offset) { + if (this.get('docAt')) { + return offset >= this.get('docAt') || topic.get('postStream.firstPostNotLoaded'); + } else { + return topic.get('postStream.firstPostNotLoaded'); + } + }, + // The user has scrolled the window, or it is finished rendering and ready for processing. scrolled() { if (this.isDestroyed || this.isDestroying || this._state !== 'inDOM') { @@ -106,12 +120,16 @@ const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolli this.set("offset", offset); - const headerController = this.get('controller.controllers.header'), - topic = this.get('controller.model'); - if (this.get('docAt')) { - headerController.set('showExtraInfo', offset >= this.get('docAt') || topic.get('postStream.firstPostNotLoaded')); - } else { - headerController.set('showExtraInfo', topic.get('postStream.firstPostNotLoaded')); + const topic = this.get('controller.model'); + const showTopic = this.showTopicInHeader(topic, offset); + if (showTopic !== this._lastShowTopic) { + this._lastShowTopic = showTopic; + + if (showTopic) { + this.appEvents.trigger('header:show-topic', topic); + } else { + this.appEvents.trigger('header:hide-topic'); + } } // Trigger a scrolled event @@ -185,8 +203,4 @@ function highlight(postNumber) { }); } -listenForViewEvent(TopicView, 'post:highlight', postNumber => { - Ember.run.scheduleOnce('afterRender', null, highlight, postNumber); -}); - export default TopicView; diff --git a/app/assets/javascripts/discourse/views/user-activity-stream.js.es6 b/app/assets/javascripts/discourse/views/user-activity-stream.js.es6 deleted file mode 100644 index 86fbaefd8f..0000000000 --- a/app/assets/javascripts/discourse/views/user-activity-stream.js.es6 +++ /dev/null @@ -1,27 +0,0 @@ -import LoadMore from "discourse/mixins/load-more"; - -export default Ember.View.extend(LoadMore, { - loading: false, - eyelineSelector: '.user-stream .item', - classNames: ['user-stream'], - - _scrollTopOnModelChange: function() { - Em.run.schedule('afterRender', function() { - $(document).scrollTop(0); - }); - }.observes('controller.model.user.id'), - - actions: { - loadMore() { - const self = this; - if (this.get('loading')) { return; } - - this.set('loading', true); - const stream = this.get('controller.model'); - stream.findItems().then(function() { - self.set('loading', false); - self.get('eyeline').flushRest(); - }); - } - } -}); diff --git a/app/assets/javascripts/discourse/views/user-card.js.es6 b/app/assets/javascripts/discourse/views/user-card.js.es6 index 6e1b42d22b..584254c7e5 100644 --- a/app/assets/javascripts/discourse/views/user-card.js.es6 +++ b/app/assets/javascripts/discourse/views/user-card.js.es6 @@ -1,3 +1,4 @@ +import { wantsNewWindow } from 'discourse/lib/intercept-click'; import { setting } from 'discourse/lib/computed'; import CleansUp from 'discourse/mixins/cleans-up'; import afterTransition from 'discourse/lib/after-transition'; @@ -57,7 +58,7 @@ export default Ember.View.extend(CleansUp, { }; $('#main-outlet').on(clickDataExpand, '[data-user-card]', (e) => { - if (e.ctrlKey || e.metaKey) { return; } + if (wantsNewWindow(e)) { return; } const $target = $(e.currentTarget), username = $target.data('user-card'); @@ -65,7 +66,7 @@ export default Ember.View.extend(CleansUp, { }); $('#main-outlet').on(clickMention, 'a.mention', (e) => { - if (e.ctrlKey || e.metaKey) { return; } + if (wantsNewWindow(e)) { return; } const $target = $(e.target), username = $target.text().replace(/^@/, ''); diff --git a/app/assets/javascripts/discourse/views/user-invited-show.js.es6 b/app/assets/javascripts/discourse/views/user-invited-show.js.es6 deleted file mode 100644 index 25ae5e30d6..0000000000 --- a/app/assets/javascripts/discourse/views/user-invited-show.js.es6 +++ /dev/null @@ -1,7 +0,0 @@ -import LoadMore from "discourse/mixins/load-more"; - -export default Ember.View.extend(LoadMore, { - classNames: ['paginated-topics-list'], - eyelineSelector: '.paginated-topics-list .user-invite-list tr', - templateName: 'user-invited-show' -}); diff --git a/app/assets/javascripts/discourse/views/user-notifications.js.es6 b/app/assets/javascripts/discourse/views/user-notifications.js.es6 deleted file mode 100644 index c674102044..0000000000 --- a/app/assets/javascripts/discourse/views/user-notifications.js.es6 +++ /dev/null @@ -1,6 +0,0 @@ -import LoadMore from "discourse/mixins/load-more"; - -export default Ember.View.extend(LoadMore, { - eyelineSelector: '.user-stream .notification', - classNames: ['user-stream', 'notification-history'] -}); diff --git a/app/assets/javascripts/discourse/views/user-posts.js.es6 b/app/assets/javascripts/discourse/views/user-posts.js.es6 deleted file mode 100644 index 6a4d254fcf..0000000000 --- a/app/assets/javascripts/discourse/views/user-posts.js.es6 +++ /dev/null @@ -1,20 +0,0 @@ -import LoadMore from "discourse/mixins/load-more"; - -export default Ember.View.extend(LoadMore, { - loading: false, - eyelineSelector: ".user-stream .item", - classNames: ["user-stream"], - - actions: { - loadMore: function() { - var self = this; - if (this.get("loading")) { return; } - - var postsStream = this.get("controller.model"); - postsStream.findItems().then(function () { - self.set("loading", false); - self.get("eyeline").flushRest(); - }).catch(function () { }); - } - } -}); diff --git a/app/assets/javascripts/discourse/views/user-stream.js.es6 b/app/assets/javascripts/discourse/views/user-stream.js.es6 deleted file mode 100644 index 86fbaefd8f..0000000000 --- a/app/assets/javascripts/discourse/views/user-stream.js.es6 +++ /dev/null @@ -1,27 +0,0 @@ -import LoadMore from "discourse/mixins/load-more"; - -export default Ember.View.extend(LoadMore, { - loading: false, - eyelineSelector: '.user-stream .item', - classNames: ['user-stream'], - - _scrollTopOnModelChange: function() { - Em.run.schedule('afterRender', function() { - $(document).scrollTop(0); - }); - }.observes('controller.model.user.id'), - - actions: { - loadMore() { - const self = this; - if (this.get('loading')) { return; } - - this.set('loading', true); - const stream = this.get('controller.model'); - stream.findItems().then(function() { - self.set('loading', false); - self.get('eyeline').flushRest(); - }); - } - } -}); diff --git a/app/assets/javascripts/discourse/views/user-topics-list.js.es6 b/app/assets/javascripts/discourse/views/user-topics-list.js.es6 deleted file mode 100644 index b60d907613..0000000000 --- a/app/assets/javascripts/discourse/views/user-topics-list.js.es6 +++ /dev/null @@ -1,6 +0,0 @@ -import LoadMore from "discourse/mixins/load-more"; - -export default Ember.View.extend(LoadMore, { - classNames: ['paginated-topics-list'], - eyelineSelector: '.paginated-topics-list .topic-list tr', -}); diff --git a/app/assets/javascripts/discourse/views/users.js.es6 b/app/assets/javascripts/discourse/views/users.js.es6 deleted file mode 100644 index 1af01b7481..0000000000 --- a/app/assets/javascripts/discourse/views/users.js.es6 +++ /dev/null @@ -1,5 +0,0 @@ -import LoadMore from 'discourse/mixins/load-more'; - -export default Ember.View.extend(LoadMore, { - eyelineSelector: '.directory tbody tr' -}); diff --git a/app/assets/javascripts/discourse/widgets/actions-summary.js.es6 b/app/assets/javascripts/discourse/widgets/actions-summary.js.es6 index b776b9a5eb..55fb1043c8 100644 --- a/app/assets/javascripts/discourse/widgets/actions-summary.js.es6 +++ b/app/assets/javascripts/discourse/widgets/actions-summary.js.es6 @@ -61,6 +61,7 @@ createWidget('action-link', { createWidget('actions-summary-item', { tagName: 'div.post-action', + buildKey: (attrs) => `actions-summary-item-${attrs.id}`, defaultState() { return { users: [] }; diff --git a/app/assets/javascripts/discourse/widgets/button.js.es6 b/app/assets/javascripts/discourse/widgets/button.js.es6 index 5b4f6e1194..656fc4c1e8 100644 --- a/app/assets/javascripts/discourse/widgets/button.js.es6 +++ b/app/assets/javascripts/discourse/widgets/button.js.es6 @@ -14,6 +14,8 @@ export default createWidget('button', { let title; if (attrs.title) { title = I18n.t(attrs.title, attrs.titleOptions); + } else if (attrs.label) { + title = I18n.t(attrs.label, attrs.labelOptions); } const attributes = { "aria-label": title, title }; diff --git a/app/assets/javascripts/discourse/widgets/click-hook.js.es6 b/app/assets/javascripts/discourse/widgets/click-hook.js.es6 deleted file mode 100644 index 16f1f4124a..0000000000 --- a/app/assets/javascripts/discourse/widgets/click-hook.js.es6 +++ /dev/null @@ -1,64 +0,0 @@ -/*eslint no-loop-func:0*/ - -const CLICK_ATTRIBUTE_NAME = '_discourse_click_widget'; -const CLICK_OUTSIDE_ATTRIBUTE_NAME = '_discourse_click_outside_widget'; - -export class WidgetClickHook { - constructor(widget) { - this.widget = widget; - } - - hook(node) { - node[CLICK_ATTRIBUTE_NAME] = this.widget; - } - - unhook(node) { - node[CLICK_ATTRIBUTE_NAME] = null; - } -}; - -export class WidgetClickOutsideHook { - constructor(widget) { - this.widget = widget; - } - - hook(node) { - node.setAttribute('data-click-outside', true); - node[CLICK_OUTSIDE_ATTRIBUTE_NAME] = this.widget; - } - - unhook(node) { - node.removeAttribute('data-click-outside'); - node[CLICK_OUTSIDE_ATTRIBUTE_NAME] = null; - } -}; - -let _watchingDocument = false; -WidgetClickHook.setupDocumentCallback = function() { - if (_watchingDocument) { return; } - - $(document).on('click.discourse-widget', e => { - let node = e.target; - while (node) { - const widget = node[CLICK_ATTRIBUTE_NAME]; - if (widget) { - widget.rerenderResult(() => widget.click(e)); - break; - } - node = node.parentNode; - } - - node = e.target; - const $outside = $('[data-click-outside]'); - $outside.each((i, outNode) => { - if (outNode.contains(node)) { return; } - const widget = outNode[CLICK_OUTSIDE_ATTRIBUTE_NAME]; - if (widget) { - widget.clickOutside(e); - } - }); - }); - - - _watchingDocument = true; -}; diff --git a/app/assets/javascripts/discourse/widgets/hamburger-categories.js.es6 b/app/assets/javascripts/discourse/widgets/hamburger-categories.js.es6 index cb86752c36..ec14630d74 100644 --- a/app/assets/javascripts/discourse/widgets/hamburger-categories.js.es6 +++ b/app/assets/javascripts/discourse/widgets/hamburger-categories.js.es6 @@ -5,7 +5,7 @@ createWidget('hamburger-category', { tagName: 'li.category-link', html(c) { - const results = [ this.attach('category_link', { category: c, allowUncategorized: true }) ]; + const results = [ this.attach('category-link', { category: c, allowUncategorized: true }) ]; const unreadTotal = parseInt(c.get('unreadTopics'), 10) + parseInt(c.get('newTopics'), 10); if (unreadTotal) { diff --git a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 new file mode 100644 index 0000000000..2d4c22323f --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 @@ -0,0 +1,165 @@ +import { createWidget, applyDecorators } from 'discourse/widgets/widget'; +import { h } from 'virtual-dom'; + +export default createWidget('hamburger-menu', { + tagName: 'div.hamburger-panel', + + faqLink(href) { + return h('a.faq-priority', { attributes: { href } }, [ + I18n.t('faq'), + ' ', + h('span.badge.badge-notification', I18n.t('new_item')) + ]); + }, + + adminLinks() { + const { currentUser } = this; + + const links = [{ route: 'admin', className: 'admin-link', icon: 'wrench', label: 'admin_title' }, + { route: 'adminFlags', + className: 'flagged-posts-link', + icon: 'flag', + label: 'flags_title', + badgeClass: 'flagged-posts', + badgeTitle: 'notifications.total_flagged', + badgeCount: 'site_flagged_posts_count' }]; + + if (currentUser.show_queued_posts) { + links.push({ route: 'queued-posts', + className: 'queued-posts-link', + label: 'queue.title', + badgeCount: 'post_queue_new_count', + badgeClass: 'queued-posts' }); + } + + if (currentUser.admin) { + links.push({ route: 'adminSiteSettings', + icon: 'gear', + label: 'admin.site_settings.title', + className: 'settings-link' }); + } + + return links.map(l => this.attach('link', l)); + }, + + lookupCount(type) { + const tts = this.container.lookup('topic-tracking-state:main'); + return tts ? tts.lookupCount(type) : 0; + }, + + showUserDirectory() { + if (!this.siteSettings.enable_user_directory) return false; + if (this.siteSettings.hide_user_profiles_from_public && !this.currentUser) return false; + return true; + }, + + generalLinks() { + const { siteSettings } = this; + const links = []; + + links.push({ route: 'discovery.latest', className: 'latest-topics-link', label: 'filters.latest.title' }); + + if (this.currentUser) { + links.push({ route: 'discovery.new', + className: 'new-topics-link', + labelCount: 'filters.new.title_with_count', + label: 'filters.new.title', + count: this.lookupCount('new') }); + + links.push({ route: 'discovery.unread', + className: 'unread-topics-link', + labelCount: 'filters.unread.title_with_count', + label: 'filters.unread.title', + count: this.lookupCount('unread') }); + } + + links.push({ route: 'discovery.top', className: 'top-topics-link', label: 'filters.top.title' }); + + if (siteSettings.enable_badges) { + links.push({ route: 'badges', className: 'badge-link', label: 'badges.title' }); + } + + if (this.showUserDirectory()) { + links.push({ route: 'users', className: 'user-directory-link', label: 'directory.title' }); + } + + if (this.siteSettings.tagging_enabled) { + links.push({ route: 'tags', label: 'tagging.tags' }); + } + + return links.map(l => this.attach('link', l)); + }, + + listCategories() { + const hideUncategorized = !this.siteSettings.allow_uncategorized_topics; + const showSubcatList = this.siteSettings.show_subcategory_list; + const isStaff = Discourse.User.currentProp('staff'); + + const categories = Discourse.Category.list().reject((c) => { + if (showSubcatList && c.get('parent_category_id')) { return true; } + if (hideUncategorized && c.get('isUncategorizedCategory') && !isStaff) { return true; } + return false; + }); + + return this.attach('hamburger-categories', { categories }); + }, + + footerLinks(prioritizeFaq, faqUrl) { + const links = []; + links.push({ route: 'about', className: 'about-link', label: 'about.simple_title' }); + + if (!prioritizeFaq) { + links.push({ href: faqUrl, className: 'faq-link', label: 'faq' }); + } + + const { site } = this; + if (!site.mobileView && !this.capabilities.touch) { + links.push({ action: 'showKeyboard', className: 'keyboard-shortcuts-link', label: 'keyboard_shortcuts_help.title' }); + } + + if (this.site.mobileView || (this.siteSettings.enable_mobile_theme && this.capabilities.touch)) { + links.push({ action: 'toggleMobileView', + className: 'mobile-toggle-link', + label: this.site.mobileView ? "desktop_view" : "mobile_view" }); + } + + return links.map(l => this.attach('link', l)); + }, + + panelContents() { + const { currentUser } = this; + const results = []; + + let faqUrl = this.siteSettings.faq_url; + if (!faqUrl || faqUrl.length === 0) { + faqUrl = Discourse.getURL('/faq'); + } + + const prioritizeFaq = this.currentUser && !this.currentUser.read_faq; + if (prioritizeFaq) { + results.push(this.attach('menu-links', { heading: true, contents: () => this.faqLink(faqUrl) })); + } + + if (currentUser && currentUser.staff) { + results.push(this.attach('menu-links', { contents: () => { + const extraLinks = applyDecorators(this, 'admin-links', this.attrs, this.state) || []; + return this.adminLinks().concat(extraLinks); + }})); + } + + results.push(this.attach('menu-links', { contents: () => this.generalLinks() })); + results.push(this.listCategories()); + results.push(h('hr')); + results.push(this.attach('menu-links', { omitRule: true, contents: () => this.footerLinks(prioritizeFaq, faqUrl) })); + + return results; + }, + + html() { + return this.attach('menu-panel', { contents: () => this.panelContents() }); + }, + + clickOutside() { + this.sendWidgetAction('toggleHamburger'); + } +}); diff --git a/app/assets/javascripts/discourse/widgets/header-topic-info.js.es6 b/app/assets/javascripts/discourse/widgets/header-topic-info.js.es6 new file mode 100644 index 0000000000..3215bc8f71 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/header-topic-info.js.es6 @@ -0,0 +1,65 @@ +import { createWidget } from 'discourse/widgets/widget'; +import { h } from 'virtual-dom'; +import { iconNode } from 'discourse/helpers/fa-icon'; +import DiscourseURL from 'discourse/lib/url'; +import RawHtml from 'discourse/widgets/raw-html'; +import { tagNode } from 'discourse/lib/render-tag'; + +export default createWidget('header-topic-info', { + tagName: 'div.extra-info-wrapper', + + html(attrs) { + const topic = attrs.topic; + + const heading = []; + + const showPM = !topic.get('is_warning') && topic.get('isPrivateMessage'); + if (showPM) { + const href = this.currentUser && this.currentUser.pmPath(topic); + if (href) { + heading.push(h('a', { attributes: { href } }, + h('span.private-message-glyph', iconNode('envelope')))); + } + } + const loaded = topic.get('details.loaded'); + + if (loaded) { + heading.push(this.attach('topic-status', attrs)); + + const titleHTML = new RawHtml({ html: `${topic.get('fancyTitle')}` }); + heading.push(this.attach('link', { className: 'topic-link', + action: 'jumpToTopPost', + href: topic.get('url'), + contents: () => titleHTML })); + } + + const title = [h('h1', heading)]; + if (loaded) { + const category = topic.get('category'); + if (category && (!category.get('isUncategorizedCategory') || !this.siteSettings.suppress_uncategorized_badge)) { + const parentCategory = category.get('parentCategory'); + if (parentCategory) { + title.push(this.attach('category-link', { category: parentCategory })); + } + title.push(this.attach('category-link', { category })); + } + + if (this.siteSettings.tagging_enabled) { + const tags = topic.get('tags') || []; + if (tags.length) { + title.push(h('div.list-tags', tags.map(tagNode))); + } + } + } + + const contents = h('div.title-wrapper', title); + return h('div.extra-info', { className: title.length > 1 ? 'two-rows' : '' }, contents); + }, + + jumpToTopPost() { + const topic = this.attrs.topic; + if (topic) { + DiscourseURL.routeTo(topic.get('firstPostUrl')); + } + } +}); diff --git a/app/assets/javascripts/discourse/widgets/header.js.es6 b/app/assets/javascripts/discourse/widgets/header.js.es6 new file mode 100644 index 0000000000..711aef6dcf --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/header.js.es6 @@ -0,0 +1,292 @@ +import { createWidget } from 'discourse/widgets/widget'; +import { iconNode } from 'discourse/helpers/fa-icon'; +import { avatarImg } from 'discourse/widgets/post'; +import DiscourseURL from 'discourse/lib/url'; +import { wantsNewWindow } from 'discourse/lib/intercept-click'; + +import { h } from 'virtual-dom'; + +const dropdown = { + buildClasses(attrs) { + if (attrs.active) { return "active"; } + }, + + click(e) { + if (wantsNewWindow(e)) { return; } + e.preventDefault(); + if (!this.attrs.active) { + this.sendWidgetAction(this.attrs.action); + } + } +}; + +createWidget('header-notifications', { + html(attrs) { + const { currentUser } = this; + + const contents = [ avatarImg('medium', { template: currentUser.get('avatar_template'), + username: currentUser.get('username') }) ]; + + const unreadNotifications = currentUser.get('unread_notifications'); + if (!!unreadNotifications) { + contents.push(this.attach('link', { action: attrs.action, + className: 'badge-notification unread-notifications', + rawLabel: unreadNotifications })); + } + + const unreadPMs = currentUser.get('unread_private_messages'); + if (!!unreadPMs) { + contents.push(this.attach('link', { action: attrs.action, + className: 'badge-notification unread-private-messages', + rawLabel: unreadPMs })); + } + + return contents; + } +}); + +createWidget('user-dropdown', jQuery.extend({ + tagName: 'li.header-dropdown-toggle.current-user', + + buildId() { + return 'current-user'; + }, + + html(attrs) { + const { currentUser } = this; + + return h('a.icon', { attributes: { href: currentUser.get('path'), 'data-auto-route': true } }, + this.attach('header-notifications', attrs)); + } +}, dropdown)); + +createWidget('header-dropdown', jQuery.extend({ + tagName: 'li.header-dropdown-toggle', + + html(attrs) { + const title = I18n.t(attrs.title); + + const body = [iconNode(attrs.icon)]; + if (attrs.contents) { + body.push(attrs.contents.call(this)); + } + + return h('a.icon', { attributes: { href: attrs.href, + 'data-auto-route': true, + title, + 'aria-label': title, + id: attrs.iconId } }, body); + } +}, dropdown)); + +createWidget('header-icons', { + tagName: 'ul.icons.clearfix', + + buildAttributes() { + return { role: 'navigation' }; + }, + + html(attrs) { + const hamburger = this.attach('header-dropdown', { + title: 'hamburger_menu', + icon: 'bars', + iconId: 'toggle-hamburger-menu', + active: attrs.hamburgerVisible, + action: 'toggleHamburger', + contents() { + if (!attrs.flagCount) { return; } + return this.attach('link', { + href: '/admin/flags/active', + title: 'notifications.total_flagged', + rawLabel: attrs.flagCount, + className: 'badge-notification flagged-posts' + }); + } + }); + + const search = this.attach('header-dropdown', { + title: 'search.title', + icon: 'search', + iconId: 'search-button', + action: 'toggleSearchMenu', + active: attrs.searchVisible, + href: '/search' + }); + + const icons = [search, hamburger]; + if (this.currentUser) { + icons.push(this.attach('user-dropdown', { active: attrs.userVisible, + action: 'toggleUserMenu' })); + } + + return icons; + }, +}); + +createWidget('header-buttons', { + tagName: 'span', + + html(attrs) { + if (this.currentUser) { return; } + + const buttons = []; + + if (attrs.canSignUp && !attrs.topic) { + buttons.push(this.attach('button', { label: "sign_up", + className: 'btn-primary btn-small sign-up-button', + action: "showCreateAccount" })); + } + + + buttons.push(this.attach('button', { label: 'log_in', + className: 'btn-primary btn-small login-button', + action: 'showLogin', + icon: 'user' })); + return buttons; + } +}); + +export default createWidget('header', { + tagName: 'header.d-header.clearfix', + buildKey: () => `header`, + + defaultState() { + return { searchVisible: false, + hamburgerVisible: false, + userVisible: false, + contextEnabled: false }; + }, + + html(attrs, state) { + const panels = [this.attach('header-buttons', attrs), + this.attach('header-icons', { hamburgerVisible: state.hamburgerVisible, + userVisible: state.userVisible, + searchVisible: state.searchVisible, + flagCount: attrs.flagCount })]; + + if (state.searchVisible) { + panels.push(this.attach('search-menu', { contextEnabled: state.contextEnabled })); + } else if (state.hamburgerVisible) { + panels.push(this.attach('hamburger-menu')); + } else if (state.userVisible) { + panels.push(this.attach('user-menu')); + } + + const contents = [ this.attach('home-logo', { minimized: !!attrs.topic }), + h('div.panel.clearfix', panels) ]; + + if (attrs.topic) { + contents.push(this.attach('header-topic-info', attrs)); + } + + return h('div.wrap', h('div.contents.clearfix', contents)); + }, + + updateHighlight() { + if (!this.state.searchVisible) { + const service = this.container.lookup('search-service:main'); + service.set('highlightTerm', ''); + } + }, + + closeAll() { + this.state.userVisible = false; + this.state.hamburgerVisible = false; + this.state.searchVisible = false; + }, + + linkClickedEvent() { + this.closeAll(); + this.updateHighlight(); + }, + + toggleSearchMenu() { + if (this.site.mobileView) { + const searchService = this.container.lookup('search-service:main'); + const context = searchService.get('searchContext'); + var params = ""; + + if (context) { + params = `?context=${context.type}&context_id=${context.id}&skip_context=true`; + } + + return DiscourseURL.routeTo('/search' + params); + } + + this.state.searchVisible = !this.state.searchVisible; + this.updateHighlight(); + Ember.run.next(() => $('#search-term').focus()); + }, + + toggleUserMenu() { + this.state.userVisible = !this.state.userVisible; + }, + + toggleHamburger() { + this.state.hamburgerVisible = !this.state.hamburgerVisible; + }, + + togglePageSearch() { + const { state } = this; + + if (state.searchVisible) { + this.toggleSearchMenu(); + return false; + } + + state.contextEnabled = false; + + const currentPath = this.container.lookup('controller:application').get('currentPath'); + const blacklist = [ /^discovery\.categories/ ]; + const whitelist = [ /^topic\./ ]; + const check = function(regex) { return !!currentPath.match(regex); }; + let showSearch = whitelist.any(check) && !blacklist.any(check); + + // If we're viewing a topic, only intercept search if there are cloaked posts + if (showSearch && currentPath.match(/^topic\./)) { + showSearch = ($('.topic-post .cooked, .small-action:not(.time-gap)').length < + this.container.lookup('controller:topic').get('model.postStream.stream.length')); + } + + if (showSearch) { + state.contextEnabled = true; + this.toggleSearchMenu(); + return false; + } + + return true; + }, + + searchMenuContextChanged(value) { + this.state.contextEnabled = value; + }, + + domClean() { + const { state } = this; + + if (state.searchVisible || state.hamburgerVisible || state.userVisible) { + this.closeAll(); + } + }, + + headerKeyboardTrigger(msg) { + switch(msg.type) { + case 'search': + this.toggleSearchMenu(); + break; + case 'user': + this.toggleUserMenu(); + break; + case 'hamburger': + this.toggleHamburger(); + break; + case 'page-search': + if (!this.togglePageSearch()) { + msg.event.preventDefault(); + msg.event.stopPropagation(); + } + break; + } + } + +}); diff --git a/app/assets/javascripts/discourse/widgets/home-logo.js.es6 b/app/assets/javascripts/discourse/widgets/home-logo.js.es6 new file mode 100644 index 0000000000..31aea3d6eb --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/home-logo.js.es6 @@ -0,0 +1,56 @@ +import { createWidget } from 'discourse/widgets/widget'; +import { h } from 'virtual-dom'; +import { iconNode } from 'discourse/helpers/fa-icon'; +import { wantsNewWindow } from 'discourse/lib/intercept-click'; +import DiscourseURL from 'discourse/lib/url'; + +export default createWidget('home-logo', { + tagName: 'div.title', + + settings: { + href: '/' + }, + + href() { + const href = this.settings.href; + return (typeof href === "function") ? href() : href; + }, + + logo() { + const { siteSettings } = this; + const mobileView = this.site.mobileView; + + const mobileLogoUrl = siteSettings.mobile_logo_url || ""; + const showMobileLogo = mobileView && (mobileLogoUrl.length > 0); + + const logoUrl = siteSettings.logo_url || ''; + const title = siteSettings.title; + + if (!mobileView && this.attrs.minimized) { + const logoSmallUrl = siteSettings.logo_small_url || ''; + if (logoSmallUrl.length) { + return h('img#site-logo.logo-small', { key: 'logo-small', attributes: { src: logoSmallUrl, width: 33, height: 33, alt: title } }); + } else { + return iconNode('home'); + } + } else if (showMobileLogo) { + return h('img#site-logo.logo-big', { key: 'logo-mobile', attributes: { src: mobileLogoUrl, alt: title } }); + } else if (logoUrl.length) { + return h('img#site-logo.logo-big', { key: 'logo-big', attributes: { src: logoUrl, alt: title } }); + } else { + return h('h2#site-text-logo.text-logo', { key: 'logo-text' }, title); + } + }, + + html() { + return h('a', { attributes: { href: this.href(), 'data-auto-route': true } }, this.logo()); + }, + + click(e) { + if (wantsNewWindow(e)) { return false; } + e.preventDefault(); + DiscourseURL.routeTo(this.href()); + return false; + } + +}); diff --git a/app/assets/javascripts/discourse/widgets/hooks.js.es6 b/app/assets/javascripts/discourse/widgets/hooks.js.es6 new file mode 100644 index 0000000000..669eac77b5 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/hooks.js.es6 @@ -0,0 +1,67 @@ +/*eslint no-loop-func:0*/ + +const CLICK_ATTRIBUTE_NAME = '_discourse_click_widget'; +const CLICK_OUTSIDE_ATTRIBUTE_NAME = '_discourse_click_outside_widget'; +const KEY_UP_ATTRIBUTE_NAME = '_discourse_key_up_widget'; + +function buildHook(attributeName, setAttr) { + return class { + constructor(widget) { + this.widget = widget; + } + + hook(node) { + if (setAttr) { + node.setAttribute(setAttr, true); + } + node[attributeName] = this.widget; + } + + unhook(node) { + if (setAttr) { + node.removeAttribute(setAttr, true); + } + node[attributeName] = null; + } + }; +} + +export const WidgetClickHook = buildHook(CLICK_ATTRIBUTE_NAME); +export const WidgetClickOutsideHook = buildHook(CLICK_OUTSIDE_ATTRIBUTE_NAME, 'data-click-outside'); +export const WidgetKeyUpHook = buildHook(KEY_UP_ATTRIBUTE_NAME); + +function findNode(node, attrName, cb) { + while (node) { + const widget = node[attrName]; + if (widget) { + widget.rerenderResult(() => cb(widget)); + break; + } + node = node.parentNode; + } +} + +let _watchingDocument = false; +WidgetClickHook.setupDocumentCallback = function() { + if (_watchingDocument) { return; } + + $(document).on('click.discourse-widget', e => { + findNode(e.target, CLICK_ATTRIBUTE_NAME, w => w.click(e)); + + let node = e.target; + const $outside = $('[data-click-outside]'); + $outside.each((i, outNode) => { + if (outNode.contains(node)) { return; } + const widget = outNode[CLICK_OUTSIDE_ATTRIBUTE_NAME]; + if (widget) { + widget.clickOutside(e); + } + }); + }); + + $(document).on('keyup.discourse-widget', e => { + findNode(e.target, KEY_UP_ATTRIBUTE_NAME, w => w.keyUp(e)); + }); + + _watchingDocument = true; +}; diff --git a/app/assets/javascripts/discourse/widgets/link.js.es6 b/app/assets/javascripts/discourse/widgets/link.js.es6 new file mode 100644 index 0000000000..5f1782fd05 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/link.js.es6 @@ -0,0 +1,86 @@ +import { wantsNewWindow } from 'discourse/lib/intercept-click'; +import { createWidget } from 'discourse/widgets/widget'; +import { iconNode } from 'discourse/helpers/fa-icon'; +import { h } from 'virtual-dom'; +import DiscourseURL from 'discourse/lib/url'; + +export default createWidget('link', { + tagName: 'a', + + href(attrs) { + const route = attrs.route; + if (route) { + const router = this.container.lookup('router:main'); + if (router && router.router) { + const params = [route]; + if (attrs.model) { + params.push(attrs.model); + } + return Discourse.getURL(router.router.generate.apply(router.router, params)); + } + } else { + return attrs.href; + } + }, + + buildClasses(attrs) { + const result = []; + result.push('widget-link'); + if (attrs.className) { result.push(attrs.className); }; + return result; + }, + + buildAttributes(attrs) { + return { href: this.href(attrs), title: this.label(attrs) }; + }, + + label(attrs) { + if (attrs.labelCount && attrs.count) { + return I18n.t(attrs.labelCount, { count: attrs.count }); + } + return attrs.rawLabel || (attrs.label ? I18n.t(attrs.label) : ''); + }, + + html(attrs) { + if (attrs.contents) { + return attrs.contents(); + } + + const result = []; + if (attrs.icon) { + result.push(iconNode(attrs.icon)); + result.push(' '); + } + + if (!attrs.hideLabel) { + result.push(this.label(attrs)); + } + + const currentUser = this.currentUser; + if (currentUser && attrs.badgeCount) { + const val = parseInt(currentUser.get(attrs.badgeCount)); + if (val > 0) { + const title = attrs.badgeTitle ? I18n.t(attrs.badgeTitle) : ''; + result.push(' '); + result.push(h('span.badge-notification', { className: attrs.badgeClass, + attributes: { title } }, val)); + } + } + + return result; + }, + + click(e) { + if (wantsNewWindow(e)) { return; } + e.preventDefault(); + + if (this.attrs.action) { + e.preventDefault(); + return this.sendWidgetAction(this.attrs.action, this.attrs.actionParam); + } else { + this.sendWidgetEvent('linkClicked'); + } + + return DiscourseURL.routeTo(this.href(this.attrs)); + } +}); diff --git a/app/assets/javascripts/discourse/widgets/menu-panel.js.es6 b/app/assets/javascripts/discourse/widgets/menu-panel.js.es6 new file mode 100644 index 0000000000..8a1ede9663 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/menu-panel.js.es6 @@ -0,0 +1,32 @@ +import { createWidget } from 'discourse/widgets/widget'; +import { h } from 'virtual-dom'; + +createWidget('menu-links', { + html(attrs) { + const links = [].concat(attrs.contents()); + const liOpts = { className: attrs.heading ? 'heading' : '' }; + + const result = []; + result.push(h('ul.menu-links.columned', links.map(l => h('li', liOpts, l)))); + + result.push(h('div.clearfix')); + if (!attrs.omitRule) { + result.push(h('hr')); + } + return result; + } +}); + +createWidget('menu-panel', { + tagName: 'div.menu-panel', + + buildAttributes(attrs) { + if (attrs.maxWidth) { + return { 'data-max-width': attrs.maxWidth }; + } + }, + + html(attrs) { + return h('div.panel-body', h('div.panel-body-contents.clearfix', attrs.contents())); + } +}); diff --git a/app/assets/javascripts/discourse/widgets/notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/notification-item.js.es6 new file mode 100644 index 0000000000..8803eaaf9a --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/notification-item.js.es6 @@ -0,0 +1,112 @@ +import { wantsNewWindow } from 'discourse/lib/intercept-click'; +import RawHtml from 'discourse/widgets/raw-html'; +import { createWidget } from 'discourse/widgets/widget'; +import DiscourseURL from 'discourse/lib/url'; +import { h } from 'virtual-dom'; + +const LIKED_TYPE = 5; +const INVITED_TYPE = 8; +const GROUP_SUMMARY_TYPE = 16; + +createWidget('notification-item', { + tagName: 'li', + + buildClasses(attrs) { + const classNames = []; + if (attrs.get('read')) { classNames.push('read'); } + if (attrs.is_warning) { classNames.push('is-warning'); } + return classNames; + }, + + url() { + const attrs = this.attrs; + const data = attrs.data; + + const badgeId = data.badge_id; + if (badgeId) { + let badgeSlug = data.badge_slug; + + if (!badgeSlug) { + const badgeName = data.badge_name; + badgeSlug = badgeName.replace(/[^A-Za-z0-9_]+/g, '-').toLowerCase(); + } + + let username = data.username; + username = username ? "?username=" + username.toLowerCase() : ""; + return Discourse.getURL('/badges/' + badgeId + '/' + badgeSlug + username); + } + + const topicId = attrs.topic_id; + if (topicId) { + return Discourse.Utilities.postUrl(attrs.slug, topicId, attrs.post_number); + } + + if (attrs.notification_type === INVITED_TYPE) { + return Discourse.getURL('/users/' + data.display_username); + } + + if (data.group_id) { + return Discourse.getURL('/users/' + data.username + '/messages/group/' + data.group_name); + } + }, + + description() { + const data = this.attrs.data; + const badgeName = data.badge_name; + if (badgeName) { return Discourse.Utilities.escapeExpression(badgeName); } + + const title = data.topic_title; + return Ember.isEmpty(title) ? "" : Discourse.Utilities.escapeExpression(title); + }, + + text(notificationType, notName) { + const { attrs } = this; + const data = attrs.data; + const scope = (notName === 'custom') ? data.message : `notifications.${notName}`; + + if (notificationType === GROUP_SUMMARY_TYPE) { + const count = data.inbox_count; + const group_name = data.group_name; + return I18n.t(scope, { count, group_name }); + } + + const username = data.display_username; + const description = this.description(); + if (notificationType === LIKED_TYPE && data.count > 1) { + const count = data.count - 2; + const username2 = data.username2; + if (count===0) { + return I18n.t('notifications.liked_2', {description, username, username2}); + } else { + return I18n.t('notifications.liked_many', {description, username, username2, count}); + } + } + + return I18n.t(scope, {description, username}); + }, + + html(attrs) { + const notificationType = attrs.notification_type; + const lookup = this.site.get('notificationLookup'); + const notName = lookup[notificationType]; + + const contents = new RawHtml({ html: `
    ${Discourse.Emoji.unescape(this.text(notificationType, notName))}
    ` }); + const href = this.url(); + const alt = I18n.t(`notifications.alt.${notName}`); + return href ? h('a', { attributes: { href, alt, 'data-auto-route': true } }, contents) : contents; + }, + + click(e) { + this.attrs.set('read', true); + const id = this.attrs.id; + Discourse.setTransientHeader("Discourse-Clear-Notifications", id); + if (document && document.cookie) { + document.cookie = `cn=${id}; expires=Fri, 31 Dec 9999 23:59:59 GMT`; + } + if (wantsNewWindow(e)) { return; } + e.preventDefault(); + + this.sendWidgetEvent('linkClicked'); + DiscourseURL.routeTo(this.url()); + } +}); diff --git a/app/assets/javascripts/discourse/widgets/post-gutter.js.es6 b/app/assets/javascripts/discourse/widgets/post-gutter.js.es6 index 61d7f973e0..81443e10bc 100644 --- a/app/assets/javascripts/discourse/widgets/post-gutter.js.es6 +++ b/app/assets/javascripts/discourse/widgets/post-gutter.js.es6 @@ -7,6 +7,7 @@ const MAX_GUTTER_LINKS = 5; export default createWidget('post-gutter', { tagName: 'div.gutter', + buildKey: (attrs) => `post-gutter-${attrs.id}`, defaultState() { return { collapsed: true }; diff --git a/app/assets/javascripts/discourse/widgets/post-small-action.js.es6 b/app/assets/javascripts/discourse/widgets/post-small-action.js.es6 index 4940b6446a..4f56c01ddb 100644 --- a/app/assets/javascripts/discourse/widgets/post-small-action.js.es6 +++ b/app/assets/javascripts/discourse/widgets/post-small-action.js.es6 @@ -20,7 +20,9 @@ const icons = { 'visible.disabled': 'eye-slash', 'split_topic': 'sign-out', 'invited_user': 'plus-circle', - 'removed_user': 'minus-circle' + 'removed_user': 'minus-circle', + 'public_topic': 'comment', + 'private_topic': 'envelope' }; export default createWidget('post-small-action', { diff --git a/app/assets/javascripts/discourse/widgets/post.js.es6 b/app/assets/javascripts/discourse/widgets/post.js.es6 index 0cf321bcfe..7dcd728c57 100644 --- a/app/assets/javascripts/discourse/widgets/post.js.es6 +++ b/app/assets/javascripts/discourse/widgets/post.js.es6 @@ -51,6 +51,7 @@ createWidget('select-post', { createWidget('reply-to-tab', { tagName: 'a.reply-to-tab', + buildKey: attrs => `reply-to-tab-${attrs.id}`, defaultState() { return { loading: false }; @@ -61,7 +62,7 @@ createWidget('reply-to-tab', { return [iconNode('mail-forward'), ' ', - avatarImg.call(this,'small',{ + avatarImg('small', { template: attrs.replyToAvatarTemplate, username: attrs.replyToUsername }), diff --git a/app/assets/javascripts/discourse/widgets/raw-html.js.es6 b/app/assets/javascripts/discourse/widgets/raw-html.js.es6 index a1eddd74b1..e009d3caf4 100644 --- a/app/assets/javascripts/discourse/widgets/raw-html.js.es6 +++ b/app/assets/javascripts/discourse/widgets/raw-html.js.es6 @@ -4,9 +4,13 @@ export default class RawHtml { } init() { - return $(this.html)[0]; + const $html = $(this.html); + this.decorate($html); + return $html[0]; } + decorate() { } + update(prev) { if (prev.html === this.html) { return; } return this.init(); diff --git a/app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6 new file mode 100644 index 0000000000..61e0626f8d --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6 @@ -0,0 +1,60 @@ +import { searchContextDescription } from 'discourse/lib/search'; +import { h } from 'virtual-dom'; +import { createWidget } from 'discourse/widgets/widget'; + +createWidget('search-term', { + tagName: 'input', + buildId: () => 'search-term', + + buildAttributes(attrs) { + return { type: 'text', + value: attrs.value || '', + placeholder: attrs.contextEnabled ? "" : I18n.t('search.title') }; + }, + + keyUp(e) { + if (e.which === 13) { + return this.sendWidgetAction('fullSearch'); + } + + const val = this.attrs.value; + const newVal = $(`#${this.buildId()}`).val(); + + if (newVal !== val) { + this.sendWidgetAction('searchTermChanged', newVal); + } + } +}); + +createWidget('search-context', { + tagName: 'div.search-context', + + html(attrs) { + const service = this.container.lookup('search-service:main'); + const ctx = service.get('searchContext'); + + const result = []; + if (ctx) { + const description = searchContextDescription(Ember.get(ctx, 'type'), + Ember.get(ctx, 'user.username') || Ember.get(ctx, 'category.name')); + result.push(h('label', [ + h('input', { type: 'checkbox', checked: attrs.contextEnabled }), + ' ', + description + ])); + } + + result.push(this.attach('link', { action: 'showSearchHelp', + label: 'show_help', + className: 'show-help' })); + result.push(h('div.clearfix')); + return result; + }, + + click() { + const val = $('.search-context input').is(':checked'); + if (val !== this.attrs.contextEnabled) { + this.sendWidgetAction('searchContextChanged', val); + } + } +}); diff --git a/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6 new file mode 100644 index 0000000000..d057d196e5 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6 @@ -0,0 +1,102 @@ +import { avatarImg } from 'discourse/widgets/post'; +import { dateNode } from 'discourse/helpers/node'; +import RawHtml from 'discourse/widgets/raw-html'; +import { createWidget } from 'discourse/widgets/widget'; +import { h } from 'virtual-dom'; +import { iconNode } from 'discourse/helpers/fa-icon'; + +class Highlighted extends RawHtml { + constructor(html, term) { + super({ html: `${html}` }); + this.term = term; + } + + decorate($html) { + if (this.term) { + $html.highlight(this.term.split(/\s+/), { className: 'search-highlight' }); + } + } +} + +function createSearchResult(type, linkField, fn) { + return createWidget(`search-result-${type}`, { + html(attrs) { + return attrs.results.map(r => { + return h('li', this.attach('link', { + href: r.get(linkField), + contents: () => fn.call(this, r, attrs.term), + className: 'search-link' + })); + }); + } + }); +} + +function postResult(result, link, term) { + const html = [link]; + + if (!this.site.mobileView) { + html.push(h('span.blurb', [ dateNode(result.created_at), + ' - ', + new Highlighted(result.blurb, term) ])); + } + + return html; +} + +createSearchResult('user', 'path', function(u) { + return [ avatarImg('small', { template: u.avatar_template, username: u.username }), ' ', u.username ]; +}); + +createSearchResult('topic', 'url', function(result, term) { + const topic = result.topic; + const link = h('span.topic', [ + this.attach('topic-status', { topic, disableActions: true }), + h('span.topic-title', new Highlighted(topic.get('fancyTitle'), term)), + this.attach('category-link', { category: topic.get('category'), link: false }) + ]); + + return postResult.call(this, result, link, term); +}); + +createSearchResult('post', 'url', function(result, term) { + return postResult.call(this, result, I18n.t('search.post_format', result), term); +}); + +createSearchResult('category', 'url', function (c) { + return this.attach('category-link', { category: c, link: false }); +}); + +createWidget('search-menu-results', { + tagName: 'div.results', + + html(attrs) { + if (attrs.noResults) { + return h('div.no-results', I18n.t('search.no_results')); + } + + const results = attrs.results; + const resultTypes = results.resultTypes || []; + return resultTypes.map(rt => { + const more = []; + + const moreArgs = { + className: 'filter', + contents: () => [I18n.t('show_more'), ' ', iconNode('chevron-down')] + }; + + if (rt.moreUrl) { + more.push(this.attach('link', $.extend(moreArgs, { href: rt.moreUrl }))); + } else if (rt.more) { + more.push(this.attach('link', $.extend(moreArgs, { action: "moreOfType", + actionParam: rt.type, + className: "filter filter-type"}))); + } + + return [ + h('ul', this.attach(rt.componentName, { results: rt.results, term: attrs.term })), + h('div.no-results', more) + ]; + }); + } +}); diff --git a/app/assets/javascripts/discourse/widgets/search-menu.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu.js.es6 new file mode 100644 index 0000000000..b585e0e18c --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/search-menu.js.es6 @@ -0,0 +1,175 @@ +import { searchForTerm, isValidSearchTerm } from 'discourse/lib/search'; +import { createWidget } from 'discourse/widgets/widget'; +import { h } from 'virtual-dom'; +import DiscourseURL from 'discourse/lib/url'; + +// Helps with debouncing and cancelling promises +const SearchHelper = { + _activeSearch: null, + _cancelSearch: null, + + // for cancelling debounced search + cancel() { + if (this._activeSearch) { + this._activeSearch.abort(); + } + + this._cancelSearch = true; + Ember.run.later(() => this._cancelSearch = false, 400); + }, + + perform(widget) { + if (this._cancelSearch){ + this._cancelSearch = null; + return; + } + + if (this._activeSearch) { + this._activeSearch.abort(); + this._activeSearch = null; + } + + const { state } = widget; + const { term, typeFilter, contextEnabled } = state; + const searchContext = contextEnabled ? widget.searchContext() : null; + const fullSearchUrl = widget.fullSearchUrl(); + + if (!isValidSearchTerm(term)) { + state.noResults = true; + state.results = []; + state.loading = false; + widget.scheduleRerender(); + } else { + this._activeSearch = searchForTerm(term, { typeFilter, searchContext, fullSearchUrl }); + this._activeSearch.then(content => { + state.noResults = content.resultTypes.length === 0; + state.results = content; + }).finally(() => { + state.loading = false; + widget.scheduleRerender(); + this._activeSearch = null; + }); + } + } +}; + +export default createWidget('search-menu', { + tagName: 'div.search-menu', + buildKey: () => 'search-menu', + + defaultState() { + return { loading: false, + results: {}, + noResults: false, + term: null, + typeFilter: null }; + }, + + fullSearchUrl() { + const state = this.state; + const contextEnabled = state.contextEnabled; + + const ctx = contextEnabled ? this.searchContext() : null; + const type = Ember.get(ctx, 'type'); + + if (contextEnabled && type === 'topic') { + return; + } + + let url = '/search?q=' + encodeURIComponent(state.term); + if (contextEnabled) { + if (ctx.id.toString().toLowerCase() === this.currentUser.username_lower && + type === "private_messages") { + url += ' in:private'; + } else { + url += encodeURIComponent(" " + type + ":" + ctx.id); + } + } + + return Discourse.getURL(url); + }, + + panelContents() { + const { state } = this; + const contextEnabled = state.contextEnabled; + + const results = [this.attach('search-term', { value: state.term, contextEnabled }), + this.attach('search-context', { contextEnabled })]; + + if (state.loading) { + results.push(h('div.searching', h('div.spinner'))); + } else { + results.push(this.attach('search-menu-results', { term: state.term, + noResults: state.noResults, + results: state.results })); + } + + return results; + }, + + searchService() { + if (!this._searchService) { + this._searchService = this.container.lookup('search-service:main'); + } + return this._searchService; + }, + + searchContext() { + if (!this._searchContext) { + this._searchContext = this.searchService().get('searchContext'); + } + return this._searchContext; + }, + + html(attrs, state) { + state.contextEnabled = attrs.contextEnabled; + + return this.attach('menu-panel', { maxWidth: 500, contents: () => this.panelContents() }); + }, + + clickOutside() { + this.sendWidgetAction('toggleSearchMenu'); + }, + + triggerSearch() { + const { state } = this; + + state.noResults = false; + if (isValidSearchTerm(state.term)) { + this.searchService().set('highlightTerm', state.term); + state.loading = true; + Ember.run.debounce(SearchHelper, SearchHelper.perform, this, 400); + } else { + state.results = []; + } + }, + + moreOfType(type) { + this.state.typeFilter = type; + this.triggerSearch(); + }, + + searchContextChanged(enabled) { + this.state.typeFilter = null; + this.sendWidgetAction('searchMenuContextChanged', enabled); + this.state.contextEnabled = enabled; + this.triggerSearch(); + }, + + searchTermChanged(term) { + this.state.typeFilter = null; + this.state.term = term; + this.triggerSearch(); + }, + + fullSearch() { + if (!isValidSearchTerm(this.state.term)) { return; } + + SearchHelper.cancel(); + const url = this.fullSearchUrl(); + if (url) { + this.sendWidgetEvent('linkClicked'); + DiscourseURL.routeTo(url); + } + } +}); diff --git a/app/assets/javascripts/discourse/widgets/topic-map.js.es6 b/app/assets/javascripts/discourse/widgets/topic-map.js.es6 index 53e1fadde9..7c7be61d6e 100644 --- a/app/assets/javascripts/discourse/widgets/topic-map.js.es6 +++ b/app/assets/javascripts/discourse/widgets/topic-map.js.es6 @@ -125,6 +125,7 @@ createWidget('topic-map-link', { createWidget('topic-map-expanded', { tagName: 'section.topic-map-expanded', + buildKey: attrs => `topic-map-expanded-${attrs.id}`, defaultState() { return { allLinksShown: false }; diff --git a/app/assets/javascripts/discourse/widgets/topic-status.js.es6 b/app/assets/javascripts/discourse/widgets/topic-status.js.es6 new file mode 100644 index 0000000000..b220641a69 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/topic-status.js.es6 @@ -0,0 +1,41 @@ +import { createWidget } from 'discourse/widgets/widget'; +import { iconNode } from 'discourse/helpers/fa-icon'; +import { h } from 'virtual-dom'; + +function renderIcon(name, key, canAct) { + const iconArgs = key === 'unpinned' ? { 'class': 'unpinned' } : null, + icon = iconNode(name, iconArgs); + + const attributes = { title: Discourse.Utilities.escapeExpression(I18n.t(`topic_statuses.${key}.help`)) }; + return h(`${canAct ? 'a' : 'span'}.topic-status`, attributes, icon); +} + +export default createWidget('topic-status', { + tagName: 'div.topic-statuses', + + html(attrs) { + const topic = attrs.topic; + const canAct = this.currentUser && !attrs.disableActions; + + const result = []; + const renderIconIf = (conditionProp, name, key) => { + if (!topic.get(conditionProp)) { return; } + result.push(renderIcon(name, key, canAct)); + }; + + renderIconIf('is_warning', 'envelope', 'warning'); + + if (topic.get('closed') && topic.get('archived')) { + renderIcon('lock', 'locked_and_archived'); + } else { + renderIconIf('closed', 'lock', 'locked'); + renderIconIf('archived', 'lock', 'archived'); + } + + renderIconIf('pinned', 'thumb-tack', 'pinned'); + renderIconIf('unpinned', 'thumb-tack', 'unpinned'); + renderIconIf('invisible', 'eye-slash', 'invisible'); + + return result; + } +}); diff --git a/app/assets/javascripts/discourse/widgets/user-menu.js.es6 b/app/assets/javascripts/discourse/widgets/user-menu.js.es6 new file mode 100644 index 0000000000..da2c8504f4 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/user-menu.js.es6 @@ -0,0 +1,93 @@ +import { createWidget } from 'discourse/widgets/widget'; +import { h } from 'virtual-dom'; + +createWidget('user-menu-links', { + tagName: 'div.menu-links-header', + + html(attrs) { + const { currentUser, siteSettings } = this; + + const isAnon = currentUser.is_anonymous; + const allowAnon = siteSettings.allow_anonymous_posting && + currentUser.trust_level >= siteSettings.anonymous_posting_min_trust_level || + isAnon; + + const path = attrs.path; + const glyphs = [{ label: 'user.bookmarks', + className: 'user-bookmarks-link', + icon: 'bookmark', + href: `${path}/activity/bookmarks` }]; + + if (siteSettings.enable_private_messages) { + glyphs.push({ label: 'user.private_messages', + className: 'user-pms-link', + icon: 'envelope', + href: `${path}/messages` }); + } + + const profileLink = { + route: 'user', + model: currentUser, + className: 'user-activity-link', + icon: 'user', + rawLabel: currentUser.username + }; + + if (currentUser.is_anonymous) { + profileLink.label = 'user.profile'; + profileLink.rawLabel = null; + } + + const links = [profileLink]; + if (allowAnon) { + if (!isAnon) { + glyphs.push({ action: 'toggleAnonymous', + label: 'switch_to_anon', + className: 'enable-anonymous', + icon: 'user-secret' }); + } else { + links.push({ className: 'disable-anonymous', + action: 'toggleAnonymous', + label: 'switch_from_anon' }); + } + } + + // preferences always goes last + glyphs.push({ label: 'user.preferences', + className: 'user-preferences-link', + icon: 'gear', + href: `${path}/preferences` }); + + return h('ul.menu-links-row', [ + links.map(l => h('li', this.attach('link', l))), + h('li.glyphs', glyphs.map(l => this.attach('link', $.extend(l, { hideLabel: true })))), + ]); + } +}); + +export default createWidget('user-menu', { + tagName: 'div.user-menu', + + panelContents() { + const path = this.currentUser.get('path'); + + return [this.attach('user-menu-links', { path }), + this.attach('user-notifications', { path }), + h('div.logout-link', [ + h('hr'), + h('ul.menu-links', + h('li', this.attach('link', { action: 'logout', + className: 'logout', + icon: 'sign-out', + label: 'user.log_out' }))) + ])]; + }, + + html() { + return this.attach('menu-panel', { contents: () => this.panelContents() }); + }, + + clickOutside() { + this.sendWidgetAction('toggleUserMenu'); + } +}); diff --git a/app/assets/javascripts/discourse/widgets/user-notifications-large.js.es6 b/app/assets/javascripts/discourse/widgets/user-notifications-large.js.es6 new file mode 100644 index 0000000000..d10e64b581 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/user-notifications-large.js.es6 @@ -0,0 +1,25 @@ +import { createWidget } from 'discourse/widgets/widget'; +import { h } from 'virtual-dom'; +import { dateNode } from 'discourse/helpers/node'; + +createWidget('large-notification-item', { + buildClasses(attrs) { + const result = ['item', 'notification']; + if (!attrs.get('read')) { + result.push('unread'); + } + return result; + }, + + html(attrs) { + return [this.attach('notification-item', attrs), + h('span.time', dateNode(attrs.created_at))]; + } +}); + +export default createWidget('user-notifications-large', { + html(attrs) { + const notifications = attrs.notifications; + return notifications.map(n => this.attach('large-notification-item', n)); + } +}); diff --git a/app/assets/javascripts/discourse/widgets/user-notifications.js.es6 b/app/assets/javascripts/discourse/widgets/user-notifications.js.es6 new file mode 100644 index 0000000000..8d3e710a0d --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/user-notifications.js.es6 @@ -0,0 +1,81 @@ +import { createWidget } from 'discourse/widgets/widget'; +import { headerHeight } from 'discourse/components/site-header'; +import { h } from 'virtual-dom'; + +export default createWidget('user-notifications', { + tagName: 'div.notifications', + buildKey: () => 'user-notifications', + + defaultState() { + return { notifications: [], loading: false }; + }, + + notificationsChanged() { + this.refreshNotifications(this.state); + }, + + refreshNotifications(state) { + if (this.loading) { return; } + + // estimate (poorly) the amount of notifications to return + let limit = Math.round(($(window).height() - headerHeight()) / 55); + // we REALLY don't want to be asking for negative counts of notifications + // less than 5 is also not that useful + if (limit < 5) { limit = 5; } + if (limit > 40) { limit = 40; } + + const stale = this.store.findStale('notification', {recent: true, limit }, {cacheKey: 'recent-notifications'}); + + if (stale.hasResults) { + const results = stale.results; + let content = results.get('content'); + + // we have to truncate to limit, otherwise we will render too much + if (content && (content.length > limit)) { + content = content.splice(0, limit); + results.set('content', content); + results.set('totalRows', limit); + } + + state.notifications = results; + } else { + state.loading = true; + } + + stale.refresh().then(notifications => { + this.currentUser.set('unread_notifications', 0); + state.notifications = notifications; + }).catch(() => { + state.notifications = []; + }).finally(() => { + state.loading = false; + this.scheduleRerender(); + }); + }, + + html(attrs, state) { + if (!state.notifications.length) { + this.refreshNotifications(state); + } + + const result = []; + if (state.loading) { + result.push(h('div.spinner-container', h('div.spinner'))); + } else if (state.notifications.length) { + + const notificationItems = state.notifications.map(n => this.attach('notification-item', n)); + const href = `${attrs.path}/notifications`; + + result.push(h('hr')); + result.push(h('ul', [ + notificationItems, + h('li.read.last.heading', + h('a', { attributes: { href } }, [I18n.t('notifications.more'), '...']) + ) + ])); + + } + + return result; + } +}); diff --git a/app/assets/javascripts/discourse/widgets/widget.js.es6 b/app/assets/javascripts/discourse/widgets/widget.js.es6 index 7bbc3c10ec..31c1c3fa33 100644 --- a/app/assets/javascripts/discourse/widgets/widget.js.es6 +++ b/app/assets/javascripts/discourse/widgets/widget.js.es6 @@ -1,4 +1,4 @@ -import { WidgetClickHook, WidgetClickOutsideHook } from 'discourse/widgets/click-hook'; +import { WidgetClickHook, WidgetClickOutsideHook, WidgetKeyUpHook } from 'discourse/widgets/hooks'; import { h } from 'virtual-dom'; import DecoratorHelper from 'discourse/widgets/decorator-helper'; @@ -66,6 +66,11 @@ function drawWidget(builder, attrs, state) { if (this.buildAttributes) { properties.attributes = this.buildAttributes(attrs); } + + if (this.keyUp) { + properties['widget-key-up'] = new WidgetKeyUpHook(this); + } + if (this.clickOutside) { properties['widget-click-outside'] = new WidgetClickOutsideHook(this); } @@ -119,9 +124,20 @@ export default class Widget { this.key = this.buildKey ? this.buildKey(attrs) : null; + // Helps debug widgets + if (Ember.testing) { + const ds = this.defaultState(attrs); + if (typeof ds !== "object") { + Ember.warn(`defaultState must return an object`); + } else if (Object.keys(ds).length > 0 && !this.key) { + Ember.warn(`you need a key when using state ${this.name}`); + } + } + this.site = container.lookup('site:main'); this.siteSettings = container.lookup('site-settings:main'); this.currentUser = container.lookup('current-user:main'); + this.capabilities = container.lookup('capabilities:main'); this.store = container.lookup('store:main'); this.appEvents = container.lookup('app-events:main'); this.keyValueStore = container.lookup('key-value-store:main'); @@ -143,7 +159,7 @@ export default class Widget { } render(prev) { - if (prev && prev.state) { + if (prev && prev.key && prev.key === this.key) { this.state = prev.state; } else { this.state = this.defaultState(this.attrs, this.state); @@ -166,7 +182,7 @@ export default class Widget { const refreshAction = dirtyOpts.onRefresh; if (refreshAction) { - this.sendWidgetAction(refreshAction); + this.sendWidgetAction(refreshAction, dirtyOpts.refreshArg); } } @@ -243,7 +259,7 @@ export default class Widget { if (target) { // TODO: Use ember closure actions - const actions = target._actions || target.actionHooks; + const actions = target._actions || target.actionHooks || {}; const method = actions[actionName]; if (method) { promise = method.call(target, param); @@ -276,6 +292,16 @@ export default class Widget { return result; } + sendWidgetEvent(name) { + const methodName = `${name}Event`; + return this.rerenderResult(() => { + const widget = this._findAncestorWithProperty(methodName); + if (widget) { + return widget[methodName](); + } + }); + } + sendWidgetAction(name, param) { return this.rerenderResult(() => { const widget = this._findAncestorWithProperty(name); diff --git a/app/assets/javascripts/main_include.js b/app/assets/javascripts/main_include.js index 0c11c43989..0af76b9aaf 100644 --- a/app/assets/javascripts/main_include.js +++ b/app/assets/javascripts/main_include.js @@ -63,12 +63,11 @@ //= require ./discourse/components/combo-box //= require ./discourse/components/edit-category-panel //= require ./discourse/views/button -//= require ./discourse/components/search-result //= require ./discourse/components/dropdown-button //= require ./discourse/components/notifications-button //= require ./discourse/components/topic-notifications-button //= require ./discourse/lib/link-mentions -//= require ./discourse/views/header +//= require ./discourse/components/site-header //= require ./discourse/lib/utilities //= require ./discourse/dialects/dialect //= require ./discourse/lib/emoji/emoji diff --git a/app/assets/javascripts/main_include_admin.js b/app/assets/javascripts/main_include_admin.js index 7816da8382..6dd3680ad5 100644 --- a/app/assets/javascripts/main_include_admin.js +++ b/app/assets/javascripts/main_include_admin.js @@ -6,8 +6,6 @@ //= require admin/models/tl3-requirements //= require admin/models/admin-user //= require_tree ./admin/models -//= require admin/routes/admin-email-logs -//= require admin/controllers/admin-email-skipped //= require discourse/lib/export-result //= require_tree ./admin diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss index 414bffb784..10460fd6cc 100644 --- a/app/assets/stylesheets/common/admin/admin_base.scss +++ b/app/assets/stylesheets/common/admin/admin_base.scss @@ -282,7 +282,7 @@ td.flaggers td { display: inline-block; margin-right: 5px; } - #last-seen { + #last-seen input[type="text"] { float: none; } .ac-wrap { diff --git a/app/assets/stylesheets/common/base/alert.scss b/app/assets/stylesheets/common/base/alert.scss index 1476a3f233..2afb3d10ed 100644 --- a/app/assets/stylesheets/common/base/alert.scss +++ b/app/assets/stylesheets/common/base/alert.scss @@ -40,5 +40,8 @@ &.alert-info { background-color: dark-light-diff($tertiary, $secondary, 85%, -65%); color: $primary; + &.clickable { + color: $tertiary; + } } } diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss index 610832b1c8..e1f2408f45 100644 --- a/app/assets/stylesheets/common/base/header.scss +++ b/app/assets/stylesheets/common/base/header.scss @@ -47,7 +47,7 @@ } .icons { - float: left; + float: right; text-align: center; margin: 0 0 0 5px; list-style: none; @@ -88,6 +88,15 @@ border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); border-left: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); border-right: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); + + .badge-notification { + top: -10px; + } + + .flagged-posts { + right: 24px; + } + &:after { display: block; position: absolute; @@ -131,7 +140,7 @@ right: 65px; } } - .flagged-posts { + .flagged-posts, .queued-posts { background: $danger; } } diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss index 4690377f86..e4956a9b11 100644 --- a/app/assets/stylesheets/common/base/onebox.scss +++ b/app/assets/stylesheets/common/base/onebox.scss @@ -321,3 +321,8 @@ aside.onebox.stackexchange .onebox-body img { max-height: 60%; max-width: 10%; } + +// mobile specific style +.mobile-view article.onebox-body { + border-top: none; +} diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss new file mode 100644 index 0000000000..40ee276863 --- /dev/null +++ b/app/assets/stylesheets/common/base/tagging.scss @@ -0,0 +1,192 @@ + +.topic-title-outlet.choose-tags { + margin-left: 25px; + margin-top: 3px; +} + +.tag-list { + margin-top: 2em; +} + +.tag-box { + display: inline-block; + width: 300px; + margin-bottom: 1em; + float: left; + + .discourse-tag { + font-size: 1em; + } + + .tag-count { + font-size: 0.9em; + } +} + +.extra-info-wrapper { + .list-tags { + padding-top: 5px; + } + + .discourse-tag { + -webkit-animation: fadein .7s; + animation: fadein .7s; + } +} + + +.add-tags .select2 { + margin: 0; +} + +$tag-color: scale-color($primary, $lightness: 40%); + +.discourse-tag-count { + font-size: 0.8em; + color: $tag-color; +} + +.select2-result-label .discourse-tag { + margin-right: 0; +} + + +.discourse-tag { + padding: 0; + margin: 0 5px 0 0; + color: $tag-color; + + &:visited, &:hover { + color: $tag-color; + } + + &.box { + background-color: scale-color($primary, $lightness: 90%); + color: scale-color($primary, $lightness: 30%); + padding: 2px 8px; + } + + &.simple, &.simple:visited, &.simple:hover { + margin-right: 0px; + color: scale-color($primary, $lightness: 30%); + } +} + +.discourse-tags, .list-tags { + .discourse-tag.simple:not(:last-child):after { + content: ", "; + margin-left: 1px; + } +} + +.select2-container-multi .select2-choices .select2-search-choice.discourse-tag-select2 { + padding-top: 5px; + -webkit-box-shadow: none; + box-shadow: none; + border: 0; + border-radius: 0; + background-color: transparent; +} + + +.fps-result .add-full-page-tags { + display: inline-block; +} + +.topic-list-item .discourse-tags { + display: block; + font-size: 0.75em; + font-weight: normal; + clear: both; + margin-top: 5px; + + .discourse-tag.box { + position:relative; + top: 2px; + } +} + +.mobile-view .topic-list-item .discourse-tags { + display: inline-block; + font-size: 0.9em; + margin-top: 0; + .discourse-tag.box { + position:relative; + top: 0; + } +} + + + +.discourse-tag.bullet:before { + content: "\f04d"; + font-family: FontAwesome; + color: scale-color($primary, $lightness: 70%); + margin-right: 5px; + font-size: 0.7em; + position:relative; + top: -0.1em; +} + +header .discourse-tag {color: $tag-color !important; } + +.list-tags { + display: inline; + margin: 0 0 0 5px; + font-size: 0.857em; +} + +.tag-chooser { + width: 100%; + margin: 5px 0; +} + +.admin-tag { + position: relative; + float: right; + margin-right: 8px; +} + +.tag-notification-menu { + float: right; + margin-bottom: 10px; +} + +.tag-notification-menu .dropdown-menu { + right: 0; + top: 30px; + bottom: auto; + left: auto; +} + +.bullet + .list-tags { + display: block; +} + +.bar + .list-tags { + line-height: 1.25; + .discourse-tag { + vertical-align: middle; + } +} + +.box + .list-tags { + display: inline-block; + margin: 5px 0 0 5px; + padding-top: 2px; +} + +.tag-sort-options a { + text-decoration: underline; +} + +.autocomplete { + .fa-tag { + color: dark-light-choose($primary, scale-color($primary, $lightness: 70%)); + padding-right: 5px; + } + + a { + color: $tag-color; + } +} diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss index 82a1ee16f4..cf4902e5af 100644 --- a/app/assets/stylesheets/desktop/modal.scss +++ b/app/assets/stylesheets/desktop/modal.scss @@ -196,3 +196,19 @@ width: 400px; } } + +.change-timestamp { + min-height: 300px; + + .date-picker { + width: 10em; + } + + input[type=time] { + width: 6em; + } + + form { + margin: 0; + } +} diff --git a/app/assets/stylesheets/vendor/pikaday.scss b/app/assets/stylesheets/vendor/pikaday.scss index 90799a4ea4..646f08ed05 100644 --- a/app/assets/stylesheets/vendor/pikaday.scss +++ b/app/assets/stylesheets/vendor/pikaday.scss @@ -1,3 +1,5 @@ +@import "common/foundation/variables"; + /*! * Pikaday * Copyright © 2014 David Bushell | BSD & MIT license | http://dbushell.com/ @@ -8,24 +10,24 @@ // Variables are namespaced with the pd (pikaday) prefix // Colours -$pd-text-color: #333 !default; -$pd-title-color: #333 !default; -$pd-title-bg: #fff !default; -$pd-picker-bg: #fff !default; -$pd-picker-border: #ccc !default; -$pd-picker-border-bottom: #bbb !default; +$pd-text-color: $primary !default; +$pd-title-color: $primary !default; +$pd-title-bg: $secondary !default; +$pd-picker-bg: $secondary !default; +$pd-picker-border: dark-light-diff($secondary, $primary, -20%, 20%) !default; +$pd-picker-border-bottom: dark-light-diff($secondary, $primary, -30%, 30%) !default; $pd-picker-shadow: rgba(0,0,0,.5) !default; -$pd-th-color: #999 !default; -$pd-day-color: #666 !default; -$pd-day-bg: #f5f5f5 !default; -$pd-day-hover-color: #fff !default; -$pd-day-hover-bg: #ff8000 !default; -$pd-day-today-color: #33aaff !default; -$pd-day-selected-color: #fff !default; -$pd-day-selected-bg: #33aaff !default; -$pd-day-selected-shadow: #178fe5 !default; -$pd-day-disabled-color: #999 !default; -$pd-week-color: #999 !default; +$pd-th-color: dark-light-diff($primary, $secondary, -20%, 20%) !default; +$pd-day-color: dark-light-diff($primary, $secondary, -30%, 30%) !default; +$pd-day-bg: dark-light-diff($primary, $secondary, 90%, -90%) !default; +$pd-day-hover-color: $secondary !default; +$pd-day-hover-bg: dark-light-diff($tertiary, $secondary, 30%, -30%) !default; +$pd-day-today-color: $tertiary !default; +$pd-day-selected-color: $secondary !default; +$pd-day-selected-bg: $tertiary !default; +$pd-day-selected-shadow: dark-light-diff($tertiary, $secondary, 50%, -50%) !default; +$pd-day-disabled-color: dark-light-diff($primary, $secondary, -20%, 20%) !default; +$pd-week-color: dark-light-diff($primary, $secondary, -20%, 20%) !default; // Font $pd-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif !default; @@ -233,15 +235,15 @@ $pd-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif !default; } .is-startrange .pika-button { - color: #fff; + color: $secondary; background: #6CB31D; box-shadow: none; border-radius: 3px; } .is-endrange .pika-button { - color: #fff; - background: #33aaff; + color: $secondary; + background: $tertiary; box-shadow: none; border-radius: 3px; } diff --git a/app/controllers/admin/email_controller.rb b/app/controllers/admin/email_controller.rb index 33e8c376d1..55b1349659 100644 --- a/app/controllers/admin/email_controller.rb +++ b/app/controllers/admin/email_controller.rb @@ -27,6 +27,11 @@ class Admin::EmailController < Admin::AdminController render_serialized(email_logs, EmailLogSerializer) end + def bounced + email_logs = filter_email_logs(EmailLog.bounced, params) + render_serialized(email_logs, EmailLogSerializer) + end + def received incoming_emails = filter_incoming_emails(IncomingEmail, params) render_serialized(incoming_emails, IncomingEmailSerializer) diff --git a/app/controllers/admin/site_settings_controller.rb b/app/controllers/admin/site_settings_controller.rb index b817014780..30ad7cd4af 100644 --- a/app/controllers/admin/site_settings_controller.rb +++ b/app/controllers/admin/site_settings_controller.rb @@ -10,9 +10,7 @@ class Admin::SiteSettingsController < Admin::AdminController value = params[id] value.strip! if value.is_a?(String) begin - prev_value = SiteSetting.send(id) - SiteSetting.set(id, value) - StaffActionLogger.new(current_user).log_site_setting_change(id, prev_value, value) if SiteSetting.has_setting?(id) + SiteSetting.set_and_log(id, value, current_user) render nothing: true rescue Discourse::InvalidParameters => e render json: {errors: [e.message]}, status: 422 diff --git a/app/controllers/embed_controller.rb b/app/controllers/embed_controller.rb index bc1fbaea86..dd66c7e7e0 100644 --- a/app/controllers/embed_controller.rb +++ b/app/controllers/embed_controller.rb @@ -22,7 +22,8 @@ class EmbedController < ApplicationController current_user, limit: SiteSetting.embed_post_limit, exclude_first: true, - exclude_deleted_users: true) + exclude_deleted_users: true, + exclude_hidden: true) @second_post_url = "#{@topic_view.topic.url}/2" if @topic_view @posts_left = 0 @@ -36,7 +37,12 @@ class EmbedController < ApplicationController end elsif embed_url.present? - Jobs.enqueue(:retrieve_topic, user_id: current_user.try(:id), embed_url: embed_url, author_username: embed_username) + Jobs.enqueue(:retrieve_topic, + user_id: current_user.try(:id), + embed_url: embed_url, + author_username: embed_username, + referer: request.env['HTTP_REFERER'] + ) render 'loading' end diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb new file mode 100644 index 0000000000..6b25d361de --- /dev/null +++ b/app/controllers/tags_controller.rb @@ -0,0 +1,200 @@ +require_dependency 'topic_list_responder' +require_dependency 'topics_bulk_action' +require_dependency 'topic_query' + +class TagsController < ::ApplicationController + include TopicListResponder + + before_filter :ensure_tags_enabled + + skip_before_filter :check_xhr, only: [:tag_feed, :show, :index] + before_filter :ensure_logged_in, only: [:notifications, :update_notifications, :update] + before_filter :set_category_from_params, except: [:index, :update, :destroy, :tag_feed, :search, :notifications, :update_notifications] + + def index + tag_counts = self.class.tags_by_count(guardian, limit: 300).count + @tags = tag_counts.map {|t, c| { id: t, text: t, count: c } } + + respond_to do |format| + format.html do + render :index + end + format.json do + render json: { tags: @tags } + end + end + end + + Discourse.filters.each do |filter| + define_method("show_#{filter}") do + @tag_id = DiscourseTagging.clean_tag(params[:tag_id]) + + # TODO PERF: doesn't scale: + topics_tagged = TopicCustomField.where(name: DiscourseTagging::TAGS_FIELD_NAME, value: @tag_id).pluck(:topic_id) + + page = params[:page].to_i + + query = TopicQuery.new(current_user, build_topic_list_options) + + results = query.send("#{filter}_results").where(id: topics_tagged) + + if @filter_on_category + category_ids = [@filter_on_category.id] + @filter_on_category.subcategories.pluck(:id) + results = results.where(category_id: category_ids) + end + + @list = query.create_list(:by_tag, {}, results) + + @list.draft_key = Draft::NEW_TOPIC + @list.draft_sequence = DraftSequence.current(current_user, Draft::NEW_TOPIC) + @list.draft = Draft.get(current_user, @list.draft_key, @list.draft_sequence) if current_user + + @list.more_topics_url = list_by_tag_path(tag_id: @tag_id, page: page + 1) + @rss = "tag" + + + if @list.topics.size == 0 && !TopicCustomField.where(name: DiscourseTagging::TAGS_FIELD_NAME, value: @tag_id).exists? + raise Discourse::NotFound + else + respond_with_list(@list) + end + end + end + + def show + show_latest + end + + def update + guardian.ensure_can_admin_tags! + + new_tag_id = DiscourseTagging.clean_tag(params[:tag][:id]) + if current_user.staff? + DiscourseTagging.rename_tag(current_user, params[:tag_id], new_tag_id) + end + render json: { tag: { id: new_tag_id }} + end + + def destroy + guardian.ensure_can_admin_tags! + tag_id = params[:tag_id] + TopicCustomField.transaction do + TopicCustomField.where(name: DiscourseTagging::TAGS_FIELD_NAME, value: tag_id).delete_all + UserCustomField.delete_all(name: ::DiscourseTagging.notification_key(tag_id)) + StaffActionLogger.new(current_user).log_custom('deleted_tag', subject: tag_id) + end + render json: success_json + end + + def tag_feed + discourse_expires_in 1.minute + + tag_id = ::DiscourseTagging.clean_tag(params[:tag_id]) + @link = "#{Discourse.base_url}/tags/#{tag_id}" + @description = I18n.t("rss_by_tag", tag: tag_id) + @title = "#{SiteSetting.title} - #{@description}" + @atom_link = "#{Discourse.base_url}/tags/#{tag_id}.rss" + + query = TopicQuery.new(current_user) + topics_tagged = TopicCustomField.where(name: DiscourseTagging::TAGS_FIELD_NAME, value: tag_id).pluck(:topic_id) + latest_results = query.latest_results.where(id: topics_tagged) + @topic_list = query.create_list(:by_tag, {}, latest_results) + + render 'list/list', formats: [:rss] + end + + def search + tags = self.class.tags_by_count(guardian, params.slice(:limit)) + term = params[:q] + if term.present? + term.gsub!(/[^a-z0-9\.\-\_]*/, '') + term.gsub!("_", "\\_") + tags = tags.where('value like ?', "%#{term}%") + end + + tags = tags.count(:value).map {|t, c| { id: t, text: t, count: c } } + + render json: { results: tags } + end + + def notifications + level = current_user.custom_fields[::DiscourseTagging.notification_key(params[:tag_id])] || 1 + render json: { tag_notification: { id: params[:tag_id], notification_level: level.to_i } } + end + + def update_notifications + level = params[:tag_notification][:notification_level].to_i + + current_user.custom_fields[::DiscourseTagging.notification_key(params[:tag_id])] = level + current_user.save_custom_fields + + render json: {notification_level: level} + end + + def check_hashtag + tag_values = params[:tag_values].each(&:downcase!) + + valid_tags = TopicCustomField.where(name: DiscourseTagging::TAGS_FIELD_NAME, value: tag_values).map do |tag| + { value: tag.value, url: "#{Discourse.base_url}/tags/#{tag.value}" } + end.compact + + render json: { valid: valid_tags } + end + + private + + def ensure_tags_enabled + raise Discourse::NotFound unless SiteSetting.tagging_enabled? + end + + def self.tags_by_count(guardian, opts=nil) + opts = opts || {} + result = TopicCustomField.where(name: DiscourseTagging::TAGS_FIELD_NAME) + .joins(:topic) + .group(:value) + .limit(opts[:limit] || 5) + .order('COUNT(topic_custom_fields.value) DESC') + + guardian.filter_allowed_categories(result) + end + + def set_category_from_params + slug_or_id = params[:category] + return true if slug_or_id.nil? + + parent_slug_or_id = params[:parent_category] + + parent_category_id = nil + if parent_slug_or_id.present? + parent_category_id = Category.query_parent_category(parent_slug_or_id) + raise Discourse::NotFound if parent_category_id.blank? + end + + @filter_on_category = Category.query_category(slug_or_id, parent_category_id) + raise Discourse::NotFound if !@filter_on_category + + guardian.ensure_can_see!(@filter_on_category) + end + + def build_topic_list_options + options = { + page: params[:page], + topic_ids: param_to_integer_list(:topic_ids), + exclude_category_ids: params[:exclude_category_ids], + category: params[:category], + order: params[:order], + ascending: params[:ascending], + min_posts: params[:min_posts], + max_posts: params[:max_posts], + status: params[:status], + filter: params[:filter], + state: params[:state], + search: params[:search], + q: params[:q] + } + options[:no_subcategories] = true if params[:no_subcategories] == 'true' + options[:slow_platform] = true if slow_platform? + + options + end +end diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb index f667fbd517..9a97662a65 100644 --- a/app/controllers/topics_controller.rb +++ b/app/controllers/topics_controller.rb @@ -27,6 +27,7 @@ class TopicsController < ApplicationController :change_timestamps, :archive_message, :move_to_inbox, + :convert_topic, :bookmark] before_filter :consider_user_for_promotion, only: :show @@ -121,13 +122,13 @@ class TopicsController < ApplicationController tu = TopicUser.find_by(user_id: current_user.id, topic_id: params[:topic_id]) - if tu.notification_level > TopicUser.notification_levels[:regular] + if tu && tu.notification_level > TopicUser.notification_levels[:regular] tu.notification_level = TopicUser.notification_levels[:regular] + tu.save! else - tu.notification_level = TopicUser.notification_levels[:muted] + TopicUser.change(current_user.id, params[:topic_id].to_i, notification_level: TopicUser.notification_levels[:muted]) end - tu.save! perform_show_response end @@ -510,6 +511,22 @@ class TopicsController < ApplicationController render nothing: true end + def convert_topic + params.require(:id) + params.require(:type) + topic = Topic.find_by(id: params[:id]) + guardian.ensure_can_convert_topic!(topic) + + if params[:type] == "public" + converted_topic = topic.convert_to_public_topic(current_user) + else + converted_topic = topic.convert_to_private_message(current_user) + end + render_topic_changes(converted_topic) + rescue ActiveRecord::RecordInvalid => ex + render_json_error(ex) + end + private def toggle_mute diff --git a/app/helpers/topics_helper.rb b/app/helpers/topics_helper.rb index 8f8dcd98e5..a92617e80f 100644 --- a/app/helpers/topics_helper.rb +++ b/app/helpers/topics_helper.rb @@ -14,6 +14,15 @@ module TopicsHelper end breadcrumb.push url: category.url, name: category.name end + + if (tags = topic.tags).present? + tags.each do |tag| + tag_id = DiscourseTagging.clean_tag(tag) + url = "#{Discourse.base_url}/tags/#{tag_id}" + breadcrumb << {url: url, name: tag} + end + end + Plugin::Filter.apply(:topic_categories_breadcrumb, topic, breadcrumb) end diff --git a/app/jobs/regular/enable_bootstrap_mode.rb b/app/jobs/regular/enable_bootstrap_mode.rb new file mode 100644 index 0000000000..32431ea2af --- /dev/null +++ b/app/jobs/regular/enable_bootstrap_mode.rb @@ -0,0 +1,18 @@ +module Jobs + class EnableBootstrapMode < Jobs::Base + sidekiq_options queue: 'critical' + + def execute(args) + raise Discourse::InvalidParameters.new(:user_id) unless args[:user_id].present? + return if SiteSetting.bootstrap_mode_enabled + + user = User.find_by(id: args[:user_id]) + return unless user.is_singular_admin? + + # let's enable bootstrap mode settings + SiteSetting.set_and_log('default_trust_level', TrustLevel[1]) if SiteSetting.send('default_trust_level') == TrustLevel[0] + SiteSetting.set_and_log('default_email_digest_frequency', 1440) if SiteSetting.send('default_email_digest_frequency') == 10080 + SiteSetting.set_and_log('bootstrap_mode_enabled', true) + end + end +end diff --git a/app/jobs/regular/export_csv_file.rb b/app/jobs/regular/export_csv_file.rb index ddb6d6b929..7c69a3a3fe 100644 --- a/app/jobs/regular/export_csv_file.rb +++ b/app/jobs/regular/export_csv_file.rb @@ -225,13 +225,15 @@ module Jobs elsif attr == 'staff_user' user = User.find_by(id: staff_action.attributes['acting_user_id']) user.username if !user.nil? + elsif attr == 'subject' + user = User.find_by(id: staff_action.attributes['target_user_id']) + user.nil? ? staff_action.attributes[attr] : "#{user.username} #{staff_action.attributes[attr]}" else staff_action.attributes[attr] end staff_action_array.push(data) end - staff_action_array end diff --git a/app/jobs/regular/user_email.rb b/app/jobs/regular/user_email.rb index bfdc6fa9f9..4a7a87d96d 100644 --- a/app/jobs/regular/user_email.rb +++ b/app/jobs/regular/user_email.rb @@ -114,7 +114,11 @@ module Jobs end if EmailLog.reached_max_emails?(user) - return skip_message(I18n.t('email_log.exceeded_limit')) + return skip_message(I18n.t('email_log.exceeded_emails_limit')) + end + + if (user.user_stat.try(:bounce_score) || 0) >= SiteSetting.bounce_score_threshold + return skip_message(I18n.t('email_log.exceeded_bounces_limit')) end message = EmailLog.unique_email_per_post(post, user) do diff --git a/app/jobs/scheduled/about_stats.rb b/app/jobs/scheduled/about_stats.rb index d745f8a0d6..1ae2a0866a 100644 --- a/app/jobs/scheduled/about_stats.rb +++ b/app/jobs/scheduled/about_stats.rb @@ -1,13 +1,9 @@ module Jobs class AboutStats < Jobs::Scheduled - include Jobs::Stats - every 30.minutes def execute(args) - stats = About.new.stats - set_cache(About, stats) - stats + About.refresh_stats end end end diff --git a/app/jobs/scheduled/dashboard_stats.rb b/app/jobs/scheduled/dashboard_stats.rb index b891b182a4..2b35fc4380 100644 --- a/app/jobs/scheduled/dashboard_stats.rb +++ b/app/jobs/scheduled/dashboard_stats.rb @@ -1,7 +1,5 @@ module Jobs class DashboardStats < Jobs::Scheduled - include Jobs::Stats - every 30.minutes def execute(args) @@ -12,9 +10,7 @@ module Jobs GroupMessage.create(Group[:admins].name, :dashboard_problems, {limit_once_per: 7.days.to_i}) end - stats = AdminDashboardData.fetch_stats - set_cache(AdminDashboardData, stats) - stats + AdminDashboardData.refresh_stats end end end diff --git a/app/jobs/scheduled/disable_bootstrap_mode.rb b/app/jobs/scheduled/disable_bootstrap_mode.rb new file mode 100644 index 0000000000..16028bac87 --- /dev/null +++ b/app/jobs/scheduled/disable_bootstrap_mode.rb @@ -0,0 +1,16 @@ +module Jobs + class DisableBootstrapMode < Jobs::Scheduled + every 1.day + + def execute(args) + return unless SiteSetting.bootstrap_mode_enabled + total_users = User.where.not(id: Discourse::SYSTEM_USER_ID).count + + if SiteSetting.bootstrap_mode_min_users == 0 || total_users > SiteSetting.bootstrap_mode_min_users + SiteSetting.set_and_log('default_trust_level', TrustLevel[0]) if SiteSetting.send('default_trust_level') == TrustLevel[1] + SiteSetting.set_and_log('default_email_digest_frequency', 10080) if SiteSetting.send('default_email_digest_frequency') == 1440 + SiteSetting.set_and_log('bootstrap_mode_enabled', false) + end + end + end +end diff --git a/app/jobs/scheduled/ensure_db_consistency.rb b/app/jobs/scheduled/ensure_db_consistency.rb index aa5b3b8e36..c86e5c3199 100644 --- a/app/jobs/scheduled/ensure_db_consistency.rb +++ b/app/jobs/scheduled/ensure_db_consistency.rb @@ -10,7 +10,7 @@ module Jobs UserAction.ensure_consistency! TopicFeaturedUsers.ensure_consistency! PostRevision.ensure_consistency! - UserStat.update_view_counts(13.hours.ago) + UserStat.ensure_consistency!(13.hours.ago) Topic.ensure_consistency! Badge.ensure_consistency! CategoryUser.ensure_consistency! diff --git a/app/jobs/scheduled/poll_mailbox.rb b/app/jobs/scheduled/poll_mailbox.rb index 44dce2adbf..cd6b3226f8 100644 --- a/app/jobs/scheduled/poll_mailbox.rb +++ b/app/jobs/scheduled/poll_mailbox.rb @@ -29,7 +29,8 @@ module Jobs log_email_process_failure(mail_string, e) set_incoming_email_rejection_message( - receiver.incoming_email, I18n.t("email.incoming.errors.bounced_email_report") + receiver.incoming_email, + I18n.t("email.incoming.errors.bounced_email_report") ) rescue Email::Receiver::AutoGeneratedEmailReplyError => e log_email_process_failure(mail_string, e) @@ -41,9 +42,7 @@ module Jobs rescue => e rejection_message = handle_failure(mail_string, e) if rejection_message.present? && receiver && (incoming_email = receiver.incoming_email) - set_incoming_email_rejection_message( - incoming_email, rejection_message.body.to_s - ) + set_incoming_email_rejection_message(incoming_email, rejection_message.body.to_s) end end end @@ -119,7 +118,11 @@ module Jobs end rescue Net::OpenTimeout => e count = $redis.incr(POLL_MAILBOX_TIMEOUT_ERROR_KEY).to_i - $redis.expire(POLL_MAILBOX_TIMEOUT_ERROR_KEY, 300) if count == 1 + + $redis.expire( + POLL_MAILBOX_TIMEOUT_ERROR_KEY, + SiteSetting.pop3_polling_period_mins.minutes * 3 + ) if count == 1 if count > 3 $redis.del(POLL_MAILBOX_TIMEOUT_ERROR_KEY) diff --git a/app/jobs/stats.rb b/app/jobs/stats.rb deleted file mode 100644 index 637091cc6a..0000000000 --- a/app/jobs/stats.rb +++ /dev/null @@ -1,9 +0,0 @@ -module Jobs - module Stats - def set_cache(klass, stats) - # Add some extra time to the expiry so that the next job run has plenty of time to - # finish before previous cached value expires. - $redis.setex klass.stats_cache_key, (klass.recalculate_stats_interval + 5).minutes, stats.to_json - end - end -end diff --git a/app/models/category.rb b/app/models/category.rb index 520c86c07f..37142c7f86 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -46,6 +46,9 @@ class Category < ActiveRecord::Base after_update :rename_category_definition, if: :name_changed? + after_create :delete_category_permalink + after_update :create_category_permalink, if: :slug_changed? + after_save :publish_discourse_stylesheet has_one :category_search_data @@ -447,6 +450,24 @@ SQL end end + def create_category_permalink + old_slug = changed_attributes["slug"] + if self.parent_category + Permalink.create(url: "c/#{self.parent_category.slug}/#{old_slug}", category_id: id) + else + Permalink.create(url: "c/#{old_slug}", category_id: id) + end + end + + def delete_category_permalink + if self.parent_category + permalink = Permalink.find_by_url("c/#{self.parent_category.slug}/#{slug}") + else + permalink = Permalink.find_by_url("c/#{slug}") + end + permalink.destroy if permalink + end + def publish_discourse_stylesheet DiscourseStylesheets.cache.clear end diff --git a/app/models/category_featured_topic.rb b/app/models/category_featured_topic.rb index c408bb4650..4f3404ab26 100644 --- a/app/models/category_featured_topic.rb +++ b/app/models/category_featured_topic.rb @@ -40,7 +40,11 @@ class CategoryFeaturedTopic < ActiveRecord::Base CategoryFeaturedTopic.delete_all(category_id: c.id) if results results.each_with_index do |topic_id, idx| - c.category_featured_topics.create(topic_id: topic_id, rank: idx) + begin + c.category_featured_topics.create(topic_id: topic_id, rank: idx) + rescue PG::UniqueViolation + # If another process features this topic, just ignore it + end end end end diff --git a/app/models/concerns/stats_cacheable.rb b/app/models/concerns/stats_cacheable.rb index d7364111f4..150c2a7b20 100644 --- a/app/models/concerns/stats_cacheable.rb +++ b/app/models/concerns/stats_cacheable.rb @@ -18,7 +18,22 @@ module StatsCacheable def fetch_cached_stats # The scheduled Stats job is responsible for generating and caching this. stats = $redis.get(stats_cache_key) - stats ? JSON.parse(stats) : nil + stats = refresh_stats if !stats + JSON.parse(stats).with_indifferent_access + end + + def refresh_stats + stats = fetch_stats.to_json + set_cache(stats) + stats + end + + private + + def set_cache(stats) + # Add some extra time to the expiry so that the next job run has plenty of time to + # finish before previous cached value expires. + $redis.setex stats_cache_key, (recalculate_stats_interval + 5).minutes, stats end end end diff --git a/app/models/email_log.rb b/app/models/email_log.rb index 7d2eba5fd2..99d12b52d1 100644 --- a/app/models/email_log.rb +++ b/app/models/email_log.rb @@ -9,6 +9,7 @@ class EmailLog < ActiveRecord::Base scope :sent, -> { where(skipped: false) } scope :skipped, -> { where(skipped: true) } + scope :bounced, -> { sent.where(bounced: true) } after_create do # Update last_emailed_at if the user_id is present and email was sent diff --git a/app/models/email_token.rb b/app/models/email_token.rb index c919b61903..b20450be78 100644 --- a/app/models/email_token.rb +++ b/app/models/email_token.rb @@ -10,7 +10,9 @@ class EmailToken < ActiveRecord::Base after_create do # Expire the previous tokens - EmailToken.where(['user_id = ? and id != ?', self.user_id, self.id]).update_all 'expired = true' + EmailToken.where(user_id: self.user_id) + .where("id != ?", self.id) + .update_all(expired: true) end def self.token_length @@ -38,7 +40,7 @@ class EmailToken < ActiveRecord::Base end def self.valid_token_format?(token) - return token.present? && token =~ /[a-f0-9]{#{token.length/2}}/i + token.present? && token =~ /\h{#{token.length/2}}/i end def self.atomic_confirm(token) @@ -51,11 +53,12 @@ class EmailToken < ActiveRecord::Base user = email_token.user failure[:user] = user row_count = EmailToken.where(id: email_token.id, expired: false).update_all 'confirmed = true' - if row_count == 1 - return { success: true, user: user, email_token: email_token } - end - return failure + if row_count == 1 + { success: true, user: user, email_token: email_token } + else + failure + end end def self.confirm(token) @@ -81,7 +84,11 @@ class EmailToken < ActiveRecord::Base end def self.confirmable(token) - EmailToken.where("token = ? and expired = FALSE AND ((NOT confirmed AND created_at >= ?) OR (confirmed AND created_at >= ?))", token, EmailToken.valid_after, EmailToken.confirm_valid_after).includes(:user).first + EmailToken.where(token: token) + .where(expired: false) + .where("(NOT confirmed AND created_at >= ?) OR (confirmed AND created_at >= ?)", EmailToken.valid_after, EmailToken.confirm_valid_after) + .includes(:user) + .first end end diff --git a/app/models/emoji.rb b/app/models/emoji.rb index f6cc04b277..9ff96bebc8 100644 --- a/app/models/emoji.rb +++ b/app/models/emoji.rb @@ -56,7 +56,7 @@ class Emoji def self.create_from_db_item(emoji) name = emoji["name"] - filename = "#{name}.png" + filename = "#{emoji['filename'] || name}.png" Emoji.new.tap do |e| e.name = name e.url = "/images/emoji/#{SiteSetting.emoji_set}/#{filename}" @@ -90,7 +90,14 @@ class Emoji end def self.db - @db ||= File.open(db_file, "r:UTF-8") { |f| JSON.parse(f.read) } + return @db if @db + @db = File.open(db_file, "r:UTF-8") { |f| JSON.parse(f.read) } + + # Small tweak to `emoji.json` from Emoji one + @db['emojis'] << {"code" => "1f44d", "name" => "+1", "filename" => "thumbsup"} + @db['emojis'] << {"code" => "1f44e", "name" => "-1", "filename" => "thumbsdown"} + + @db end def self.load_standard diff --git a/app/models/post.rb b/app/models/post.rb index 83c669fe49..981a0ba924 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -229,7 +229,6 @@ class Post < ActiveRecord::Base end def whitelisted_spam_hosts - hosts = SiteSetting .white_listed_spam_host_domains .split('|') @@ -255,7 +254,8 @@ class Post < ActiveRecord::Base TopicLink.where(domain: hosts.keys, user_id: acting_user.id) .group(:domain, :post_id) - .count.each_key do |tuple| + .count + .each_key do |tuple| domain = tuple[0] hosts[domain] = (hosts[domain] || 0) + 1 end @@ -265,13 +265,9 @@ class Post < ActiveRecord::Base # Prevent new users from posting the same hosts too many times. def has_host_spam? - return false if acting_user.present? && acting_user.has_trust_level?(TrustLevel[1]) + return false if acting_user.present? && (acting_user.staged? || acting_user.has_trust_level?(TrustLevel[1])) - total_hosts_usage.each do |_, count| - return true if count >= SiteSetting.newuser_spam_host_threshold - end - - false + total_hosts_usage.values.any? { |count| count >= SiteSetting.newuser_spam_host_threshold } end def archetype @@ -557,8 +553,8 @@ class Post < ActiveRecord::Base result.group('date(posts.created_at)').order('date(posts.created_at)').count end - def self.private_messages_count_per_day(since_days_ago, topic_subtype) - private_posts.with_topic_subtype(topic_subtype).where('posts.created_at > ?', since_days_ago.days.ago).group('date(posts.created_at)').order('date(posts.created_at)').count + def self.private_messages_count_per_day(start_date, end_date, topic_subtype) + private_posts.with_topic_subtype(topic_subtype).where('posts.created_at >= ? AND posts.created_at <= ?', start_date, end_date).group('date(posts.created_at)').order('date(posts.created_at)').count end def reply_history(max_replies=100, guardian=nil) diff --git a/app/models/report.rb b/app/models/report.rb index e5135dcacf..ecb7c27f3b 100644 --- a/app/models/report.rb +++ b/app/models/report.rb @@ -205,7 +205,7 @@ class Report # Private messages counts: def self.private_messages_report(report, topic_subtype) - basic_report_about report, Post, :private_messages_count_per_day, default_days, topic_subtype + basic_report_about report, Post, :private_messages_count_per_day, report.start_date, report.end_date, topic_subtype add_counts report, Post.private_posts.with_topic_subtype(topic_subtype), 'posts.created_at' end diff --git a/app/models/topic.rb b/app/models/topic.rb index 5ac125e303..2fc4484051 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -6,6 +6,7 @@ require_dependency 'text_sentinel' require_dependency 'text_cleaner' require_dependency 'archetype' require_dependency 'html_prettify' +require_dependency 'discourse_tagging' class Topic < ActiveRecord::Base include ActionView::Helpers::SanitizeHelper @@ -138,14 +139,12 @@ class Topic < ActiveRecord::Base # Query conditions condition = if ids.present? - ["NOT c.read_restricted or c.id in (:cats)", cats: ids] + ["NOT read_restricted OR id IN (:cats)", cats: ids] else - ["NOT c.read_restricted"] + ["NOT read_restricted"] end - where("category_id IS NULL OR category_id IN ( - SELECT c.id FROM categories c - WHERE #{condition[0]})", condition[1]) + where("topics.category_id IS NULL OR topics.category_id IN (SELECT id FROM categories WHERE #{condition[0]})", condition[1]) } attr_accessor :ignore_category_auto_close @@ -245,7 +244,7 @@ class Topic < ActiveRecord::Base end def best_post - posts.order('score desc nulls last').limit(1).first + posts.where(post_type: Post.types[:regular]).order('score desc nulls last').limit(1).first end def has_flags? @@ -1043,6 +1042,23 @@ SQL builder.exec.first["count"].to_i end + def tags + result = custom_fields[DiscourseTagging::TAGS_FIELD_NAME] + [result].flatten unless result.blank? + end + + def convert_to_public_topic(user) + public_topic = TopicConverter.new(self, user).convert_to_public_topic + add_small_action(user, "public_topic") if public_topic + public_topic + end + + def convert_to_private_message(user) + private_topic = TopicConverter.new(self, user).convert_to_private_message + add_small_action(user, "private_topic") if private_topic + private_topic + end + private def update_category_topic_count_by(num) diff --git a/app/models/topic_converter.rb b/app/models/topic_converter.rb new file mode 100644 index 0000000000..4e40c28342 --- /dev/null +++ b/app/models/topic_converter.rb @@ -0,0 +1,69 @@ +class TopicConverter + + attr_reader :topic + + def initialize(topic, user) + @topic = topic + @user = user + end + + def convert_to_public_topic + Topic.transaction do + @topic.category_id = SiteSetting.allow_uncategorized_topics ? SiteSetting.uncategorized_category_id : Category.where(read_restricted: false).first.id + @topic.archetype = Archetype.default + @topic.save + update_user_stats + watch_topic(topic) + end + @topic + end + + def convert_to_private_message + Topic.transaction do + @topic.category_id = nil + @topic.archetype = Archetype.private_message + add_allowed_users + @topic.save + watch_topic(topic) + end + @topic + end + + private + + def update_user_stats + @topic.posts.where(deleted_at: nil).each do |p| + user = User.find(p.user_id) + # update posts count + user.user_stat.post_count += 1 + user.user_stat.save! + end + # update topics count + @topic.user.user_stat.topic_count += 1 + @topic.user.user_stat.save! + end + + def add_allowed_users + @topic.posts.where(deleted_at: nil).each do |p| + user = User.find(p.user_id) + @topic.topic_allowed_users.build(user_id: user.id) unless @topic.topic_allowed_users.where(user_id: user.id).exists? + # update posts count + user.user_stat.post_count -= 1 + user.user_stat.save! + end + @topic.topic_allowed_users.build(user_id: @user.id) + # update topics count + @topic.user.user_stat.topic_count -= 1 + @topic.user.user_stat.save! + end + + def watch_topic(topic) + @topic.notifier.watch_topic!(topic.user_id) + + @topic.topic_allowed_users(true).each do |tau| + next if tau.user_id == -1 || tau.user_id == topic.user_id + topic.notifier.watch!(tau.user_id) + end + end + +end diff --git a/app/models/topic_list.rb b/app/models/topic_list.rb index cce332a6d0..4abdc36f09 100644 --- a/app/models/topic_list.rb +++ b/app/models/topic_list.rb @@ -81,8 +81,11 @@ class TopicList ft.topic_list = self end - if TopicList.preloaded_custom_fields.present? - Topic.preload_custom_fields(@topics, TopicList.preloaded_custom_fields) + preload_custom_fields = TopicList.preloaded_custom_fields + preload_custom_fields << DiscourseTagging::TAGS_FIELD_NAME if SiteSetting.tagging_enabled + + if preload_custom_fields.present? + Topic.preload_custom_fields(@topics, preload_custom_fields) end @topics diff --git a/app/models/upload.rb b/app/models/upload.rb index 8d2c0ffeb9..5783a94d2d 100644 --- a/app/models/upload.rb +++ b/app/models/upload.rb @@ -70,7 +70,7 @@ class Upload < ActiveRecord::Base def self.create_for(user_id, file, filename, filesize, options = {}) DistributedMutex.synchronize("upload_#{user_id}_#{filename}") do # do some work on images - if FileHelper.is_image?(filename) && system("identify '#{file.path}' >/dev/null 2>&1") + if FileHelper.is_image?(filename) && is_actual_image?(file) if filename =~ /\.svg$/i svg = Nokogiri::XML(file).at_css("svg") w = svg["width"].to_i @@ -170,6 +170,14 @@ class Upload < ActiveRecord::Base end end + def self.is_actual_image?(file) + # due to ImageMagick CVE-2016–3714, use FastImage to check the magic bytes + # cf. https://meta.discourse.org/t/imagemagick-cve-2016-3714/43624 + FastImage.size(file, raise_on_failure: true) + rescue + false + end + LARGE_PNG_SIZE ||= 3.megabytes def self.should_optimize?(path) diff --git a/app/models/user.rb b/app/models/user.rb index 0909d61760..8d68c337b0 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -702,12 +702,16 @@ class User < ActiveRecord::Base # Flag all posts from a user as spam def flag_linked_posts_as_spam - admin = Discourse.system_user + disagreed_flag_post_ids = PostAction.where(post_action_type_id: PostActionType.types[:spam]) + .where.not(disagreed_at: nil) + .pluck(:post_id) - disagreed_flag_post_ids = PostAction.where(post_action_type_id: PostActionType.types[:spam]).where.not(disagreed_at: nil).pluck(:post_id) - topic_links.includes(:post).where.not(post_id: disagreed_flag_post_ids).each do |tl| + topic_links.includes(:post) + .where.not(post_id: disagreed_flag_post_ids) + .each do |tl| begin - PostAction.act(admin, tl.post, PostActionType.types[:spam], message: I18n.t('flag_reason.spam_hosts')) + message = I18n.t('flag_reason.spam_hosts', domain: tl.domain) + PostAction.act(Discourse.system_user, tl.post, PostActionType.types[:spam], message: message) rescue PostAction::AlreadyActed # If the user has already acted, just ignore it end @@ -841,6 +845,10 @@ class User < ActiveRecord::Base custom_fields["master_id"].to_i > 0 end + def is_singular_admin? + User.where(admin: true).where.not(id: id).where.not(id: Discourse::SYSTEM_USER_ID).blank? + end + protected def badge_grant diff --git a/app/models/user_action_observer.rb b/app/models/user_action_observer.rb index b0be1230d1..932e8254ed 100644 --- a/app/models/user_action_observer.rb +++ b/app/models/user_action_observer.rb @@ -79,6 +79,11 @@ class UserActionObserver < ActiveRecord::Observer end def log_topic(model) + + # no action to log here, this can happen if a user is deleted + # then topic has no user_id + return unless model.user_id + row = { action_type: model.archetype == Archetype.private_message ? UserAction::NEW_PRIVATE_MESSAGE : UserAction::NEW_TOPIC, user_id: model.user_id, diff --git a/app/models/user_history.rb b/app/models/user_history.rb index d2afa1c526..cdd23e8381 100644 --- a/app/models/user_history.rb +++ b/app/models/user_history.rb @@ -52,7 +52,8 @@ class UserHistory < ActiveRecord::Base grant_moderation: 34, revoke_moderation: 35, backup_operation: 36, - rate_limited_like: 37 # not used anymore + rate_limited_like: 37, # not used anymore + revoke_email: 38 ) end diff --git a/app/models/user_stat.rb b/app/models/user_stat.rb index 21590b9c80..746ad3557b 100644 --- a/app/models/user_stat.rb +++ b/app/models/user_stat.rb @@ -3,6 +3,17 @@ class UserStat < ActiveRecord::Base belongs_to :user after_save :trigger_badges + def self.ensure_consistency!(last_seen = 1.hour.ago) + reset_bounce_scores + update_view_counts(last_seen) + end + + def self.reset_bounce_scores + UserStat.where("reset_bounce_score_after < now()") + .where("bounce_score > 0") + .update_all(bounce_score: 0) + end + # Updates the denormalized view counts for all users def self.update_view_counts(last_seen = 1.hour.ago) diff --git a/app/models/user_summary.rb b/app/models/user_summary.rb index a95094e0e5..fc1c455787 100644 --- a/app/models/user_summary.rb +++ b/app/models/user_summary.rb @@ -30,7 +30,6 @@ class UserSummary .merge(Topic.listable_topics.visible.secured(@guardian)) .where(user: @user) .where('post_number > 1') - .where('topics.archetype <> ?', Archetype.private_message) .order('posts.like_count DESC, posts.created_at ASC') .limit(MAX_SUMMARY_RESULTS) end @@ -39,7 +38,8 @@ class UserSummary TopicLink .joins(:topic, :post) .includes(:topic, :post) - .where('topics.archetype <> ?', Archetype.private_message) + .where('posts.post_type IN (?)', Topic.visible_post_types(@guardian && @guardian.user)) + .merge(Topic.listable_topics.visible.secured(@guardian)) .where(user: @user) .where(internal: false, reflection: false, quote: false) .order('clicks DESC, topic_links.created_at ASC') diff --git a/app/serializers/email_log_serializer.rb b/app/serializers/email_log_serializer.rb index 4b4d1f875c..1d83496b85 100644 --- a/app/serializers/email_log_serializer.rb +++ b/app/serializers/email_log_serializer.rb @@ -9,7 +9,8 @@ class EmailLogSerializer < ApplicationSerializer :skipped, :skipped_reason, :post_url, - :post_description + :post_description, + :bounced has_one :user, serializer: BasicUserSerializer, embed: :objects diff --git a/app/serializers/site_serializer.rb b/app/serializers/site_serializer.rb index 2a3a49170a..d49257b145 100644 --- a/app/serializers/site_serializer.rb +++ b/app/serializers/site_serializer.rb @@ -1,3 +1,5 @@ +require_dependency 'discourse_tagging' + class SiteSerializer < ApplicationSerializer attributes :default_archetype, @@ -14,7 +16,11 @@ class SiteSerializer < ApplicationSerializer :user_field_max_length, :suppressed_from_homepage_category_ids, :post_action_types, - :topic_flag_types + :topic_flag_types, + :can_create_tag, + :can_tag_topics, + :tags_filter_regexp, + :top_tags has_many :categories, serializer: BasicCategorySerializer, embed: :objects has_many :trust_levels, embed: :objects @@ -81,4 +87,26 @@ class SiteSerializer < ApplicationSerializer UserField.max_length end + def can_create_tag + SiteSetting.tagging_enabled && scope.can_create_tag? + end + + def can_tag_topics + SiteSetting.tagging_enabled && scope.can_tag_topics? + end + + def include_tags_filter_regexp? + SiteSetting.tagging_enabled + end + def tags_filter_regexp + DiscourseTagging::TAGS_FILTER_REGEXP.source + end + + def include_top_tags? + SiteSetting.tagging_enabled && SiteSetting.show_filter_by_tag + end + def top_tags + DiscourseTagging.top_tags + end + end diff --git a/app/serializers/topic_list_item_serializer.rb b/app/serializers/topic_list_item_serializer.rb index a9f961827e..5a8ac8d379 100644 --- a/app/serializers/topic_list_item_serializer.rb +++ b/app/serializers/topic_list_item_serializer.rb @@ -9,7 +9,8 @@ class TopicListItemSerializer < ListableTopicSerializer :op_like_count, :pinned_globally, :bookmarked_post_numbers, - :liked_post_numbers + :liked_post_numbers, + :tags has_many :posters, serializer: TopicPosterSerializer, embed: :objects has_many :participants, serializer: TopicPosterSerializer, embed: :objects @@ -63,4 +64,11 @@ class TopicListItemSerializer < ListableTopicSerializer object.association(:first_post).loaded? end + def include_tags? + SiteSetting.tagging_enabled + end + def tags + object.tags + end + end diff --git a/app/serializers/topic_list_serializer.rb b/app/serializers/topic_list_serializer.rb index 6193888145..f932b644d1 100644 --- a/app/serializers/topic_list_serializer.rb +++ b/app/serializers/topic_list_serializer.rb @@ -6,7 +6,8 @@ class TopicListSerializer < ApplicationSerializer :draft_key, :draft_sequence, :for_period, - :per_page + :per_page, + :tags has_many :topics, serializer: TopicListItemSerializer, embed: :objects @@ -22,4 +23,11 @@ class TopicListSerializer < ApplicationSerializer object.more_topics_url.present? && (object.topics.size == object.per_page) end + def include_tags? + SiteSetting.tagging_enabled && SiteSetting.show_filter_by_tag + end + def tags + DiscourseTagging.top_tags + end + end diff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb index bacdb2dcf6..b30d0c9e6e 100644 --- a/app/serializers/topic_view_serializer.rb +++ b/app/serializers/topic_view_serializer.rb @@ -33,7 +33,8 @@ class TopicViewSerializer < ApplicationSerializer :word_count, :deleted_at, :pending_posts_count, - :user_id + :user_id, + :tags attributes :draft, :draft_key, diff --git a/app/services/spam_rule/flag_sockpuppets.rb b/app/services/spam_rule/flag_sockpuppets.rb index 4c96a0687f..b669e80a8a 100644 --- a/app/services/spam_rule/flag_sockpuppets.rb +++ b/app/services/spam_rule/flag_sockpuppets.rb @@ -30,10 +30,11 @@ class SpamRule::FlagSockpuppets end def flag_sockpuppet_users - system_user = Discourse.system_user - PostAction.act(system_user, @post, PostActionType.types[:spam], message: I18n.t('flag_reason.sockpuppet')) rescue PostAction::AlreadyActed + message = I18n.t('flag_reason.sockpuppet', ip_address: @post.user.ip_address) + PostAction.act(Discourse.system_user, @post, PostActionType.types[:spam], message: message) rescue PostAction::AlreadyActed + if (first_post = @post.topic.posts.by_post_number.first).try(:user).try(:new_user?) - PostAction.act(system_user, first_post, PostActionType.types[:spam], message: I18n.t('flag_reason.sockpuppet')) rescue PostAction::AlreadyActed + PostAction.act(Discourse.system_user, first_post, PostActionType.types[:spam], message: message) rescue PostAction::AlreadyActed end end diff --git a/app/services/staff_action_logger.rb b/app/services/staff_action_logger.rb index c3e1412352..c2d282247c 100644 --- a/app/services/staff_action_logger.rb +++ b/app/services/staff_action_logger.rb @@ -334,6 +334,14 @@ class StaffActionLogger })) end + def log_revoke_email(user, opts={}) + UserHistory.create(params(opts).merge({ + action: UserHistory.actions[:revoke_email], + target_user_id: user.id, + details: user.email + })) + end + private def params(opts=nil) diff --git a/app/services/user_updater.rb b/app/services/user_updater.rb index e7136f74e9..747ce7d15b 100644 --- a/app/services/user_updater.rb +++ b/app/services/user_updater.rb @@ -34,7 +34,7 @@ class UserUpdater def update(attributes = {}) user_profile = user.user_profile - user_profile.location = attributes[:location] + user_profile.location = attributes.fetch(:location) { user_profile.location } user_profile.dismissed_banner_key = attributes[:dismissed_banner_key] if attributes[:dismissed_banner_key].present? user_profile.website = format_url(attributes.fetch(:website) { user_profile.website }) user_profile.bio_raw = attributes.fetch(:bio_raw) { user_profile.bio_raw } diff --git a/app/views/list/list.erb b/app/views/list/list.erb index bfb7c511c9..9ba31d2a82 100644 --- a/app/views/list/list.erb +++ b/app/views/list/list.erb @@ -2,6 +2,14 @@ <%= server_plugin_outlet "topic_list_header" %> +<%- if SiteSetting.tagging_enabled && @tag_id %> +

    + <%= link_to "#{Discourse.base_url}/t/#{@tag_id}", itemprop: 'item' do %> + <%= @tag_id %> + <% end %> +

    +<% end %> + <% if @category %>

    <% if @category.parent_category %> diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb new file mode 100644 index 0000000000..0ffd169cb5 --- /dev/null +++ b/app/views/tags/index.html.erb @@ -0,0 +1,20 @@ +<% if crawler_layout? %> + +<% content_for :title do %><%=t "tags.title" %><% end %> + +

    <%=t "tags.title" %>

    + +
    + <% @tags.each do |tag| %> + + <% end %> +
    + +<% end %> diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb index 010999cc92..b227aa3c62 100644 --- a/app/views/topics/show.html.erb +++ b/app/views/topics/show.html.erb @@ -17,7 +17,19 @@ <% end %>
    <% end %> + +<%- if SiteSetting.tagging_enabled && @topic_view.topic.tags.present? %> +
    + <%= t 'js.tagging.tags' %>: + + <%- @topic_view.topic.tags.each do |t| %> + <%= t %> + <%- end %> +
    +<% end %> + <%= server_plugin_outlet "topic_header" %> +
    <%- if include_crawler_content? %> diff --git a/app/views/user_notifications/digest.html.erb b/app/views/user_notifications/digest.html.erb index fe5962f669..042a332bf4 100644 --- a/app/views/user_notifications/digest.html.erb +++ b/app/views/user_notifications/digest.html.erb @@ -5,7 +5,7 @@ <%- if logo_url.blank? %> <%= SiteSetting.title %> <%- else %> - + <%- end %> @@ -21,7 +21,7 @@ <%- @featured_topics.each_with_index do |t, i| %>
    - <%= raw format_topic_title(t.title) %> + <%= raw format_topic_title(t.title) %>
    <%= category_badge(t.category, inline_style: true, absolute_url: true) %>
    @@ -44,7 +44,7 @@ <%- @new_topics.each do |t| %>
    • - <%= raw format_topic_title(t.title) %> + <%= raw format_topic_title(t.title) %> <%= t.posts_count %> <%= category_badge(t.category, inline_style: true, absolute_url: true) %>
      • @@ -59,7 +59,7 @@
      <%- @new_by_category.first(10).each do |c| %> - <%= c[0].name %> <%= c[1] %> + <%= c[0].name %> <%= c[1] %> <%- end %>
      @@ -74,5 +74,5 @@
      <%=raw(t 'user_notifications.digest.unsubscribe', site_link: html_site_link(@anchor_color), - unsubscribe_link: link_to(t('user_notifications.digest.click_here'), email_unsubscribe_url(host: Discourse.base_url, key: @unsubscribe_key), {:style=>'color: #' + @anchor_color })) %> + unsubscribe_link: link_to(t('user_notifications.digest.click_here'), email_unsubscribe_url(host: Discourse.base_url_no_prefix, key: @unsubscribe_key), {:style=>"color: ##{@anchor_color}"})) %>
      diff --git a/config/database.yml b/config/database.yml index fb6d923aea..e9a2a50369 100644 --- a/config/database.yml +++ b/config/database.yml @@ -16,6 +16,7 @@ development: # re-generated from your development database when you run "rake". # Do not set this db to the same as development or production. test: + prepared_statements: false adapter: postgresql database: discourse_test min_messages: warning diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml index cef14f6e9c..4f9847ba9e 100644 --- a/config/locales/client.ar.yml +++ b/config/locales/client.ar.yml @@ -1538,9 +1538,7 @@ ar: create: "المعذرة، حدثت مشكلة أثناء إنشاء المشاركة. الرجاء المحاولة مرة أخرى." edit: "المعذرة، حدث خطأ أثناء تحرير مشاركتك. الرجاء المحاولة في وقت لاحق." upload: "المعذرة، حدث خطأ أثناء رفع الملف. الرجاء المحاولة في وقت لاحق." - file_too_large: "المعذرة، الملف الذي تحاول رفعه أكبر من المسموح به {{max_size_kb}} كيلوبايت" too_many_uploads: "نأسف, يمكنك رفع ملف واحد فقط في نفس الوقت." - too_many_dragged_and_dropped_files: "يمكنك سحب و إفلات ١٠ ملفات في الوقت الواحد كحد أقصى." upload_not_authorized: "المعذرة، الملف الذي تحاول رفعه غير مسموح به، الامتدادات المسموح بها هي {{authorized_extensions}}." image_upload_not_allowed_for_new_user: "نعتذر، المستخدمين الجدد لا يمكنهم رفع صور." attachment_upload_not_allowed_for_new_user: "نعتذر، المستخدمين الجدد لا يمكنهم رفع مرفقات." @@ -2094,7 +2092,6 @@ ar: 30_days_ago: "منذ ٣٠ يوم" all: "الكل" view_table: "جدول" - view_chart: "شريط الرسم البياني" refresh_report: "تحديث التقرير " start_date: "تاريخ البدء" end_date: "تاريخ الإنتهاء" diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml index 08b0fc2eb4..eca629e1c3 100644 --- a/config/locales/client.bs_BA.yml +++ b/config/locales/client.bs_BA.yml @@ -33,6 +33,7 @@ bs_BA: full_no_year_no_time: "MMMM Do" long_with_year: "MMM D, YYYY h:mm a" long_with_year_no_time: "MMM D, YYYY" + full_with_year_no_time: "Do.MMMM.YYYY." long_date_with_year: "MMM D, 'YY LT" long_date_without_year: "MMM D, LT" long_date_with_year_without_time: "MMM D, 'YY" @@ -127,6 +128,7 @@ bs_BA: enabled: 'izlistan %{when}' disabled: 'sklonjen %{when}' topic_admin_menu: "topic admin actions" + emails_are_disabled: "Sve odlazeće email poruke su globalno onemogućene od strane administratora. Niti jedna notifikacija bilo kakve vrste neće biti poslana." edit: 'izmjeni naslov i kategoriju ove teme' not_implemented: "That feature hasn't been implemented yet, sorry!" no_value: "Ne" @@ -256,6 +258,7 @@ bs_BA: few: "Ova tema ima {{count}} postova koji čekaju odobrenje" other: "Ova tema ima {{count}} postova koji čekaju odobrenje" confirm: "Sačuvaj promjene" + delete_prompt: "Da li ste sigurni da želite da izbrišete %{username} nalog? Ovo će ukloniti svaku objavu tog naloga, te blokirati korisnikovu email adresu kao i njegov IP." approval: title: "Post treba odobrenje" description: "Primili smo Vaš novi post ali on treba biti odobren od strane moderatora prije nego bude javno dostupan. Molimo budite strpljivi." @@ -358,6 +361,7 @@ bs_BA: title: "Preuredi Kategorije" title_long: "Reorganizuj listu kategorija" fix_order: "Fixirane Pozicije" + fix_order_tooltip: "Nemaju sve kategorije poziciju, što može da dovede do nepredvidljivih rezultata." save: "Sačuvaj pozicije" apply_all: "Snimi" position: "Pozicija" @@ -408,6 +412,7 @@ bs_BA: not_supported: "Notifikacije nisu podržane na ovom browseru." perm_default: "Upali notifikacije" perm_denied_btn: "Zabranje pristup" + perm_denied_expl: "Odbili ste dozvolu za slanje notifikacija. Omogućite ih kroz postavke vašeg pretraživača." disable: "Isključi notifikacije" enable: "Uključi notifikacije" each_browser_note: "Napomena: Ovu opciju morate promjeniti na svakom pregledniku." @@ -429,7 +434,9 @@ bs_BA: github_profile: "Github" mailing_list_mode: "Receive an email for every new post (unless you mute the topic or category)" watched_categories: "Watched" + watched_categories_instructions: "Automatski ćete da pratite sve nove objave u ovom kategorijama. Bićete notifikovani o svim novim objavama i temama i broj novih objava će se pojaviti pored naziva teme." tracked_categories: "Tracked" + tracked_categories_instructions: "Automatski ćete da pratite sve nove objave u ovom kategorijama. Broj novih objava će se pojaviti pored naziva teme." muted_categories: "Muted" delete_account: "Delete My Account" delete_account_confirm: "Are you sure you want to permanently delete your account? This action cannot be undone!" @@ -439,6 +446,7 @@ bs_BA: admin_delete: "Izbriši" users: "Korisnici" muted_users: "Utišani" + muted_users_instructions: "Odbij sve notifikacije od ovih korisnika." muted_topics_link: "Prikaži utišane teme" staff_counters: flags_given: "helpful flags" @@ -491,6 +499,7 @@ bs_BA: cache_notice: "Uspješno ste promjenili sliku profila, možda potraje njeno prikazivanje zbog browser keš-a" change_profile_background: title: "Pozadina profila" + instructions: "Pozadinske slike profila će biti centrirane i imati širinu od 850px." email: title: "Email" instructions: "Nikada se ne pokazuje javno." @@ -744,8 +753,8 @@ bs_BA: instagram: title: "sa Instagramom" facebook: - title: "sa Facebukom" - message: "Identifikujemo sa Facebukom (nadamo se da su vam isključeni popup blokeri)" + title: "sa Facebook" + message: "Identifikujemo sa Facebook (nadamo se da su vam isključeni popup blokeri)" yahoo: title: "sa Yahoo" message: "Authenticating with Yahoo (make sure pop up blockers are not enabled)" @@ -1620,6 +1629,7 @@ bs_BA: actions: delete_user: "delete user" change_trust_level: "change trust level" + change_username: "zamjeni korisničko ime" change_site_setting: "change site setting" change_site_customization: "change site customization" delete_site_customization: "delete site customization" @@ -1677,6 +1687,7 @@ bs_BA: pending: 'Users Pending Review' newuser: 'Users at Trust Level 0 (New User)' basic: 'Users at Trust Level 1 (Basic User)' + staff: "Zaposleni" admins: 'Admin Users' moderators: 'Moderators' blocked: 'Blocked Users' diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml index 6a9f585a81..2bf819fd08 100644 --- a/config/locales/client.de.yml +++ b/config/locales/client.de.yml @@ -1052,6 +1052,9 @@ de: selected: one: "Du hast ein Thema ausgewählt." other: "Du hast {{count}} Themen ausgewählt." + change_tags: "Tags ändern" + choose_new_tags: "Wähle neue Tags für diese Themen:" + changed_tags: "Die Tags dieser Themen wurden geändert." none: unread: "Du hast alle Themen gelesen." new: "Es gibt für dich keine neuen Themen." @@ -2204,6 +2207,8 @@ de: grant_moderation: "Moderation gewähren" revoke_moderation: "Moderation entziehen" backup_operation: "Backup läuft" + deleted_tag: "Tag löschen" + renamed_tag: "Tag umbenennen" screened_emails: title: "Gefilterte E-Mails" description: "Wenn jemand ein Konto erstellt, werden die folgenden E-Mail-Adressen überprüft und es wird die Anmeldung blockiert oder eine andere Aktion ausgeführt." @@ -2699,3 +2704,32 @@ de:

      + + tagging: + all_tags: "Alle Tags" + selector_all_tags: "Alle Tags" + changed: "Tags geändert:" + tags: "Tags" + choose_for_topic: "Wähle optional Tags für dieses Thema" + topics_tagged: "Themen getaggt mit {{tag}}" + delete_tag: "Tag löschen" + delete_confirm: "Bist du sicher, dass du das Tag löschen möchtest?" + rename_tag: "Tag umbenennen" + rename_instructions: "Wähle einen neuen Namen für das Tag:" + sort_by: "Sortieren nach:" + sort_by_count: "Anzahl" + sort_by_name: "Name" + + notifications: + watching: + title: "Beobachten" + description: "Du wirst automatisch alle neuen Themen dieses Tags beobachten. Du wirst über jeden neuen Beitrag und jedes neue Thema benachrichtigt. Die Anzahl der ungelesenen und neuen Beiträge wird neben dem Thema erscheinen." + tracking: + title: "Verfolgen" + description: "Du wirst automatisch alle neuen Themen dieses Tags verfolgen. Die Anzahl der ungelesenen und neuen Beiträge wird neben dem Thema erscheinen." + regular: + title: "Normal" + description: "Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deinen Beitrag antwortet." + muted: + title: "Stummgeschaltet" + description: "Du erhältst keine Benachrichtigungen über neue Themen mit diesem Tag und es wird nicht in deiner Liste ungelesener Tags erscheinen." diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index d58b84c7c2..c9d7675d98 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -121,6 +121,8 @@ en: email: 'send this link in an email' action_codes: + public_topic: "made this topic public %{when}" + private_topic: "made this topic private %{when}" split_topic: "split this topic %{when}" invited_user: "invited %{who} %{when}" removed_user: "removed %{who} %{when}" @@ -147,6 +149,9 @@ en: emails_are_disabled: "All outgoing email has been globally disabled by an administrator. No email notifications of any kind will be sent." + bootstrap_mode_enabled: "To make launching your new site easier, you are in bootstrap mode. All new users will be granted trust level 1 and have daily email digest updates enabled. This will be automatically turned off when total user count exceeds %{min_users} users." + bootstrap_mode_disabled: "Bootstrap mode will be disabled in next 24 hours." + s3: regions: us_east_1: "US East (N. Virginia)" @@ -1161,6 +1166,9 @@ en: selected: one: "You have selected 1 topic." other: "You have selected {{count}} topics." + change_tags: "Change Tags" + choose_new_tags: "Choose new tags for these topics:" + changed_tags: "The tags of those topics were changed." none: unread: "You have no unread topics." @@ -1338,6 +1346,8 @@ en: invisible: "Make Unlisted" visible: "Make Listed" reset_read: "Reset Read Data" + make_public: "Make Public Topic" + make_private: "Make Private Message" feature: pin: "Pin Topic" @@ -2297,6 +2307,7 @@ en: test_error: "There was a problem sending the test email. Please double-check your mail settings, verify that your host is not blocking mail connections, and try again." sent: "Sent" skipped: "Skipped" + bounced: "Bounced" received: "Received" rejected: "Rejected" sent_at: "Sent At" @@ -2407,6 +2418,8 @@ en: grant_moderation: "grant moderation" revoke_moderation: "revoke moderation" backup_operation: "backup operation" + deleted_tag: "deleted tag" + renamed_tag: "renamed tag" screened_emails: title: "Screened Emails" description: "When someone tries to create a new account, the following email addresses will be checked and the registration will be blocked, or some other action performed." @@ -2701,6 +2714,7 @@ en: login: "Login" plugins: "Plugins" user_preferences: "User Preferences" + tags: "Tags" badges: title: Badges @@ -2919,3 +2933,57 @@ en:

      + + tagging: + all_tags: "All Tags" + selector_all_tags: "all tags" + changed: "tags changed:" + tags: "Tags" + choose_for_topic: "choose optional tags for this topic" + delete_tag: "Delete Tag" + delete_confirm: "Are you sure you want to delete that tag?" + rename_tag: "Rename Tag" + rename_instructions: "Choose a new name for the tag:" + sort_by: "Sort by:" + sort_by_count: "count" + sort_by_name: "name" + + filters: + without_category: "%{filter} %{tag} topics" + with_category: "%{filter} %{tag} topics in %{category}" + + notifications: + watching: + title: "Watching" + description: "You will automatically watch all new topics in this tag. You will be notified of all new posts and topics, plus the count of unread and new posts will also appear next to the topic." + tracking: + title: "Tracking" + description: "You will automatically track all new topics in this tag. A count of unread and new posts will appear next to the topic." + regular: + title: "Regular" + description: "You will be notified if someone mentions your @name or replies to your post." + muted: + title: "Muted" + description: "You will not be notified of anything about new topics in this tag, and they will not appear on your unread tab." + + topics: + none: + unread: "You have no unread topics." + new: "You have no new topics." + read: "You haven't read any topics yet." + posted: "You haven't posted in any topics yet." + latest: "There are no latest topics." + hot: "There are no hot topics." + bookmarks: "You have no bookmarked topics yet." + top: "There are no top topics." + search: "There are no search results." + bottom: + latest: "There are no more latest topics." + hot: "There are no more hot topics." + posted: "There are no more posted topics." + read: "There are no more read topics." + new: "There are no more new topics." + unread: "There are no more unread topics." + top: "There are no more top topics." + bookmarks: "There are no more bookmarked topics." + search: "There are no more search results." diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml index 09aa1e8f12..36e3c53d8e 100644 --- a/config/locales/client.es.yml +++ b/config/locales/client.es.yml @@ -676,17 +676,20 @@ es: one: "post publicado" other: "posts publicados" likes_given: - one: "me gusta dado" - other: "me gusta dados" + one: " dado" + other: " dados" likes_received: - one: "me gusta recibido" - other: "me gusta recibidos" + one: " recibido" + other: " recibidos" days_visited: one: "día visitado" other: "días visitados" posts_read: one: "post leído" other: "posts leídos" + bookmark_count: + one: "marcador" + other: "marcadores" top_replies: "Respuestas top" no_replies: "No hay respuestas aún." more_replies: "Más respuestas" @@ -696,6 +699,10 @@ es: top_badges: "Distintivos top" no_badges: "No hay distintivos aún." more_badges: "Más distintivos" + top_links: "Top enlaces" + no_links: "No hay enlaces aún." + most_liked_by: "Los que dieron más me gusta" + no_likes: "No hay me gusta aún." associated_accounts: "Inicios de sesión" ip_address: title: "Última dirección IP" @@ -1052,6 +1059,9 @@ es: selected: one: "Has seleccionado 1 tema." other: "Has seleccionado {{count}} temas." + change_tags: "Cambiar etiquetas" + choose_new_tags: "Elegir nuevas etiquetas para estos temas:" + changed_tags: "Las etiquetas de estos temas fueron cambiadas." none: unread: "No hay temas que sigas y que no hayas leído ya." new: "No tienes temas nuevos por leer." @@ -1365,9 +1375,9 @@ es: create: "Lo sentimos, hubo un error al crear tu post. Por favor, inténtalo de nuevo." edit: "Lo sentimos, hubo un error al editar tu post. Por favor, inténtalo de nuevo." upload: "Lo sentimos, hubo un error al subir el archivo. Por favor, inténtalo de nuevo." - file_too_large: "Lo sentimos, el archivo que estas tratando de subir es demasiado grande (el tamaño máximo es de {{max_size_kb}}kb)" + file_too_large: "Lo sentimos, ese archivo es demasiado grande (el tamaño máximo es {{max_size_kb}}kb). ¿Quizá podrías subir el archivo a un servicio de almacenamiento en la nube y compartir aquí el enlace?" too_many_uploads: "Lo siento solo puedes subir un archivo cada vez." - too_many_dragged_and_dropped_files: "Lo sentimos, solo puedes arrastrar 10 archivos a la vez." + too_many_dragged_and_dropped_files: "Lo sentimos, sólo puedes subir 10 archivos a la vez." upload_not_authorized: "Lo sentimos, el archivo que intenta cargar no está autorizado (authorized extension: {{authorized_extensions}})." image_upload_not_allowed_for_new_user: "Lo siento, usuarios nuevos no pueden subir imágenes." attachment_upload_not_allowed_for_new_user: "Lo siento, usuarios nuevos no pueden subir archivos adjuntos." @@ -1377,6 +1387,7 @@ es: no_value: "No, mantener" yes_value: "Sí, abandonar" via_email: "este post llegó por email" + via_auto_generated_email: "este post llegó a través de un email generado automáticamente" whisper: "esto post es un susurro privado para moderadores" wiki: about: "este post es tipo wiki" @@ -1593,6 +1604,7 @@ es: action: 'Reportar post' take_action: "Tomar medidas" notify_action: 'Mensaje' + official_warning: 'Advertencia oficial' delete_spammer: "Borrar spammer" delete_confirm: "Estás a punto de eliminar %{posts} publicaciones y %{topics} temas de este usuario, borrar su cuenta, bloquear sus inicios de sesión desde su dirección IP %{ip_address}, y añadir su dirección de email %{email} a una lista de bloqueo permanente. ¿Estás seguro de que este usuario es realmente un spammer?" yes_delete_spammer: "Sí, borrar spammer" @@ -1806,7 +1818,7 @@ es: 30_days_ago: "Hace 30 días" all: "Todo" view_table: "tabla" - view_chart: "gráfico de barras" + view_graph: "gráfico" refresh_report: "Actualizar reporte" start_date: "Desde fecha" end_date: "Hasta fecha" @@ -2208,6 +2220,8 @@ es: grant_moderation: "conceder moderación" revoke_moderation: "revocar moderación" backup_operation: "operación de copia de seguridad de respaldo" + deleted_tag: "etiqueta eliminada" + renamed_tag: "etiqueta renombrada" screened_emails: title: "Correos bloqueados" description: "Cuando alguien trata de crear una cuenta nueva, los siguientes correos serán revisados y el registro será bloqueado, o alguna otra acción será realizada." @@ -2703,3 +2717,54 @@ es:

      + + tagging: + all_tags: "Etiquetas" + selector_all_tags: "etiquetas" + changed: "etiquetas cambiadas:" + tags: "Etiquetas" + choose_for_topic: "elegir etiquetas para este tema (opcional)" + delete_tag: "Eliminar etiqueta" + delete_confirm: "¿Seguro que quieres eliminar esta etiqueta?" + rename_tag: "Renombrar etiqueta" + rename_instructions: "Elige un nuevo nombre para la etiqueta:" + sort_by: "Ordenar por:" + sort_by_count: "volumen" + sort_by_name: "nombre" + + notifications: + watching: + title: "Vigilar" + description: "Vigilarás automáticamente todos los nuevos temas con esta etiqueta. Se añadirá un contador de posts nuevos y sin leer al lado del tema y además, se te notificará de cada nuevo tema y post." + tracking: + title: "Seguir" + description: "Seguirás automáticamente todos los nuevos temas con esta etiqueta. Se añadirá un contador de posts nuevos y sin leer al lado del tema." + regular: + title: "Normal" + description: "Se te notificará solo si alguien te menciona con tu @usuario o responde a algún post tuyo." + muted: + title: "Silenciar" + description: "No se te notificará de nuevos temas con esta etiqueta, ni aparecerán en tu pestaña de temas no leídos." + + topics: + none: + unread: "No tienes temas sin leer." + new: "No hay temas nuevos." + read: "Aún no has leído ningún tema." + posted: "Aún no has publicado en ningún tema." + latest: "No hay temas recientes." + hot: "No hay temas candentes" + bookmarks: "Aún no has guardado temas en marcadores." + top: "No hay temas top." + search: "No hay resultados resultados de búsqueda." + bottom: + latest: "No hay más temas recientes." + hot: "No hay más temas candentes." + posted: "No hay más temas en los que hayas publicado." + read: "No hay más temas que hayas leído." + new: "No hay más temas nuevos." + unread: "No hay más temas sin leer." + top: "No hay más temas top." + bookmarks: "No hay más temas en marcadores." + search: "No hay más resultados de búsqueda." + diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml index 048a86b1ed..4706ddeb46 100644 --- a/config/locales/client.fa_IR.yml +++ b/config/locales/client.fa_IR.yml @@ -918,6 +918,9 @@ fa_IR: choose_new_category: "یک دسته بندی جدید برای موضوع انتخاب نمایید" selected: other: "شما تعداد {{count}} موضوع را انتخاب کرده اید." + change_tags: "تغییر برچسب ها" + choose_new_tags: "انتخاب برچسب های جدید برای این موضوع:" + changed_tags: "برچسب های انتخابی برای این موضوع جایگزین شد." none: unread: "موضوع خوانده نشده‌ای ندارید." new: "شما هیچ موضوع تازه‌ای ندارید" @@ -1956,6 +1959,8 @@ fa_IR: change_category_settings: "تغییر تنظیمات دسته بندی" delete_category: "حذف دسته بندی" create_category: "ساخت دسته بندی" + deleted_tag: "حذف برچسب" + renamed_tag: "تغییر نام برچسب" screened_emails: title: "ایمیل ها نمایش داده شده" description: "وقتی کسی سعی می کند یک حساب جدید ایجاد کند، از آدرس ایمیل زیر بررسی و ثبت نام مسدود خواهد شد، و یا برخی از اقدام های دیگر انجام می شود." @@ -2430,3 +2435,27 @@ fa_IR:

      + tagging: + all_tags: "تمام پرچسب ها" + changed: "برچسب های تغییر یافته:" + tags: "برچسب ها" + choose_for_topic: "انتخاب برچسب اختیاری برای این موضوع" + delete_tag: "حذف برچسب" + delete_confirm: "آیا مطمئنید که می خواهید این برچسب را خذف کنید?" + rename_tag: "تغییر نام برچسب" + rename_instructions: "یک نام جدید برای برچسب انتخاب نمایید:" + + notifications: + watching: + title: "تماشا" + description: "شما به صورت خودکار تمام نوشته های این برچسب را مشاهده خواهید کرد، تمام نوشته ها به شما اطلاع رسانی خواهد شد.و تعداد نوشته های خوانده نشده در جلوی موضوعات نشان داده خواهد شد." + tracking: + title: "پی گیری" + description: "شما به صورت خودکار تمام نوشته های این برچسب را پی گیری خواهید کرد، تمام نوشته های خوانده نشده جلوی موضوعات نشان داده خواهد شد." + regular: + title: "منظم" + description: "به شما اطلاع داده خواهد شد اگر کسی به شما اششاره@name یا به نوشته شما پاسخ دهند." + muted: + title: "بی صدا" + description: "به شما هیچ چیزی در باره نوشته های این تگ اطلاع رسانی نخواهد شد." + diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml index ad45574ec8..2136048863 100644 --- a/config/locales/client.fi.yml +++ b/config/locales/client.fi.yml @@ -1019,6 +1019,9 @@ fi: selected: one: "Olet valinnut yhden ketjun." other: "Olet valinnut {{count}} ketjua." + change_tags: "Muuta tagit" + choose_new_tags: "Valitse uudet tagit näille aiheille:" + changed_tags: "Aiheiden tagit on vaihdettu." none: unread: "Sinulla ei ole lukemattomia ketjuja." new: "Sinulla ei ole uusia ketjuja." @@ -2166,6 +2169,8 @@ fi: grant_moderation: "myönnä valvojan oikeudet" revoke_moderation: "peru valvojan oikeudet" backup_operation: "varmuuskopiointi" + deleted_tag: "poistettu tagi" + renamed_tag: "uudelleennimetty tagi" screened_emails: title: "Seulottavat sähköpostiosoitteet" description: "Uuden käyttäjätunnuksen luonnin yhteydessä annettua sähköpostiosoitetta verrataan alla olevaan listaan ja tarvittaessa tunnuksen luonti joko estetään tai suoritetaan muita toimenpiteitä." @@ -2656,3 +2661,27 @@ fi:

      + tagging: + all_tags: "Kaikki tagit" + changed: "muutetut tagit:" + tags: "Tagit" + choose_for_topic: "valitse sopivat tagit aiheelle" + topics_tagged: "Aiheet tagattu {{tag}}" + delete_tag: "Poista tagi" + delete_confirm: "Haluatko varmasti poistaa tagin?" + rename_tag: "Uudelleennimeä tagi" + rename_instructions: "Valitse tagin uusi nimi:" + + notifications: + watching: + title: "Tarkkaile" + description: "Saat ilmoituksen kaikista uusista viesteistä ja ketjuista jotka käyttää tätä tagia. Uusien ja lukemattomien määrä näkyy ketjun yhteydessä." + tracking: + title: "Seuraa" + description: "Seuraat automaattisesti tämän tagin ketjuja ja viestejä. Uusien ja lukemattomien määrä näkyy ketjun yhteydessä." + regular: + title: "Tavallinen" + description: "Saat ilmoituksen kun joku mainitsee @nimesi tai vastaa ketjuun." + muted: + title: "Vaimenna" + description: "Et saa ilmoituksia, eikä se näy lukemattomissa." diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml index e46cd3dfbd..af91e9c360 100644 --- a/config/locales/client.fr.yml +++ b/config/locales/client.fr.yml @@ -499,6 +499,7 @@ fr: set_password: "Définir le mot de passe" change_about: title: "Modifier à propos de moi" + error: "Il y avait une erreur lors de la modification de cette valeur." change_username: title: "Modifier le pseudo" confirm: "Si vous modifiez votre pseudo, toutes les citations de vos messages et les mentions @pseudo seront cassées. Êtes-vous absolument sûr de vouloir le faire ?" @@ -592,12 +593,16 @@ fr: every_three_days: "tous les trois jours" weekly: "hebdomadaire" every_two_weeks: "toutes les deux semaines" + include_tl0_in_digests: "Inclure les messages de nouveaux utilisateurs dans courriels de résumé" email_in_reply_to: "Inclure un extrait du message auquel il a été répondu dans les courriels" email_direct: "M'envoyer un courriel quand quelqu'un me cite, répond à mon message ou mentionne mon @pseudo ou m'invite à rejoindre un sujet" email_private_messages: "M'envoyer un courriel quand quelqu'un m'envoie un message privé" email_always: "Recevoir des notifications par email même lorsque je suis actif sur le site" other_settings: "Autre" categories_settings: "Catégories" + enable_mailing_list: + one: "Etes-vous sûr que vous souhaitez recevoir un courriel pour chaque nouveau message?" + other: "Etes-vous sûr que vous souhaitez recevoir un email pour chaque nouveau message?

      Ceci équivaudra à environ {{count}} courriels par jour." new_topic_duration: label: "Considérer les sujets comme nouveau quand" not_viewed: "Je ne les ai pas encore vus" @@ -663,12 +668,41 @@ fr: summary: title: "Résumé" stats: "Statistiques" + time_read: "temps de lecture" + topic_count: + one: "sujets créés" + other: "sujets créés" + post_count: + one: "message créé" + other: "messages créés" + likes_given: + one: " donné" + other: " donnés" + likes_received: + one: " reçu" + other: " reçus" + days_visited: + one: "jour visité" + other: "jours visités" + posts_read: + one: "message lu" + other: "Messages lus" + bookmark_count: + one: "signet" + other: "signets" top_replies: "Réponses les plus référencés" + no_replies: "Pas encore de message." more_replies: "Plus de réponses" top_topics: "Sujets les plus référencés" + no_topics: "Pas encore de sujet." more_topics: "Plus de sujets" top_badges: "Badges les plus accordés" + no_badges: "Pas encore de badge." more_badges: "Plus de badges" + top_links: "Liens les plus suivis" + no_links: "Pas encore de lien." + most_liked_by: "Les plus aimés par" + no_likes: "Pas encore de j'aime." associated_accounts: "Connexions" ip_address: title: "Dernières adresses IP" @@ -717,6 +751,12 @@ fr: too_few_topics_and_posts_notice: "Démarrons cette discussion! Il y a actuellement %{currentTopics} / %{requiredTopics} sujets et %{currentPosts} / %{requiredPosts} messages. Les nouveaux visiteurs ont besoin de quelques conversations pour lire et répondre." too_few_topics_notice: "Démarrons cette discussion ! Il y a actuellement %{currentTopics} / %{requiredTopics} sujets. Les nouveaux visiteurs ont besoin de quelques conversations à lire et répondre." too_few_posts_notice: "Démarrons cette discussion ! Il y a actuellement %{currentPosts} / %{requiredPosts} messages. Les nouveaux visiteurs ont besoin de quelques conversations à lire et répondre." + logs_error_rate_notice: + reached: "%{timestamp}: Le taux actuel de %{rate} a atteint la limite des paramètres du site de %{siteSettingRate}." + exceeded: "%{timestamp}: Le taux actuel de %{rate} a atteint la limite des paramètres du site de %{siteSettingRate}." + rate: + one: "1 erreur/%{duration}" + other: "%{count} erreurs/%{duration}" learn_more: "en savoir plus…" year: 'an' year_desc: 'sujets créés durant les 365 derniers jours' @@ -880,6 +920,7 @@ fr: link_description: "saisir ici la description du lien" link_dialog_title: "Insérez le lien" link_optional_text: "titre optionnel" + link_url_placeholder: "http://example.com" quote_title: "Citation" quote_text: "Citation" code_title: "Texte préformaté" @@ -1018,6 +1059,9 @@ fr: selected: one: "Vous avez sélectionné 1 sujet." other: "Vous avez sélectionné {{count}} sujets." + change_tags: "Modifier les tags" + choose_new_tags: "Choisir de nouveaux tags pour ces sujets :" + changed_tags: "Les tags de ces sujets ont été modifiés." none: unread: "Vous n'avez aucun sujet non lu." new: "Vous n'avez aucun nouveau sujet." @@ -1331,9 +1375,9 @@ fr: create: "Désolé, il y a eu une erreur lors de la publication de votre message. Merci de réessayer." edit: "Désolé, il y a eu une erreur lors de l'édition de votre message. Merci de réessayer." upload: "Désolé, il y a eu une erreur lors de l'envoi du fichier. Merci de réessayer." - file_too_large: "Désolé, le fichier que vous êtes en train d'envoyer est trop grand (taille maximum de {{max_size_kb}} Ko)" + file_too_large: "Désolé, ce fichier est trop gros (la taille maximale est {{max_size_kb}}kb). Pourquoi ne pas télécharger votre gros fichier sur un service partagé cloud, puis partager le lien?" too_many_uploads: "Désolé, vous ne pouvez envoyer qu'un seul fichier à la fois." - too_many_dragged_and_dropped_files: "Désolé, vous pouvez seulement glisser-déposer jusqu'à 10 fichiers à la fois." + too_many_dragged_and_dropped_files: "Désolé, vous ne pouvez télécharger que 10 fichiers à la fois." upload_not_authorized: "Désolé, le fichier que vous êtes en train d'envoyer n'est pas autorisé (extensions autorisées : {{authorized_extensions}})." image_upload_not_allowed_for_new_user: "Désolé, les nouveaux utilisateurs ne peuvent pas envoyer d'image." attachment_upload_not_allowed_for_new_user: "Désolé, les nouveaux utilisateurs ne peuvent pas envoyer de fichier." @@ -1343,11 +1387,13 @@ fr: no_value: "Non, le conserver" yes_value: "Oui, abandonner" via_email: "message depuis un courriel" + via_auto_generated_email: "ce message est arrivé via un courriel généré automatiquement" whisper: "ce message est un murmure privé pour les modérateurs" wiki: about: "ce message est un wiki" archetypes: save: 'Sauvegarder les options' + few_likes_left: "Merci de partager votre amour! Vous avez plus que quelques j'aime à distribuer pour aujourd'hui." controls: reply: "Rédiger une réponse à ce message" like: "J'aime ce message" @@ -1558,6 +1604,7 @@ fr: action: 'Signaler ce message' take_action: "Signaler" notify_action: 'Message' + official_warning: 'Avertissement officiel' delete_spammer: "Supprimer le spammeur" delete_confirm: "Vous vous apprêtez à supprimer %{posts} messages et %{topics} sujets de cet utilisateur, supprimer son compte, bloquer les inscriptions depuis son adresse IP %{ip_address} et à ajouter son adresse de courriel %{email} à la liste des utilisateurs bloqués. Etes-vous sûr que cet utilisateur est un spammeur ?" yes_delete_spammer: "Oui, supprimer le spammeur" @@ -1771,7 +1818,7 @@ fr: 30_days_ago: "il y a 30 jours" all: "Tous" view_table: "tableau" - view_chart: "histogramme" + view_graph: "graphique" refresh_report: "Actualiser le rapport" start_date: "Date de début" end_date: "Date de fin" @@ -1906,6 +1953,14 @@ fr: backups: "Sauvegardes" logs: "Journaux" none: "Aucune sauvegarde disponible." + read_only: + enable: + title: "Activer le mode lecture seule" + label: "Activer la lecture seule" + confirm: "Etes-vous sûr de vouloir activer le mode lecture seule?" + disable: + title: "Désactiver le mode lecture seule" + label: "Désactiver lecture seule" logs: none: "Pas de journaux pour l'instant..." columns: @@ -2085,6 +2140,7 @@ fr: modal: title: "Détails du courriel entrant" error: "Erreur" + headers: "En-têtes" subject: "Subject" body: "Body" rejection_message: "Courriel de refus" @@ -2164,6 +2220,8 @@ fr: grant_moderation: "Accorder les droits de modération" revoke_moderation: "Révoquer les droits de modération" backup_operation: "sauvegarde" + deleted_tag: "tag supprimé" + renamed_tag: "tag renommé" screened_emails: title: "Courriels affichés" description: "Lorsque quelqu'un essaye de créé un nouveau compte, les adresses de courriel suivantes seront vérifiées et l'inscription sera bloquée, ou une autre action sera réalisée." @@ -2402,6 +2460,10 @@ fr: title: "Afficher dans le profil public" enabled: "affiché dans le profil" disabled: "pas affiché dans le profil" + show_on_user_card: + title: "Montrer sur la carte de l'utilisateur?" + enabled: "montré sur la carte de l'utilisateur" + disabled: "non montré sur la carte de l'utilisateur" field_types: text: 'Zone de texte' confirm: 'Confirmation' @@ -2455,6 +2517,7 @@ fr: badge: Badge display_name: Nom affiché description: Description + long_description: Description longue badge_type: Type de badge badge_grouping: Groupe badge_groupings: @@ -2494,6 +2557,7 @@ fr: post_revision: "Lorsqu'un utilisateur modifie ou crée un message" trust_level_change: "Lorsqu'un utilisateur change de niveau de confiance" user_change: "Lorsqu'un utilisateur est modifié ou crée" + post_processed: "Après un message est traité" preview: link_text: "Aperçu du badge accordé" plan_text: "Aperçu avant le plan de requête" @@ -2617,7 +2681,11 @@ fr: earned_n_times: one: "A reçu ce badge 1 fois" other: "A reçu ce badge %{count} fois" + granted_on: "Accordé %{date}" + others_count: "Autres utilisateurs avec ce badge (%{count})" title: Badges + allow_title: "titre disponible" + multiple_grant: "attribué plusieurs fois" badge_count: one: "1 badge" other: "%{count} badges" @@ -2649,3 +2717,26 @@ fr:

      + tagging: + all_tags: "Tous les tags" + changed: "tags modifiés:" + tags: "Tags" + choose_for_topic: "choisissez des tags pour ce sujet (optionnel)" + delete_tag: "Supprimer ce tag" + delete_confirm: "Êtes-vous sûr de vouloir supprimer ce tag ?" + rename_tag: "Renommer ce tag" + rename_instructions: "Choisissez un nouveau nom pour le tag :" + + notifications: + watching: + title: "Surveiller" + description: "Vous surveillerez automatiquement les nouveaux sujets portant ce tag. Vous serez averti de tous les nouveaux messages et sujets. De plus, le nombre de messages non lus et nouveaux apparaîtra en regard du sujet." + tracking: + title: "Suivre" + description: "Vous suivrez automatiquement les nouveaux sujets portant ce tag. Le nombre de messages non lus et nouveaux apparaîtra en regard du sujet." + regular: + title: "Normal" + description: "Vous serez averti si quelqu'un mentionne votre @pseudo ou répond à votre message." + muted: + title: "Silencieux" + description: "Vous ne recevrez aucune notification des sujets portant ce tag, et ils n'apparaîtront pas dans votre onglet non lus." diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml index a5600dffde..032861d0b4 100644 --- a/config/locales/client.id.yml +++ b/config/locales/client.id.yml @@ -81,6 +81,8 @@ id: other: "%{count} bulan kemudian" x_years: other: "%{count} bulan kemudian" + previous_month: 'Bulan Lalu' + next_month: 'Bulan Depan' share: topic: 'share link ke topik ini' post: 'post #%{postNumber}' @@ -91,6 +93,8 @@ id: email: 'kirim link ini melalui email' action_codes: split_topic: "pisahkan topik ini %{when}" + invited_user: "mengundang %{who} %{when}" + removed_user: "menghapus %{who} %{when}" autoclosed: enabled: 'ditutup %{when}' disabled: 'dibuka %{when}' @@ -142,6 +146,8 @@ id: more: "Selengkapnya" less: "Lebih Singkat" never: "tidak pernah" + every_30_minutes: "setiap 30 menit" + every_hour: "setiap jam" daily: "harian" weekly: "mingguan" every_two_weeks: "setiap dua minggu" @@ -222,6 +228,8 @@ id: none: "Tidak ada pos untuk di pratinjau." edit: "Ubah" cancel: "Batal" + approval: + description: "Kami telah menerima posting baru Anda, tetapi diperlukan persetujuan dari moderator sebelum posting tersebut tampil. Mohon kesabarannya. Terima kasih!" user_action: user_posted_topic: "{{user}} memposting topik" you_posted_topic: "Anda memposting the topic" @@ -275,10 +283,12 @@ id: post_stat_sentence: other: "%{count} pos baru dalam %{unit} terakhir." ip_lookup: + title: Pencarian Alamat IP location: Lokasi location_not_found: (tidak diketahui) organisation: Organisasi phone: Telepon + other_accounts: "Akun lain dengan alamat IP ini: " username: "username" read_time: "waktu baca" confirm_delete_other_accounts: "Apakah Anda yakin untuk menghapus akun ini?" @@ -288,6 +298,7 @@ id: mute: "Redam" edit: "Ubah Preferensi" download_archive: "Unduh Pos Saya" + new_private_message: "Pesan Baru" private_messages: "Messages" activity_stream: "Activity" bookmarks: "Markah" @@ -331,6 +342,10 @@ id: change_email: title: "Ganti Alamat Surel" taken: "Maaf, alamat surel tersebut tidak tersedia." + error: "Ada kesalahan dalam merubah alamat email Anda. Alamat ini telah digunakan oleh pengguna lain?" + success: "Kami telah mengirimkan surel kepada alamat itu. Silahkan mengikuti petunjuk konfirmasi didalamnya." + email: + invalid: "Silahkan masukkan alamat email yang valid" name: title: "Name" last_seen: "Seen" @@ -346,6 +361,10 @@ id: password: title: "Password" too_short: "Password kamu terlalu pendek." + ip_address: + title: "Alamat IP terakhir" + registration_ip_address: + title: "Alamat IP registrasi" filters: all: "Semua" close: "Tutup" @@ -354,8 +373,12 @@ id: week: 'minggu' last_seen: 'Terlihat' created: 'Dibuat' + search_hint: 'username, email, atau alamat IP' + create_account: + title: "Buat Akun Baru" forgot_password: action: "Saya lupa password" + invite: "Silahkan masukkan username atau alamat email, dan kami akan mengirimkan email untuk menentukan ulang sandi Anda." login: title: "Log In" email_placeholder: "email atau username" @@ -368,19 +391,35 @@ id: reply: "Balas" cancel: "Batal" users_placeholder: "Tambahkan pengguna" + view_new_post: "Lihat posting baru Anda" bold_title: "Strong" italic_title: "Emphasis" link_title: "Hyperlink" modal_cancel: "Batal" notifications: more: "lihat notifikasi sebelumnya" + new_item: "baru" + topics: + bulk: + choose_new_tags: "Silahkan pilih tag baru untuk topik-topik ini:" + none: + new: "Anda tidak memiliki topik baru" + bottom: + new: "Tidak ada topik baru lagi" topic: + create: 'Topik Baru' + create_long: 'Pilih topik baru' + new: 'topik baru' + new_topics: + other: '{{count}} topik baru' invalid_access: description: "Maaf, kamu tidak berhak mengakses topik tersebut." server_error: title: "Gagal membuka topik" not_found: title: "Tidak ada topik" + new_posts: + other: "ada {{count}} posting baru di topik ini sejak terakhir Anda mengunjunginya" back_to_list: "Kembali ke Daftar Topik" options: "Opsi Topik" show_links: "tampilkan pranala dalam topik ini" @@ -388,6 +427,14 @@ id: view_latest_topics: lihat topik terbaru suggest_create_topic: Buat topik baru? jump_reply_up: lompat ke balasan sebelumnya + split_topic: + title: "Pindahkan sebagai Topik Baru" + action: "pindahkan sebagai topik baru" + topic_name: "Nama Topik Baru" + error: "Ada kesalahan dalam memindahkan posting sebagai topik baru" + change_owner: + label: "Pemilik Posting Yang Baru" + placeholder: "username pemilik yang baru" post: errors: image_upload_not_allowed_for_new_user: "Maaf, pengguna baru belum diperbolehkan mengunggah gambar." @@ -400,12 +447,22 @@ id: category: edit_long: "Ubah" auto_close_units: "jam" + topic_statuses: + locked: + help: "Topik ini telah ditutup; tidak lagi menerima jawaban baru" + locked_and_archived: + help: "Topik ini telah ditutup dan diarsip; tidak lagi menerima jawaban baru dan tidak dapat dirubah lagi" posts: "Pos" likes: "Suka" users: "Pengguna" filters: new: + lower_title_with_count: + other: "{{count}} baru" lower_title: "baru" + title: "Baru" + title_with_count: + other: "Baru ({{count}})" category: help: "topik terakhir di kategori {{categoryName}}" top: @@ -426,6 +483,7 @@ id: flags: system: "Sistem" groups: + new: "Baru" delete: "Hapus" delete_confirm: "Hapus grup ini?" backups: @@ -438,30 +496,49 @@ id: new_style: "preview" delete: "Hapus" email: + to_address: "Kepada Alamat" test_email_address: "alamat email uji coba" sent_test: "terkirim!" delivery_method: "Metode Pengiriman" html: "html" logs: edit: 'Ubah' + staff_actions: + new_value: "Baru" + deleted: "Tidak ada nilai baru. Catatan telah dihapus." + screened_emails: + email: "Alamat Email" + screened_ips: + description: 'Alamat IP sedang dalam pengawasan. Gunakan "Allow" atau "Ijinkan" untuk memasukkan alamat IP dalam daftar putih.' + form: + label: "Baru:" + ip_address: "Alamat IP" users: not_found: "Maaf, username tersebut tidak ada ditemukan." active: "Aktif" nav: + new: "Baru" staff: 'Staf' titles: + new: 'Pengguna Baru' staff: "Staf" + check_email: + title: "Tampilkan alamat email pengguna ini" user: suspend_duration_units: "(hari)" suspend_reason: "Alasan" approve: 'Terima' delete: "Hapus Pengguna" + delete_and_block: "Hapus dan block email dan alamat IP ini" user_fields: edit: "Ubah" cancel: "Batal" site_settings: categories: users: 'Pengguna' + badges: + new_badge: Badge Baru + new: Baru lightbox: download: "unduh" keyboard_shortcuts_help: @@ -483,3 +560,9 @@ id:

      + tagging: + topics: + none: + new: "Anda tidak memiliki topik baru." + bottom: + new: "Tidak ada topik baru lainnya." diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml index 7b9c1fad03..78c99a4ac1 100644 --- a/config/locales/client.it.yml +++ b/config/locales/client.it.yml @@ -142,7 +142,7 @@ it: eu_west_1: "Europa (Irlanda)" eu_central_1: "Europa (Francoforte)" ap_southeast_1: "Asia Pacifico (Singapore)" - ap_southeast_2: "Asia Pacifico (Sydney)" + ap_southeast_2: "Asia Pacifico (Sidney)" ap_northeast_1: "Asia Pacifico (Tokyo)" ap_northeast_2: "Asia Pacifico (Seoul)" sa_east_1: "America del Sud (San Paolo)" @@ -270,7 +270,7 @@ it: one: "Questo argomento ha 1 messaggio in attesa di approvazione" other: "Questo argomento ha {{count}} messaggi in attesa di approvazione" confirm: "Salva Modifiche" - delete_prompt: "Sei sicuro di voler cancellare %{nome utente}? Questo cancellerà tutti i loro post e bloccherà le loro email e indirizzo IP." + delete_prompt: "Sei sicuro di voler eliminare %{username}? Ciò cancellerà tutti i suoi messaggi e bloccherà il suo indirizzo email e l'indirizzo IP." approval: title: "Il Messaggio Richiede Approvazione" description: "Abbiamo ricevuto il tuo messaggio ma prima che appaia è necessario che venga approvato da un moderatore. Per favore sii paziente." @@ -498,7 +498,7 @@ it: set_password: "Imposta Password" change_about: title: "Modifica i dati personali" - error: "Si è verificato un errore durante la modifica di questo valore." + error: "Si è verificato un errore durante la modifica del valore." change_username: title: "Cambia Utente" confirm: "Se modifichi il tuo nome utente, non funzioneranno più le precedenti citazioni ai tuoi messaggi e le menzioni @nome. Sei sicuro di volerlo fare?" @@ -574,14 +574,14 @@ it: website: "Sito Web" email_settings: "Email" like_notification_frequency: - title: "Notifica quando gradito" + title: "Notifica alla ricezione di \"Mi piace\"." always: "Sempre" - first_time_and_daily: "Prima volta che un post è gradito e quotidianamente" - first_time: "Prima volta che un post è gradito" + first_time_and_daily: "La prima volta che un messaggio riceve un \"Mi piace\" e giornalmente" + first_time: "La prima volta che un messaggio riceve un \"Mi piace\"" never: "Mai" email_previous_replies: title: "Includi risposte precedenti al fondo delle email" - unless_emailed: "Senza invio precedente" + unless_emailed: "a meno che non sia stato già inviato" always: "sempre" never: "mai" email_digests: @@ -592,8 +592,8 @@ it: every_three_days: "ogni tre giorni" weekly: "ogni settimana" every_two_weeks: "ogni due settimane" - include_tl0_in_digests: "Includi post dai nuovi utenti nelle email raccolte" - email_in_reply_to: "Includi un estratto di risposta al post nelle email" + include_tl0_in_digests: "Includi messaggi dai nuovi utenti nelle email riepilogative" + email_in_reply_to: "Nelle email includi un estratto delle risposte al messaggio" email_direct: "Inviami un'email quando qualcuno mi cita, risponde a un mio messaggio, menziona il mio @nome o mi invita ad un argomento" email_private_messages: "Inviami una email quando qualcuno mi scrive un messaggio" email_always: "Inviami notifiche via email anche quando sono collegato al sito" @@ -674,18 +674,12 @@ it: post_count: one: "messaggio creato" other: "messaggi creati" - likes_given: - one: "\"Mi piace\" assegnato" - other: "\"Mi piace\" assegnati" - likes_received: - one: "\"Mi piace\" ricevuto" - other: "\"Mi piace\" ricevuti" days_visited: one: "Giorno visitato" other: "Giorni Frequenza" posts_read: - one: "Messaggio letto" - other: "Messaggi letti" + one: "messaggio letto" + other: "messaggi letti" top_replies: "Migliori Risposte" no_replies: "Ancora nessuna risposta." more_replies: "Altre Risposte" @@ -737,9 +731,9 @@ it: logout: "Ti sei disconnesso." refresh: "Ricarica" read_only_mode: - enabled: "Questo sito è in modalità di sola lettura. Per favore continua a scorrere, ma risposte, likes e altre azioni sono disabilitate per il momento." + enabled: "Questo sito è in modalità di sola lettura. Puoi continuare a navigare nel sito, ma le risposte, i \"Mi piace\" e altre azioni sono per il momento disabilitate." login_disabled: "L'accesso è disabilitato quando il sito è in modalità di sola lettura." - logout_disabled: "Il logout è disattivo mentre il sito è in modalità di sola lettura." + logout_disabled: "Il logout è disabilitato quando il sito è in modalità di sola lettura." too_few_topics_and_posts_notice: "Cominciamo a discutere! Ci sono al momento %{currentTopics} / %{requiredTopics} argomenti e %{currentPosts} / %{requiredPosts} messaggi. I nuovi visitatori vogliono qualche discussione da leggere e a cui rispondere." too_few_topics_notice: "Cominciamo a discutere! Ci sono al momento %{currentTopics} / %{requiredTopics} argomenti. I nuovi visitatori vogliono qualche discussione da leggere e a cui rispondere." too_few_posts_notice: "Cominciamo a discutere! Ci sono al momento %{currentTopics} / %{requiredTopics} argomenti e %{currentPosts} / %{requiredPosts} messaggi. I nuovi visitatori vogliono qualche discussione da leggere e a cui rispondere." @@ -1048,6 +1042,9 @@ it: category: "Non ci sono argomenti in {{category}}." top: "Non ci sono argomenti di punta." search: "Non ci sono risultati della ricerca." + educate: + new: '

      Qui compaiono i nuovi argomenti.

      Per difetto, gli argomenti vengono considerati nuovi e mostrano l''indicatore nuovo se sono stati creati negli ultimi 2 giorni.

      Puoi cambiare questa configurazione nelle tue preferenze.

      ' + unread: '

      Qui compaiono gli argomenti che non hai letto.

      Per difetto, gli argomenti sono considerati non letti e ne viene mostrato un conteggio 1 se hai:

      • Creato l''argomento
      • Risposto all''argomento
      • Letto l''argomento per più di 4 minuti

      Oppure se hai esplicitamente impostato l''argomento come Seguito o Osservato usando il pannello delle notifiche in fondo ad ogni argomento.

      Puoi cambiare questa configurazione nelle tue preferenze.

      ' bottom: latest: "Non ci sono altri argomenti più recenti." hot: "Non ci sono altri argomenti caldi." @@ -1072,7 +1069,7 @@ it: title: 'Archivio' move_to_inbox: title: 'Sposta in arrivo' - help: 'Sposta in arrivo' + help: 'Sposta il messaggio di nuovo nella posta in arrivo' list: 'Argomenti' new: 'nuovo argomento' unread: 'non letto' @@ -1364,7 +1361,7 @@ it: about: "questo messaggio è una guida" archetypes: save: 'Opzioni di salvataggio' - few_likes_left: "Grazie per aver condiviso l'amore! Hai solo ancora pochi likes per oggi." + few_likes_left: "Grazie per aver condiviso l'amore! Hai ancora pochi \"Mi piace\" rimasti per oggi." controls: reply: "inizia a comporre una risposta a questo messaggio" like: "metti \"Mi piace\" al messaggio" @@ -1416,10 +1413,10 @@ it: spam: "l'hanno segnalato come spam" inappropriate: "l'hanno segnalato come inappropriato" notify_moderators: "hanno informato i moderatori" - notify_user: "inviato un messaggio" - bookmark: "Hai aggiunto questo ai segnalibri" - like: "hai messo \"Mi piace\"" - vote: "Hai votato per questo " + notify_user: "hanno inviato un messaggio" + bookmark: "l'hanno aggiunto ai segnalibri" + like: "hanno messo \"Mi piace\"" + vote: "hanno votato" by_you: off_topic: "L'hai segnalato come fuori tema" spam: "L'hai segnalato come spam" @@ -1428,7 +1425,7 @@ it: notify_user: "Hai inviato un messaggio a questo utente" bookmark: "Hai inserito questo messaggio nei segnalibri" like: "Ti piace" - vote: "Hai votato per questo post" + vote: "Hai votato per questo messaggio" by_you_and_others: off_topic: one: "Tu e un'altra persona lo avete contrassegnato come fuori tema" @@ -1583,7 +1580,7 @@ it: submit_tooltip: "Invia la segnalazione privata" take_action_tooltip: "Raggiungi la soglia di segnalazioni immediatamente, piuttosto che aspettare altre segnalazioni della comunità" cant: "Spiacenti, al momento non puoi segnalare questo messaggio." - notify_staff: 'Notifica personale privatamente' + notify_staff: 'Notifica staff privatamente' formatted_name: off_topic: "E' fuori tema" inappropriate: "È inappropriato" @@ -1921,9 +1918,9 @@ it: none: "Nessun backup disponibile." read_only: enable: - title: "Attiva la modalità sola-lettura" - label: "Attivita sola-lettura" - confirm: "Sei sicuro di voler attivare la modalità sola-lettura?" + title: "Abilita la modalità sola-lettura" + label: "Abilita sola-lettura" + confirm: "Sei sicuro di voler abilitare la modalità sola-lettura?" disable: title: "Disattiva la modalità di sola-lettura" label: "Disattiva sola-lettura" @@ -1964,7 +1961,7 @@ it: rollback: label: "Rollback" title: "Ripristina il database a una versione funzionante precedente" - confirm: "Sei sicuro di voler ripristinare il database a una versione funzionante precedente?" + confirm: "Sei sicuro di voler ripristinare il database alla versione funzionante precedente?" export_csv: user_archive_confirm: "Sei sicuro di voler scaricare i tuoi messaggi?" success: "Esportazione iniziata, verrai avvertito con un messaggio al termine del processo." @@ -2070,15 +2067,15 @@ it: email: title: "Email" settings: "Impostazioni" - templates: "Template" - preview_digest: "Anteprima Riassunto" + templates: "Modelli" + preview_digest: "Anteprima Riepilogo" sending_test: "Invio email di prova in corso..." error: "ERRORE - %{server_error}" test_error: "C'è stato un problema nell'invio dell'email di test. Controlla nuovamente le impostazioni email, verifica che il tuo host non blocchi le connessioni email e riprova." sent: "Inviato" skipped: "Omesso" - received: "Ricevuto" - rejected: "Rifiutato" + received: "Ricevute" + rejected: "Rifiutate" sent_at: "Inviato Alle" time: "Ora" user: "Utente" @@ -2088,7 +2085,7 @@ it: send_test: "Invia una email di prova" sent_test: "inviata!" delivery_method: "Metodo di consegna" - preview_digest_desc: "Vedi in anteprima il contenuto delle email di riassunto inviate agli utenti inattivi." + preview_digest_desc: "Vedi in anteprima il contenuto delle email di riepilogo inviate agli utenti inattivi." refresh: "Aggiorna" format: "Formato" html: "html" @@ -2102,14 +2099,14 @@ it: cc_addresses: "Cc" subject: "Oggetto" error: "Errore" - none: "Nessun messaggio in entrata." + none: "Nessuna email in entrata." modal: title: "In arrivo dettagli email" error: "Errore" headers: "Intestazione" subject: "Oggetto" body: "Corpo" - rejection_message: "Scarto mail" + rejection_message: "Mail di Rifiuto" filters: from_placeholder: "da@esempio.com" to_placeholder: "a@esempio.com" @@ -2122,7 +2119,7 @@ it: title: "Filtro" user_placeholder: "nome utente" address_placeholder: "nome@esempio.com" - type_placeholder: "riassunto, iscrizione..." + type_placeholder: "riepilogo, iscrizione..." reply_key_placeholder: "chiave di risposta" skipped_reason_placeholder: "motivo" logs: @@ -2179,13 +2176,13 @@ it: change_category_settings: "cambia le impostazioni della categoria" delete_category: "cancella categoria" create_category: "crea categoria" - block_user: "Blocca utente" - unblock_user: "Sblocca utente" - grant_admin: "Assegna amministratore" - revoke_admin: "Revoca amministratore" - grant_moderation: "Assegna moderazione" - revoke_moderation: "Revoca moderazione" - backup_operation: "Operazione di backup" + block_user: "blocca utente" + unblock_user: "sblocca utente" + grant_admin: "assegna amministrazione" + revoke_admin: "revoca amministrazione" + grant_moderation: "assegna moderazione" + revoke_moderation: "revoca moderazione" + backup_operation: "operazione di backup" screened_emails: title: "Email Scansionate" description: "Quando qualcuno cerca di creare un nuovo account, verrando controllati i seguenti indirizzi email e la registrazione viene bloccata, o eseguita qualche altra azione." @@ -2352,7 +2349,7 @@ it: deactivate_failed: "Si è verificato un errore durante la disattivazione dell'utente." unblock_failed: 'Si è verificato un errore durante lo sblocco dell''utente.' block_failed: 'Si è verificato un errore durante il blocco dell''utente.' - block_confirm: 'Sei sicuro di voler bloccare questo utente? Non sarà più in grado di creare alcun nuovo argomento o post.' + block_confirm: 'Sei sicuro di voler bloccare questo utente? Non sarà più in grado di creare alcun nuovo argomento o messaggio.' block_accept: 'Sì, blocca questo utente' deactivate_explanation: "Un utente disattivato deve riconvalidare la propria email." suspended_explanation: "Un utente sospeso non può fare il login." @@ -2424,9 +2421,9 @@ it: enabled: "mostrato nel profilo" disabled: "non mostrato nel profilo" show_on_user_card: - title: "Mostra sulla carta utente?" - enabled: "Mostrato sulla carta utente" - disabled: "Non mostrato sulla carta utente" + title: "Mostrare sulla scheda utente?" + enabled: "mostrato sulla scheda utente" + disabled: "non mostrato sulla scheda utente" field_types: text: 'Campo Testo' confirm: 'Conferma' @@ -2480,7 +2477,7 @@ it: badge: Targhetta display_name: Nome Visualizzato description: Descrizione - long_description: Descrizione lunga + long_description: Descrizione Lunga badge_type: Tipo Targhetta badge_grouping: Gruppo badge_groupings: @@ -2520,7 +2517,7 @@ it: post_revision: "Quando un utente modifica o crea un messaggio" trust_level_change: "Quando un utente cambia livello di esperienza" user_change: "Quando un utente viene modificato o creato" - post_processed: "Dopo che un nuovo post è elaborato" + post_processed: "Dopo che un messaggio viene elaborato" preview: link_text: "Anteprima targhette guadagnate" plan_text: "Anteprima con query plan" @@ -2642,13 +2639,13 @@ it: mark_watching: 'm, w Osserva argomento' badges: earned_n_times: - one: "Ottenuto questa targhetta una volta" - other: "Ottenuto questa targhetta %{somma} volte" - granted_on: "Assegnato %{data}" - others_count: "Altri con questa targhetta (%{somma})" + one: "Guadagnato questa targhetta una volta" + other: "Guadagnato questa targhetta %{count} volte" + granted_on: "Assegnata %{data}" + others_count: "Altri utenti con questa targhetta (%{count})" title: Targhette - allow_title: "Titolo disponibile" - multiple_grant: "Assegnato più volte" + allow_title: "titolo disponibile" + multiple_grant: "assegnata più volte" badge_count: one: "1 Targhetta" other: "%{count} Targhette" diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml index 0472d90f33..f6984914e9 100644 --- a/config/locales/client.ja.yml +++ b/config/locales/client.ja.yml @@ -91,6 +91,12 @@ ja: facebook: 'Facebook でこのリンクを共有する' google+: 'Google+ でこのリンクを共有する' email: 'メールでこのリンクを送る' + action_codes: + invited_user: "%{who} から招待されました: %{when}" + autoclosed: + enabled: 'クローズされました // %{when}' + closed: + enabled: 'クローズされました // %{when}' topic_admin_menu: "トピック管理" emails_are_disabled: "メールアドレスの送信は管理者によって無効化されています。全てのメール通知は行われません" s3: @@ -117,12 +123,12 @@ ja: age: "経過" joined: "参加時刻" admin_title: "管理者" - flags_title: "フラグ" + flags_title: "通報" show_more: "もっと見る" show_help: "オプション" links: "リンク" links_lowercase: - other: "リンク集" + other: "リンク" faq: "よくある質問" guidelines: "ガイドライン" privacy_policy: "プライバシーポリシー" @@ -305,7 +311,7 @@ ja: '2': "「いいね！」 された" '3': "ブックマーク" '4': "トピック" - '5': "返信数" + '5': "返信" '6': "レスポンス数" '7': "タグ付け" '9': "引用" @@ -371,7 +377,7 @@ ja: bio: "自己紹介" invited_by: "招待した人: " trust_level: "トラストレベル" - notifications: "通知" + notifications: "お知らせ" statistics: "統計" desktop_notifications: label: "デスクトップ通知" @@ -384,11 +390,11 @@ ja: each_browser_note: "注意: 利用するすべてのブラウザでこの設定を変更する必要があります" dismiss_notifications: "全て既読にする" dismiss_notifications_tooltip: "全ての未読の通知を既読にします" - disable_jump_reply: "返信後に投稿へ移動しない" + disable_jump_reply: "返信した後に投稿へ移動しない" dynamic_favicon: "新規または更新されたトピックのカウントをブラウザアイコンに表示する" edit_history_public: "投稿の編集履歴を公開する" external_links_in_new_tab: "外部リンクを全て新しいタブで開く" - enable_quoting: "ハイライトしたテキストを引用して回答する" + enable_quoting: "選択したテキストを引用して返信する" change: "変更" moderator: "{{user}} はモデレータです" admin: "{{user}} は管理者です" @@ -405,9 +411,9 @@ ja: tracked_categories_instructions: "カテゴリの新しいトピックを自動的に追跡します。トピックに対して新しい投稿があった場合、トピック一覧に新しい投稿数がつきます。" muted_categories: "ミュート中" delete_account: "アカウントを削除する" - delete_account_confirm: "本当にアカウントを削除しますか？削除されたアカウントを復元できません。" + delete_account_confirm: "本当にアカウントを削除しますか？削除されたアカウントは復元できません。" deleted_yourself: "あなたのアカウントは削除されました。" - delete_yourself_not_allowed: "アカウントを削除できませんでした。サイト管理者を連絡してください。" + delete_yourself_not_allowed: "アカウントを削除できませんでした。サイトの管理者へ連絡してください。" unread_message_count: "メッセージ" admin_delete: "削除" users: "ユーザ" @@ -415,15 +421,15 @@ ja: muted_users_instructions: "ユーザからの通知をすべて行いません" muted_topics_link: "ミュートしたトピックを表示する" staff_counters: - flags_given: "役に立ったフラグ" - flagged_posts: "フラグをした投稿" + flags_given: "役に立った通報" + flagged_posts: "通報した投稿" deleted_posts: "削除された投稿" suspensions: "凍結" warnings_received: "警告" messages: all: "すべて" inbox: "Inbox" - sent: "送る" + sent: "送信済み" archive: "アーカイブ" groups: "自分のグループ" bulk_select: "メッセージを選択" @@ -438,16 +444,16 @@ ja: action: "パスワードリセット用メールを送信する" set_password: "パスワードを設定する" change_about: - title: "自己紹介の変更" + title: "プロフィールを変更" error: "変更中にエラーが発生しました。" change_username: - title: "ユーザ名の変更" - confirm: "ユーザ名を変更すると、あなたのポストの引用と @ユーザ名でタグ付けされたリンクが解除されます。本当にユーザ名を変更しますか？" + title: "ユーザ名を変更" + confirm: "ユーザ名を変更すると、投稿への引用と @ユーザ名でメンションされた時のリンクが解除されます。本当にユーザ名を変更してもよろしいですか?" taken: "このユーザ名は既に使われています。" error: "ユーザ名変更中にエラーが発生しました。" invalid: "このユーザ名は無効です。英数字のみ利用可能です。" change_email: - title: "メールアドレスの変更" + title: "メールアドレスを変更" taken: "このメールアドレスは既に使われています。" error: "メールアドレス変更中にエラーが発生しました。既にこのアドレスが使われているのかもしれません。" success: "このアドレスにメールを送信しました。メールの指示に従って確認処理を行ってください。" @@ -523,7 +529,7 @@ ja: every_three_days: "3日毎" weekly: "毎週" every_two_weeks: "2週間に1回" - email_direct: "誰かが投稿を引用した時、投稿したポストに返信があった時、私のユーザ名にメンションがあった時、またはトピックへの招待があった時にメールで通知を受け取る。" + email_direct: "誰かが投稿を引用した時、投稿に返信があった時、私のユーザ名にメンションがあった時、またはトピックへの招待があった時にメールで通知を受け取る。" email_private_messages: "メッセージを受け取ったときにメールで通知を受け取る。" email_always: "フォーラムにアクティブに参加している状態でも常にメール通知を受け取る" other_settings: "その他" @@ -531,10 +537,10 @@ ja: new_topic_duration: label: "以下の条件でトピックを新規と見なす" not_viewed: "未読のもの" - last_here: "前回ログアウト後に投稿されたもの" - auto_track_topics: "自動でトピックをトラックする" + last_here: "ログアウトした後に投稿されたもの" + auto_track_topics: "自動でトピックを追跡する" auto_track_options: - never: "トラックしない" + never: "追跡しない" immediately: "今すぐ" after_30_seconds: "30秒後" after_1_minute: "1分後" @@ -544,9 +550,12 @@ ja: after_5_minutes: "5分後" after_10_minutes: "10分後" invited: - search: "招待履歴を検索するためにキーワードを入力してください..." + search: "招待履歴を検索" title: "招待" user: "招待したユーザ" + none: "保留中の招待はありません。" + truncated: + other: "{{count}} 件の招待を表示しています。" redeemed: "受理された招待" redeemed_tab: "受理" redeemed_at: "受理日" @@ -557,16 +566,17 @@ ja: expired: "この招待の有効期限が切れました。" rescind: "削除" rescinded: "取り消された招待" - reinvite: "招待を再送する" - reinvited: "招待を再送しました。" + reinvite: "招待を再送信する" + reinvited: "招待を再度送りました。" time_read: "リード時間" days_visited: "訪問日数" account_age_days: "アカウント有効日数" - create: "友人をこのフォーラムに招待" + create: "招待を送る" + generate_link: "招待リンクをコピー" bulk_invite: none: "あなたはまだ誰も招待していません。" text: "ファイルからまとめて招待をする" - uploading: "アップロード中..." + uploading: "アップロードしています..." success: "ファイルは無事にアップロードされました。完了されましたらメッセージでお知らせをさせていただきます。" error: "ファイルアップロードエラー：'{{filename}}': {{message}}" password: @@ -577,6 +587,19 @@ ja: same_as_email: "パスワードとメールアドレスが一致しています" ok: "パスワード OK。" instructions: "%{count} 文字以上の長さにしてください。" + summary: + title: "情報" + stats: "統計" + time_read: "読んだ時間" + likes_given: + other: "likes をあげた数" + likes_received: + other: "likes をもらった数" + posts_read: + other: "読んだ投稿" + no_replies: "まだ返信はありません。" + no_topics: "まだトピックはありません。" + no_badges: "まだバッジはありません。" associated_accounts: "関連アカウント" ip_address: title: "最近使用したIPアドレス" @@ -602,6 +625,7 @@ ja: server: "サーバーエラー" forbidden: "アクセス拒否" unknown: "エラー" + not_found: "ページが見つかりません" desc: network: "インターネット接続を確認してください。" network_fixed: "ネットワーク接続が回復しました。" @@ -613,14 +637,15 @@ ja: again: "やり直す" fixed: "ページロード" close: "閉じる" - assets_changed_confirm: "Discourseはアップデートされました。ページ更新して最新バージョンを導入しますか？" + assets_changed_confirm: "Discourseがアップデートされました。ページを更新して最新のバージョンにしますか？" logout: "ログアウトしました" - refresh: "Refresh" + refresh: "更新" read_only_mode: + enabled: "このサイトは閲覧専用モードになっています。閲覧し続けられますが、返信したりいいねを付けたり等のアクションは現在出来ません。" login_disabled: "読み取り専用モードにされています。ログインできません。" learn_more: "より詳しく..." year: '年' - year_desc: '過去365日間に投稿されたトピック' + year_desc: '過去一年間に投稿されたトピック' month: '月' month_desc: '過去30日間に投稿されたトピック' week: '週' @@ -630,13 +655,17 @@ ja: mute: ミュート unmute: ミュート解除 last_post: 最終投稿時刻 - last_reply_lowercase: 最新の回答 + last_reply_lowercase: 最後の返信 replies_lowercase: - other: 回答 + other: 返信 signup_cta: sign_up: "新しいアカウントを作成" + hide_forever: "いいえ、結構です" + intro: "こんにちは！ :heart_eyes: エンジョイしていますね。 ですが、サインアップしていないようです。" + value_prop: "アカウントを作成した後、いま読んでいるページへ戻ります。また、新しい投稿があった場合はこことメールにてお知らせします。 いいね！を使って好きな投稿をみんなに教えましょう。 :heartbeat:" summary: enabled_description: "トピックのまとめを表示されています。" + description: "{{replyCount}}件の返信があります。" enable: 'このトピックを要訳する' disable: '全ての投稿を表示する' deleted_filter: @@ -646,7 +675,7 @@ ja: disable: "削除された投稿を表示する" private_message_info: title: "メッセージ" - invite: "友人を招待..." + invite: "友だちを招待する..." remove_allowed_user: "このメッセージから{{name}}を本当に取り除きますか？" email: 'メール' username: 'ユーザ名' @@ -667,11 +696,11 @@ ja: complete_email: "%{email}にパスワード再設定メールを送りました。" complete_username_found: "%{username},アカウントにパスワード再設定メールを送りました。" complete_email_found: "%{email}にパスワード再設定メールを送りました。" - complete_username_not_found: " %{username}のアカウントがありません" + complete_username_not_found: " %{username}は見つかりませんでした" complete_email_not_found: "%{email}で登録したアカウントがありません。" login: title: "ログイン" - username: "ログイン名" + username: "ユーザ名" password: "パスワード" email_placeholder: "メールアドレスかユーザ名" caps_lock_warning: "Caps Lockがオンになっています。" @@ -683,13 +712,14 @@ ja: or: "または" authenticating: "認証中..." awaiting_confirmation: "アカウントはアクティベーション待ち状態です。もう一度アクティベーションメールを送信するには「パスワードを忘れました」リンクをクリックしてください。" - awaiting_approval: "アカウントはまだスタッフメンバーに承認されていません。承認され次第メールにてお知らせいたします。" + awaiting_approval: "アカウントはまだスタッフに承認されていません。承認され次第メールにてお知らせいたします。" requires_invite: "申し訳ありませんが、このフォーラムは招待制です。" not_activated: "まだログインできません。{{sentTo}} にアクティベーションメールを送信しております。メールの指示に従ってアカウントのアクティベーションを行ってください。" not_allowed_from_ip_address: "このIPアドレスでログインできません" admin_not_allowed_from_ip_address: "そのIPアドレスからは管理者としてログインできません" resend_activation_email: "再度アクティベーションメールを送信するにはここをクリックしてください。" - sent_activation_email_again: "{{currentEmail}} にアクティベーションメールを再送しました。メール到着まで数分かかることがあります (いつまで立ってもメールが届かない場合は、念のためスパムフォルダの中も確認してみてください)。" + sent_activation_email_again: "{{currentEmail}} にアクティベーションメールを再送信しました。メールが届くまで数分掛かることがあります。 (メールが届かない場合は、迷惑メールフォルダの中をご確認ください)。" + preferences: "ユーザ設定を変更するには、ログインする必要があります。" google: title: "Googleで" message: "Google による認証 (ポップアップがブロックされていないことを確認してください)" @@ -697,8 +727,10 @@ ja: title: "Googleで" message: "Googleによる認証 (ポップアップがブロックされていないことを確認してください)" twitter: - title: "Twitterで" + title: "Twitter" message: "Twitter による認証 (ポップアップがブロックされていないことを確認してください)" + instagram: + message: "Instagram による認証 (ポップアップがブロックされていないことを確認してください)" facebook: title: "Facebookで" message: "Facebook による認証 (ポップアップがブロックされていないことを確認してください)" @@ -713,9 +745,10 @@ ja: twitter: "Twitter" emoji_one: "Emoji One" composer: + more_emoji: "もっと..." options: "オプション" add_warning: "これは公式の警告です。" - posting_not_on_topic: "回答したいトピックはどれですか?" + posting_not_on_topic: "返信したいトピックはどれですか?" saving_draft_tip: "保存中..." saved_draft_tip: "保存しました" saved_local_draft_tip: "ローカルに保存しました" @@ -730,9 +763,9 @@ ja: try_like: ' ボタンを試しましたか？' category_missing: "カテゴリを選択してください。" save_edit: "編集内容を保存" - reply_original: "元のトピックに回答" - reply_here: "ここに回答" - reply: "回答" + reply_original: "オリジナルトピックへ返信" + reply_here: "ここに返信" + reply: "返信" cancel: "キャンセル" create_topic: "トピック作成" create_pm: "メッセージ" @@ -783,9 +816,9 @@ ja: units: "(# of hours)" examples: '時間(24)を入力してください' notifications: - title: "@ユーザ名のタグ付けやあなたが投稿した記事やトピックやメッセージなどに対する回答に関する通知" + title: "@ユーザ名 のメンション、投稿やトピックへの返信、メッセージなどの通知" none: "通知はありません" - more: "古い通知を確認する" + more: "通知をすべて確認する" total_flagged: "フラグが立った投稿の合計" mentioned: "

      {{username}} {{description}}

      " quoted: "

      {{username}} {{description}}

      " @@ -800,16 +833,22 @@ ja: moved_post: "

      {{username}} moved {{description}}

      " linked: "

      {{username}} {{description}}

      " granted_badge: "

      {{description}}バッジを付けられました

      " + group_message_summary: + other: "

      {{count}}件のメッセージが{{group_name}}へ着ています

      " alt: posted: "投稿者 " edited: "投稿の編集者: " liked: "あなたの投稿をいいねしました" + invited_to_private_message: "プライベートメッセージへ招待されました: " + invited_to_topic: "トピックに招待されました: " + invitee_accepted: "招待が承認されました: " moved_post: "投稿を移動しました: " linked: "あなたの投稿にリンク" + group_message_summary: "グループ宛のメッセージがあります" popup: mentioned: '"{{topic}}"で{{username}} がタグ付けしました - {{site_title}}' quoted: '"{{topic}}"で{{username}}が引用しました - {{site_title}}' - replied: '"{{topic}}"で{{username}}が回答しました - {{site_title}}' + replied: '{{username}}が"{{topic}}"へ返信しました - {{site_title}}' posted: '{{username}} が投稿しました "{{topic}}" - {{site_title}}' private_message: '"{{topic}}"で{{username}}からプライベートメッセージが届きました - {{site_title}}' linked: '"{{topic}}"にあるあなたの投稿に{{username}}がリンクしました - {{site_title}}' @@ -820,6 +859,7 @@ ja: from_the_web: "Web から" remote_tip: "画像へのリンク" local_tip: "ローカルからアップロードする画像を選択" + local_tip_with_attachments: "デバイスから画像/ファイルを選択する {{authorized_extensions}}" hint: "(アップロードする画像をエディタにドラッグ&ドロップすることもできます)" uploading: "アップロード中" select_file: "ファイル選択" @@ -829,7 +869,7 @@ ja: select_all: "全てを選択する" title: "トピック、投稿、ユーザ、カテゴリを探す" no_results: "何も見つかりませんでした。" - no_more_results: "これ以上結果が見つかりませんでした。" + no_more_results: "何も見つかりませんでした。" search_help: 検索ヘルプ searching: "検索中..." post_format: "#{{post_number}} {{username}}から" @@ -838,26 +878,28 @@ ja: category: "\"{{category}}\" カテゴリで検索する" topic: "このトピックを探す" private_messages: "メッセージ検索" + hamburger_menu: "他のトピック一覧 or カテゴリ へ行く" go_back: '戻る' not_logged_in_user: 'ユーザアクティビティと設定ページ' current_user: 'ユーザページに移動' topics: bulk: + unlist_topics: "トピックをリストから非表示にする" reset_read: "未読に設定" delete: "トピックを削除" dismiss_new: "既読に設定" toggle: "選択したトピックを切り替え" actions: "操作" - change_category: "カテゴリ変更" + change_category: "カテゴリを変更" close_topics: "トピックをクローズする" archive_topics: "アーカイブトピック" - notification_level: "通知レベル変更" - choose_new_category: "このトピックへの新しいカテゴリを選択してください" + notification_level: "通知レベルを変更" + choose_new_category: "このトピックの新しいカテゴリを選択してください" selected: other: "あなたは {{count}} トピックを選択しました。" none: - unread: "未読トピックはありません。" - new: "新着トピックはありません。" + unread: "未読のトピックはありません。" + new: "新しいトピックはありません。" read: "まだトピックを一つも読んでいません。" posted: "トピックは一つもありません。" latest: "最新のトピックはありません。" @@ -867,23 +909,26 @@ ja: top: "トップトピックはありません。" search: "検索結果はありません。" educate: - unread: '

      Y新しいトピックがここに表示されます。

      未読のトピックがある場合は、1と表示されます。 もし、

      • トピックを作る
      • トピックに返信
      • 4分以上のトピックを読む場合

      などを設定した場合、トピックを追跡してそれぞれのトピックの下にある通知の設定を経由してウォッチします。

      プロフィール から変更できます。

      ' + new: '

      新しいトピックがここに表示されます。

      デフォルトで、新しいトピックがある場合は2日間、 new が表示されます。

      設定はプロフィール設定から変更できます。

      ' + unread: '

      新しいトピックがここに表示されます。

      未読のトピックがある場合は、1と表示されます。 もし、

      • トピックを作る
      • トピックに返信
      • 4分以上のトピックを読む場合

      などを設定した場合、トピックを追跡してそれぞれのトピックの下にある通知の設定を経由してウォッチします。

      プロフィール から変更できます。

      ' bottom: - latest: "最新のトピックはこれ以上ありません。" - hot: "ホットなトピックはこれ以上ありません。" - posted: "ポストのあるトピックはこれ以上ありません。" - read: "既読のトピックはこれ以上ありません。" - new: "新規トピックはこれ以上ありません。" - unread: "未読のトピックはこれ以上ありません。" - category: "{{category}} トピックはこれ以上ありません。" + latest: "最新のトピックは以上です。" + hot: "ホットなトピックは以上です。" + posted: "投稿のあるトピックは以上です。" + read: "既読のトピックは以上です。" + new: "新規トピックは以上です。" + unread: "未読のトピックは以上です。" + category: "{{category}}トピックは以上です。" top: "トップトピックはこれ以上ありません。" bookmarks: "ブックマーク済みのトピックはこれ以上ありません。" - search: "検索結果はこれ以上ありません。" + search: "検索結果は以上です。" topic: filter_to: "トピック内の{{post_count}}個のポストを表示" create: '新規トピック' create_long: '新しいトピックの作成' private_message: 'メッセージを書く' + archive_message: + title: 'アーカイブ' list: 'トピック' new: '新規トピック' unread: '未読' @@ -914,14 +959,14 @@ ja: options: "トピックオプション" show_links: "このトピック内のリンクを表示" toggle_information: "トピック詳細をトグル" - read_more_in_category: "{{catLink}} の他のトピックを見る or {{latestLink}}。" + read_more_in_category: "{{catLink}}の他のトピックを見る or {{latestLink}}。" read_more: "{{catLink}} or {{latestLink}}。" read_more_MF: "{ UNREAD, plural, =0 {} one { 未読 1つ } other { 未読 #つ } } { NEW, plural, =0 {} one { {BOTH, select, true{} false {} other{}} 新規トピック 1つ} other { {BOTH, select, true{} false {} other{}} 新規トピック #つ} } remaining, or {CATEGORY, select, true {{catLink}の他のトピックを読む} false {{latestLink}} other {}}" browse_all_categories: 全てのカテゴリを閲覧する view_latest_topics: 最新のトピックを見る - suggest_create_topic: 新しいトピックを作成しますか？ - jump_reply_up: 以前の回答へジャンプ - jump_reply_down: 以後の回答へジャンプ + suggest_create_topic: 新しいトピックを作成しませんか? + jump_reply_up: 以前の返信へジャンプ + jump_reply_down: 以後の返信へジャンプ deleted: "トピックは削除されました" auto_close_notice: "このトピックはあと%{timeLeft}で自動的にクローズします。" auto_close_notice_based_on_last_post: "このトピックは最後の返信から%{duration} 経つとクローズします" @@ -943,14 +988,14 @@ ja: '3_6': 'このカテゴリに参加中のため通知されます' '3_5': 'このトピックに参加中のため通知されます' '3_2': 'このトピックに参加中のため通知されます。' - '3_1': 'このトピックを作成したため通知されます。' + '3_1': 'このトピックの作成者なため、通知されます。' '3': 'このトピックに参加中のため通知されます。' - '2_8': 'このカテゴリをトラック中のため通知されます。' + '2_8': 'このカテゴリを追跡しているため通知されます。' '2_4': 'このトピックに返信したため通知されます。' - '2_2': 'このトピックをトラック中のため通知されます。' + '2_2': 'このトピックを追跡中のため通知されます。' '2': 'このトピックを閲覧したため通知されます。' - '1_2': '他ユーザからタグ付けをされた場合、またはあなたの投稿に回答が付いた場合に通知されます' - '1': '他ユーザからタグ付けをされた場合、またはあなたの投稿に回答が付いた場合に通知されます' + '1_2': '他のユーザからメンションされた場合、投稿へ返信された場合に通知します。' + '1': '他のユーザからメンションされた場合、投稿へ返信された場合に通知します。' '0_7': 'このカテゴリに関して一切通知を受け取りません。' '0_2': 'このトピックに関して一切通知を受け取りません。' '0': 'このトピックに関して一切通知を受け取りません。' @@ -961,53 +1006,56 @@ ja: title: "参加中" description: "未読件数と新しい投稿がトピックの横に表示されます。このトピックに対して新しい投稿があった場合に通知されます。" tracking_pm: - title: "トラック中" - description: "新規回答件数がこのメッセージに表示されます。他ユーザから@ユーザ名でタグ付けされた場合、またはあなたの投稿に回答がついた場合に通知されます。" + title: "追跡中" + description: "新しい返信の数がこのメッセージに表示されます。他のユーザから@ユーザ名でメンションされた場合や、投稿へ返信された場合に通知されます。" tracking: - title: "トラック中" - description: "新規回答件数がこのトピックに表示されます。他ユーザから@ユーザ名でタグ付けされた場合、またはあなたの投稿に回答がついた場合に通知されます。" + title: "追跡中" + description: "新しい返信の数がこのトピックに表示されます。他のユーザから@ユーザ名でメンションされた場合や、投稿へ返信された場合に通知されます。" regular: - description: "他ユーザからタグ付けをされた場合、またはあなたの投稿に回答が付いた場合に通知されます。" + title: "ノーマル" + description: "他のユーザからメンションされた場合か、投稿に返信された場合に通知されます。" regular_pm: - description: "他ユーザからタグ付けをされた場合、またはあなたのメッセージ内の投稿に回答が付いた場合に通知されます。" + title: "ノーマル" + description: "他のユーザからメンションされた場合か、メッセージ内の投稿に返信された場合に通知されます。" muted_pm: title: "ミュートされました" description: "このメッセージについての通知を受け取りません。" muted: title: "ミュート" + description: "このトピックに関するお知らせをすべて受け取りません。また、未読のタブにも通知されません。" actions: - recover: "トピック削除の取り消し" - delete: "トピック削除" + recover: "トピックの削除を取り消す" + delete: "トピックを削除" open: "トピックを開く" close: "トピックをクローズする" multi_select: "投稿を選択" auto_close: "自動でクローズする..." - pin: "トピックをピンで留める。。。" - unpin: "トピックのピンを取り除く。。。" + pin: "トピックを固定" + unpin: "トピックの固定を解除" unarchive: "トピックのアーカイブ解除" archive: "トピックのアーカイブ" - invisible: "リストされないようにする" - visible: "リストする" + invisible: "リストから非表示にする" + visible: "リストに表示" reset_read: "読み込みデータをリセット" feature: - pin: "トピックをピンで留める。。。" - unpin: "トピックをピンで留める。。。" + pin: "トピックをピン留めする..." + unpin: "トピックの固定を解除" pin_globally: "トピックを全サイト的にピン留めする" make_banner: "バナートピック" remove_banner: "バナートピックを削除" reply: - title: '回答' - help: 'このトピックに回答する' + title: '返信' + help: 'このトピックに返信する' clear_pin: title: "ピンを解除する" - help: "このトピックのピンを解除し、トピックリストの先頭に表示されないようにする" + help: "このトピックのピンを外し、トピックリストの先頭に表示されないようにする" share: title: 'シェア' help: 'このトピックへのリンクをシェアする' flag_topic: - title: 'フラグ' - help: '注目したいトピックにフラグを立てることで、それについての通知をプライベートに受け取ることが出来ます' - success_message: 'このトピックにフラグを立てました。' + title: '通報' + help: 'スタッフに知らせたいトピックを通報することにより、それについての通知をプライベートメッセージで受け取ることが出来ます' + success_message: 'このトピックを通報しました。' feature_topic: title: "トピックを特集" pin: "{{categoryLink}} カテゴリのトップに表示する" @@ -1015,11 +1063,13 @@ ja: unpin: "{{categoryLink}} カテゴリのトップからトピックを削除" unpin_until: "{{categoryLink}} カテゴリのトップからこのトピックを削除するか、%{until} まで待つ。" pin_note: "ユーザはトピックを個別にピン留め解除することができます" + not_pinned: "{{categoryLink}}でピン留めされているトピックはありません。" pin_globally: "このトピックをすべてのトピックリストのトップに表示する" confirm_pin_globally: "既に{{count}} 個ピン留めしています。　多すぎるピン留めは新規ユーザと匿名ユーザの負担になる場合があります。ピン留めを続けますか？" unpin_globally: "トピック一覧のトップからこのトピックを削除します" unpin_globally_until: "このトピックをすべてのトピックリストのトップから削除するか、%{until} まで待つ。" global_pin_note: "ユーザはトピックを個別にピン留め解除することができます" + not_pinned_globally: "すべてのトピックリストでピン留めされたトピックはありません。" make_banner: "このトピックを全てのページのバナーに表示します" remove_banner: "全てのページのバナーを削除します" banner_note: "ユーザはバナーを閉じることができます。常に１つのトピックだけがバナー表示されます" @@ -1027,7 +1077,7 @@ ja: automatically_add_to_groups_optional: "この招待によって、リストされたグループに参加することができます。" automatically_add_to_groups_required: "この招待によって、リストされたグループに参加することができます。" invite_private: - title: 'メッセージへの参加を招待する' + title: 'プライベートメッセージへ招待する' email_or_username: "招待するユーザのメールアドレスまたはユーザ名" email_or_username_placeholder: "メールアドレスまたはユーザ名" action: "招待" @@ -1035,19 +1085,19 @@ ja: error: "申し訳ありませんが、ユーザ招待中にエラーが発生しました。" group_name: "グループ名" invite_reply: - title: '友人を招待して回答してもらう' + title: '招待' username_placeholder: "ユーザ名" - action: '招待状を送る' + action: '招待を送る' help: 'このトピックに他のユーザをメールまたは通知で招待する。' to_forum: "ログインしなくてもこの投稿に返信ができることを、あなたの友人に知らせます。" sso_enabled: "このトピックに招待したい人のユーザ名を入れてください" to_topic_blank: "このトピックに招待したい人のユーザ名かメールアドレスを入れてください" - to_topic_email: "あなたはメールアドレスを入力しました。あなたの友人がすぐにこのトピックに返信をできるように招待状をメールで送信します。" + to_topic_email: "あなたはメールアドレスを入力しました。フレンドがすぐにこのトピックへ返信できるようにメールで招待します。" to_topic_username: "ユーザ名を入力しました。このトピックへの招待リンクの通知を送信します。" to_username: "招待したい人のユーザ名を入れてください。このトピックへの招待リンクの通知を送信します。" email_placeholder: 'name@example.com' success_email: "{{emailOrUsername}}に招待を送信しました。招待が受理されたらお知らせします。招待した人はユーザページの招待タブにて確認できます。" - success_username: "ユーザにこのトピックへの参加を招待しました。" + success_username: "ユーザをこのトピックへ招待しました。" error: "申し訳ありません。その人を招待できませんでした。すでに招待を送信していませんか？ (招待できる数には限りがあります)" login_reply: 'ログインして返信' filters: @@ -1069,17 +1119,20 @@ ja: other: "{{count}}個の投稿をどのトピックに移動するか選択してください。" change_owner: title: "投稿者を変更する" - action: "所有権を変更" + action: "オーナーシップを変更" error: "オーナーの変更ができませんでした。" label: "投稿の新しいオーナー" placeholder: "新しい所有者のユーザ名" instructions: other: "この {{count}} つの投稿の新しいオーナーを選択してください。（前のオーナー：{{old_user}}）" instructions_warn: "この投稿についての通知が新しいユーザにさかのぼって移動されることはないので注意してください。
      警告: 投稿の関連データの所有権は、新しいユーザに転送されません。 注意して使用してください。" + change_timestamp: + title: "タイムスタンプを変更" + action: "タイムスタンプを変更" multi_select: select: '選択' selected: '選択中 ({{count}})' - select_replies: '全ての回答と共に選択' + select_replies: '返信と選択' delete: 選択中のものを削除 cancel: 選択を外す select_all: 全てを選択する @@ -1089,12 +1142,12 @@ ja: post: reply: " {{replyAvatar}} {{usernameLink}}" reply_topic: " {{link}}" - quote_reply: "引用して回答" + quote_reply: "引用して返信" edit: "編集中 {{link}} {{replyAvatar}} {{username}}" edit_reason: "理由: " post_number: "投稿{{number}}" last_edited_on: "投稿の最終編集日" - reply_as_new_topic: "リンクトピックとして引用返信" + reply_as_new_topic: "リンクされたトピックとして返信" continue_discussion: "{{postLink}} からのディスカッションを継続:" follow_quote: "引用した投稿に移動" show_full: "全て表示" @@ -1103,11 +1156,11 @@ ja: other: "(投稿は投稿者により削除されました。フラグがついていない場合、%{count}時間後に自動的に削除されます)" expand_collapse: "展開/折りたたみ" gap: - other: "{{count}}個の隠された回答を表示する" - more_links: "{{count}} つリンク..." + other: "{{count}}個の返信をすべて表示する" + more_links: "{{count}} つのリンク..." unread: "未読の投稿" has_replies: - other: "{{count}} つの回答" + other: "{{count}} 件の返信" has_likes: other: "{{count}} 個のいいね！" has_likes_title: @@ -1147,52 +1200,57 @@ ja: delete_replies: confirm: other: "この投稿への{{count}}件の返信を削除しますか?" - yes_value: "はい、回答も一緒に削除する" + yes_value: "返信も一緒に削除します" no_value: "投稿のみを削除する" admin: "投稿の管理" wiki: "wiki投稿にする" unwiki: "wiki投稿から外す" - convert_to_moderator: "スタッフ色を追加" - revert_to_regular: "スタッフ色を削除" + convert_to_moderator: "スタッフカラーを追加" + revert_to_regular: "スタッフカラーを外す" rebake: "HTMLを再構築" unhide: "表示する" + change_owner: "オーナーシップを変更" actions: - flag: 'フラグ' + flag: '通報' defer_flags: - other: "デファーフラグ" + other: "受理された通報" it_too: - off_topic: "フラグをたてる" - spam: "フラグをたてる" - inappropriate: "フラグをたてる" - custom_flag: "フラグをたてる" + off_topic: "通報する" + spam: "通報する" + inappropriate: "通報する" + custom_flag: "通報する" bookmark: "ブックマークする" like: "あなたも「いいね！」する" vote: "投票する" undo: - off_topic: "フラグを取り消す" - spam: "フラグを取り消す" - inappropriate: "フラグを取り消す" + off_topic: "通報を取り消す" + spam: "通報を取り消す" + inappropriate: "通報を取り消す" bookmark: "ブックマークを取り消す" like: "「いいね！」を取り消す" vote: "投票を取り消す" + people: + off_topic: "関係無い話題として通報" + spam: "スパムとして通報" + inappropriate: "不適切な発言として通報" by_you: - off_topic: "オフトピックのフラグを立てました" - spam: "スパムを報告するフラグを立てました" + off_topic: "関係のない話題として通報しました" + spam: "スパム報告として通報しました" inappropriate: "不適切であると報告するフラグを立てました" - notify_moderators: "モデレータ確認を必要とするというフラグを立てました" + notify_moderators: "スタッフによる確認が必要として通報しました" notify_user: "このユーザにメッセージを送信しました" bookmark: "この投稿をブックマークしました" like: "あなたが「いいね！」しました" vote: "この投稿に投票しました" by_you_and_others: off_topic: - other: "あなたと他{{count}}人がオフトピックであるとフラグを立てました" + other: "あなたと他{{count}}名が関係無い話題として通報しました" spam: - other: "あなたと他{{count}}人がスパムであるとフラグを立てました" + other: "あなたと他{{count}}名がスパム報告として通報しました" inappropriate: - other: "あなたと他{{count}}人が不適切であるとフラグを立てました" + other: "あなたと他{{count}}名が不適切な発言として通報しました" notify_moderators: - other: "あなたと他{{count}}人がモデレータ確認を要するとフラグを立てました" + other: "あなたと他{{count}}名がスタッフの確認が必要として通報しました" notify_user: other: "あなたと他{{count}}人がこのユーザにメッセージを送信しました" bookmark: @@ -1203,13 +1261,13 @@ ja: other: "あなたと他{{count}}人がこの投稿に投票しました" by_others: off_topic: - other: "{{count}}人のユーザがオフトピックであるとフラグを立てました" + other: "{{count}}名のユーザが関係無い話題として通報しました" spam: - other: "{{count}}人のユーザがスパムであるとフラグを立てました" + other: "{{count}}名のユーザがスパム報告として通報しました" inappropriate: - other: "{{count}}人のユーザが不適切であるとフラグを立てました" + other: "{{count}}名のユーザが不適切な発言として通報しました" notify_moderators: - other: "{{count}}人のユーザがモデレータ確認を要するとフラグを立てました" + other: "{{count}}名のユーザがスタッフの確認が必要として通報しました" notify_user: other: "{{count}} 人がこのユーザにメッセージを送信しました" bookmark: @@ -1252,7 +1310,8 @@ ja: settings: '設定' topic_template: "トピックテンプレート" delete: 'カテゴリを削除する' - create: '新しいカテゴリ' + create: '新規カテゴリ' + create_long: '新しいカテゴリを作る' save: 'カテゴリを保存する' slug: 'カテゴリスラグ' slug_placeholder: '(任意)URL用' @@ -1295,24 +1354,25 @@ ja: watching: title: "カテゴリ参加中" tracking: - title: "トラック中" + title: "追跡中" regular: - description: "他ユーザからタグ付けをされた場合、またはあなたの投稿に回答が付いた場合に通知されます。" + title: "ノーマル" + description: "他のユーザからメンションされた場合や、投稿に返信された場合に通知されます。" muted: title: "ミュート中" flagging: title: '私達のコミュニティの維持を助けてくれてありがとうごうざいます' - action: 'フラグをつける' + action: '投稿を通報' take_action: "アクションをする" notify_action: 'メッセージ' - delete_spammer: "スパマーの削除" + delete_spammer: "スパムの削除" delete_confirm: "このユーザのアカウントと、%{posts}個の投稿、%{topics}個のトピックを削除し、メールアドレス %{email} をブロックリストに追加しようとしています。本当にこのユーザをスパムユーザーとして認識してもよろしいですか?" - yes_delete_spammer: "はい、スパマーを削除する" + yes_delete_spammer: "はい、スパムを削除する" ip_address_missing: "(N/A)" hidden_email_address: "(hidden)" - submit_tooltip: "プライベートフラグを通知する" - take_action_tooltip: "コミュニティのフラグを待つのではなく、すぐにフラグを始めましょう" - cant: "申し訳ありませんが、現在この投稿にフラグをつけることはできません。" + submit_tooltip: "プライベートの通報を送信する" + take_action_tooltip: "誰かが通報するのを待つのではなく、通報しましょう。" + cant: "現在、この投稿を通報することはできません。" formatted_name: off_topic: "オフトピック" inappropriate: "不適切" @@ -1325,10 +1385,10 @@ ja: left: "残り{{n}}文字" flagging_topic: title: "私達のコミュニティの維持を助けてくれてありがとうごうざいます" - action: "トピックにフラグを立てる" + action: "トピックを通報" notify_action: "メッセージ" topic_map: - title: "トピックのサマリー" + title: "トピックの情報" participants_title: "よく投稿する人" links_title: "人気のリンク" links_shown: "全{{totalLinks}}リンクを表示..." @@ -1346,10 +1406,10 @@ ja: locked_and_archived: help: "このトピックは閉じられ、アーカイブされます。新しい返信を受け入れず、変更することはできません" unpinned: - title: "ピン留め解除しました" + title: "ピン留めされていません" help: "このトピックはピン留めされていません。 既定の順番に表示されます。" pinned_globally: - title: "全サイト的にピン留めされました" + title: "全体でピン留めされました" pinned: title: "ピン留め" help: "このトピックはピン留めされています。常にカテゴリのトップに表示されます" @@ -1368,7 +1428,7 @@ ja: views: "閲覧" views_lowercase: other: " 閲覧" - replies: "回答" + replies: "返信" views_long: "このトピックは{{number}}回閲覧されました" activity: "アクティビティ" likes: "いいね！" @@ -1438,7 +1498,7 @@ ja: yearly: title: "今年" quarterly: - title: "３ヶ月おき" + title: "3ヶ月おき" monthly: title: "今月" weekly: @@ -1447,18 +1507,18 @@ ja: title: "毎日" all_time: "今まで" this_year: "年" - this_quarter: "季刊" + this_quarter: "今季" this_month: "月" this_week: "週" today: "本日" other_periods: "次の期間のトピックを見る" browser_update: 'ここで動作するにはブラウザのバージョンが古すぎます。 。 ここでブラウザアップグレード.' permission_types: - full: "作成できる / 回答できる / 閲覧できる" - create_post: "回答できる / 閲覧できる" + full: "作成 / 返信 / 閲覧" + create_post: "返信 / 閲覧" readonly: "閲覧できる" admin_js: - type_to_filter: "設定項目の絞り込み..." + type_to_filter: "設定項目を検索..." admin: title: 'Discourse 管理者' moderator: 'モデレータ' @@ -1512,51 +1572,51 @@ ja: latest_changes: "最新の更新内容:" by: "by" flags: - title: "フラグ" + title: "通報" old: "古いフラグ" active: "アクティブなフラグ" agree: "賛成" - agree_title: "有効かつ正しいとしてフラグを確認" + agree_title: "有効で、間違いが無いものとして通報を行う" agree_flag_modal_title: "Agree and..." agree_flag_hide_post: "賛成(ポスト非表示 + プライベートメッセージ送信)" agree_flag_hide_post_title: "この投稿を非表示にし、編集を促すプライベートメッセージを自動的に送信する" agree_flag_restore_post: "賛成(投稿を復元)" agree_flag_restore_post_title: "この投稿を復元" - agree_flag: "フラグに賛成する" - agree_flag_title: "フラグと投稿を変更しないことに賛成します" - defer_flag: "Defer" - defer_flag_title: "フラグを削除します。何のアクションも必要としません" + agree_flag: "通報に賛成" + agree_flag_title: "投稿を変更できなくする事に賛成" + defer_flag: "受理" + defer_flag_title: "通報を削除します。何のアクションも必要としません" delete: "削除する" - delete_title: "このフラグが参照している投稿を削除します" - delete_post_defer_flag: "投稿を削除し、フラグを外します" + delete_title: "この通報で通報されている投稿を削除します" + delete_post_defer_flag: "投稿を削除し、通報を受理します" delete_post_defer_flag_title: "投稿を削除します。最初の投稿を削除した場合、トピックも削除されます。" - delete_post_agree_flag: "投稿を削除し、フラグに賛成します" + delete_post_agree_flag: "投稿を削除することに賛成します" delete_post_agree_flag_title: "投稿を削除します。最初の投稿を削除した場合、トピックも削除されます。" delete_flag_modal_title: "Delete and..." delete_spammer: "スパムユーザーを削除" delete_spammer_title: "ユーザと投稿した全ての投稿とトピックを削除します" disagree_flag_unhide_post: "反対する（投稿を表示する）" - disagree_flag_unhide_post_title: "投稿に付けたフラグを削除し、投稿を表示します" + disagree_flag_unhide_post_title: "投稿への通報を削除し、投稿を表示します" disagree_flag: "反対する" - disagree_flag_title: "無効または、不正としてこのフラグを拒否" + disagree_flag_title: "無効または、不正としてこの通報を拒否します" clear_topic_flags: "トピックのフラグをクリアしました" - clear_topic_flags_title: "このトピックについての問題が解決されました。「完了」をクリックしてフラグを外します。" + clear_topic_flags_title: "このトピックについての問題が解決されました。「完了」をクリックして通報の対応を完了します。" more: "(more replies...)" dispositions: agreed: "賛成した。" disagreed: "反対する" deferred: "deferred" - flagged_by: "フラグを立てた人" + flagged_by: "通報者: " resolved_by: "解決方法" took_action: "Took action" system: "システム" error: "何らかの理由でうまくいきませんでした" reply_message: "返信する" - no_results: "フラグはありません。" - topic_flagged: "この トピック はフラグされました。" + no_results: "通報はありません。" + topic_flagged: "この トピック は通報されました。" visit_topic: "トピックを閲覧して問題を調査してくさだい" - was_edited: "最初のフラグ後に編集された投稿" - previous_flags_count: "この投稿は既に {{count}} 回フラグされています" + was_edited: "最初の通報後に編集された投稿" + previous_flags_count: "この投稿は既に {{count}} 回通報されています" summary: action_type_3: other: "オフトピック x{{count}}" @@ -1644,7 +1704,7 @@ ja: confirm: "本当に実行中バックアップ作業をキャンセルしますか？" backup: label: "バックアップ" - title: "バックアップを作成します" + title: "バックアップを作成" confirm: "新しいバックアップを行ってもよろしいですか？" without_uploads: "はい(ファイルは含まない)" download: @@ -1715,15 +1775,15 @@ ja: long_title: "CSS と HTML のカスタマイズ" colors: title: "色" - long_title: "色スキーマ" + long_title: "カラースキーム" about: "CSSを記述することなくサイトのカラーを変更できます。スキームを追加して始めてください" - new_name: "新しい色スキーム" + new_name: "カラースキームを作成" copy_name_prefix: "のコピー" - delete_confirm: "このカラースキームを削除しますか？" + delete_confirm: "このカラースキームを削除してもよろしいですか？" undo: "取り消す" undo_title: "変更を元に戻して、前回保存されたカラーにします" revert: "取り戻す" - revert_title: "既定の配色に戻る" + revert_title: "デフォルトのカラースキームへ戻す" primary: name: 'プライマリー' description: 'テキスト、アイコンと枠の色' @@ -1732,7 +1792,7 @@ ja: description: 'メイン背景とボタンのテキスト色' tertiary: name: 'ターシャリ' - description: 'リンク、いくつかのボタン、通知、アクセントカラー' + description: 'リンク、いくつかのボタン、お知らせ、アクセントカラー' quaternary: name: "クォータナリ" description: "ナビゲーションリンク" @@ -1762,6 +1822,7 @@ ja: test_error: "テストメールを送れませんでした。メール設定、またはホストをメールコネクションをブロックされていないようを確認してください。" sent: "送信済み" skipped: "スキップ済み" + received: "もらった" sent_at: "送信時間" time: "日付" user: "ユーザ" @@ -1776,7 +1837,7 @@ ja: html: "html" text: "text" last_seen_user: "ユーザが最後にサイトを訪れた日:" - reply_key: "回答キー" + reply_key: "返信キー" skipped_reason: "スキップの理由" incoming_emails: error: "エラー" @@ -1789,7 +1850,7 @@ ja: user_placeholder: "ユーザ名" address_placeholder: "name@example.com" type_placeholder: "ダイジェスト、サインアップ..." - reply_key_placeholder: "回答キー" + reply_key_placeholder: "返信キー" skipped_reason_placeholder: "理由" logs: title: "ログ" @@ -1831,8 +1892,8 @@ ja: change_site_setting: "サイトの設定を変更" change_site_customization: "サイトのカスタマイズ設定を変更" delete_site_customization: "サイトのカスタマイズ設定を削除" - suspend_user: "ユーザをサスペンドにする" - unsuspend_user: "ユーザのサスペンドを解除する" + suspend_user: "ユーザを凍結する" + unsuspend_user: "ユーザの凍結を解除する" grant_badge: "バッジを付ける" revoke_badge: "バッジを取り消す" check_email: "メールアドレスを表示する" @@ -1842,6 +1903,7 @@ ja: anonymize_user: "匿名ユーザ" roll_up: "IPブロックをロールアップ" delete_category: "カテゴリを削除する" + create_category: "カテゴリを作る" block_user: "ユーザをブロック" unblock_user: "ユーザをブロック解除" grant_admin: "管理者権限を付与" @@ -1881,7 +1943,7 @@ ja: logster: title: "エラーログ" impersonate: - title: "ユーザになる" + title: "このユーザに切り替える" help: "Use this tool to impersonate a user account for debugging purposes. You will have to log out once finished." not_found: "ユーザが見つかりませんでした。" invalid: "申し訳ありませんがこのユーザとして使えません。" @@ -1889,7 +1951,7 @@ ja: title: 'ユーザ' create: '管理者を追加' last_emailed: "最終メール" - not_found: "このユーザネームはシステムに存在しません。" + not_found: "ユーザが見つかりませんでした。" id_not_found: "申し訳ありません。そのユーザIDはシステムに存在していません" active: "アクティブ" show_emails: "メールアドレス参照" @@ -1898,7 +1960,7 @@ ja: active: "アクティブ" pending: "保留中" staff: 'スタッフ' - suspended: 'サスペンド中' + suspended: '凍結中' blocked: 'ブロック中' suspect: 'サスペクト' approved: "承認?" @@ -1916,7 +1978,7 @@ ja: admins: '管理者ユーザ' moderators: 'モデレータ' blocked: 'ブロック中のユーザ' - suspended: 'サスペンド中のユーザ' + suspended: '凍結中のユーザ' suspect: 'サスペクトユーザ' reject_successful: other: "%{count}人のユーザの拒否に成功しました。" @@ -1927,18 +1989,18 @@ ja: title: "メールアドレスを表示する" text: "表示する" user: - suspend_failed: "ユーザのサスペンドに失敗しました {{error}}" - unsuspend_failed: "ユーザのサスペンド解除に失敗しました {{error}}" - suspend_duration: "ユーザを何日間サスペンドしますか?" + suspend_failed: "ユーザの凍結に失敗しました: {{error}}" + unsuspend_failed: "ユーザの凍結解除に失敗しました: {{error}}" + suspend_duration: "ユーザを何日間凍結しますか?" suspend_duration_units: "(日)" - suspend_reason_label: "サスペンドする理由を簡潔に説明してください。ここに書いた理由は、このユーザのプロファイルページにおいて全員が閲覧可能な状態で公開されます。またこのユーザがログインを試みた際にも表示されます。" + suspend_reason_label: "アカウントを凍結する理由を説明してください。ここに書いた理由は、このユーザのプロファイルページにおいて全員が閲覧可能な状態で公開されます。またこのユーザがログインを試みた際にも表示されます。" suspend_reason: "理由" - suspended_by: "サスペンドしたユーザ" + suspended_by: "凍結したユーザ" delete_all_posts: "全ての投稿を削除" delete_all_posts_confirm: "%{posts}件の投稿と%{topics}個のトピックが削除されます。よろしいですか?" - suspend: "サスペンド" - unsuspend: "サスペンド解除" - suspended: "サスペンド中?" + suspend: "凍結" + unsuspend: "凍結解除" + suspended: "凍結状態" moderator: "モデレータ?" admin: "管理者?" blocked: "ブロック中?" @@ -1947,7 +2009,7 @@ ja: save_title: "タイトルを保存" refresh_browsers: "ブラウザを強制リフレッシュ" refresh_browsers_message: "全てのクライアントにメッセージが送信されました！" - show_public_profile: "一般プロファイルを表示" + show_public_profile: "公開されるプロフィールを見る" impersonate: 'このユーザになりすます' ip_lookup: "IP検索" log_out: "ログアウト" @@ -1965,12 +2027,12 @@ ja: last_100_days: '過去100日に' private_topics_count: プライベートトピック数 posts_read_count: 読んだ投稿数 - post_count: 投稿した投稿数 + post_count: 投稿数 topics_entered: 閲覧したトピック数 - flags_given_count: 設定したフラグ数 - flags_received_count: 設定されたフラグ数 - warnings_received_count: 警告をもらった - flags_given_received_count: 'フラグを与えた/もらった' + flags_given_count: 通報した数 + flags_received_count: 通報された数 + warnings_received_count: 警告されました + flags_given_received_count: '通報をした / された' approve: '承認' approved_by: "承認したユーザ" approve_success: "ユーザが承認され、アクティベーション方法を記載したメールが送信されました。" @@ -2003,11 +2065,12 @@ ja: deactivate_failed: "ユーザのアクティベート解除に失敗しました。" unblock_failed: 'ユーザのブロック解除に失敗しました。' block_failed: 'ユーザのブロックに失敗しました。' + block_confirm: 'このユーザをブロックしてもよろしいですか? ユーザは新しくトピックを作成したり、投稿する事ができなくなります。' deactivate_explanation: "アクティベート解除されたユーザは、メールで再アクティベートする必要があります。" - suspended_explanation: "サスペンド中のユーザはログインできません。" + suspended_explanation: "凍結中のユーザはログインできません。" block_explanation: "ブロックされているユーザは投稿およびトピックの作成ができません。" trust_level_change_failed: "ユーザのトラストレベル変更に失敗しました。" - suspend_modal_title: "サスペンド中ユーザ" + suspend_modal_title: "凍結中のユーザ" trust_level_2_users: "トラストレベル2のユーザ" trust_level_3_requirements: "トラストレベル3の条件" trust_level_locked_tip: "トラストレベルはロックされています。システムがユーザを昇格、降格させることはありません" @@ -2021,12 +2084,12 @@ ja: requirement_heading: "条件" visits: "訪問" days: "日" - topics_replied_to: "回答したトピック" + topics_replied_to: "返信したトピック" topics_viewed: "閲覧したトピック数" topics_viewed_all_time: "閲覧したトピック" posts_read: "閲覧した投稿数" posts_read_all_time: "閲覧した投稿数" - flagged_posts: "フラグ付きの投稿" + flagged_posts: "通報されている投稿" flagged_by_users: "フラグを立ったユーザ" likes_given: "与えた「いいね！」" likes_received: "もらった「いいね！」" @@ -2235,18 +2298,18 @@ ja: pin_unpin_topic: 'shift+pトピックを ピン留め/ピン留め解除' share_topic: 'shift+s トピックをシェア' share_post: 's 投稿をシェアする' - reply_as_new_topic: 't リンクトピックとして引用返信' + reply_as_new_topic: 't トピックへリンクして返信' reply_topic: 'shift+r トピックに返信' reply_post: 'r 投稿に返信' quote_post: 'q 投稿を引用する' like: 'l 投稿を「いいね！」する' - flag: '! 投稿にフラグをつける' + flag: '! 投稿を通報' bookmark: 'b 投稿をブックマークする' edit: 'e 投稿を編集' delete: 'd 投稿を削除する' mark_muted: 'm, m トピックをミュートする' mark_regular: 'm, r 通常トピックにする' - mark_tracking: 'm, t トピックをトラックする' + mark_tracking: 'm, t トピックを追跡する' mark_watching: 'm, w トピックを参加中にする' badges: title: バッジ diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml index 30a764705f..452b8630ec 100644 --- a/config/locales/client.nb_NO.yml +++ b/config/locales/client.nb_NO.yml @@ -100,6 +100,8 @@ nb_NO: x_years: one: "1 år senere" other: "%{count} år senere" + previous_month: 'Forrige Måned' + next_month: 'Neste Måned' share: topic: 'del en lenke til dette emnet' post: 'innlegg #%{postNumber}' @@ -157,6 +159,8 @@ nb_NO: more: "Mer" less: "Mindre" never: "aldri" + every_30_minutes: "hvert 30 minutt" + every_hour: "hver time" daily: "daglig" weekly: "ukentlig" every_two_weeks: "annenhver uke" @@ -168,6 +172,7 @@ nb_NO: other: "{{count}} tegn" suggested_topics: title: "Anbefalte emner" + pm_title: "Foreslåtte Meldinger" about: simple_title: "Om" title: "Om %{title}" @@ -223,6 +228,7 @@ nb_NO: revert: "Reverser" failed: "Mislykket" switch_to_anon: "Anonym modus" + switch_from_anon: "Avslutt Anonym" banner: close: "Fjern denne banneren" edit: "Endre denne banneren >>" @@ -299,7 +305,9 @@ nb_NO: one: "gruppe" other: "grupper" members: "Medlemmer" + topics: "Emner" posts: "Innlegg" + messages: "Meldinger" alias_levels: nobody: "Ingen" only_admins: "Kun administratorer" @@ -315,6 +323,7 @@ nb_NO: title: "Sporer" regular: title: "Normal" + description: "Du vil bli varslet hvis noen nevner ditt @navn eller svarer deg." user_action_groups: '1': "Liker tildelt" '2': "Liker mottatt" @@ -382,6 +391,7 @@ nb_NO: notifications: "Varsler" statistics: "Statistikk" desktop_notifications: + label: "Skrivebordsvarslinger" perm_default: "Slå på varslinger" perm_denied_btn: "Tillatelse avslått" disable: "Slå av varslinger" @@ -507,8 +517,17 @@ nb_NO: title: "Brukerkort merke" website: "Nettsted" email_settings: "E-post" + like_notification_frequency: + always: "Alltid" + first_time_and_daily: "Første gnag et innlegg blir likt og daglig" + first_time: "Første gang et innlegg blir likt" + never: "Aldri" + email_previous_replies: + always: "alltid" + never: "aldri" email_digests: title: "Send meg sammendrag av hva som er nytt på e-post når jeg ikke er ofte innom:" + every_hour: "hver time" daily: "daglig" every_three_days: "hver tredje dag" weekly: "ukentlig" @@ -526,6 +545,12 @@ nb_NO: auto_track_options: never: "aldri" immediately: "øyeblikkelig" + after_1_minute: "etter 1 minutt" + after_2_minutes: "etter 2 minutt" + after_3_minutes: "etter 3 minutt" + after_4_minutes: "etter 4 minutt" + after_5_minutes: "etter 5 minut" + after_10_minutes: "etter 10 minutt" invited: search: "skriv for å søke etter invitasjoner..." title: "invitasjoner" @@ -874,6 +899,9 @@ nb_NO: selected: one: "Du har valgt 1 emne." other: "Du har valgt {{count}} emner." + change_tags: "Endre emneord" + choose_new_tags: "Velg nye emneord for disse emnene:" + changed_tags: "Emneord for disse emnene ble endret." none: unread: "Du har ingen uleste emner å lese." new: "Du har ingen nye emner å lese." @@ -901,6 +929,11 @@ nb_NO: create: 'Nytt emne' create_long: 'Opprett et nytt emne' private_message: 'Begynn en melding' + archive_message: + title: 'Arkiver' + move_to_inbox: + title: 'Flytt til Inbox' + help: 'Flytt meldingen tilbake til Inbox' list: 'Emner' new: 'nytt emne' unread: 'ulest' @@ -1208,6 +1241,11 @@ nb_NO: bookmark: "Angre bokmerke" like: "Angre liker" vote: "Angre stemme" + people: + notify_moderators: "varslet moderatorer" + notify_user: "sendte en melding" + like: "likte dette" + vote: "stemte for dette" by_you: off_topic: "Du rapporterte dette som irrelevant" spam: "Du rapporterte dette som spam" @@ -1570,6 +1608,7 @@ nb_NO: refresh_report: "Refresh Rapport" start_date: "Startdato" end_date: "Sluttdato" + groups: "Alle grupper" commits: latest_changes: "Siste endringer: Vennligst oppgrader ofte!" by: "av" @@ -1914,6 +1953,8 @@ nb_NO: roll_up: "rull opp IP-blokker" delete_category: "slett kategori" create_category: "opprett kategori" + deleted_tag: "Slettet emneord" + renamed_tag: "Endret emneord" screened_emails: title: "Kontrollerte e-poster" description: "Når noen forsøker å lage en ny konto, vil de følgende e-postadressene bli sjekket, og registreringen vil bli blokkert, eller en annen handling vil bli utført." @@ -2338,3 +2379,27 @@ nb_NO: name: Annet posting: name: Posting + tagging: + all_tags: "Alle emneord" + changed: "emneord endret:" + tags: "Emneord" + choose_for_topic: "velg ekstra emneord for dette emnet" + delete_tag: "Slett emneord" + delete_confirm: "Er du sikker påat du ønsker å slette dette emneordet?" + rename_tag: "Endre emneord" + rename_instructions: "Velg et nytt navn på dette emneordet:" + + notifications: + watching: + title: "Følger" + description: "Du vil automatisk følge alle nye emner med dette emneordet. Du vil bli varslet om alle nye innlegg og emner samt at antallet uleste og nye innlegg vil vises sammen med emneoppføringen." + tracking: + title: "Følger" + description: "Du vil automatisk følge alle nye emner med dette emneordet. Antallet uleste og nye innlegg vil vises sammen med emneoppføringen." + regular: + title: "Vanlig" + description: "Du vil bli varslet om noen nevnet ditt @navn eller svarer på din post." + muted: + title: "Dempet" + description: "Du vil ikke bli varslet om noe vedrørende disse emneneordene og de vil ikke vises i din ulest-liste." + diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml index 51327dcd44..ee67063e4d 100644 --- a/config/locales/client.pl_PL.yml +++ b/config/locales/client.pl_PL.yml @@ -2699,3 +2699,9 @@ pl_PL:

      + tagging: + all_tags: "Wszystkie tagi" + changed: "zmienione tagi:" + tags: "Tagi" + choose_for_topic: "wybierz opcjonalne tagi dla tego tematu" + topics_tagged: "Tematy otagowane jako {{tag}}" diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml index 964b58e174..03cacd03f3 100644 --- a/config/locales/client.pt.yml +++ b/config/locales/client.pt.yml @@ -134,6 +134,8 @@ pt: disabled: 'removido da lista %{when}' topic_admin_menu: "Ações administrativas dos Tópicos" emails_are_disabled: "Todos os envios de e-mail foram globalmente desativados por um administrador. Nenhum e-mail de notificação será enviado." + bootstrap_mode_enabled: "Para facilitar o lançamento do seu novo sítio mais fácil, encontra-se agora em modo de inicialização. Qualquer utilizador novo terá nível de confiança 1 e resumos de email diários ligados. Este modo será automaticamente desligado quando o número total de utilizadores ultrapassar %{min_users}." + bootstrap_mode_disabled: "Modo de inicialização será desligado dentro das próximas 24 horas." s3: regions: us_east_1: "Este dos E.U.A. (Virgínia do Norte)" @@ -676,17 +678,20 @@ pt: one: "mensagem criada" other: "mensagens criadas" likes_given: - one: "gosto dado" - other: "gostos dados" + one: " dado" + other: " dados" likes_received: - one: "gosto recebido" - other: "gostos recebidos" + one: " recebido" + other: " recebidos" days_visited: one: "dia visitado" other: "dias visitados" posts_read: one: "mensagem lida" other: "mensagens lidas" + bookmark_count: + one: "marcador" + other: "marcadores" top_replies: "Respostas" no_replies: "Nenhuma resposta ainda." more_replies: "Mais Respostas" @@ -696,6 +701,10 @@ pt: top_badges: "Melhores Medalhas" no_badges: "Nenhuma medalha ainda." more_badges: "Mais Medalhas" + top_links: "Melhores hiperligações" + no_links: "Não há nenhuma hiperligação ainda." + most_liked_by: "Por mais apreciados" + no_likes: "Nenhum gostos ainda." associated_accounts: "Contas associadas" ip_address: title: "Último endereço IP" @@ -1052,6 +1061,9 @@ pt: selected: one: "Selecionou 1 tópico." other: "Selecionou {{count}} tópicos." + change_tags: "Mudar Etiquetas" + choose_new_tags: "Escolha novas etiquetas para estes tópicos:" + changed_tags: "As etiquetas para esses tópicos foram mudadas." none: unread: "Tem tópicos não lidos." new: "Não tem novos tópicos." @@ -1206,6 +1218,8 @@ pt: invisible: "Tornar Não Listado" visible: "Tornar Listado" reset_read: "Repor Data de Leitura" + make_public: "Criar tópico publico" + make_private: "Criar mensagem privada" feature: pin: "Fixar Tópico" unpin: "Desafixar Tópico" @@ -1365,9 +1379,9 @@ pt: create: "Pedimos desculpa, ocorreu um erro ao criar a sua mensagem. Por favor, tente novamente." edit: "Pedimos desculpa, ocorreu um erro ao editar a sua mensagem. Por favor, tente novamente." upload: "Pedimos desculpa, ocorreu um erro ao carregar esse ficheiro. Por favor, tente novamente." - file_too_large: "Pedimos desculpa, o ficheiro que está a tentar carregar é muito grande (o tamanho máximo permitido é {{max_size_kb}}kb)." + file_too_large: "Lamentamos mas esse ficheiro é demasiado grande (o tamanho máximo é de {{max_size_kb}}kb). Porque não carregar o seu ficheiro grande para um serviço de partilha na nuvem e depois partilhar o link?" too_many_uploads: "Pedimos desculpa, só pode carregar um ficheiro de cada vez." - too_many_dragged_and_dropped_files: "Pedimos desculpa, só pode arrastar e largar até 10 ficheiros de cada vez." + too_many_dragged_and_dropped_files: "Lamentamos mas só pode carregar 10 ficheiros de cada vez." upload_not_authorized: "Pedimos desculpa, o tipo de ficheiro que está a carregar não está autorizado (extensões autorizadas: {{authorized_extensions}})." image_upload_not_allowed_for_new_user: "Pedimos desculpa, os novos utilizadores não podem carregar imagens." attachment_upload_not_allowed_for_new_user: "Pedimos desculpa, os novos utilizadores não podem carregar anexos." @@ -1377,6 +1391,7 @@ pt: no_value: "Não, manter" yes_value: "Sim, abandonar" via_email: "esta mensagem chegou por email" + via_auto_generated_email: "esta mensagem chegou via um email gerado automaticamente" whisper: "esta mensagem é um susurro privado para os moderadores" wiki: about: "esta mensagem é uma wiki" @@ -1593,6 +1608,7 @@ pt: action: 'Sinalizar Mensagem' take_action: "Acionar" notify_action: 'Mensagem' + official_warning: 'Aviso Oficial' delete_spammer: "Eliminar Spammer" delete_confirm: "Está prestes a apagar %{posts} mensagens e %{topics} tópicos deste utilizador, remover a sua conta, bloquear acessos do seu endereço IP %{ip_address}, e adicionar o seu endereço de email %{email} a uma lista negra. Tem a certeza que este utilizador é de facto um spammer?" yes_delete_spammer: "Sim, Eliminar Spammer" @@ -1806,7 +1822,7 @@ pt: 30_days_ago: "30 Dias Atrás" all: "Tudo" view_table: "tabela" - view_chart: "gráfico de barras" + view_graph: "grafo" refresh_report: "Atualizar relatório" start_date: "Data de Início" end_date: "Data final" @@ -2208,6 +2224,8 @@ pt: grant_moderation: "conceder moderação" revoke_moderation: "revogar moderação" backup_operation: "operação de cópia de segurança" + deleted_tag: "etiqueta removida" + renamed_tag: "etiqueta renomeada" screened_emails: title: "Emails Filtrados" description: "Quando alguém tenta criar uma nova conta, os seguintes endereços de email serão verificados e o registo será bloqueado, ou outra ação será executada." @@ -2495,6 +2513,7 @@ pt: login: "Iniciar Sessão" plugins: "Plugins" user_preferences: "Preferências do Utilizador" + tags: "Etiquetas" badges: title: Distintivos new_badge: Novo Distintivo @@ -2703,3 +2722,46 @@ pt:

      + tagging: + all_tags: "Todas as Etiquetas" + selector_all_tags: "todas as etiquetas" + changed: "etiquetas modificadas:" + tags: "Etiquetas" + choose_for_topic: "escolha etiquetas opcionais para este tópico" + delete_tag: "Remover Etiqueta" + delete_confirm: "Tem a certeza que deseja remover esta etiqueta?" + rename_tag: "Renomear Etiqueta" + rename_instructions: "Escolha o novo nome para a etiqueta:" + sort_by: "Ordenar por:" + sort_by_count: "contagem" + sort_by_name: "nome" + filters: + without_category: "%{filter} %{tag} tópicos" + with_category: "%{filter} %{tag} tópicos em %{category}" + notifications: + watching: + title: "A vigiar" + description: "Vigiará automaticamente todos os tópicos novos nesta etiqueta. Será notificado acerca de todas as novas mensagens e tópicos,bem como lhe será apresentada a contagem de mensagens por ler e novas ao lado do tópico." + tracking: + title: "A seguir" + description: "Irá automaticamente seguir todos os novos tópicos nesta etiqueta. Uma contagem de mensagens não lidas e novas aparecerá ao lado to tópico." + regular: + title: "Regular" + description: "Será notificado quando alguém mencione o seu @nome ou responda à sua mensagem." + muted: + title: "Silenciado" + description: "Não será notificado acerca de novos tópicos sob esta etiqueta, não aparecendo eles no seu separador de não lidos." + topics: + none: + unread: "Não tem tópicos por ler." + new: "Não tem nenhum tópico novo." + read: "Ainda não leu quaisquer tópicos." + posted: "Ainda não publicou nada em um tópico qualquer." + latest: "Não há tópicos recentes." + hot: "Não há tópicos quentes." + bookmarks: "Não marcou qualquer tópico ainda." + top: "Não há quaisquer tópicos de topo." + search: "Não há resultados para a procura." + bottom: + latest: "Não há mais tópicos recentes." + hot: "Não há mais tópicos quentes." diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml index 55ddb71147..b6ddc76de0 100644 --- a/config/locales/client.pt_BR.yml +++ b/config/locales/client.pt_BR.yml @@ -1049,6 +1049,9 @@ pt_BR: selected: one: "Você selecionou 1 tópico." other: "Você selecionou {{count}} tópicos." + change_tags: "Alterar Tags" + choose_new_tags: "Escolha novas tags para estes tópicos:" + changed_tags: "As tags desses tópicos foram alteradas." none: unread: "Não há nenhum tópico não lido." new: "Não há tópicos novos." @@ -2148,6 +2151,8 @@ pt_BR: block_user: "bloquear usuário" unblock_user: "desbloquear usuário" backup_operation: "operação de backup" + deleted_tag: "tag removida" + renamed_tag: "tag renomeada" screened_emails: title: "Emails Filtrados" description: "Quando alguém tenta cria uma nova conta, os seguintes endereços de email serão verificados e o registro será bloqueado, ou outra ação será executada." @@ -2628,3 +2633,52 @@ pt_BR:

      + tagging: + all_tags: "Todas as Tags" + selector_all_tags: "todas as tags" + changed: "tags alteradas:" + tags: "Tags" + choose_for_topic: "escolha tags opcionais para este tópico" + delete_tag: "Remover Tag" + delete_confirm: "Você tem certeza que quer remover essa tag?" + rename_tag: "Renomear Tag" + rename_instructions: "Escolha um novo nome para a tag:" + sort_by: "Ordenar por:" + sort_by_count: "número" + sort_by_name: "nome" + + notifications: + watching: + title: "Observando" + description: "Você vai observar automaticamente todos os novos tópicos dessa tag. Você será notificado de todas as novas mensagens e tópicos, e uma contagem de novas respostas será mostrada ao lado do tópico." + tracking: + title: "Monitorando" + description: "Você vai monitorar automaticamente todos os novos tópicos dessa tag. Uma contagem de novas respostas será mostrada ao lado do tópico." + regular: + title: "Normal" + description: "Você será notificado se alguém mencionar o seu @nome ou responder à sua mensagem." + muted: + title: "Silenciado" + description: "Você nunca será notificado sobre novos tópicos nessa tag, e eles não aparecerão na sua aba não lidas." + + topics: + none: + unread: "Você não possui tópicos não lidos." + new: "Você não possui novos tópicos." + read: "Você não leu nenhum tópico ainda." + posted: "Você não postou em nenhum tópico ainda." + latest: "Não há tópicos mais recentes." + hot: "Não há tópicos quentes." + bookmarks: "Você não possui tópicos favoritos ainda." + top: "Não há melhores tópicos." + search: "Nenhum resultado encontrado." + bottom: + latest: "Não há mais tópicos mais recentes." + hot: "Não há mais tópicos quentes." + posted: "Não há mais tópicos postados." + read: "Não há mais tópicos lidos." + new: "Não há mais tópicos novos." + unread: "Não há mais tópicos não lidos." + top: "Não há mais melhores tópicos." + bookmarks: "Não há mais tópicos favoritos." + search: "Não há mais resultados de busca." diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml index c80200f509..0a268b9ebb 100644 --- a/config/locales/client.ru.yml +++ b/config/locales/client.ru.yml @@ -400,6 +400,7 @@ ru: notifications: watching: title: "Отслеживание" + description: "Уведомлять по каждому ответу на это сообщение и показывать счетчик новых непрочитанных ответов." tracking: title: "Следить" regular: @@ -407,6 +408,7 @@ ru: description: "Вам придёт уведомление, если кто-нибудь упомянет ваш @псевдоним или ответит вам." muted: title: "Выключено" + description: "Не уведомлять о новых темах в этой группе." user_action_groups: '1': "Выразил симпатий" '2': "Получил симпатий" @@ -492,6 +494,7 @@ ru: not_supported: "К сожалению, оповещения не поддерживаются этим браузером." perm_default: "Включить оповещения" perm_denied_btn: "Отказано в разрешении" + perm_denied_expl: "Вы запретили оповещения в вашем браузере. Вначале возобновите разрешение, а затем попробуйте еще раз." disable: "Отключить оповещения" enable: "Включить оповещения" each_browser_note: "Примечание: эта настройка устанавливается в каждом браузере индивидуально." @@ -528,6 +531,7 @@ ru: muted_users: "Выключено" muted_users_instructions: "Не отображать уведомления от этих пользователей." muted_topics_link: "Показать темы \"Без уведомлений\"" + automatically_unpin_topics: "Автоматически откреплять топики после прочтения." staff_counters: flags_given: "полезные жалобы" flagged_posts: "сообщения с жалобами" @@ -553,6 +557,7 @@ ru: set_password: "Установить пароль" change_about: title: "Изменить информацию обо мне" + error: "При изменении значения произошла ошибка." change_username: title: "Изменить псевдоним" confirm: "Если вы измените свой псевдоним, то все существующие цитаты ваших сообщений и упоминания вас по @псевдониму в чужих сообщениях перестанут ссылаться на вас. Вы точно хотите изменить псевадоним?" @@ -1035,8 +1040,8 @@ ru: upload_selector: title: "Add an image" title_with_attachments: "Add an image or a file" - from_my_computer: "From my device" - from_the_web: "From the web" + from_my_computer: "С моего устройства" + from_the_web: "С интернета" remote_tip: "ссылка на изображение" remote_tip_with_attachments: "ссылка на изображение или файл {{authorized_extensions}}" local_tip: "выбрать изображения с вашего устройства" @@ -1098,6 +1103,9 @@ ru: few: "Вы выбрали {{count}} темы." many: "Вы выбрали {{count}} тем." other: "Вы выбрали {{count}} тем." + change_tags: "Изменить теги" + choose_new_tags: "Выберите новые теги для этих тем:" + changed_tags: "Теги изменены." none: unread: "У вас нет непрочитанных тем." new: "У вас нет новых тем." @@ -2303,6 +2311,8 @@ ru: revoke_admin: "отозваны права администратора" grant_moderation: "выданы права модератора" revoke_moderation: "отозваны права модератора" + deleted_tag: "удалить тег" + renamed_tag: "переименовать тег" screened_emails: title: "Почтовые адреса" description: "Когда кто-то создает новую учетную запись, проверяется данный почтовый адрес и регистрация блокируется или производятся другие дополнительные действия." @@ -2552,15 +2562,21 @@ ru: title: "Показывать в публичном профиле?" enabled: "Показывать в профиле" disabled: "Не показывать в профиле" + show_on_user_card: + disabled: "Не показывать в карточке пользователя" field_types: text: 'Текстовое поле' confirm: 'Подтверждение' dropdown: "Выпадающий список" site_text: + description: "Вы можете отредактировать любой текст на вашем форуме. Начните с поиска ниже:" + search: "Найти текст, который вы хотите отредактировать" title: 'Текстовое содержание' edit: 'изменить' revert: "Отменить изменения" + revert_confirm: "Вы уверены что хите отменить ваши изменения?" go_back: "Вернуться к поиску" + recommended: "Мы рекомендуем изменить следующий текст под ваши нужды:" show_overriden: 'Показывать только измененные' site_settings: show_overriden: 'Показывать только измененные' @@ -2601,6 +2617,7 @@ ru: badge: Награда display_name: Отображаемое название description: Описание + long_description: Длинное описание badge_type: Тип награды badge_grouping: Группа badge_groupings: @@ -2640,6 +2657,7 @@ ru: post_revision: "Когда пользователь редактирует или создает сообщение" trust_level_change: "Когда пользователь меняет уровень доверия" user_change: "Когда создается или редактируется пользователь" + post_processed: "После обработки сообщения" preview: link_text: "Предварительный просмотр выданных наград" plan_text: "Предварительный просмотр с анализом быстродействия" @@ -2669,9 +2687,11 @@ ru: image: "Изображение" delete_confirm: "Вы уверены, что хотите удалить иконку :%{name}:?" embedding: + confirm_delete: "Вы уверены, что хотите удалить это поле?" title: "Встраивание" host: "Разрешённые Хосты" edit: "изменить" + category: "Опубликовать в разделе" add_host: "Добавить хост" settings: "Настройки встраивания" feed_settings: "Настройки Фида" @@ -2793,3 +2813,30 @@ ru:

      + tagging: + all_tags: "Все теги" + selector_all_tags: "все теги" + changed: "теги изменены:" + tags: "Теги" + choose_for_topic: "выберите теги для темы" + delete_tag: "Удалить тег" + delete_confirm: "Удалить тег?" + rename_tag: "Переименовать тег" + rename_instructions: "Выберите новое имя для тега:" + sort_by: "Сортировать по:" + sort_by_count: "количеству" + sort_by_name: "имени" + + notifications: + watching: + title: "Наблюдать" + description: "Уведомлять о каждой новой теме с этим тегом и показывать счетчик новых непрочитанных ответов." + tracking: + title: "Следить" + description: "Количество непрочитанных сообщений появится рядом с названием новых тем с этим тегом." + regular: + title: "Уведомлять" + description: "Вам придет уведомление, только если кто-нибудь упомянет ваш @псевдоним или ответит на ваше сообщение." + muted: + title: "Без уведомлений" + description: "Не уведомлять об изменениях в новых темах с этим тегом и скрыть их из непрочитанных." diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml index ce1dac3b22..a73b446348 100644 --- a/config/locales/client.sq.yml +++ b/config/locales/client.sq.yml @@ -92,48 +92,48 @@ sq: other: "%{count} ditë më parë" later: x_days: - one: "1 day later" - other: "%{count} days later" + one: "1 ditë më vonë" + other: "%{count} ditë më vonë" x_months: - one: "1 month later" - other: "%{count} months later" + one: "1 muaj më vonë" + other: "%{count} muaj më vonë" x_years: - one: "1 year later" - other: "%{count} years later" - previous_month: 'Muaji i Kaluar' - next_month: 'Muaji Tjetër' + one: "1 vit më vonë" + other: "%{count} vjet më vonë" + previous_month: 'Muaji i kaluar' + next_month: 'Muaji i ardhshëm' share: topic: 'shpërnda një lidhje tek kjo temë' post: 'postim #%{postNumber}' close: 'mbylle' - twitter: 'shpërndaje këtë lidhe në Twitter' + twitter: 'shpërndaje këtë lidhje në Twitter' facebook: 'shpërndaje këtë lidhje ne Facebook' google+: 'shpërndaje këtë lidhje në Google+' - email: 'dërgo këtë lidhje me email' + email: 'dërgoje këtë lidhje me email' action_codes: split_topic: "ndaje këtë teme %{when}" invited_user: "ftuar %{who} %{when}" removed_user: "hequr %{who} %{when}" autoclosed: - enabled: 'mbyllur %{when}' + enabled: 'mbylli %{when}' disabled: 'hapur %{when}' closed: enabled: 'mbyllur %{when}' disabled: 'hapur %{when}' archived: - enabled: 'arkivuar %{when}' - disabled: 'ç''arkivuar %{when}' + enabled: 'arkivoi %{when}' + disabled: 'çarkivuar %{when}' pinned: enabled: 'mbërthyer %{when}' - disabled: 'ç''mbërthyer %{when}' + disabled: 'zbërthyer %{when}' pinned_globally: enabled: 'mbërthyer globalisht %{when}' disabled: 'ç''mbërthyer %{when}' visible: enabled: 'listuar %{when}' disabled: 'ç''listuar %{when}' - topic_admin_menu: "topic admin actions" - emails_are_disabled: "All outgoing email has been globally disabled by an administrator. No email notifications of any kind will be sent." + topic_admin_menu: "veprimet administrative mbi temën" + emails_are_disabled: "Emailat janë çaktivizuar globalisht nga administratori i faqes. Asnjë njoftim me email nuk do të dërgohet. " s3: regions: us_east_1: "US East (N. Virginia)" @@ -152,177 +152,177 @@ sq: no_value: "Jo" yes_value: "Po" generic_error: "Na vjen keq, por sapo ndodhi një gabim." - generic_error_with_reason: "U shfaq një gabim: %{error}" + generic_error_with_reason: "Pati një gabim: %{error}" sign_up: "Regjistrohu" log_in: "Identifikohu" age: "Mosha" joined: "Anëtarësuar" admin_title: "Admin" - flags_title: "Flags" + flags_title: "Sinjalizimet" show_more: "trego më shumë" show_help: "opsione" links: "Lidhjet" links_lowercase: one: "lidhje" other: "lidhje" - faq: "Pyetje" + faq: "Pyetje të shpeshta" guidelines: "Udhëzimet" - privacy_policy: "Politika e Privatësis" + privacy_policy: "Politika e Privatësisë" privacy: "Privatësia" - terms_of_service: "Kushtet e Shërbimit" - mobile_view: "Pamja Mobile" - desktop_view: "Pamja Desktop" + terms_of_service: "Kushtet e shërbimit" + mobile_view: "Pamja për celular" + desktop_view: "Pamja për desktop" you: "Ju" or: "ose" now: "tani" read_more: 'lexo më shumë' more: "Më shumë" less: "Më pak" - never: "asnjëher" + never: "asnjëherë" every_30_minutes: "çdo 30 minuta" every_hour: "çdo orë" - daily: "ditore" - weekly: "javore" + daily: "çdo ditë" + weekly: "çdo javë" every_two_weeks: "çdo dy javë" every_three_days: "çdo 3 ditë" max_of_count: "max i {{count}}" alternation: "ose" character_count: - one: "{{count}} karakter" - other: "{{count}} karakterë" + one: "{{count}} shkronjë" + other: "{{count}} shkronja" suggested_topics: - title: "Temat e Sugjeruara" - pm_title: "Mesazhet e Sygjeruara" + title: "Temat e sugjeruara" + pm_title: "Mesazhet e sugjeruara" about: simple_title: "Rreth" title: "Rreth %{title}" stats: "Statistikat e faqjes" - our_admins: "Stafi Jonë" - our_moderators: "Moderatorët Tanë" + our_admins: "Administratorët tanë" + our_moderators: "Moderatorët tanë" stat: - all_time: "Gjithë Kohës" - last_7_days: "7 Ditët e Fundit" - last_30_days: "30 Ditët e Fundit" + all_time: "Gjithë kohës" + last_7_days: "7 ditët e fundit" + last_30_days: "30 ditët e fundit" like_count: "Pëlqime" topic_count: "Tema" post_count: "Postime" - user_count: "Anëtarët e Rinjë" - active_user_count: "Anëtarë Aktivë" - contact: "Kontaktoni" - contact_info: "In the event of a critical issue or urgent matter affecting this site, please contact us at %{contact_info}." + user_count: "Anëtarët e rinj" + active_user_count: "Anëtarët aktivë" + contact: "Na kontaktoni" + contact_info: "Në rast të një problemi madhor ose të një çështjeje urgjente që prek faqen, ju lutemi të kontaktoni %{contact_info}." bookmarked: - title: "Të Preferuarat" - clear_bookmarks: "Pastro Bookmarks" + title: "Të preferuarat" + clear_bookmarks: "Pastro të preferuarat" help: - bookmark: "Click to bookmark the first post on this topic" - unbookmark: "Click to remove all bookmarks in this topic" + bookmark: "Kliko për të shtuar tek të preferuarat e tua postimin e parë të kësaj teme." + unbookmark: "Kliko për të hequr të preferuarat nga kjo temë" bookmarks: not_logged_in: "ju duhet të jeni të identifikuar për të ruajtur temën." - created: "ju ruajtët këtë temë" - not_bookmarked: "e keni lexuar këtë temë; kliko për ta ruajtur" - last_read: "this is the last post you've read; click to bookmark it" - remove: "Hiq Preferencën" - confirm_clear: "Are you sure you want to clear all the bookmarks from this topic?" + created: "ju ruajtët këtë temë tek të preferuarat tuaja" + not_bookmarked: "e keni lexuar këtë temë; klikoni për ta ruajtur tek të preferuarat" + last_read: "ky është postimi i fundit që keni lexuar; klikoni për t'a shtuar tek të preferuarat" + remove: "Hiqeni nga të prefereruarat" + confirm_clear: "Jeni të sigurtë se doni të fshini të gjitha të preferuarat nga kjo temë?" topic_count_latest: - one: "{{count}} new or updated topic." - other: "{{count}} new or updated topics." + one: "{{count}} temë e re ose e përditësuar." + other: "{{count}} tema të reja ose të përditësuara." topic_count_unread: one: "{{count}} temë e palexuar." other: "{{count}} tema të palexuara." topic_count_new: - one: "{{count}} new topic." - other: "{{count}} new topics." + one: "{{count}} temë e re." + other: "{{count}} tema të reja." click_to_show: "Kliko për ti shfaqur." preview: "shiko" cancel: "anulo" - save: "Ruaj Ndryshimet" + save: "Ruaj ndryshimet" saving: "Duke e ruajtur..." saved: "U ruajt!" upload: "Ngarko" - uploading: "Duke nga ngarkuar..." - uploading_filename: "Duke Ngarkuar {{filename}}..." + uploading: "Duke ngarkuar..." + uploading_filename: "Duke ngarkuar {{filename}}..." uploaded: "U ngarkua!" enable: "Aktivizo" - disable: "Disaktivizo" - undo: "Zhbëj" + disable: "Çaktivizo" + undo: "Çbëj" revert: "Rikthe" - failed: "Dështojë" - switch_to_anon: "Mënyrë Anonime" - switch_from_anon: "Dalja e Anonimit" + failed: "Dështoi" + switch_to_anon: "Mënyrë anonime" + switch_from_anon: "Shkëputu si anonim" banner: - close: "Hiq këtë reklamë." - edit: "Edit this banner >>" + close: "Hiq këtë banderolë." + edit: "Modifiko këtë banderolë >>" choose_topic: - none_found: "Asnjë temë u gjet." + none_found: "Asnjë temë nuk u gjet." title: - search: "Kërko për një Temë sipas emrit, adresës apo id:" + search: "Kërko për një temë sipas titullit, adresës URL apo id:" placeholder: "shkruaj titullin e temës këtu" queue: - topic: "Temë:" - approve: 'Approve' - reject: 'Rifiuto' - delete_user: 'Fshij Anëtarë' - title: "Kërkohet Aprovim" - none: "There are no posts to review." + topic: "Tema:" + approve: 'Aprovo' + reject: 'Refuzo' + delete_user: 'Fshij Anëtarin' + title: "Kërkon aprovim" + none: "Nuk ka postime për të redaktuar." edit: "Redakto" cancel: "Anulo" - view_pending: "shiko postimet pezull" + view_pending: "shiko postimet në pritje" has_pending_posts: one: "This topic has 1 post awaiting approval" - other: "This topic has {{count}} posts awaiting approval" + other: "Kjo temë ka {{count}} postime që presin aprovimin" confirm: "Ruaj ndryshimet" delete_prompt: "A jeni te sigurtë që doni të fshini %{username}? Ky veprim do të fshijë çdo shkrim të tyre dhe do bllokojë e-mailin dhe IP e tyre." approval: - title: "Post Needs Approval" - description: "We've received your new post but it needs to be approved by a moderator before it will appear. Please be patient." + title: "Postimi ka nevojë për aprovim" + description: "Postimi juaj u morr, por duhet të aprovohet nga një moderator para se të shfaqet në faqe. Kini pak durim. " pending_posts: - one: "You have 1 post pending." - other: "You have {{count}} posts pending." + one: "Ju keni 1 postim në pritje." + other: "Ju keni {{count}} postime në pritje." ok: "OK" user_action: - user_posted_topic: "{{user}} postoj temën" + user_posted_topic: "{{user}} postoi temën" you_posted_topic: "Ju postuat temën" - user_replied_to_post: "{{user}} u përgjigj tek {{post_number}}" - you_replied_to_post: "Ju jeni përgjigjur tek {{post_number}}" - user_replied_to_topic: "{{user}} u përgjigj tek tema" - you_replied_to_topic: "Ju jeni përgjigjur tek tema" - user_mentioned_user: "{{user}} ju citoj {{another_user}}" - user_mentioned_you: "{{user}} ju ka cituar ju" - you_mentioned_user: "Ju keni cituar {{another_user}}" + user_replied_to_post: "{{user}} iu përgjigj {{post_number}}" + you_replied_to_post: "Ju i jeni përgjigjur {{post_number}}" + user_replied_to_topic: "{{user}} iu përgjigj temës" + you_replied_to_topic: "Ju i jeni përgjigjur temës" + user_mentioned_user: "{{user}} përmendi {{another_user}}" + user_mentioned_you: "{{user}} ju ka përmendur ju" + you_mentioned_user: "Ju keni përmendur {{another_user}}" posted_by_user: "Postuar nga {{user}}" posted_by_you: "Postuar nga ju" sent_by_user: "Dërguar nga {{user}}" sent_by_you: "Dërguar nga ju" directory: - filter_name: "filter by username" - title: "Users" + filter_name: "filtro sipas emrit të anëtarit" + title: "Anëtarët" likes_given: "Dhënë" likes_received: "Marrë" topics_entered: "Entered" topics_entered_long: "Topics Entered" - time_read: "Koha e Leximit" + time_read: "Koha e leximit" topic_count: "Tema" topic_count_long: "Topics Created" post_count: "Përgjigje" post_count_long: "Replies Posted" - no_results: "No results were found." + no_results: "Nuk u gjet asnjë rezultat." days_visited: "Vizita" days_visited_long: "Vizita Ditore" posts_read: "Lexuar" - posts_read_long: "Posts Read" + posts_read_long: "Postimet e lexuara" total_rows: - one: "1 user" - other: "%{count} users" + one: "1 anëtar" + other: "%{count} anëtarë" groups: empty: posts: "Nuk ka postim nga anëtarët e këtij grupi." members: "Nuk ka asnjë anëtar në këtë grup." - mentions: "Nuk ka përmendje në këtë grup." + mentions: "Nuk ka përmendje për këtë grup." messages: "Nuk ka mesazhe për këtë grup." topics: "Nuk ka asnjë temë nga anëtarët e këtij grupi." add: "Shto" selector_placeholder: "Shto anëtarë" - owner: "pronar" + owner: "autori" visible: "Grupi është i dukshëm për të gjithë përdoruesit" title: one: "grupë" @@ -331,55 +331,55 @@ sq: topics: "Tema" posts: "Postime" mentions: "Përmendje" - messages: "Nesazhe" + messages: "Mesazhet" alias_levels: title: "Kush mund ti bëjë mesazh dhe @permendje këtij grupi?" nobody: "Asnjëri" only_admins: "Vetëm adminët" - mods_and_admins: "Vetëm moderatorët dhe Adminët" - members_mods_and_admins: "Vetëm anëtarët e grupit, moderatorët dhe administratorët" + mods_and_admins: "Vetëm moderatorët dhe adminët" + members_mods_and_admins: "Vetëm anëtarët e grupit, moderatorët dhe adminët" everyone: "Të gjithë" trust_levels: - title: "Niveli i besimit automatikisht shtohet për anëtarët e grupit:" - none: "Asnje" + title: "Niveli i besimit që ju akordohet automatikisht anëtarëve të grupit:" + none: "Asnjë" notifications: watching: - title: "Duke Parë" - description: "Ju do të njoftoheni në çdo postim të ri, dhe numburi i ri i përgjigjeve do të tregohet." + title: "Në vëzhgim" + description: "Ju do të njoftoheni për çdo postim të ri në çdo mesazh, dhe numri i ri i përgjigjeve të reja do të tregohet." tracking: title: "Ndjekje" - description: "Ju do të njoftoheni në qoftë se dikush ju pëmend me @emri ose ju përgjigjet, gjithashtu numbri i përgjigjeve do të tregohet." + description: "Ju do të njoftoheni në qoftë se dikush ju pëmend me @emri ose ju përgjigjet, gjithashtu numri i përgjigjeve të reja do të tregohet." regular: title: "Normale" - description: "Ju do të njoftoheni në qoftë se dikush ju përmend me @emrin ose ju përgjigjet." + description: "Ju do të njoftoheni në qoftë se dikush ju përmend @emrin ose ju përgjigjet." muted: title: "Heshtur" - description: "Ju asnjëherë nuk do të njoftoheni për cdo gjë qe mund të ndodhë në këtë teme të këtij grupi." + description: "Ju nuk do të njoftoheni asnjëherë për asgjë mbi temat e reja të këtij grupi." user_action_groups: - '1': "Pëlqime të Dhëna" + '1': "Pëlqime të dhëna" '2': "Pëlqime të marra" - '3': "Të Preferuarat" + '3': "Të preferuarat" '4': "Tema" '5': "Përgjigje" - '6': "Responses" + '6': "Përgjigjet" '7': "Përmendje" - '9': "Citim" - '11': "Redaktuar" - '12': "Sent Items" + '9': "Citime" + '11': "Redaktime" + '12': "Të dërguar" '13': "Inbox" '14': "Në pritje" categories: - all: "shfaq kategoritë" + all: "kategoritë" all_subcategories: "të gjitha" no_subcategory: "asnjë" category: "Kategori" - category_list: "Trego listen e kateogorive" + category_list: "Trego listën e kategorive" reorder: - title: "Rendit Kategoritë" + title: "Rendit kategoritë" title_long: "Ri-organizo listën e kategorive" - fix_order: "Rregullo Pozicionet" - fix_order_tooltip: "Jo të gjitha kategoritë kanë një numbë pozicioni unik, kjo mund të shkaktojë rezultate të pa vlefshme." - save: "Ruaje Renditjen" + fix_order: "Rregullo pozicionet" + fix_order_tooltip: "Jo të gjitha kategoritë kanë një numër pozicioni unik, kjo mund të shkaktojë rezultate të paparashikuara." + save: "Ruaje renditjen" apply_all: "Apliko" position: "Pozicioni" posts: "Postime" @@ -392,67 +392,67 @@ sq: topic_stat_sentence: one: "%{count} new topic in the past %{unit}." other: "%{count} new topics in the past %{unit}." - post_stats: "Numri i postimeve te ri." + post_stats: "Numri i postimeve të reja." post_stat_sentence: - one: "%{count} new post in the past %{unit}." - other: "%{count} new posts in the past %{unit}." + one: "%{count} postim i ri këto %{unit}." + other: "%{count} postime të reja këto %{unit}." ip_lookup: - title: Shiko Adresën IP - hostname: Emri Hostit + title: Shiko adresën IP + hostname: Hostname location: Vendndodhja location_not_found: (i panjohur) organisation: Organizata phone: Telefoni - other_accounts: "Other accounts with this IP address:" - delete_other_accounts: "Fshij %{count}" - username: "pseudonimi" + other_accounts: "Llogari të tjera me këtë adresë IP:" + delete_other_accounts: "Fshi %{count}" + username: "emri i përdoruesit" trust_level: "TL" read_time: "koha e leximit" topics_entered: "topics entered" post_count: "# postimeve" - confirm_delete_other_accounts: "Are you sure you want to delete these accounts?" + confirm_delete_other_accounts: "A jeni të sigurtë që doni të fshini këto llogari?" user_fields: - none: "(select an option)" + none: "(zgjidhni një opsion)" user: said: "{{username}}:" profile: "Profili" - mute: "Mute" - edit: "Ndrysho Preferencat" - download_archive: "Download My Posts" - new_private_message: "Mesazh i Ri" + mute: "Hesht" + edit: "Ndrysho preferencat" + download_archive: "Shkarko postimet e mia" + new_private_message: "Mesazh i ri" private_message: "Mesazh" private_messages: "Mesazhet" activity_stream: "Aktiviteti" preferences: "Preferencat" expand_profile: "Shpalos" - bookmarks: "Të Preferuarat" + bookmarks: "Të preferuarat" bio: "Rreth meje" invited_by: "Të ftuar nga unë" - trust_level: "Niveli Besimit" + trust_level: "Niveli i besimit" notifications: "Njoftimet" statistics: "Statistikat" desktop_notifications: - label: "Desktop Notifications" - not_supported: "Notifications are not supported on this browser. Sorry." - perm_default: "Turn On Notifications" - perm_denied_btn: "Permission Denied" - perm_denied_expl: "You denied permission for notifications. Allow notifications via your browser settings." - disable: "Disable Notifications" - enable: "Enable Notifications" - each_browser_note: "Note: You have to change this setting on every browser you use." - dismiss_notifications: "Shënoj të gjitha si të lexuara" + label: "Njoftimet në desktop" + not_supported: "Ky shfletues nuk është i aftë të ruajë njoftimet. " + perm_default: "Aktivizo njoftimet" + perm_denied_btn: "Nuk lejohet" + perm_denied_expl: "Ju nuk na dhatë të drejtën t'ju dërgojmë njoftime. Njoftimet mund t'i lejoni në rregullimet e shfletuesit tuaj. " + disable: "Çaktivizoni njoftimet" + enable: "Aktivizoni njoftimet" + each_browser_note: "Shënim: Duhet të ndryshoni këtë rregullim (setting) në çdo shfletues që përdorni. " + dismiss_notifications: "Shëno të gjitha si të lexuara" dismiss_notifications_tooltip: "Shëno njoftimet e palexuara si të lexuara" disable_jump_reply: "Don't jump to my post after I reply" - dynamic_favicon: "Show new / updated topic count on browser icon" - edit_history_public: "Lejo anëtarët e tjerë të shikojnë redaktimet e mia " + dynamic_favicon: "Tregoni numrin e temave të reja e azhornuara në ikonën e shfletuesit" + edit_history_public: "Lejo anëtarët e tjerë të shikojnë redaktimet e mia" external_links_in_new_tab: "Hap të gjitha lidhjet e jashtme në një tab të ri" enable_quoting: "Aktivizo citimin në përgjigje për tekstin e përzgjedhur" change: "ndrysho" - moderator: "{{user}} është një moderator" - admin: "{{user}} është një admin" - moderator_tooltip: "Ky anëtar është një moderator" + moderator: "{{user}} është moderator" + admin: "{{user}} është admin" + moderator_tooltip: "Ky anëtar është moderator" admin_tooltip: "Ky anëtar është administrator" - blocked_tooltip: "This user is blocked" + blocked_tooltip: "Ky anëtar është i bllokuar" suspended_notice: "Ky anëtarë është përjashtuar deri më {{date}}." suspended_reason: "Arsyeja:" github_profile: "Github" @@ -463,119 +463,122 @@ sq: tracked_categories_instructions: "You will automatically track all new topics in these categories. A count of new posts will appear next to the topic." muted_categories: "Heshtur" muted_categories_instructions: "You will not be notified of anything about new topics in these categories, and they will not appear in latest." - delete_account: "Fshi Llogarin Time" + delete_account: "Fshi llogarinë time" delete_account_confirm: "Are you sure you want to permanently delete your account? This action cannot be undone!" deleted_yourself: "Llogaria juaj u fshi me sukses." delete_yourself_not_allowed: "You cannot delete your account right now. Contact an admin to do delete your account for you." unread_message_count: "Mesazhet" - admin_delete: "Fshij" - users: "Users" - muted_users: "Muted" - muted_users_instructions: "Suppress all notifications from these users." - muted_topics_link: "Show muted topics" + admin_delete: "Fshi" + users: "Anëtarët" + muted_users: "Të heshtur" + muted_users_instructions: "Çaktivizo të gjitha njoftimet nga këta anëtarë." + muted_topics_link: "Trego temat e heshtura" automatically_unpin_topics: "Automatically unpin topics when I reach the bottom." staff_counters: - flags_given: "helpful flags" + flags_given: "sinjalizime të dobishme" flagged_posts: "postimet e raportuara" - deleted_posts: "fshi postimet" + deleted_posts: "postimet e fshira" suspensions: "pezullimet" warnings_received: "paralajmërimet" messages: - all: "Të gjithë" + all: "Të gjitha" inbox: "Inbox" - sent: "Sent" - archive: "Archive" + sent: "Të dërguara" + archive: "Arkivi" groups: "Grupet e mia" bulk_select: "Zgjidh mesazhet" - move_to_inbox: "Move to Inbox" + move_to_inbox: "Transfero në inbox" move_to_archive: "Arkivo" - failed_to_move: "Failed to move selected messages (perhaps your network is down)" - select_all: "Agjidh të gjitha" + failed_to_move: "Nuk i transferuam dot mesazhet e zgjedhura (ka mundësi që të jeni shkëputur nga rrjeti)" + select_all: "Zgjidh të gjitha" change_password: - success: "(email u dërgua)" + success: "(emaili u dërgua)" in_progress: "(duke dërguar emailin)" error: "(gabim)" - action: "Dërgo email për të rivendosur Fjalëkalimin" - set_password: "Vendos Fjalëkalim" + action: "Dërgo email për të rivendosur fjalëkalimin" + set_password: "Vendos fjalëkalim" change_about: - title: "Ndrysho Rreth Meje" - error: "There was an error changing this value." + title: "Ndrysho Rreth meje" + error: "Pati një gabim gjatë ndryshimit të kësaj të dhëne." change_username: - title: "Ndrysho Pseudonimin" - confirm: "Nëse ndryshoni emrin, të gjithë postimet e cituara tek duke përfolur @emri nuk do të punojnë. Jeni të sigurte që doni ta aprovoni?" + title: "Ndrysho emrin e përdoruesit" + confirm: "Nëse ndryshoni emrin, të gjithë citimet dhe përmendjet @emri nuk do të punojnë. A jeni absolutisht të sigurte që doni të vazhdoni?" taken: "Na vjen keq, por ky emër është i zënë." error: "Ndodhi një gabim gjatë ndryshimit të emrit." - invalid: "Pseudonimi nuk është i vlefshëm. Duhet të përmbaje vetëm shkronja ose numra" + invalid: "Emri i përdoruesit nuk është i vlefshëm. Duhet të përmbaje vetëm shkronja ose numra" change_email: - title: "Ndrysho Email" + title: "Ndrysho email" taken: "Na vjen keq, por ky email nuk është i disponueshëm." error: "Hasëm një gabim gjatë ndryshimit të adresës email. Mos vallë është në përdorim nga dikush tjetër?" success: "Ju dërguam një email tek adresa që shkruajtët. Ju ftojmë të ndiqni udhëzimet e konfirmimit." change_avatar: title: "Ndrysho fotografinë e profilit" gravatar: "Gravatar, bazur në" - gravatar_title: "Change your avatar on Gravatar's website" - refresh_gravatar_title: "Rifresko Gravatar tuaj" - letter_based: "System assigned profile picture" - uploaded_avatar: "Foto personalizuar" + gravatar_title: "Ndryshoni avatarin tuaj në faqen web të shërbimit Gravatar" + refresh_gravatar_title: "Rifreskoni Gravatarin tuaj" + letter_based: "Foto e profilit e caktuar nga sistemi" + uploaded_avatar: "Foto e personalizuar" uploaded_avatar_empty: "Shto një foto të personalizuar" - upload_title: "Ngarni foton tuaj" + upload_title: "Ngarkoni foton tuaj" upload_picture: "Ngarko Foto" - image_is_not_a_square: "Warning: we've cropped your image; width and height were not equal." - cache_notice: "You've successfully changed your profile picture but it might take some time to appear due to browser caching." + image_is_not_a_square: "Vini re: fotoja juaj është përshtatur, pasi nuk ishte katrore." + cache_notice: "Fotografia e profilit tuaj u ndryshua por paraqitja në faqe mund të vonohet, për shkak të ruajtjes në memorjen \"cache\" të shfletuesit tuaj. " change_profile_background: - title: "Sfondi Profilit" - instructions: "Sfondi profilit do të vendoset në qendër dhe do të ketë një gjerësi prej 850px." + title: "Sfondi i profilit" + instructions: "Sfondi i profilit do të vendoset në qendër dhe do të ketë një gjerësi prej 850px." change_card_background: - title: "Sfondi për Skedën Anëtarit" - instructions: "Sfondi profilit do të vendoset në qendër dhe do të ketë një gjerësi prej 590px." + title: "Sfondi për skedën e anëtarit" + instructions: "Sfondi do të vendoset në qendër dhe do të ketë një gjerësi prej 590px." email: title: "Email" - instructions: "Never shown to the public" - ok: "We will email you to confirm" - invalid: "Please enter a valid email address" - authenticated: "Your email has been authenticated by {{provider}}" + instructions: "Nuk do të shfaqet asnjëherë publikisht" + ok: "Do ju nisim emailin e konfirmimit" + invalid: "Ju lutemi të vendosni një email të vlefshëm" + authenticated: "Emaili juaj është verifikuar nga {{provider}}" frequency_immediately: "We'll email you immediately if you haven't read the thing we're emailing you about." + frequency: + one: "Do t'ju dërgojmë një email vetëm nëse nuk të kemi parë në faqe në minutën e fundit." + other: "Do t'ju dërgojmë një email vetëm nëse nuk të kemi parë në faqe në {{count}} minutat e fundit." name: - title: "Emri" - instructions: "Emri i Plotë (fakultativ)" + title: "Emri juaj" + instructions: "Emri i plotë (fakultativ)" instructions_required: "Emri i plotë" too_short: "Emri juaj është shumë i shkurtër" ok: "Emri duket në rregull" username: - title: "Pseudonimi" + title: "Emri i përdoruesit" instructions: "Unik, pa hapësira, i shkurtër" - short_instructions: "People can mention you as @{{username}}" + short_instructions: "Anëtarët e tjerë mund t'ju përmendin si @{{username}}" available: "Emri është i disponueshëm" global_match: "Email matches the registered username" - global_mismatch: "Jeni vallë regjistruar më parë. Provo {{suggestion}}?" - not_available: "Nuk është i disponueshëm. Provo {{suggestion}}?" + global_mismatch: "Jeni regjistruar më parë. Provoni {{suggestion}}?" + not_available: "Nuk është i disponueshëm. Provoni {{suggestion}}?" too_short: "Emri juaj është shumë i shkurtër" too_long: "Emri juaj është shumë i gjatë" - checking: "Duke kontrolluar disponibilitetin e pseudonimit...." - enter_email: 'Username found; enter matching email' + checking: "Duke verifikuar disponibilitetin e emrit të përdoruesit...." + enter_email: 'Emri i përdoruesit u gjet; vendosni emailin përkatës' prefilled: "Email matches this registered username" locale: title: "Gjuha e faqes" - instructions: "User interface language. It will change when you refresh the page." + instructions: "Gjuha e faqes për përdoruesin. Do tue ndryshoj pasi të rifreskoni faqen. " default: "(paracaktuar)" password_confirmation: - title: "Rishkruaj Fjalëkalimin" - last_posted: "Postimi Fundit" - last_emailed: "Emaili Fundit" + title: "Rishkruani fjalëkalimin" + last_posted: "Postimi i fundit" + last_emailed: "Emaili i fundit" last_seen: "Parë" created: "Regjistruar" log_out: "Dilni" - location: "Pozicioni" + location: "Vendndodhja" card_badge: - title: "Card Badge Anëtarit" - website: "Web Site" + title: "Karta e anëtarit" + website: "Faqja web" email_settings: "Email" like_notification_frequency: - title: "Notify when liked" + title: "Njoftimet e pëlqimeve" always: "Gjithmonë" - first_time_and_daily: "First time a post is liked and daily" - first_time: "First time a post is liked" + first_time_and_daily: "Herën e parë që një postim pëlqehet, dhe përditë " + first_time: "Herën e parë që një postim pëlqehet" never: "Asnjëherë" email_previous_replies: title: "Include previous replies at the bottom of emails" @@ -583,27 +586,36 @@ sq: always: "gjithmonë" never: "asnjëherë" email_digests: - title: "When I don't visit here, send an email digest of what's new:" + title: "Kur nuk vizitoj faqen, më dërgo një përmbledhje të të rejave me email:" every_30_minutes: "çdo 30 minuta" - every_hour: "ditore" - daily: "ditore" + every_hour: "çdo orë" + daily: "çdo ditë" every_three_days: "çdo 3 ditë" - weekly: "javore" + weekly: "çdo javë" every_two_weeks: "çdo 2 javë" + include_tl0_in_digests: "Përfshi postimet nga anëtarët e rinj të faqes në emailat përmbledhës. " + email_in_reply_to: "Përfshi një copëz të përgjigjeve ndaj postimit në email" email_direct: "Send me an email when someone quotes me, replies to my post, mentions my @username, or invites me to a topic" email_private_messages: "Send me an email when someone messages me" email_always: "Send me email notifications even when I am active on the site" other_settings: "Tjetër" categories_settings: "Kategoritë" + enable_mailing_list: + one: "A jeni të sigurtë që doni të merrni njoftim me email për çdo postim?" + other: "A jeni të sigurtë që doni të merrni njoftim me email për çdo postim?

      Kjo do të rezultojë në afërsisht {{count}} emails në ditë." new_topic_duration: - label: "Konsidero diskutim te ri kur" - not_viewed: "I haven't viewed them yet" - last_here: "created since I was here last" - auto_track_topics: "Automatically track topics I enter" + label: "Konsidero diskutimin të ri kur" + not_viewed: "Nuk i kam shikuar akoma" + last_here: "krijuar që herën e fundit që isha këtu" + after_1_day: "krijuar në ditën e djeshme" + after_2_days: "krijuar në 2 ditët e shkuara" + after_1_week: "krijuar në javën e shkuar" + after_2_weeks: "krijuar në 2 javët e shkuara" + auto_track_topics: "Ndiq automatikisht temat ku futem" auto_track_options: never: "asnjëherë" immediately: "menjëherë" - after_30_seconds: "pas 30 sekonda" + after_30_seconds: "pas 30 sekondash" after_1_minute: "pas 1 minute" after_2_minutes: "pas 2 minutash" after_3_minutes: "pas 3 minutash" @@ -613,7 +625,7 @@ sq: invited: search: "shkruaj për të kërkuar ftesat..." title: "Ftesa" - user: "Anëtarët e Ftuar" + user: "Anëtari i ftuar" sent: "Dërguar" none: "There are no pending invites to display." truncated: @@ -623,24 +635,24 @@ sq: redeemed_tab: "Redeemed" redeemed_tab_with_count: "Redeemed ({{count}})" redeemed_at: "Redeemed" - pending: "Ftesat e Pezulluara" - pending_tab: "Pending" - pending_tab_with_count: "Pending ({{count}})" - topics_entered: "Diskutimet e Para" - posts_read_count: "Postimet e Lexuara" - expired: "Kjo ftesa ka skaduar." + pending: "Ftesat në pritje" + pending_tab: "Në pritje" + pending_tab_with_count: "Në pritje ({{count}})" + topics_entered: "Temat e shikuara" + posts_read_count: "Postimet e lexuara" + expired: "Kjo ftesë ka skaduar." rescind: "Hiq" rescinded: "Ftesa u hoq" - reinvite: "Ridërgo Ftesën" + reinvite: "Ridërgo ftesën" reinvited: "Ftesa u ri-dërgua" - time_read: "Koha e Leximit" + time_read: "Koha e leximit" days_visited: "Days Visited" - account_age_days: "Account age in days" + account_age_days: "Jetëgjatësia e llogarisë (ditë)" create: "Dërgo një ftesë" - generate_link: "Kopjo lidhjen e Ftesës" + generate_link: "Kopjo lidhjen e ftesës" bulk_invite: none: "Ju nuk keni ftuar askënd deri tani. Mund të dërgoni ftesa individuale ose mund të ftoni një grup personash duke ngarkuar skedarin." - text: "Skedari për Ftesat në Grup" + text: "Skedari për ftesat në grup" uploading: "Duke ngarkuar..." success: "File uploaded successfully, you will be notified via message when the process is complete." error: "There was an error uploading '{{filename}}': {{message}}" @@ -648,67 +660,91 @@ sq: title: "Fjalëkalimi" too_short: "Fjalëkalimi është shumë i shkurër." common: "Ky fjalëkalim është shumë i përdorur." - same_as_username: "Fjalëkalimi është i njëjtë me pseudonimin." - same_as_email: "Your password is the same as your email." + same_as_username: "Fjalëkalimi është i njëjtë me emrin e përdoruesit." + same_as_email: "Fjalëkalimi është i njëjtë me adresën email." ok: "Fjalëkalimi është i pranueshëm." - instructions: "Të paktën %{count} karaktere." + instructions: "Të paktën %{count} shkronja." summary: title: "Përmbledhja" stats: "Statistikat" time_read: "koha e leximit" + topic_count: + one: "temë e krijuar" + other: "tema të krijuara" + post_count: + one: "postim i krijuar" + other: "postime të krijuara" likes_given: - one: "like given" - other: "pëlqime të dhëna" + one: " dhënë" + other: " dhënë" + likes_received: + one: " marrë" + other: " marrë" + days_visited: + one: "ditë që viziton faqen" + other: "ditë që viziton faqen" + posts_read: + one: "postim i lexuar" + other: "postime të lexuar" + bookmark_count: + one: "temë e preferuar" + other: "tema të preferuara" + top_replies: "Përgjigjet popullore" + no_replies: "Nuk ka ende përgjigje." more_replies: "Më shumë përgjigje" - top_topics: "Top Topics" - no_topics: "No topics yet." - more_topics: "More Topics" + top_topics: "Temat popullore" + no_topics: "Nuk ka ende tema." + more_topics: "Më shumë tema" top_badges: "Top Badges" no_badges: "No badges yet." more_badges: "More Badges" - associated_accounts: "Logins" + top_links: "Lidhjet Top" + no_links: "Nuk ka ende lidhje." + most_liked_by: "Më e pëlqyer nga" + no_likes: "Nuk ka ende asnjë pëlqim." + associated_accounts: "Identifikime" ip_address: - title: "Adresa IP e Fundit" + title: "Adresa IP e fundit" registration_ip_address: - title: "Adresa IP e rregjistrimit" + title: "Adresa IP e regjistrimit" avatar: - title: "Foto Profilit" - header_title: "profile, messages, bookmarks and preferences" + title: "Foto e profilit" + header_title: "profili, mesazhet, të preferuarat dhe preferencat" title: title: "Titulli" filters: - all: "Të Gjithë" + all: "Të gjitha" stream: posted_by: "Postuar nga" - sent_by: "Dërgura nga" - private_message: "mesazh" + sent_by: "Dërguar nga" + private_message: "mesazhi" the_topic: "tema" loading: "Duke ngarkuar..." errors: - prev_page: "while trying to load" + prev_page: "duku u munduar të ngarkohet" reasons: network: "Gabim në rrjet" - server: "Gabim në Server" - forbidden: "Ndalohet Hyrja" + server: "Gabim në server" + forbidden: "Ndalohet hyrja" unknown: "Gabim" not_found: "Faqja nuk u gjet" desc: network: "Ju lutemi, kontrolloni lidhjen me Internetin." - network_fixed: "Duket sikur u ktheve." - server: "Kodi Gabimit: {{status}}" - forbidden: "You're not allowed to view that." - not_found: "Oops, the application tried to load a URL that doesn't exist." - unknown: "Diçka shkoj keq." + network_fixed: "Duket sikur Interneti u kthye." + server: "Kodi i gabimit: {{status}}" + forbidden: "Nuk keni të drejtë të shikoni këtë." + not_found: "Ups, aplikimi tentoi të hapë një URL që nuk ekziston. " + unknown: "Diçka shkoi keq." buttons: - back: "Shko Mbrapa" - again: "Provoje Përsëri" - fixed: "Ngarko Faqen" + back: "Kthehu mbrapa" + again: "Provo përsëri" + fixed: "Ngarko faqen" close: "Mbyll" - assets_changed_confirm: "Faqja u azhurnuar. Rifreskojeni tani për versionin e fundit." + assets_changed_confirm: "Faqja u azhornua. Doni t'a rifreskoni tani për versionin e fundit?" logout: "Ju jeni shkëputur!" refresh: "Rifresko" read_only_mode: - enabled: "This site is in read only mode. Please continue to browse, but replying, likes, and other actions are disabled for now." + enabled: "Faqja lejon vetëm leximet per momentin. Mund të vazhdoni të shfletoni, por përgjigjet, pëlqimet dhe veprime të tjera janë të çaktivizuara përkohësisht." login_disabled: "Login is disabled while the site is in read only mode." logout_disabled: "Logout is disabled while the site is in read only mode." too_few_topics_and_posts_notice: "Let's get this discussion started! There are currently %{currentTopics} / %{requiredTopics} topics and %{currentPosts} / %{requiredPosts} posts. New visitors need some conversations to read and respond to." @@ -717,6 +753,9 @@ sq: logs_error_rate_notice: reached: "%{timestamp}: Current rate of %{rate} has reached site settings's limit of %{siteSettingRate}." exceeded: "%{timestamp}: Current rate of %{rate} has exceeded site settings's limit of %{siteSettingRate}." + rate: + one: "1 gabim/%{duration}" + other: "%{count} gabime/%{duration}" learn_more: "mëso më shumë..." year: 'vit' year_desc: 'temat e krijuara në 365 ditët e fundit' @@ -724,52 +763,52 @@ sq: month_desc: 'temat e krijuara në 30 ditët e fundit' week: 'javë' week_desc: 'temat e krijuara në 7 ditët e fundit' - day: 'dit' - first_post: Postimi parë + day: 'ditë' + first_post: Postimi i parë mute: Mute unmute: Unmute - last_post: Postimi fundit - last_reply_lowercase: përgjigja fundit + last_post: Postimi i fundit + last_reply_lowercase: përgjigja e fundit replies_lowercase: one: përgjigje other: përgjigje signup_cta: - sign_up: "Sign Up" - hide_session: "Remind me tomorrow" + sign_up: "Regjistrohu" + hide_session: "Më rikujto nesër" hide_forever: "jo faleminderit" - hidden_for_session: "OK, I'll ask you tomorrow. You can always use 'Log In' to create an account, too." - intro: "Hey there! :heart_eyes: Looks like you're enjoying the discussion, but you're not signed up for an account." - value_prop: "When you create an account, we remember exactly what you've read, so you always come right back where you left off. You also get notifications, here and via email, whenever new posts are made. And you can like posts to share the love. :heartbeat:" + hidden_for_session: "OK, do t'ju rikujtojmë nesër. Sidoqoftë, ju mund të përdorni butonin \"Identifikohu\" për të hapur një llogari. " + intro: "Njatjeta! :heart_eyes: Sikur po ju pëlqen diskutimi... po s'jeni anëtarësuar akoma në faqe. " + value_prop: "Kur krijoni një llogari në faqe, sistemi mban mend se çfarë keni lexuar, që të mund të riktheheni aty ku e latë. Ju ofrojmë gjithashtu njoftime në shfletues ose me email, sa herë që ka postime të reja. :heartbeat:" summary: - enabled_description: "You're viewing a summary of this topic: the most interesting posts as determined by the community." - description: "There are {{replyCount}} replies." - description_time: "There are {{replyCount}} replies with an estimated read time of {{readingTime}} minutes." - enable: 'Përmbidhë këtë Diskutim' - disable: 'Shfaq të gjithë Postimet' + enabled_description: "Po lexoni një përmbledhje të kësaj teme: postimet më interesante sipas vlerësimit të komunitetit." + description: "Ka {{replyCount}} përgjigje." + description_time: "Ka {{replyCount}} përgjigje, do ju duhen rreth {{readingTime}} minuta për t'i lexuar." + enable: 'Përmbidhë këtë temë' + disable: 'Shfaq të gjithë postimet' deleted_filter: - enabled_description: "This topic contains deleted posts, which have been hidden. " - disabled_description: "Deleted posts in the topic are shown." - enable: "Fsheh Postimet e Eliminuara" - disable: "Show Deleted Posts" + enabled_description: "Kjo temë përmban postime të fshira, që tani janë fshehur." + disabled_description: "Postimet e fshira në këtë temë janë të dukshme." + enable: "Fshehi postimet e fshira" + disable: "Trego postimet e fshira" private_message_info: title: "Mesazh" - invite: "Fto të tjerët..." + invite: "Fto të tjerë..." remove_allowed_user: "Do you really want to remove {{name}} from this message?" email: 'Email' - username: 'Username' - last_seen: 'Parë' + username: 'Emri i përdoruesit' + last_seen: 'Shikuar' created: 'Krijuar' created_lowercase: 'krijuar' - trust_level: 'Niveli Besimit' - search_hint: 'username, email or IP address' + trust_level: 'Niveli i besimit' + search_hint: 'emri i anëtarit, email ose adresë IP' create_account: - title: "Krijo një Llogari të Re" - failed: "Something went wrong, perhaps this email is already registered, try the forgot password link" + title: "Regjistrohuni" + failed: "Diçka nuk funksionoi siç duhet, mbase kjo adresë emaili është e regjistruar në faqe. Provoni butonin e fjalëkalimit të humbur. " forgot_password: - title: "Rivendos Fjalëkalimin" + title: "Rivendos fjalëkalimin" action: "Kam harruar fjalëkalimin" invite: "Enter your username or email address, and we'll send you a password reset email." - reset: "Rivendos Fjalëkalimin" + reset: "Rivendos fjalëkalimin" complete_username: "If an account matches the username %{username}, you should receive an email with instructions on how to reset your password shortly." complete_email: "If an account matches %{email}, you should receive an email with instructions on how to reset your password shortly." complete_username_found: "We found an account that matches the username %{username}, you should receive an email with instructions on how to reset your password shortly." @@ -778,28 +817,28 @@ sq: complete_email_not_found: "No account matches %{email}" login: title: "Identifikohu" - username: "User" + username: "Anëtari" password: "Fjalëkalimi" - email_placeholder: "email ose emri" + email_placeholder: "email ose emri i përdoruesit" caps_lock_warning: "Caps Lock është aktive" error: "Gabim i panjohur" - rate_limit: "Please wait before trying to log in again." - blank_username_or_password: "Ju lutem, shkruani adresën email ose pseudonim dhe fjalëkalimin." - reset_password: 'Rivendos Fjalëkalimin' - logging_in: "Duke u Identifikuar..." + rate_limit: "Ju lutemi të prisni para se të provoni të identifikoheni përsëri. " + blank_username_or_password: "Ju lutem, shkruani adresën email ose emrin e përdoruesit dhe fjalëkalimin." + reset_password: 'Rivendos fjalëkalimin' + logging_in: "Duke u identifikuar..." or: "Ose" - authenticating: "Duke u Autorizuar..." - awaiting_confirmation: "Your account is awaiting activation, use the forgot password link to issue another activation email." - awaiting_approval: "Your account has not been approved by a staff member yet. You will be sent an email when it is approved." + authenticating: "Duke u autorizuar..." + awaiting_confirmation: "Llogaria juaj është në pritje të aktivizimit, përdorni butonin e fjalëkalimit të humbur që të merrni një email të ri me kodin e aktivizimit." + awaiting_approval: "Llogaria juaj nuk është aprovuar ende nga një admin. Do t'ju dërgojmë një email kur të aprovohet. " requires_invite: "Sorry, access to this forum is by invite only." not_activated: "You can't log in yet. We previously sent an activation email to you at {{sentTo}}. Please follow the instructions in that email to activate your account." not_allowed_from_ip_address: "You can't login from that IP address." admin_not_allowed_from_ip_address: "You can't log in as admin from that IP address." resend_activation_email: "Click here to send the activation email again." sent_activation_email_again: "We sent another activation email to you at {{currentEmail}}. It might take a few minutes for it to arrive; be sure to check your spam folder." - to_continue: "Ju lutem, Identifikohuni" + to_continue: "Ju lutemi, identifikohuni" preferences: "You need to be logged in to change your user preferences." - forgot: "I don't recall my account details" + forgot: "Nuk i mbaj mend detajet e llogarisë" google: title: "me Google" message: "Authenticating with Google (make sure pop up blockers are not enabled)" @@ -834,60 +873,60 @@ sq: more_emoji: "më shumë..." options: "Opsione" whisper: "pëshpëritje" - add_warning: "This is an official warning." + add_warning: "Ky është një paralajmërim zyrtar." toggle_whisper: "Hiq pëshpëritjet" - posting_not_on_topic: "Which topic do you want to reply to?" + posting_not_on_topic: "Cilës temë doni t'i përgjigjeni?" saving_draft_tip: "duke e ruajtur..." saved_draft_tip: "ruajtur" - saved_local_draft_tip: "saved locally" + saved_local_draft_tip: "ruajtur lokalisht" similar_topics: "Tema juaj është e ngjashme me..." drafts_offline: "drafts offline" group_mentioned: "By using {{group}}, you are about to notify {{count}} people." error: title_missing: "Titulli është i nevojshëm" - title_too_short: "Title must be at least {{min}} characters" + title_too_short: "Titulli duhet të ketë të paktën {{min} shkronja." title_too_long: "Title can't be more than {{max}} characters" post_missing: "Postimi s'mund të jetë bosh" - post_length: "Post must be at least {{min}} characters" - try_like: 'Have you tried the button?' - category_missing: "You must choose a category" - save_edit: "Save Edit" - reply_original: "Reply on Original Topic" - reply_here: "Përgjigju Këtu" + post_length: "Postimi duhet të ketë të paktën {{min} shkronja." + try_like: 'A e keni provuar butonin ?' + category_missing: "Duhet të zgjidhni një kategori" + save_edit: "Ruani modifikimet" + reply_original: "Përgjigjuni temës origjinale" + reply_here: "Përgjigju këtu" reply: "Përgjigju" cancel: "Anulo" - create_topic: "Fillo Diskutim" + create_topic: "Krijo temën" create_pm: "Mesazh" title: "Ose shtyp Ctrl+Enter" - users_placeholder: "Shto Anëtar" - title_placeholder: "What is this discussion about in one brief sentence?" + users_placeholder: "Shto një anëtar" + title_placeholder: "Në një fjali të shkurtër shpjegoni për çfarë bën fjalë tema?" edit_reason_placeholder: "pse jeni duke e redaktuar?" - show_edit_reason: "(arsye redaktimit)" - reply_placeholder: "Type here. Use Markdown, BBCode, or HTML to format. Drag or paste images." - view_new_post: "Shikoni postimin tuaj te ri." + show_edit_reason: "(vendosni arsyen e redaktimit)" + reply_placeholder: "Shkruani këtu. Mund të përdorni Markdown, BBCode, ose kod HTML për formatimin. Tërhiqni ose ngjisni imazhet. " + view_new_post: "Shikoni postimin tuaj të ri." saving: "Duke e ruajtur" - saved: "U Ruajt!" - saved_draft: "Post draft in progress. Select to resume." - uploading: "Duke nga ngarkuar..." - show_preview: 'show preview »' - hide_preview: '« hide preview' - quote_post_title: "Quote whole post" + saved: "U ruajt!" + saved_draft: "Keni një postim në shkrim e sipër. Kikoni për të vazhduar. " + uploading: "Duke ngarkuar..." + show_preview: 'tregoni panelin e parashikimit »' + hide_preview: '« fshiheni panelin e parashikimit' + quote_post_title: "Citoni të gjithë postimin" bold_title: "Theksuar" - bold_text: "tekst i theksuar" - italic_title: "Emphasis" - italic_text: "emphasized text" + bold_text: "tekst i trashë" + italic_title: "Theksuar" + italic_text: "tekst i theksuar" link_title: "Lidhje" link_description: "shkruaj përshkrimin e lidhjes këtu" - link_dialog_title: "Vendos Lidhje" - link_optional_text: "titull opsional" - link_url_placeholder: "http://example.com" + link_dialog_title: "Vendosni një lidhje" + link_optional_text: "titull fakultativ" + link_url_placeholder: "http://shembull.com" quote_title: "Citim" quote_text: "Blockquote" code_title: "Preformatted text" code_text: "indent preformatted text by 4 spaces" upload_title: "Ngarko" upload_description: "enter upload description here" - olist_title: "List e Numëruar" + olist_title: "Listë e numëruar" ulist_title: "Bulleted List" list_item: "List item" heading_title: "Heading" @@ -898,7 +937,7 @@ sq: modal_ok: "OK" modal_cancel: "Anulo" cant_send_pm: "Sorry, you can't send a message to %{username}." - admin_options_title: "Optional staff settings for this topic" + admin_options_title: "Rregullime opsionale të stafit për këtë temë" auto_close: label: "Auto-close topic time:" error: "Please enter a valid value." @@ -912,18 +951,18 @@ sq: title: "notifications of @name mentions, replies to your posts and topics, messages, etc" none: "Unable to load notifications at this time." more: "shiko njoftimet e kaluara" - total_flagged: "totali postimeve të sinjalizuar" + total_flagged: "totali i postimeve të sinjalizuar" mentioned: "

      {{username}} {{description}}

      " group_mentioned: "

      {{username}} {{description}}

      " quoted: "

      {{username}} {{description}}

      " replied: "

      {{username}} {{description}}

      " posted: "

      {{username}} {{description}}

      " edited: "

      {{username}} {{description}}

      " - liked: "

      {{username}} {{description}}

      " - liked_2: "

      {{username}}, {{username2}} {{description}}

      " + liked: "

      {{username}} {{description}}

      " + liked_2: "

      {{username}}, {{username2}} {{description}}

      " liked_many: - one: "

      {{username}}, {{username2}} dhe 1 tjetër {{description}}

      " - other: "

      {{username}}, {{username2}} dhe {{count}} others {{description}}

      " + one: "

      {{username}}, {{username2}} dhe 1 tjetër {{description}}

      " + other: "

      {{username}}, {{username2}} dhe {{count}} të tjerë {{description}}

      " private_message: "

      {{username}} {{description}}

      " invited_to_private_message: "

      {{username}} {{description}}

      " invited_to_topic: "

      {{username}} {{description}}

      " @@ -935,12 +974,12 @@ sq: one: "

      {{count}} message in your {{group_name}} inbox

      " other: "

      {{count}} mesazhe në {{group_name}} inbox

      " alt: - mentioned: "Cituar nga" + mentioned: "Përmendur nga" quoted: "Cituar nga" replied: "Përgjigjur" posted: "Postim nga" edited: "Redakto postimin tuaj" - liked: "Liked your post" + liked: "Pëlqeu postimin tuaj" private_message: "Private message from" invited_to_private_message: "Invited to a private message from" invited_to_topic: "Invited to a topic from" @@ -959,16 +998,16 @@ sq: linked: '{{username}} linked to your post from "{{topic}}" - {{site_title}}' upload_selector: title: "Shto një imazh" - title_with_attachments: "Shto një imazh ose një skedarë" - from_my_computer: "Nga çdo paisje" - from_the_web: "Nga web" + title_with_attachments: "Shto një imazh ose një skedar" + from_my_computer: "Nga kompiuteri im" + from_the_web: "Nga Interneti" remote_tip: "lidhje tek imazhi" remote_tip_with_attachments: "link to image or file {{authorized_extensions}}" local_tip: "select images from your device" local_tip_with_attachments: "select images or files from your device {{authorized_extensions}}" hint: "(you can also drag & drop into the editor to upload them)" hint_for_supported_browsers: "you can also drag and drop or paste images into the editor" - uploading: "Duke ngarkaur" + uploading: "Duke ngarkuar" select_file: "Select File" image_link: "link your image will point to" search: @@ -976,11 +1015,14 @@ sq: relevance: "Relevance" latest_post: "Latest Post" most_viewed: "Most Viewed" - most_liked: "Most Liked" + most_liked: "Më të pëlqyer" select_all: "Select All" clear_all: "Clear All" + result_count: + one: "1 rezultat për \"{{term}}\"" + other: "{{count}} rezultate për \"{{term}}\"" title: "search topics, posts, users, or categories" - no_results: "Nuk i gjet asnjë rezultat." + no_results: "Nuk u gjet asnjë rezultat." no_more_results: "No more results found." search_help: Search help searching: "Duke kërkuar..." @@ -1008,46 +1050,49 @@ sq: dismiss_new: "Dismiss New" toggle: "toggle bulk selection of topics" actions: "Bulk Actions" - change_category: "Ndrysho Kategori" - close_topics: "Myll Diskutim" + change_category: "Ndrysho kategori" + close_topics: "Mbyll temat" archive_topics: "Archive Topics" - notification_level: "Ndrysho Nivelin e Njoftimeve" + notification_level: "Ndrysho nivelin e njoftimeve" choose_new_category: "Choose the new category for the topics:" selected: one: "You have selected 1 topic." other: "You have selected {{count}} topics." + change_tags: "Ndrysho etiketat" + choose_new_tags: "Zgjidh etiketa të reja për këto tema:" + changed_tags: "Etiketat e temave u ndryshuan. " none: unread: "Nuk keni tema të palexuara." new: "Nuk ka tema të reja." read: "Nuk keni lexuar asnjë temë deri tani." posted: "Nuk keni shkruajtur tek asnjë temë deri tani." - latest: "Nuk ka tema të fundit. Hm sa keq." - hot: "Nuk tema të populluara." - bookmarks: "You have no bookmarked topics yet." - category: "Nuk ka {{category}} tema." - top: "Nuk ka tema të populluara." + latest: "Nuk ka tema të fundit. Oh sa keq." + hot: "Nuk ka tema të nxehta." + bookmarks: "Nuk keni ende tema të preferuara. " + category: "Nuk ka tema në: {{category}}." + top: "Nuk ka tema popullore." search: "There are no search results." educate: - new: '

      Your new topics appear here.

      By default, topics are considered new and will show a new indicator if they were created in the last 2 days.

      Visit your preferences to change this.

      ' + new: '

      Temat e reja shfaqen këtu.

      Automatikisht, temat cilësohen si të reja dhe kanë një shënim i ri nëse janë krijuar gjatë dy ditëve të fundit.

      Vizitoni preferencat për t''a ndryshuar këtë parametër.

      ' unread: '

      Your unread topics appear here.

      By default, topics are considered unread and will show unread counts 1 if you:

      • Created the topic
      • Replied to the topic
      • Read the topic for more than 4 minutes

      Or if you have explicitly set the topic to Tracked or Watched via the notification control at the bottom of each topic.

      Visit your preferences to change this.

      ' bottom: - latest: "Nuk ka më tema së fundmi." - hot: "Nuk ka më tema të populluara." + latest: "Nuk ka më tema të reja." + hot: "Nuk ka më tema të nxehta." posted: "Nuk ka më tema të publikuara." - read: "Nuk ka më tema për të lexuar." + read: "Nuk ka më tema të lexuara." new: "Nuk ka më tema të reja." unread: "Nuk ka më tema të palexuara." category: "Nuk ka me tema nga {{category}}." - top: "Nuk ka më tema të populluara" - bookmarks: "There are no more bookmarked topics." + top: "Nuk ka më tema popullore." + bookmarks: "Nuk ka më tema të preferuara." search: "There are no more search results." topic: unsubscribe: - stop_notifications: "You will now receive less notifications for {{title}}" + stop_notifications: "Tani ju do të merrni më pak njoftime për {{title}}" change_notification_state: "Your current notification state is " filter_to: "{{post_count}} posts in topic" - create: 'Temë e Re' - create_long: 'Fillo një Diskutim të Ri' + create: 'Temë e re' + create_long: 'Hap një temë të re' private_message: 'Start a message' archive_message: help: 'Move message to your archive' @@ -1055,7 +1100,7 @@ sq: move_to_inbox: title: 'Move to Inbox' help: 'Move message back to Inbox' - list: 'Tema' + list: 'Temat' new: 'temë e re' unread: 'unread' new_topics: @@ -1064,7 +1109,7 @@ sq: unread_topics: one: '1 unread topic' other: '{{count}} unread topics' - title: 'Temë' + title: 'Tema' invalid_access: title: "Tema është private" description: "Sorry, you don't have access to that topic!" @@ -1085,18 +1130,18 @@ sq: one: "there is 1 new post in this topic since you last read it" other: "there are {{count}} new posts in this topic since you last read it" likes: - one: "there is 1 like in this topic" - other: "there are {{count}} likes in this topic" - back_to_list: "Kthehu tek Lista e Temave" - options: "Opsionet e Temës" + one: "ka 1 pëlqim në këtë temë" + other: "ka {{count}} pëlqime në këtë temë" + back_to_list: "Kthehu tek lista e temave" + options: "Opsionet e temës" show_links: "show links within this topic" toggle_information: "toggle topic details" - read_more_in_category: "Dëshironi të lexoni të tjera? Shfleto temat në {{catLink}} ose {{latestLink}}." - read_more: "Dëshironi të lexoni të tjera? {{catLink}} ose {{latestLink}}." + read_more_in_category: "Dëshironi të lexoni më shumë? Shfleto temat në {{catLink}} ose {{latestLink}}." + read_more: "Dëshironi të lexoni më shumë? {{catLink}} ose {{latestLink}}." read_more_MF: "There { UNREAD, plural, =0 {} one { is 1 unread } other { are # unread } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} 1 new topic} other { {BOTH, select, true{and } false {are } other{}} # new topics} } remaining, or {CATEGORY, select, true {browse other topics in {catLink}} false {{latestLink}} other {}}" - browse_all_categories: Browse all categories - view_latest_topics: shiko temat e fundit - suggest_create_topic: Pse nuk filloni një diskutim? + browse_all_categories: Shfleto kategoritë + view_latest_topics: shiko temat më të fundit + suggest_create_topic: Pse nuk hapni një temë të re? jump_reply_up: jump to earlier reply jump_reply_down: jump to later reply deleted: "The topic has been deleted" @@ -1107,18 +1152,18 @@ sq: auto_close_remove: "Don't Auto-Close This Topic" auto_close_immediate: "The last post in the topic is already %{hours} hours old, so the topic will be closed immediately." progress: - title: progresi temës + title: progresi i temës go_top: "sipër" go_bottom: "poshtë" go: "shko" jump_bottom: "jump to last post" jump_bottom_with_number: "jump to post %{post_number}" - total: totali postimeve + total: totali i postimeve current: postimi aktual - position: "tema %{current} e %{total}" + position: "tema %{current} nga %{total}" notifications: reasons: - '3_6': 'You will receive notifications because you are watching this category.' + '3_6': 'Ju do të merrni njoftime sepse jeni duke vëzhguar këtë kategori. ' '3_5': 'You will receive notifications because you started watching this topic automatically.' '3_2': 'You will receive notifications because you are watching this topic.' '3_1': 'You will receive notifications because you created this topic.' @@ -1126,15 +1171,15 @@ sq: '2_8': 'You will receive notifications because you are tracking this category.' '2_4': 'You will receive notifications because you posted a reply to this topic.' '2_2': 'You will receive notifications because you are tracking this topic.' - '2': 'You will receive notifications because you read this topic.' - '1_2': 'You will be notified if someone mentions your @name or replies to you.' - '1': 'You will be notified if someone mentions your @name or replies to you.' + '2': 'Ju do të merrni njoftime sepse e keni lexuar këtë temë.' + '1_2': 'Ju do të njoftoheni nëse dikush përmend @emrin tuaj ose nëse dikush ju përgjigjet. ' + '1': 'Ju do të njoftoheni nëse dikush përmend @emrin tuaj ose nëse dikush ju përgjigjet. ' '0_7': 'You are ignoring all notifications in this category.' '0_2': 'You are ignoring all notifications on this topic.' '0': 'You are ignoring all notifications on this topic.' watching_pm: title: "Watching" - description: "You will be notified of every new reply in this message, and a count of new replies will be shown." + description: "Ju do të njoftoheni për çdo përgjigje të re në këtë mesazh, dhe numri i përgjigjeve të reja do të shfaqet. " watching: title: "Në vëzhgim" description: "You will be notified of every new reply in this topic, and a count of new replies will be shown." @@ -1146,21 +1191,21 @@ sq: description: "A count of new replies will be shown for this topic. You will be notified if someone mentions your @name or replies to you. " regular: title: "Normal" - description: "You will be notified if someone mentions your @name or replies to you." + description: "Ju do të njoftoheni nëse dikush përmend @emrin tuaj ose nëse dikush ju përgjigjet. " regular_pm: title: "Normal" - description: "You will be notified if someone mentions your @name or replies to you." + description: "Ju do të njoftoheni nëse dikush përmend @emrin tuaj ose nëse dikush ju përgjigjet. " muted_pm: title: "Muted" - description: "You will never be notified of anything about this message." + description: "Ju nuk do të njoftoheni kurrë mbi këtë mesazh. " muted: title: "Muted" - description: "You will never be notified of anything about this topic, and it will not appear in latest." + description: "Ju nuk do të njoftoheni për asgjë mbi këtë temë, dhe tema nuk do të shfaqet në listën e temave më të fundit. " actions: recover: "Un-Delete Topic" - delete: "Fshi Diskutimin" - open: "Fillo Diskutim" - close: "Mbyll Diskutimin" + delete: "Fshi temën" + open: "Hap temën" + close: "Mbyll temën" multi_select: "Select Posts…" auto_close: "Auto Close…" pin: "Pin Topic…" @@ -1178,7 +1223,7 @@ sq: remove_banner: "Remove Banner Topic" reply: title: 'Përgjigju' - help: 'shkruaj një përgjigje tek ky diskutim' + help: 'shkruaj një përgjigje tek kjo temë' clear_pin: title: "Clear pin" help: "Clear the pinned status of this topic so it no longer appears at the top of your topic list" @@ -1223,25 +1268,25 @@ sq: controls: "Topic Controls" invite_reply: title: 'Ftesa' - username_placeholder: "username" - action: 'Dërgo Ftesa' + username_placeholder: "emri i përdoruesit" + action: 'Dërgo një ftesë' help: 'invite others to this topic via email or notifications' to_forum: "We'll send a brief email allowing your friend to immediately join by clicking a link, no login required." - sso_enabled: "Enter the username of the person you'd like to invite to this topic." - to_topic_blank: "Enter the username or email address of the person you'd like to invite to this topic." + sso_enabled: "Vendosni emrin e përdoruesit që dëshironi të ftoni në këtë temë" + to_topic_blank: "Vendosni emrin e përdoruesit ose adresën email të personit që dëshironi të ftoni në këtë temë" to_topic_email: "You've entered an email address. We'll email an invitation that allows your friend to immediately reply to this topic." to_topic_username: "You've entered a username. We'll send a notification with a link inviting them to this topic." - to_username: "Enter the username of the person you'd like to invite. We'll send a notification with a link inviting them to this topic." - email_placeholder: 'name@example.com' + to_username: "Vendosni emrin e përdoruesit që dëshironi të ftoni. Sistemi do i dërgojë një njoftim me një lidhje drejt kësaj teme. " + email_placeholder: 'emri@adresa.com' success_email: "We mailed out an invitation to {{emailOrUsername}}. We'll notify you when the invitation is redeemed. Check the invitations tab on your user page to keep track of your invites." success_username: "We've invited that user to participate in this topic." error: "Sorry, we couldn't invite that person. Perhaps they have already been invited? (Invites are rate limited)" - login_reply: 'Përgjigju tek Diskutimi' + login_reply: 'Identifikohu për t''u përgjigjur' filters: n_posts: one: "1 postim" other: "{{count}} postime" - cancel: "Hiq filtërin" + cancel: "Hiq filtrin" split_topic: title: "Move to New Topic" action: "move to new topic" @@ -1277,9 +1322,9 @@ sq: select: 'zgjidh' selected: 'selected ({{count}})' select_replies: 'select +replies' - delete: fshij të zgjedhurin + delete: fshij të përzgjedhurat cancel: anulo përzgjedhjen - select_all: zgjidh të gjitha + select_all: përzgjidhi të gjitha deselect_all: deselect all description: one: You have selected 1 post. @@ -1291,38 +1336,40 @@ sq: edit: "Editing {{link}} {{replyAvatar}} {{username}}" edit_reason: "Arsyeja:" post_number: "postimi {{number}}" - last_edited_on: "redaktimi fundit u krye me" - reply_as_new_topic: "Përgjigju si Temë e ndërlidhur" - continue_discussion: "Continuing the discussion from {{postLink}}:" + last_edited_on: "redaktimi i fundit u krye më" + reply_as_new_topic: "Përgjigju në një temë të re të ndërlidhur" + continue_discussion: "Vazhdim i diskutimit nga tema {{postLink}}:" follow_quote: "go to the quoted post" - show_full: "Shfaq Postimin e Plotë" + show_full: "Shfaq postimin e plotë" show_hidden: 'Shfaq materialin e fshehur.' deleted_by_author: one: "(post withdrawn by author, will be automatically deleted in %{count} hour unless flagged)" other: "(post withdrawn by author, will be automatically deleted in %{count} hours unless flagged)" expand_collapse: "expand/collapse" gap: - one: "view 1 hidden reply" - other: "view {{count}} hidden replies" + one: "shiko 1 përgjigje të fshehur" + other: "shiko {{count}} përgjigje të fshehura" more_links: "{{count}} më shumë..." unread: "Postimi është i palexuar" has_replies: one: "{{count}} Përgjigje" - other: "{{count}} Përgjigje" + other: "{{count}} përgjigje" has_likes: one: "{{count}} Pëlqim" - other: "{{count}} Pëlqime" + other: "{{count}} pëlqime" has_likes_title: - one: "1 person liked this post" - other: "{{count}} people liked this post" - has_likes_title_only_you: "you liked this post" + one: "1 person pëlqeu këtë postim" + other: "{{count}} vetë pëlqyen këtë postim" + has_likes_title_only_you: "ju pëlqeni këtë postim" + has_likes_title_you: + one: "ju dhe 1 person tjetër pëlqyet këtë postim" + other: "ju dhe {{count}} të tjerë pëlqyen këtë postim" errors: create: "Na vjen keq, por ndodhi një gabim gjatë hapjes së temës. Provojeni përsëri." edit: "Na vjen keq, ndodhi një gabim gjatë redaktimit të temës. Provojeni përsëri." upload: "Sorry, there was an error uploading that file. Please try again." - file_too_large: "Upps, skedari qe po ngarkoni është shume i madh (vlera maksimale {{max_size_kb}}kb)" - too_many_uploads: "Na vjen keq, por ju mund te ngarkoni vetëm një skedar." - too_many_dragged_and_dropped_files: "Sorry, you can only drag & drop up to 10 files at a time." + too_many_uploads: "Na vjen keq, por duhet t'i ngarkoni skedarët një nga një." + too_many_dragged_and_dropped_files: "Na vjen keq, por ju lejohet të ngarkoni vetëm 10 skedarë njëkohësisht." upload_not_authorized: "Sorry, the file you are trying to upload is not authorized (authorized extension: {{authorized_extensions}})." image_upload_not_allowed_for_new_user: "Sorry, new users can not upload images." attachment_upload_not_allowed_for_new_user: "Sorry, new users can not upload attachments." @@ -1332,23 +1379,24 @@ sq: no_value: "Jo, mbaji" yes_value: "Po, braktise" via_email: "this post arrived via email" + via_auto_generated_email: "ky posit u krijua nga një email automatik" whisper: "this post is a private whisper for moderators" wiki: about: "this post is a wiki" archetypes: - save: 'Ruaj Opsionet' - few_likes_left: "Thanks for sharing the love! You only have a few likes left for today." + save: 'Ruaj opsionet' + few_likes_left: "Ju falenderojmë! Ju kanë ngelur edhe disa pëlqime për sot." controls: reply: "shkruaj një përgjigje tek ky diskutim" - like: "pëlqejë postimin" - has_liked: "Ju pëlqeni këtë diskutim" + like: "pëlqeje postimin" + has_liked: "ju pëlqeni këtë postim" undo_like: "anulo pëlqimin" edit: "redakto këtë postim" edit_anonymous: "Sorry, but you need to be logged in to edit this post." flag: "privately flag this post for attention or send a private notification about it" - delete: "fshij këtë postim" - undelete: "rikthe fshirjen e postimit" - share: "shpërnda një link tek ky postim" + delete: "fshini këtë postim" + undelete: "anuloni fshirjen e postimit" + share: "shpërndani një link tek ky postim" more: "Më shumë" delete_replies: confirm: @@ -1361,11 +1409,11 @@ sq: unwiki: "Hiqe Wiki" convert_to_moderator: "Add Staff Color" revert_to_regular: "Remove Staff Color" - rebake: "Rebuild HTML" + rebake: "Rindërtoni HTML" unhide: "Unhide" change_owner: "Change Ownership" actions: - flag: 'Shëno' + flag: 'Sinjalizoni' defer_flags: one: "Defer flag" other: "Defer flags" @@ -1374,14 +1422,13 @@ sq: spam: "Flag it too" inappropriate: "Flag it too" custom_flag: "Flag it too" - bookmark: "Bookmark it too" like: "E pëlqejnë" vote: "Vote for it too" undo: off_topic: "Undo flag" spam: "Undo flag" inappropriate: "Undo flag" - bookmark: "Undo bookmark" + bookmark: "Hiqe nga të preferuarat" like: "Anulo pëlqimin" vote: "Rikthe votën" people: @@ -1391,7 +1438,7 @@ sq: notify_moderators: "notified moderators" notify_user: "sent a message" bookmark: "bookmarked this" - like: "liked this" + like: "pëlqyen këtë" vote: "voted for this" by_you: off_topic: "You flagged this as off-topic" @@ -1400,7 +1447,7 @@ sq: notify_moderators: "You flagged this for moderation" notify_user: "You sent a message to this user" bookmark: "You bookmarked this post" - like: "Ju e pëlqeni këtë" + like: "Ju e pëlqyet këtë" vote: "You voted for this post" by_you_and_others: off_topic: @@ -1422,8 +1469,8 @@ sq: one: "You and 1 other bookmarked this post" other: "You and {{count}} other people bookmarked this post" like: - one: "You and 1 other liked this" - other: "You and {{count}} other people liked this" + one: "Ju dhe 1 person tjetër pëlqyet këtë " + other: "Ju dhe {{count}} të tjerë pëlqyen këtë postim" vote: one: "You and 1 other voted for this post" other: "You and {{count}} other people voted for this post" @@ -1447,8 +1494,8 @@ sq: one: "1 person bookmarked this post" other: "{{count}} people bookmarked this post" like: - one: "1 person liked this" - other: "{{count}} people liked this" + one: "1 person pëlqeu këtë postim" + other: "{{count}} vetë pëlqyen këtë postim" vote: one: "1 person voted for this post" other: "{{count}} people voted for this post" @@ -1479,7 +1526,7 @@ sq: category: can: 'can… ' none: '(pa kategori)' - all: 'Gjitha kategoritë' + all: 'Të gjitha kategoritë' choose: 'Select a category…' edit: 'redakto' edit_long: "Redakto" @@ -1487,15 +1534,15 @@ sq: general: 'I përgjithshëm' settings: 'Rregullimet' topic_template: "Topic Template" - delete: 'Fshi Kategori' - create: 'Kategori e Re' + delete: 'Fshini kategorinë' + create: 'Kategori e re' create_long: 'Create a new category' - save: 'Ruaj Kategori' + save: 'Ruaj kategorinë' slug: 'Category Slug' slug_placeholder: '(Optional) dashed-words for url' creation_error: There has been an error during the creation of the category. save_error: There was an error saving the category. - name: "Emri Kategorisë" + name: "Emri i kategorisë" description: "Përshkrimi" topic: "category topic" logo: "Category Logo Image" @@ -1507,13 +1554,13 @@ sq: color_placeholder: "Çdo ngjyrë web" delete_confirm: "Are you sure you want to delete this category?" delete_error: "There was an error deleting the category." - list: "Shfaq Kategoritë" + list: "Shfaq kategoritë" no_description: "Please add a description for this category." - change_in_category_topic: "Redakto Përshkrimin" + change_in_category_topic: "Redakto përshkrimin" already_used: 'This color has been used by another category' security: "Siguria" special_warning: "Warning: This category is a pre-seeded category and the security settings cannot be edited. If you do not wish to use this category, delete it instead of repurposing it." - images: "Imazhe" + images: "Imazhet" auto_close_label: "Auto-close topics after:" auto_close_units: "orë" email_in: "Custom incoming email address:" @@ -1522,8 +1569,8 @@ sq: email_in_disabled_click: 'enable the "email in" setting.' suppress_from_homepage: "Suppress this category from the homepage." allow_badges_label: "Allow badges to be awarded in this category" - edit_permissions: "Ndrysho autorizimin" - add_permission: "Shto autorizim" + edit_permissions: "Ndryshoni autorizimet" + add_permission: "Shtoni autorizim" this_year: "këtë vit" position: "pozicion" default_position: "Default Position" @@ -1539,7 +1586,7 @@ sq: description: "You will automatically track all new topics in these categories. You will be notified if someone mentions your @name or replies to you, and a count of new replies will be shown." regular: title: "Normal" - description: "You will be notified if someone mentions your @name or replies to you." + description: "Ju do të njoftoheni nëse dikush përmend @emrin tuaj ose nëse dikush ju përgjigjet. " muted: title: "Muted" description: "You will never be notified of anything about new topics in these categories, and they will not appear in latest." @@ -1548,6 +1595,7 @@ sq: action: 'Flag Post' take_action: "Take Action" notify_action: 'Mesazh' + official_warning: 'Paralajmërim zyrtar' delete_spammer: "Elimino Spammer" delete_confirm: "You are about to delete %{posts} posts and %{topics} topics from this user, remove their account, block signups from their IP address %{ip_address}, and add their email address %{email} to a permanent block list. Are you sure this user is really a spammer?" yes_delete_spammer: "Po, Elimino Spammer" @@ -1622,12 +1670,12 @@ sq: likes_lowercase: one: "like" other: "pëlqime" - likes_long: "there are {{number}} likes in this topic" + likes_long: "ka {{number}} pëlqime në këtë temë" users: "Anëtarët" users_lowercase: one: "anëtar" other: "anëtarët" - category_title: "Kategori" + category_title: "Kategoria" history: "Historia" changed_by: "nga {{author}}" raw_email: @@ -1638,38 +1686,57 @@ sq: with_topics: "%{filter} topics" with_category: "%{filter} %{category} topics" latest: - title: "Latest" + title: "Më të fundit" + title_with_count: + one: "Më të fundit (1) " + other: "Më të fundit ({{count}}) " help: "temat me postime të fundit" hot: - title: "Kryesoret" + title: "Të nxehta" help: "a selection of the hottest topics" read: title: "Lexo" - help: "topics you've read, in the order that you last read them" + help: "temat që keni lexuar, radhitur sipas datës më të fundit të leximit" search: title: "Kërko" - help: "search all topics" + help: "kërko të gjitha temat" categories: title: "Kategoritë" - title_in: "Category - {{categoryName}}" - help: "all topics grouped by category" + title_in: "Kategoria - {{categoryName}}" + help: "të gjitha temat të grupuara sipas kategorisë" unread: - title: "Palexuar " + title: "Të palexuara" + title_with_count: + one: "Të palexuara (1)" + other: "Të palexuara ({{count}})" help: "topics you are currently watching or tracking with unread posts" + lower_title_with_count: + one: "1 e palexuar" + other: "{{count}} të palexuara" new: + lower_title_with_count: + one: "1 e re" + other: "{{count}} të reja" lower_title: "e re" - title: "I Ri" + title: "Të reja" + title_with_count: + one: "Të reja (1)" + other: "Të reja ({{count}})" help: "topics created in the last few days" posted: title: "Postimet e Mia" help: "topics you have posted in" bookmarks: - title: "Bookmarks" - help: "topics you have bookmarked" + title: "Të preferuarat" + help: "tema që keni preferuar" category: + title: "{{categoryName}}" + title_with_count: + one: "{{categoryName}} (1)" + other: "{{categoryName}} ({{count}})" help: "latest topics in the {{categoryName}} category" top: - title: "Kryesoret" + title: "Top" help: "the most active topics in the last year, month, week or day" all: title: "Gjithë Kohës" @@ -1690,7 +1757,7 @@ sq: this_week: "javë" today: "Sot" other_periods: "see top" - browser_update: 'Unfortunately, your browser is too old to work on this site. Please upgrade your browser.' + browser_update: 'Fatkeqësisht, shfletuesi juaj është shumë i vjetër për këtë faqe. Ju lutemi, azhornoni shfletuesin.' permission_types: full: "Krijo / Përgjigju / Shiko" create_post: "Përgjigju / Shiko" @@ -1701,7 +1768,7 @@ sq: title: 'Administrator' moderator: 'Moderator' dashboard: - title: "Paneli Kontrollit" + title: "Paneli i kontrollit" last_updated: "Dashboard last updated:" version: "Versioni" up_to_date: "Jeni të azhurnuar!" @@ -1710,7 +1777,7 @@ sq: please_upgrade: "Ju lutem, azhornoje!" no_check_performed: "A check for updates has not been performed. Ensure sidekiq is running." stale_data: "A check for updates has not been performed lately. Ensure sidekiq is running." - version_check_pending: "Looks like you upgraded recently. Fantastic!" + version_check_pending: "Me sa shohim keni rinovuar faqen se fundmi. Fantastike!" installed_version: "Instaluar" latest_version: "Të fundit" problems_found: "Some problems have been found with your installation of Discourse:" @@ -1742,7 +1809,7 @@ sq: 30_days_ago: "30 Ditë më parë" all: "Të Gjithë" view_table: "tabelë" - view_chart: "bar chart" + view_graph: "grafik" refresh_report: "Refresh Report" start_date: "Start Date" end_date: "End Date" @@ -2024,7 +2091,7 @@ sq: description: 'Used to indicate an action was successful.' love: name: 'love' - description: "The like button's color." + description: "Ngjyra e butonit të pëlqimeve." email: title: "Emails" settings: "Rregullimet" @@ -2059,6 +2126,7 @@ sq: cc_addresses: "Cc" subject: "Subject" error: "Error" + none: "Nuk u gieten emaila hyrës." modal: title: "Incoming Email Details" error: "Error" @@ -2132,7 +2200,7 @@ sq: impersonate: "impersonate" anonymize_user: "anonymize user" roll_up: "roll up IP blocks" - change_category_settings: "change category settings" + change_category_settings: "ndrysho rregullimet e kategorisë" delete_category: "delete category" create_category: "create category" block_user: "block user" @@ -2140,6 +2208,8 @@ sq: grant_admin: "grant admin" revoke_admin: "revoke admin" grant_moderation: "grant moderation" + deleted_tag: "etiketë e fshirë" + renamed_tag: "etiketë e riemëruar" screened_emails: title: "Screened Emails" description: "When someone tries to create a new account, the following email addresses will be checked and the registration will be blocked, or some other action performed." @@ -2173,7 +2243,7 @@ sq: logster: title: "Error Logs" impersonate: - title: "Impersonate" + title: "Personifiko" help: "Use this tool to impersonate a user account for debugging purposes. You will have to log out once finished." not_found: "That user can't be found." invalid: "Sorry, you may not impersonate that user." @@ -2257,7 +2327,7 @@ sq: reputation: Reputation permissions: Permissions activity: Aktiviteti - like_count: Likes Given / Received + like_count: Pëlqime të dhëna / të marra last_100_days: 'në 100 ditët e fundit' private_topics_count: Diskutime Private posts_read_count: Posts Read @@ -2296,12 +2366,14 @@ sq: send_activation_email: "Dërgo Emailin e Aktivizimit" activation_email_sent: "An activation email has been sent." send_activation_email_failed: "There was a problem sending another activation email. %{error}" - activate: "Aktivizo Llogarinë" + activate: "Aktivizoni llogarinë" activate_failed: "There was a problem activating the user." deactivate_account: "Deactivate Account" deactivate_failed: "There was a problem deactivating the user." unblock_failed: 'There was a problem unblocking the user.' block_failed: 'There was a problem blocking the user.' + block_confirm: 'A jeni të sigurtë që doni të bllokoni këtë anëtar? Anëtari nuk do të ketë më të drejtën të krijojë postime ose tema të reja.' + block_accept: 'Po, blloko anëtarin' deactivate_explanation: "A deactivated user must re-validate their email." suspended_explanation: "A suspended user can't log in." block_explanation: "A blocked user can't post or start topics." @@ -2315,6 +2387,7 @@ sq: unlock_trust_level: "Unlock Trust Level" tl3_requirements: title: "Requirements for Trust Level 3" + table_title: "Në %{time_period} ditët e fundit:" value_heading: "Vlera" requirement_heading: "Requirement" visits: "Vizita" @@ -2326,10 +2399,10 @@ sq: posts_read_all_time: "Posts Read (all time)" flagged_posts: "Flagged Posts" flagged_by_users: "Users Who Flagged" - likes_given: "Likes Given" - likes_received: "Likes Received" - likes_received_days: "Likes Received: unique days" - likes_received_users: "Likes Received: unique users" + likes_given: "Pëlqime të dhëna" + likes_received: "Pëlqime të marra" + likes_received_days: "Pëlqime të marra: ditë unike" + likes_received_users: "Pëlqime të marra: anëtarë unikë" qualifies: "Qualifies for trust level 3." does_not_qualify: "Doesn't qualify for trust level 3." will_be_promoted: "Will be promoted soon." @@ -2340,7 +2413,7 @@ sq: sso: title: "Single Sign On" external_id: "External ID" - external_username: "Pseudonimi" + external_username: "Emri i përdoruesit" external_name: "Emri" external_email: "Email" external_avatar_url: "Profile Picture URL" @@ -2370,13 +2443,23 @@ sq: title: "Show on public profile?" enabled: "shown on profile" disabled: "not shown on profile" + show_on_user_card: + title: "Trego në kartën e anëtarit?" + enabled: "e treguar në kartën e anëtarit" + disabled: "nuk tregohet në kartën e anëtarit" field_types: text: 'Text Field' confirm: 'Confirmation' dropdown: "Dropdown" site_text: + description: "Mund të adaptoni çdo tekst në këtë faqe. Filloni duke bërë një kërkim më poshtë: " + search: "Kërkoni për tekstin që dëshironi të redaktoni" title: 'Text Content' edit: 'redakto' + revert: "Rikthe ndryshimet" + revert_confirm: "A jeni të sigurtë se doni të riktheni mbrapsht ndryshimet e bëra?" + go_back: "Kthehu tek Kërkimi" + recommended: "Ju rekomandojmë të ndryshoni tekstin më poshtë sipas nevojave tuaja: " site_settings: show_overriden: 'Only show overridden' title: 'Rregullimet' @@ -2407,6 +2490,8 @@ sq: backups: "Backups" login: "Idetifikohu" plugins: "Plugins" + user_preferences: "Rregullimet e Përdoruesit" + tags: "Etiketat" badges: title: Badges new_badge: New Badge @@ -2415,6 +2500,7 @@ sq: badge: Badge display_name: Emri Shfaqur description: Description + long_description: Përshkrim i gjatë badge_type: Badge Type badge_grouping: Grupi badge_groupings: @@ -2473,7 +2559,7 @@ sq: title: "Emoji" help: "Add new emoji that will be available to everyone. (PROTIP: drag & drop multiple files at once)" add: "Add New Emoji" - name: "Name" + name: "Emri" image: "Imazh" delete_confirm: "Are you sure you want to delete the :%{name}: emoji?" embedding: @@ -2482,11 +2568,11 @@ sq: title: "Permalinks" url: "URL" topic_id: "Topic ID" - topic_title: "Topic" + topic_title: "Temë" post_id: "Post ID" - post_title: "Post" + post_title: "Postim" category_id: "Category ID" - category_title: "Category" + category_title: "Kategoria" external_url: "External URL" delete_confirm: Are you sure you want to delete this permalink? form: @@ -2531,7 +2617,7 @@ sq: pin_unpin_topic: 'shift+p Pin/Unpin topic' share_topic: 'shift+s Share topic' share_post: 's Share post' - reply_as_new_topic: 't Përgjigju si Temë e ndërlidhur' + reply_as_new_topic: 't Përgjigju në një temë të re të ndërlidhur' reply_topic: 'shift+r Reply to topic' reply_post: 'r Reply to post' quote_post: 'q Quote post' @@ -2563,9 +2649,9 @@ sq: community: name: Komuniteti trust_level: - name: Trust Level + name: Niveli i besimit other: - name: Other + name: Të tjerë posting: name: Posting google_search: | @@ -2577,3 +2663,38 @@ sq:

      + tagging: + all_tags: "Të gjitha etiketat" + selector_all_tags: "të gjithat etiketat" + changed: "etiketat e ndryshuara:" + tags: "Etiketat" + choose_for_topic: "zgjidhni etiketat fakultative për këtë temë" + delete_tag: "Fshi etiketën" + delete_confirm: "Jeni të sigurtë që doni të fshini këtë etiketë?" + rename_tag: "Riemëro etiketën" + rename_instructions: "Zgjidhni një emër të ri për këtë etiketë" + sort_by: "Rendit sipas:" + filters: + without_category: "%{filter} %{tag} temat" + with_category: "%{filter} %{tag} temat në %{category}" + topics: + none: + unread: "Nuk keni tema të palexuara." + new: "Nuk keni tema të palexuara." + read: "Nuk keni lexuar asnjë temë deri tani." + posted: "Nuk keni shkruar tek asnjë temë deri tani." + latest: "Nuk ka tema të reja." + hot: "Nuk ka tema të nxehta." + bookmarks: "Nuk keni ende tema të preferuara. " + top: "Nuk ka tema popullore." + search: "Kërkimi nuk ka asnjë rezultat." + bottom: + latest: "Nuk ka më tema të reja." + hot: "Nuk ka më tema të nxehta." + posted: "Nuk ka më tema të publikuara." + read: "Nuk ka më tema të lexuara." + new: "Nuk ka më tema të reja." + unread: "Nuk ka më tema të palexuara." + top: "Nuk ka më tema popullore." + bookmarks: "Nuk ka më tema të preferuara." + search: "Kërkimi nuk ka më rezultate." diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml index 3975ab16d8..94e0a7dce8 100644 --- a/config/locales/client.sv.yml +++ b/config/locales/client.sv.yml @@ -1203,9 +1203,7 @@ sv: create: "Tyvärr, det uppstod ett fel under skapandet av ditt inlägg. Var god försök igen." edit: "Tyvärr, det uppstod ett fel under ändringen av ditt inlägg. Var god försök igen." upload: "Tyvärr, det uppstod ett fel under uppladdandet av den filen. Vad god försök igen." - file_too_large: "Tyvärr, filen du försöker ladda upp är för stor (maximal filstorlek är {{max_size_kb}}kb)" too_many_uploads: "Tyvärr, du kan bara ladda upp en bild i taget." - too_many_dragged_and_dropped_files: "Tyvärr, du kan bara dra och släppa upp till 10 filer åt gången." upload_not_authorized: "Tyvärr, filen du försökte ladda upp är inte tillåten (tillåtna filtyper: {{authorized_extensions}})." image_upload_not_allowed_for_new_user: "Tyvärr, nya användare kan inte ladda upp bilder." attachment_upload_not_allowed_for_new_user: "Tyvärr, nya användare kan inte bifoga filer." diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml index 153ab3ef0e..fc20d6ceda 100644 --- a/config/locales/client.tr_TR.yml +++ b/config/locales/client.tr_TR.yml @@ -857,6 +857,7 @@ tr_TR: link_description: "buraya bağlantı açıklamasını girin" link_dialog_title: "Bağlantı ekle" link_optional_text: "opsiyonel başlık" + link_url_placeholder: "http://ornek.com" quote_title: "Blok-alıntı" quote_text: "Blok-alıntı" code_title: "Önceden biçimlendirilmiş yazı" @@ -991,6 +992,9 @@ tr_TR: choose_new_category: "Konular için yeni bir kategori seçin:" selected: other: "{{count}} konu seçtiniz." + change_tags: "Etiketleri değiştir" + choose_new_tags: "Bu konular için yeni etiket seç:" + changed_tags: "Seçtğiniz konular için etiketler değiştirildi." none: unread: "Okunmamış konunuz yok." new: "Yeni konunuz yok." @@ -2081,6 +2085,8 @@ tr_TR: grant_moderation: "moderasyon yetkisi ver" revoke_moderation: "moderasyon yetkisini kaldır" backup_operation: "yedek operasyonu" + deleted_tag: "silinmiş etiket" + renamed_tag: "yeniden adlandırılmış etiket" screened_emails: title: "Taranmış E-postalar" description: "Biri yeni bir hesap oluşturmaya çalıştığında, aşağıdaki e-posta adresleri kontrol edilecek ve kayıt önlenecek veya başka bir aksiyon alınacak." @@ -2557,3 +2563,26 @@ tr_TR:

      + tagging: + all_tags: "Tüm etiketler" + changed: "Etiketler değişti:" + tags: "Etiketler" + choose_for_topic: "Bu konu için opsiyonel olarak bir etiket seçin" + delete_tag: "Etiketi sil" + delete_confirm: "Bu etiketi kaldırmak istediğinize emin misiniz?" + rename_tag: "Etiketi yeniden adlandır" + rename_instructions: "Etiket için yeni bir ad girin:" + + notifications: + watching: + title: "Gözleniyor" + description: "Bu etikette ki her yeni gönderi için bir bildirim alacaksınız. Okunmamış ve yeni gönderilerin sayısı konunun yanında belirecek." + tracking: + title: "Takip Ediliyor" + description: "Bu etikette ki her yeni gönderi takip edilecek. Okunmamış ve yeni gönderilerin sayısı konunun yanında belirecek." + regular: + title: "Standart" + description: "Biri @isim şeklinde sizden bahsederse ya da gönderinize cevap verirse bildirim alacaksınız." + muted: + title: "Susturuldu" + description: "Bu etiket okunmamışlar sekmenizde belirmeyecek, ve hakkında hiç bir bildirim almayacaksınız." diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml index 66e9c06c66..d5f127fe06 100644 --- a/config/locales/client.zh_CN.yml +++ b/config/locales/client.zh_CN.yml @@ -1005,6 +1005,9 @@ zh_CN: choose_new_category: "为主题选择新分类：" selected: other: "你已经选择了 {{count}}个主题" + change_tags: "更改标签" + choose_new_tags: "为这些主题选择新标签：" + changed_tags: "这些主题的标签已被修改。" none: unread: "你没有未读主题。" new: "你没有新主题可读。" @@ -2100,6 +2103,8 @@ zh_CN: grant_moderation: "授予版主权限" revoke_moderation: "撤销版主权限" backup_operation: "备份操作" + deleted_tag: "deleted tag" + renamed_tag: "renamed tag" screened_emails: title: "被屏蔽的邮件地址" description: "当有人试图用以下邮件地址注册时，将受到阻止或其它系统操作。" @@ -2578,3 +2583,52 @@ zh_CN:

      + tagging: + all_tags: "全部标签" + selector_all_tags: "所有标签" + changed: "标签更改：" + tags: "标签" + choose_for_topic: "为主题选择可选标签" + delete_tag: "删除标签" + delete_confirm: "你确定要删除该标签？" + rename_tag: "重命名标签" + rename_instructions: "为标签选择一个新的名字：" + sort_by: "排列顺序：" + sort_by_count: "数量" + sort_by_name: "名字" + + notifications: + watching: + title: "关注" + description: "你能自动关注该标签下的所有主题。一旦与这个标签有关的新主题和新帖子发表，你都会收到通知。未读贴和新帖子的数量将出现在主题列表中每个主题的标题后。" + tracking: + title: "追踪" + description: "你能自动追踪这个标签下的所有新主题。未读贴和新帖子的数量将出现在主题列表中每个主题的标题后。" + regular: + title: "常规" + description: "当有人@你或者回复你的帖子时，你才会收到通知。" + muted: + title: "防打扰" + description: "你不会收到该标签下的新主题的任何通知，也不会在你的未阅选项卡中显示。" + + topics: + none: + unread: "你没有未读主题。" + new: "你没有近期主题。" + read: "你还未阅读任何主题。" + posted: "你还未在任何主题中回复。" + latest: "没有最新主题。" + hot: "没有热门主题。" + bookmarks: "你还没有加上书签的主题。" + top: "没有热门主题。" + search: "搜索无结果。" + bottom: + latest: "没有更多最新主题了。" + hot: "没有更多热门主题了。" + posted: "没有更多发表的主题了。" + read: "没有更多读过的主题了。" + new: "没有更多近期主题了。" + unread: "没有更多未读主题了。" + top: "没有更多热门主题了。" + bookmarks: "没有更多加上书签的主题了。" + search: "没有更多搜索结果了。" diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml index 8fc0ebf21f..99973ef437 100644 --- a/config/locales/client.zh_TW.yml +++ b/config/locales/client.zh_TW.yml @@ -93,6 +93,8 @@ zh_TW: email: '以電子郵件分享此連結' action_codes: split_topic: "於 %{when} 切分此討論話題" + invited_user: "邀請 %{who} 於 %{when} " + removed_user: "移除 %{who} 於 %{when} " autoclosed: enabled: '於 %{when} 關閉' disabled: '於 %{when} 開啟' @@ -108,8 +110,24 @@ zh_TW: pinned_globally: enabled: '於 %{when} 全局置頂' disabled: '於 %{when} 解除置頂' + visible: + enabled: '於 %{when} 列出' + disabled: '於 %{when} 除名' topic_admin_menu: "討論話題管理員操作" emails_are_disabled: "管理員已經停用了所有外寄郵件功能。通知信件都不會寄出。" + s3: + regions: + us_east_1: "美國東部 (北維珍尼亞州)" + us_west_1: "美國西部 (北加州)" + us_west_2: "美國西部 (奧勒岡州)" + us_gov_west_1: "AWS GovCloud (美國)" + eu_west_1: "歐洲 (愛爾蘭)" + eu_central_1: "歐洲 (法蘭克福)" + ap_southeast_1: "亞太地區 (新加坡)" + ap_southeast_2: "亞太地區 (悉尼)" + ap_northeast_1: "亞太地區 (東京)" + ap_northeast_2: "亞太地區 (首爾)" + sa_east_1: "南美洲 (聖保羅)" edit: '編輯此討論話題的標題與分類' not_implemented: "抱歉，此功能尚未開放。" no_value: "否" @@ -141,6 +159,8 @@ zh_TW: more: "更多" less: "較少" never: "永不" + every_30_minutes: "每 30 分鐘" + every_hour: "每小時" daily: "每天" weekly: "每週" every_two_weeks: "每兩週" @@ -151,6 +171,7 @@ zh_TW: other: "{{count}} 個字" suggested_topics: title: "推薦的討論話題" + pm_title: "推薦訊息" about: simple_title: "關於" title: "關於%{title}" @@ -225,6 +246,7 @@ zh_TW: has_pending_posts: other: "本主題仍有 {{count}}篇貼文等待審核" confirm: "儲存變更" + delete_prompt: "你確定要刪除 %{username} ? 這會移走有關他的文章，並封鎖他的電子郵箱及 IP 位址。" approval: title: "貼文需等待審核" description: "貼文已經送出，但必須等待管理者審核過後才會出現在板上，請耐心等候。" diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml index 1496da8c88..8042ec3556 100644 --- a/config/locales/server.ar.yml +++ b/config/locales/server.ar.yml @@ -216,6 +216,7 @@ ar: hot: "عناوين ساخنة" top: "أفضل المواضيع" posts: "اخر المشاركات " + private_posts: "الرسائل الخاصة الآخيرة" too_late_to_edit: "أُنشئ المنشور منذ فترة طويلة جدا، لذا تعديله أو حذفه لم يعد ممكنا." revert_version_same: "ألاصدار الحالي يتطابق مع نفس ألاصدار الذي تحاول استرجاعه ." excerpt_image: "صورة" @@ -1637,6 +1638,7 @@ ar: subject_pm: "[مسائًا]" user_notifications: previous_discussion: "الردود السابقة " + in_reply_to: "في رد لـ " unsubscribe: title: "غير مشترك " description: "لست مهتما في تلقي هذه الرسائل الالكترونيه؟ لا مشكله! اضغط تحت ليتم الغاء اشتركك فورا:" @@ -1769,6 +1771,12 @@ ar: انقر على الرابط التالي لاختيار كلمة مرور لحسابك الجديد: %{base_url}/users/password-reset/%{email_token} + confirm_new_email: + subject_template: "[%{site_name}] تأكيد عنوان بريدك الإلكتروني الجديد" + confirm_old_email: + subject_template: "[%{site_name}] تأكيد عنوان بريدك الإلكتروني الحالي" + notify_old_email: + subject_template: "[%{site_name}] عنوان بريدك الإلكتروني تم تغييره" signup_after_approval: subject_template: "قد وافقت على %{site_name}!" text_body_template: | @@ -1800,7 +1808,7 @@ ar: recent_topics: "الأخيرة" see_more: "المزيد" search_title: "البحث في الموقع" - search_google: "جوجل" + search_google: "غوغل" login_required: welcome_message: | #[أهلاً بكم %{title}](#مرحبًا) @@ -1993,8 +2001,65 @@ ar: title: "سياسة الخصوصية" body: "\n\n## [ما هي البيانات التي نقوم بجمعها؟](#جمع)\n\nنحن نجمع معلومات عنك عندما تسجل في موقعنا، وعندما تشارك في المنتدى عن طريق القراءة أو الكتابة، ونقوم بتقييم ما تم مشاركته هنا .\n\n\nيمكنك زيارة موقعنا بدون تسجيل، ولكن عند التسجيل في موقعنا، سيطلب منك ادخال اسمك وعنوان بريدك الالكتروني، وسيتم التحقق من بريدك الالكتروني بإرسال رسالة الى بريدك الالكتروني تحتوي على رابط خاص، عند الضغط على هذا الرابط، نحن سنعرف أنك مالك البريد الالكتروني المتحكم فيه.\n\nعندما تقوم بالتسجيل في موقعنا والنشر، سنقوم بتسجيل عنوان IP الذي نشرت منه، أيضا قد تحتفظ سجلات الخادم عناوين IP جميع الطلبات من الخادم.\n\n\n\n## [في ماذا نستخدم المعلومات الخاصة بك؟](#استخدام)\n\nيمكننا استخدام المعلومات التي نجمعها عنك بإحدى الطرق التالية:\n\n* لتخصيص تجربتك و mdahs؛ المعلومات الخاصة بك تساعدنا على الاستجابة بشكل أفضل لاحتياجاتك الفردية.\n* لتحسين موقعنا و mdash ؛ نسعى باستمرار لتحسين ما يعرضه الموقع استنادًا الى المعلومات والتغذية الراجعة - الملاحظات - التي نتلقاها منك.\n* لتحسين خدمة العملاء و mdash ؛ المعلومات الخاصة بك تساعدنا على الاستجابة بشكل أكثر فعالية لطلبات الدعم وخدمة العملاء.\n* لإرسال رسائل البريد الالكتروني الدورية و mdash ؛ سنستخدم عنوان البريد الالكتروني الذي وفرته لنا لإرسال معلومات إليك، الاشعارات التي تطلبها حول التحديثات في المواضيع، أو الاستجابة لاسم المستخدم الخاص بك، كالرد على الاستفسارات، او الطلبات أو اسئلة اخرى.\n\n\n\n## [كيف نقوم بحماية معلوماتك ؟](#حماية)\n\nنقوم بتطبيق مجموعة من الإجراءات الأمنية للمحافظة على أمن وسلامة معلوماتك الشخصية، عندما تقوم بإرسال أو إدخال أو الدخول لمعلوماتك الشخصية.\n\n\n\n## [ما هي سياسة الاحتفاظ بالبيانات الخاصة بك ؟](#الاحتفاظ-بالبيانات)\n\nسوف نبذل جهونا بإخلاص للتالي :\n\n* الاحتفاظ بسجلات عناوين IP لجميع الطلبات لهذا الخادم لمدة لا تزيد عن 90 يومًا.\n* الاحتفاظ بعناوين IP الخاصة بالمستخدمين المسجلين ومنشوراتهم لمدة لا تزيد عن 5 سنوات.\n\n\n\n## [هل نستخدم الكعكات - cookies - ملفات تعريف الارتباط ؟ ](#كعكات)\n\nنعم، الكعكات هي عبارة عن ملفات صغيرة يقوم الموقع أو مزود الخدمة بنقلها الى القرص الصلب لحاسبك من خلال متصفحك (اذا سمحتم بذلك)، هذه الكعكات تعرف الموقع على متصفحك، فن كان لديك حساب مسجل، سيتم ربطه مع حسابك.\n\nنحن نستخدم ملفات تعريف الارتباط - cookies - لفهم وحفظ التفضيلات الخاصة بك للزيارات في المستقبل، وجمع البيانات العامة حول حركة المرور والتفاعل في الموقع حتى نتمكن من تقديم تجربة وأدوات افضل في المستقبل، نحن قد نتعاقد مع مقدمي خدمات من الطرف الثالث لمساعدتنا في تحسين فهمنا لزوار الموقع، مقدمي الخدمات لا يسمح لهم بإستخدام المعلومات التي تم جمعها نيابة عنا، إلّا لمساعدتنا في سلوكنا وتحسين أعمالنا.\n\n\n\n## [هل نقوم بالإفصاح عن أي معلومات لأطراف خارجية؟](#إفصاح)\n\nنحن لا نبيع، ولا نتاجر أو ننقل المعلومات الشخصية الى أطراف خارجية. وهذا لا يشمل الطرف الخاجية الموثوق بها والتي تساعد في تشغيل موقعنا، واجراء أعمالنا، أو تقديم الخدمات لكم، طالما أن تلك الأطراف موافقة للحفاظ على سرية المعلومات، يجوز لنا الافراج عن معوماتك الشخصية عندما نرى أنه هو المناسب للإمتثال للقانون، مع فرض سياسة موقعنا، أو حماية حقوقنا أو حقوق الآخرين، أو حقوق الملكية، أو السلامة. ومع ذلك، يمكننا تقديم معلومات الزائرين دون تحديد الهوية، الى أطراف أخرى للتسويق والاعلان، أو غيرها من الاستخدامات.\n\n\n\n## [روابط الطرف الثالث](#الطرف-الثالث)\n\nأحيانًا، نفترض، أنه عند وجود مواقع طرف ثالث تقجم خدمات أو منتجات على موقعنا، كان لدى مواقع الطرف الثالث هذه، سياسات خصوصية منفصلة ومستقلة، لن يكون لدينا أية مسؤولية عن محتوى وأنشطة هذه المواقع المرتبطة، ومع ذلك، نحن نسعى إلى حماية موقعنا وسلامته، ونرحب بأي ملاحظات حول هذه المواقع. \n\n\n\n## [الالتزام بقانون حماية خصوصية الأطفال على الانترنت ](#coppa)\n\nموقعنا والمنتجات والخدمات موجهه للأشخاص اللذين لا تقل أعمارهم عن 13 سنة، إذا كان هذا الخادم في الولايات المتحدة الأمريكية، من شروط COPPA\n ([Children's Online Privacy Protection Act](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act))\nعدم استخدم هذا الموقع.\n\n\n\n## [سياسة الخصوصية على الانترنت](#متصل)\n\nتنطبق سياسة الخصوصية على الانترنت فقط على المعلومات التي يتم جمعها من خلال موقعنا، ولاتنطبق على المعلومات التي يتم جمعها أثناء عدم الاتصال.\n\n\n\n## [الموافقة](#الموافقة)\n\nبإستخدام موقعنا، أنت توافق على سياسة الخصوصية لموقعنا.\n\n\n\n## [تغييرات على سياسة الخصوصية](#تغييرات)\n\nإذا قمنا بتغيير سياسة الخصوصية، سوف نقوم بنشر هذه التغييرات في هذه الصفحة.\n\nهذه الوثيقة هي نسخة من CC-BY-SA تم تحديثها في 31 مايو عام 2013م .\n" badges: + editor: + name: محرر + basic_user: + name: بسيط + member: + name: عضو + regular: + name: منتظم + leader: + name: قائد welcome: name: مرحباً + description: استقبلت كـ + anniversary: + name: الذكرى السنوية + nice_post: + name: رد رائع + good_post: + name: رد حسن + great_post: + name: رد عظيم + nice_topic: + name: موضوع رائع + good_topic: + name: موضوع حسن + great_topic: + name: موضوع عظيم + first_like: + name: أول إعجاب + first_flag: + name: أول إبلاغ + promoter: + description: عضو غير صحيح + read_guidelines: + name: إقرأ القواعد العامة + reader: + name: قارئ + popular_link: + name: رابط شائع + hot_link: + name: رابط ساخن + famous_link: + name: رابط مشهور + appreciated: + name: مشكور + respected: + name: محترم + crazy_in_love: + name: مجنون واقع في حب + thank_you: + name: شكراً لك + gives_back: + name: أعده + empathetic: + description: لديه 500 إعجاب وأعطى 1000 إعجاب + first_emoji: + name: أول رمز تعبيري + first_mention: + name: أول إشارة admin_login: success: "البريد أُرسل" error: "خطأ!" @@ -2005,6 +2070,8 @@ ar: performance_report: initial_post_raw: 'هذا الموضوع يحتوي على معلومات الاداء اليومي للموقع ' initial_topic_title: التبليغ عن اداء الموقع + topic_invite: + user_exists: "آسف، ذلك المستخدم قد تمت دعوته من قبل. تستطيع فقط أن تدعوا عضواً لموضوعِ مرة واحدة." time: <<: *datetime_formats activemodel: diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml index ba044fc61b..776b036fed 100644 --- a/config/locales/server.de.yml +++ b/config/locales/server.de.yml @@ -174,6 +174,7 @@ de: group_mentions: "Neueste Nennungen von %{group_name}" user_posts: "Neueste Beiträge von @%{username}" user_topics: "Neueste Themen von @%{username}" + tag: "Getaggte Themen" too_late_to_edit: "Dieser Beitrag wurde vor zu langer Zeit erstellt. Er kann nicht mehr bearbeitet oder gelöscht werden." revert_version_same: "Die aktuelle Version entspricht der Version, zu der du zurückkehren möchtest." excerpt_image: "Bild" @@ -1101,6 +1102,19 @@ de: default_categories_watching: "Liste der standardmäßig beobachteten Kategorien." default_categories_tracking: "Liste der standardmäßig gefolgten Kategorien." default_categories_muted: "Liste der standardmäßig stummgeschalteten Kategorien." + tagging_enabled: "Nutzern erlauben Themen zu taggen?" + min_trust_to_create_tag: "Minimale Vertrauensstufe um ein Tag zu erstellen." + max_tags_per_topic: "Maximale Anzahl von Tags, die einem Thema zugeordnet werden können." + max_tag_length: "Maximale Anzahl von Zeichen, die in einem Tag verwendet werden können." + max_tag_search_results: "Maximale Anzahl von Ergebnissen, die bei der Suche nach Tags angezeigt werden." + show_filter_by_tag: "Dropdown-Liste zum Filtern von Theman nach Tag anzeigen." + max_tags_in_filter_list: "Maximale Anzahl von Tags in der Dropdown-Liste. Die meist genutzten Tags werden angezeigt." + tags_sort_alphabetically: "Anzeige der Tags in alphabetischer Reihenfolge. Standard ist die Sortierung nach Beliebtheit." + tag_style: "Visuelle Darstellung der Tag-Schildchen." + staff_tags: "Eine Liste von Tags, die nur von Mitarbeitern verwendet werden können" + min_trust_level_to_tag_topics: "Minimal benötigte Vertrauensstufe zum Taggen von Themen" + suppress_overlapping_tags_in_list: "Verstecke Tags in Listen, wenn diese mit dem Titel überlappen" + remove_muted_tags_from_latest: "Zeige Themen mit stummgeschalteten Tags nicht in der Liste der aktuellen Themen an." errors: invalid_email: "Ungültige E-Mail-Ad­res­se" invalid_username: "Es gibt keinen Benutzer mit diesem Benutzernamen." @@ -2048,3 +2062,7 @@ de: activemodel: errors: <<: *errors + tags: + staff_tag_disallowed: "Das Tag \"%{tag}\" kann nur von Mitarbeitern hinzugefügt werden." + staff_tag_remove_disallowed: "Das Tag \"%{tag}\" kann nur von Mitarbeitern entfernt werden." + rss_by_tag: "Themen getaggt mit %{tag}" diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index c5eab8c7e6..a054bc5163 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -43,7 +43,7 @@ en: powered_by_html: 'Powered by Discourse, best viewed with JavaScript enabled' log_in: "Log In" - purge_reason: "Automatically deleted as abandoned, unactivated account" + purge_reason: "Automatically deleted as abandoned, deactivated account" disable_remote_images_download_reason: "Remote images download was disabled because there wasn't enough disk space available." anonymous: "Anonymous" @@ -55,7 +55,7 @@ en: empty_email_error: "Happens when the raw mail we received was blank." no_message_id_error: "Happens when the mail has no 'Message-Id' header." auto_generated_email_error: "Happens when the 'precedence' header is set to: list, junk, bulk or auto_reply, or when any other header contains: auto-submitted, auto-replied or auto-generated." - no_body_detected_error: "Happens when we couldn't extract a body and there was no attachments." + no_body_detected_error: "Happens when we couldn't extract a body and there were no attachments." inactive_user_error: "Happens when the sender is not active." blocked_user_error: "Happens when the sender has been blocked." bad_destination_address: "Happens when none of the email addresses in To/Cc/Bcc fields matched a configured incoming email address." @@ -212,6 +212,7 @@ en: group_mentions: "Latest mentions from %{group_name}" user_posts: "Latest posts by @%{username}" user_topics: "Latest topics by @%{username}" + tag: "Tagged topics" too_late_to_edit: "That post was created too long ago. It can no longer be edited or deleted." revert_version_same: "The current version is same as the version you are trying to revert to." @@ -222,7 +223,7 @@ en: groups: errors: - can_not_modify_automatic: "You can not modify an automatic group" + can_not_modify_automatic: "You cannot modify an automatic group" member_already_exist: "'%{username}' is already a member of this group." invalid_domain: "'%{domain}' is not a valid domain." invalid_incoming_email: "'%{email}' is not a valid email address." @@ -540,7 +541,7 @@ en: continue_button: "Continue to %{site_name}" welcome_to: "Welcome to %{site_name}!" approval_required: "A moderator must manually approve your new account before you can access this forum. You'll get an email when your account is approved!" - missing_session: "We can not detect if your account was created, please ensure you have cookies enabled." + missing_session: "We cannot detect if your account was created, please ensure you have cookies enabled." post_action_types: off_topic: title: 'Off-Topic' @@ -819,7 +820,6 @@ en: title: "The name of this site, as used in the title tag." site_description: "Describe this site in one sentence, as used in the meta description tag." contact_email: "Email address of key contact responsible for this site. Used for critical notifications such as unhandled flags, as well as on the /about contact form for urgent matters." - bounce_email: "Variable Email Return Path used for emails, example: bounce@example.com will cause us to generate bounce+GUID@example.com as the Retrun Path for emails we send. This feature allows us to automatically disable bouncing emails. Requires additional configurations, leave blank if unsure." contact_url: "Contact URL for this site. Used on the /about contact form for urgent matters." queue_jobs: "DEVELOPER ONLY! WARNING! By default, queue jobs in sidekiq. If disabled, your site will be broken." crawl_images: "Retrieve images from remote URLs to insert the correct width and height dimensions." @@ -893,7 +893,7 @@ en: ga_domain_name: "Google analytics (ga.js) domain name, eg: mysite.com; see http://google.com/analytics" ga_universal_tracking_code: "Google Universal Analytics (analytics.js) tracking code code, eg: UA-12345678-9; see http://google.com/analytics" ga_universal_domain_name: "Google Universal Analytics (analytics.js) domain name, eg: mysite.com; see http://google.com/analytics" - enable_escaped_fragments: "Fall back to Google's Ajax-Crawling API if no webcrawler is detected. See https://support.google.com/webmasters/answer/174992?hl=en" + enable_escaped_fragments: "Fall back to Google's Ajax-Crawling API if no webcrawler is detected. See https://developers.google.com/webmasters/ajax-crawling/docs/learn-more" enable_noscript_support: "Enable standard webcrawler search engine support via the noscript tag" allow_moderators_to_create_categories: "Allow moderators to create new categories" cors_origins: "Allowed origins for cross-origin requests (CORS). Each origin must include http:// or https://. The DISCOURSE_ENABLE_CORS env variable must be set to true to enable CORS." @@ -1135,7 +1135,7 @@ en: tos_url: "If you have a Terms of Service document hosted elsewhere that you want to use, provide the full URL here." privacy_policy_url: "If you have a Privacy Policy document hosted elsewhere that you want to use, provide the full URL here." - newuser_spam_host_threshold: "How many times a new user can post a link to the same host within their `newuser_spam_host_posts` posts before being considered spam." + newuser_spam_host_threshold: "How many times a new user can post a link to the same host within their `newuser_spam_host_threshold` posts before being considered spam." white_listed_spam_host_domains: "A list of domains excluded from spam host testing. New users will never be restricted from creating posts with links to these domains." staff_like_weight: "How much extra weighting factor to give staff likes." @@ -1175,6 +1175,7 @@ en: enable_staged_users: "Automatically create staged users when processing incoming emails." auto_generated_whitelist: "List of email addresses that won't be checked for auto-generated content." block_auto_generated_emails: "Block incoming emails identified as being auto generated." + bounce_score_threshold: "The maximum user bounce score before the they are deactivated. A soft bounce adds 1, a hard bounce adds 2." manual_polling_enabled: "Push emails using the API for email replies." pop3_polling_enabled: "Poll via POP3 for email replies." @@ -1273,6 +1274,8 @@ en: delete_drafts_older_than_n_days: Delete drafts older than (n) days. + bootstrap_mode_min_users: "Minimum number of users required to disable bootstrap mode (set to 0 to disable)" + vacuum_db_days: "Run VACUUM ANALYZE to reclaim DB space after migrations (set to 0 to disable)" prevent_anons_from_downloading_files: "Prevent anonymous users from downloading attachments. WARNING: this will prevent any non-image site assets posted as attachments from working." @@ -1316,6 +1319,20 @@ en: default_categories_tracking: "List of categories that are tracked by default." default_categories_muted: "List of categories that are muted by default." + tagging_enabled: "Enable tags on topics?" + min_trust_to_create_tag: "The minimum trust level required to create a tag." + max_tags_per_topic: "The maximum tags that can be applied to a topic." + max_tag_length: "The maximum amount of characters that can be used in a tag." + max_tag_search_results: "When searching for tags, the maxium number of results to show." + show_filter_by_tag: "Show a dropdown to filter a topic list by tag." + max_tags_in_filter_list: "Maximum number of tags to show in the filter dropdown. The most used tags will be shown." + tags_sort_alphabetically: "Show tags in alphabetical order. Default is to show in order of popularity." + tag_style: "Visual style for tag badges." + staff_tags: "A list of tags that can only be applied by staff members" + min_trust_level_to_tag_topics: "Minimum trust level required to tag topics" + suppress_overlapping_tags_in_list: "Hide tags from list views, if they overlap with title" + remove_muted_tags_from_latest: "Don't show topics tagged with muted tags in the latest topic list." + errors: invalid_email: "Invalid email address." invalid_username: "There's no user with that username." @@ -2390,8 +2407,8 @@ en: missing: "Sorry, we can't find any avatar associated with that email address. Can you try uploading it again?" flag_reason: - sockpuppet: "A new user created a topic, and another new user at the same IP address replied. See the flag_sockpuppets site setting." - spam_hosts: "This new user tried to create multiple posts with links to the same domain. See the newuser_spam_host_threshold site setting." + sockpuppet: "A new user created a topic, and another new user at the same IP address (%{ip_address}) replied. See the `flag_sockpuppets` site setting." + spam_hosts: "This new user tried to create multiple posts with links to the same domain (%{domain}). See the `newuser_spam_host_threshold` site setting." email_log: no_user: "Can't find user with id %{user_id}" @@ -2404,7 +2421,8 @@ en: post_deleted: "post was deleted by the author" user_suspended: "user was suspended" already_read: "user has already read this post" - exceeded_limit: "Exceeded max_emails_per_day_per_user" + exceeded_emails_limit: "Exceeded max_emails_per_day_per_user" + exceeded_bounces_limit: "Exceeded bounce_score_threshold" message_blank: "message is blank" message_to_blank: "message.to is blank" text_part_body_blank: "text_part.body is blank" @@ -3005,3 +3023,9 @@ en: topic_invite: user_exists: "Sorry, that user has already been invited. You may only invite a user to a topic once." + + tags: + title: "Tags" + staff_tag_disallowed: "The tag \"%{tag}\" may only be applied by staff." + staff_tag_remove_disallowed: "The tag \"%{tag}\" may only be removed by staff." + rss_by_tag: "Topics tagged %{tag}" diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml index 9b9d1c42de..cafceea669 100644 --- a/config/locales/server.es.yml +++ b/config/locales/server.es.yml @@ -174,6 +174,7 @@ es: group_mentions: "Últimas menciones de %{group_name}" user_posts: "Posts recientes por @%{username}" user_topics: "Temas recientes por @%{username}" + tag: "Temas etiquetados" too_late_to_edit: "Ese post fue publicado hace demasiado tiempo. No puede ser editado ni eliminado." revert_version_same: "La versión actual es la misma que la versión a la que intentas volver." excerpt_image: "imagen" @@ -1110,6 +1111,19 @@ es: default_categories_watching: "Lista de categorías que están vigiladas por defecto." default_categories_tracking: "Lista de categorías que están seguidas por defecto" default_categories_muted: "Lista de categorías que están silenciadas por defecto." + tagging_enabled: "¿Permitir a los usuarios etiquetar temas?" + min_trust_to_create_tag: "Mínimo nivel de confianza requerido para crear una etiqueta." + max_tags_per_topic: "Número máximo de etiquetas que pueden añadirse a un tema." + max_tag_length: "Longitud máxima de caracteres que puede tener el nombre de una etiqueta." + max_tag_search_results: "Máximo número de resultados a mostrar al buscar etiquetas." + show_filter_by_tag: "Mostrar un desplegable para filtrar la lista de temas por etiqueta." + max_tags_in_filter_list: "Máximo número de etiquetas a mostrar en el desplegable. Se mostrarán las más usadas." + tags_sort_alphabetically: "Mostrar etiquetas en orden alfabético. Por defecto se muestran por popularidad." + tag_style: "Estilo visual de los distintivos de etiqueta." + staff_tags: "Una lista de etiquetas que sólo podrá ser aplicada por administradores o moderadores" + min_trust_level_to_tag_topics: "Mínimo nivel de confianza requerido para etiquetar temas" + suppress_overlapping_tags_in_list: "Ocultar etiquetas de la vista de listado si se solapan con el título" + remove_muted_tags_from_latest: "No mostrar temas etiquetados con etiquetas silenciadas en la lista de temas recientes." errors: invalid_email: "Dirección de correo electrónico inválida. " invalid_username: "No existe ningún usuario con ese nombre de usuario. " @@ -2206,11 +2220,15 @@ es: name: Primer emoji description: Utilizó un emoji en un post long_description: | - Este distintivo se concede cuando utilizas tu primer emoji en un post :heart: + Este distintivo se concede la primera vez que añades un Emoji a tu post :thumbsup:. Los Emoji te permiten añadir emociones a tu publicación, desde felicidad :smiley: a tristeza :anguished: pasando por enfado :angry: o cualquier otra expresión :sunglasses: . Comienza escribiendo : (dos puntos) o haz clic en el botón Emoji de la barra del editor para seleccionar entre cientos de opciones :ok_hand: first_mention: name: Primera mención description: Mencionó a un usuario en un post - long_description: Este distintivo se concede cuando mencionas a un @usuario en tu post. Las @menciones te permiten notificar a otros miembros del foro. + long_description: Este distintivo se concede la primera vez que mencionas a un @usuario en tu post. Las menciones generan una notificación a la persona, así saben de tu publicación. Comienza escribiendo una @ para mencionar a cualquier usuario o, si está permitido, a un grupo – es una forma útil de llamar su atención. + first_onebox: + name: Primer Onebox + description: Publicó un enlace expandido vía Onebox + long_description: Este distintivo se concede la primera vez que publicas un enlace en una línea aparte, que fue automáticamente expandido vía Onebox con un resumen del enlace, un título y (si estuvo disponible) una imagen. admin_login: success: "Email enviado" error: "¡Error!" @@ -2228,3 +2246,7 @@ es: activemodel: errors: <<: *errors + tags: + staff_tag_disallowed: "La etiqueta \"%{tag}\" sólo puede ser aplicada por los administradores." + staff_tag_remove_disallowed: "La etiqueta \"%{tag}\" sólo puede ser eliminada por los administradores." + rss_by_tag: "Temas con la etiqueta %{tag}" diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml index d367f254f4..a94df297f5 100644 --- a/config/locales/server.fa_IR.yml +++ b/config/locales/server.fa_IR.yml @@ -134,6 +134,7 @@ fa_IR: latest: "آخرین ارسال ها" hot: "جستارهای داغ" posts: "آخرین نوشته‌ها" + tag: "موضوعات برچسب خورد" too_late_to_edit: "ارسالی مورد نظر مربوط به زمان بسیار گذشته می باشد. امکان ویرایش و حذف آن وجود ندارد." excerpt_image: "تصویر" queue: @@ -913,6 +914,10 @@ fa_IR: emoji_set: "می‌خواهید ایموجی شما چطور باشد؟" enforce_square_emoji: "تحمیل نسبت ابعاد مربع به تمام شکلک ها emojis . " approve_unless_trust_level: "نوشته ها برای کاربران پایین ت از این سطح اعتماد نیاز به تایید دارد. " + tagging_enabled: "کاربران اجازه انتخاب برچسب برای موضوعات داشته باشند?" + min_trust_to_create_tag: "حداقل سطح اعتماد مورد نیاز برای انتخاب برچسب؟." + max_tags_per_topic: "حداکثر تعداد برچسب انتخابی برای موضوع." + max_tag_length: "حداقل کراکتر یک نوشته برای برچسب انتخابی." errors: invalid_email: "آدرس ایمیل نامعتبر" invalid_username: "هیچ کاربری با این نام کاربری وجود ندارد." @@ -1291,3 +1296,4 @@ fa_IR: activemodel: errors: <<: *errors + rss_by_tag: "موضوعات برچسب خورد %{tag}" diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml index 77b404e589..71f1642a11 100644 --- a/config/locales/server.fi.yml +++ b/config/locales/server.fi.yml @@ -172,6 +172,7 @@ fi: private_posts: "Uusimmat yksityisviestit" group_posts: "Uusimmat viestit ryhmässä %{group_name}" group_mentions: "Uusimmat maininnat ryhmässä %{group_name}" + tag: "Tagatut aiheet" too_late_to_edit: "Tämä viesti luotiin liian kauan sitten. Sitä ei voi enää muokata tai poistaa." revert_version_same: "Nykyinen revisio on sama, kuin jonka yrität palauttaa." excerpt_image: "kuva" @@ -1112,6 +1113,10 @@ fi: default_categories_watching: "Lista oletuksena tarkkailtavista alueista." default_categories_tracking: "Lista oletuksena seurattavista alueista." default_categories_muted: "Lista oletuksena vaimennetuista alueista." + tagging_enabled: "Salli käyttäjien tagata viestejä?" + min_trust_to_create_tag: "Alin luottamustaso tagin luomiseen." + max_tags_per_topic: "Tagien maksimiäärä per aihe." + max_tag_length: "Tagien merkkien maksimimäärä." errors: invalid_email: "Sähköpostiosoite ei kelpaa." invalid_username: "Tällä nimellä ei löydy käyttäjää." @@ -2270,3 +2275,4 @@ fi: activemodel: errors: <<: *errors + rss_by_tag: "Aiheet tagattu %{tag}" diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml index 0ed9723409..0180f61036 100644 --- a/config/locales/server.fr.yml +++ b/config/locales/server.fr.yml @@ -24,7 +24,7 @@ fr: loading: "Chargement" powered_by_html: 'Propulsé par Discourse, le rendu est meilleur avec le JavaScript activé' log_in: "Se connecter" - purge_reason: "Supprimé automatiquement comme compte abandonné, non activé" + purge_reason: "Supprimé automatiquement comme abandonné, compte désactivé" disable_remote_images_download_reason: "Le téléchargement des images externes a été désactivé faute de place suffisante sur le disque." anonymous: "Anonyme" emails: @@ -44,6 +44,9 @@ fr: reply_user_not_matching_error: "Arrive quand une réponse est venue d'une adresse de courriel différente de celle où a été envoyée la notification." topic_not_found_error: "Arrive quand quelqu'un répond à un sujet qui a été supprimé." topic_closed_error: "Arrive quand quelqu'un répond mais le sujet lié a été fermé." + bounced_email_report: "Le courriel est un rapport de courriel rejeté." + auto_generated_email_reply: "Email contient une réponse à un email automatiquement généré." + screened_email_error: "Arrive quand l'adresse courriel de l'expéditeur est déjà sous surveillance." errors: &errors format: '%{attribute} %{message}' messages: @@ -170,10 +173,10 @@ fr: top: "Meilleurs sujets" posts: "Messages récents" private_posts: "Derniers messages privés" - group_posts: "Sujets récents par @%{username}" - group_mentions: "Mentions récentes par %{username}" + group_posts: "Derniers messages de %{group_name}" + group_mentions: "Dernières mentions de %{group_name}" user_posts: "Derniers messages par @%{username}" - user_topics: "Sujets récents par @%{username}" + user_topics: "Derniers sujets par @%{username}" too_late_to_edit: "Ce message a été créé il y a trop longtemps. Il ne peut plus être modifié ou supprimé." revert_version_same: "La version actuelle est la même que la version vers laquelle vous essayez de revenir." excerpt_image: "image" @@ -358,6 +361,7 @@ fr: create_like: "Vous avez atteint le nombre maximum de J'aime pour aujourd'hui. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau." create_bookmark: "Vous avez atteint le nombre maximum de favoris pour aujourd'hui. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau." edit_post: "Vous avez atteint le nombre maximum de modifications pour aujourd'hui. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau." + live_post_counts: "Vous demandez le nombre de posts en activité trop rapidement. Veuillez respecter le temps d'attente %{time_left} avant de réessayer." unsubscribe_via_email: "Vous avez atteint le nombre maximum de désinscriptions par email pour aujourd'hui. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau." topic_invitations_per_day: "Vous avez atteint le nombre maximum d'invitations dans un sujet pour aujourd'hui. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau." hours: @@ -454,6 +458,7 @@ fr: confirmed: "Votre adresse de courriel a été mise à jour." please_continue: "Continuer vers %{site_name}" error: "Il y a eu une erreur lors de la modification de votre adresse de courriel. Elle est peut-être déjà utilisée ?" + error_staged: "Une erreur est survenue lors de la modification de votre adresse courriel. Cette adresse est déjà utilisée par un utilisateur en attente." already_done: "Désolé, ce lien de confirmation n'est plus valide. Votre adresse de courriel a peut-être déjà été changée ?" authorizing_old: title: "Merci d'avoir confirmée votre adresse de courriel" @@ -465,7 +470,7 @@ fr: continue_button: "Continuer vers %{site_name}" welcome_to: "Bienvenue sur %{site_name} !" approval_required: "Un modérateur doit approuver manuellement votre nouveau compte avant que vous accédiez au forum. Vous recevrez un courriel lorsque que votre compte sera approuvé !" - missing_session: "Nous n'arrivons pas à savoir si votre compte a été créé ou pas. Veuillez vérifier que vous avec bien activé les cookies." + missing_session: "Nous ne pouvons pas détecter si votre compte a été créé, veuillez vérifier que vous avez activé les cookies." post_action_types: off_topic: title: 'Hors-sujet' @@ -708,6 +713,7 @@ fr: site_contact_username_warning: "Saisissez le pseudo d'un responsable sympathique à partir duquel sera envoyé les messages importants. Mettez à jour site_contact_username dans les Paramètres du site." notification_email_warning: "Les courriels de notification ne serot pas envoyés depuis une adresse de courriel valide sur votre domaine ; l'envoie des courriels sera aléatoire et peu fiable. Veuillez saisir une adresse de courriel locale dans notification_email dans les Paramètres du site." subfolder_ends_in_slash: "Votre configuration de sous-répertoire est erronée; DISCOURSE_RELATIVE_URL_ROOT se termine avec une barre oblique ." + bad_favicon_url: "Impossible de charger la favicon. Vérifiez le paramètre favicon_url dans les paramètres du site" site_settings: censored_words: "Mots qui seront automatiquement remplacés par ■■■■" delete_old_hidden_posts: "Supprimer automatiquement les messages cachés plus de 30 jours." @@ -938,6 +944,7 @@ fr: max_users_notified_per_group_mention: "Nombre maximum d'utilisateurs qui peuvent recevoir une notification si un groupe est mentionné (si le seuil est atteint aucune notification n'est envoyée)" create_thumbnails: "Créer un aperçu pour les images imbriquées qui sont trop large pour le message." email_time_window_mins: "Attendre (n) minutes avant l'envoi des courriels de notification, afin de laisser une chance aux utilisateurs de modifier ou finaliser leurs messages." + private_email_time_window_seconds: "Attendre (n) secondes avant d'envoyer des courriels de notification privés, afin de donner aux utilisateurs la chance d'éditer et de finaliser leurs messages." email_posts_context: "Combien de réponses précédentes doit-on inclure dans les courriels de notifications pour situer le contexte." flush_timings_secs: "A quelle fréquence les données de timing doivent être vider, en secondes." title_max_word_length: "Le nombre maximum de caractères dans le titre d'un sujet." @@ -995,6 +1002,10 @@ fr: unsubscribe_via_email: "Autorise les utilisateurs à se désinscrire des courriels en envoyant un courriel avec \"unsubscribe\" dans le sujet ou le corps du message." unsubscribe_via_email_footer: "Ajoute un lien pour se désinscrire dans le pied des courriels envoyés" delete_email_logs_after_days: "Efface les journaux de messagerie après (N) jours. 0 pour conserver indéfiniment." + max_emails_per_day_per_user: "Nombre maximum de courriels à envoyer aux utilisateurs par jour. 0 pour désactiver la limite" + enable_staged_users: "Créer automatiquement les utilisateurs en attente lors du traitement des courriels entrants." + auto_generated_whitelist: "Liste des adresses courriel qui ne seront pas vérifiées pour du contenu généré automatiquement." + block_auto_generated_emails: "Bloquer les courriels entrants identifiés comme générés automatiquement." pop3_polling_enabled: "Utiliser POP3 pour les réponses via courriel." pop3_polling_ssl: "Utiliser SSL pour les connections au serveur POP3. (Recommandé)" pop3_polling_period_mins: "La période en minute entre chaque vérification du compte POP3 des courriels.\nNote: nécessite un redémarrage de la machine." @@ -1094,6 +1105,10 @@ fr: default_categories_watching: "Liste de catégories surveillées par défaut." default_categories_tracking: "Liste de catégories suivies par défaut." default_categories_muted: "Liste de catégories silencées par défaut." + tagging_enabled: "Autoriser les utilisateurs à mettre des tags sur les sujets ?" + min_trust_to_create_tag: "Le niveau de confiance requis pour créer un tag." + max_tags_per_topic: "Le nombre maximum de tags qui peuvent être ajouté à un sujet." + max_tag_length: "The nombre maximum de caractères qui peuvent être utilisés pour un tag." errors: invalid_email: "Adresse de courriel invalide." invalid_username: "Il n'y a pas d'utilisateur ayant ce pseudo." @@ -1134,6 +1149,11 @@ fr: category: 'Catégories' topic: 'Résultats' user: 'Utilisateurs' + sso: + not_found: "Votre compte n'a pas été trouvé. Merci de contacter l'administrateur du site." + account_not_approved: "Votre compte est en attente d'approbation. Vous recevrez une notification par courriel lorsque vous êtes approuvé." + unknown_error: "Il y a un problème avec votre compte. Merci de contacter l'administrateur du site." + timeout_expired: "La connexion au compte a expiré, veuillez essayer de vous reconnecter." original_poster: "Créateur du sujet" most_posts: "Le plus de messages" most_recent_poster: "Auteur le plus récent" @@ -1160,6 +1180,12 @@ fr: archived_disabled: "Ce sujet est maintenant dé-archivé. Il n'est plus gelé, et peut être modifié." closed_enabled: "Ce sujet est maintenant fermé. Les nouvelles réponses ne sont plus autorisées." closed_disabled: "Ce sujet est maintenant ouvert. Les nouvelles réponses sont autorisées." + autoclosed_message_max_posts: + one: "Ce message a été automatiquement fermé après avoir atteint la limite maximum de 1 réponse." + other: "Ce message a été automatiquement fermé après avoir atteint la limite maximum de %{count} réponses." + autoclosed_topic_max_posts: + one: "Ce sujet a été automatiquement fermé après avoir atteint la limite maximum de 1 réponse." + other: "Ce sujet a été automatiquement fermé après avoir atteint la limite maximum de %{count} réponses." autoclosed_enabled_days: one: "Cette discussion a été automatiquement fermée après un jour. Aucune réponse n'est permise dorénavant." other: "Ce sujet a été automatiquement fermé après %{count} jours. Aucune réponse n'est permise dorénavant." @@ -1612,17 +1638,9 @@ fr: S'il y a une interface web pour le compte POP, vous devrez peut-être vous y connecter pour vérifier les paramètres. too_many_spam_flags: - subject_template: "Nouveau compte bloqué" - text_body_template: | - Bonjour, - - Ceci est un message automatique de %{site_name} pour vous informer que vos messages ont été cachés automatiquement à la suite des signalements de la communauté. - - Par mesure de précaution, votre compte a été bloqué, vous ne pourrez par créer de nouvelles réponses ou sujets tant qu'un membre de l'équipe n'aura pas étudié votre compte. - - Pour plus d'informations, merci de vous en référer à la [charte de la communauté](%{base_url}/guidelines). + subject_template: "Nouveau compte bloqué en raison de signalements communautaires." blocked_by_staff: - subject_template: "Compte bloqué" + subject_template: "Compte bloqué temporairement" user_automatically_blocked: subject_template: "Nouvel utilisateur %{username} bloqué à cause de signalements de la communauté" text_body_template: | @@ -1655,6 +1673,8 @@ fr: download_remote_images_disabled: subject_template: "Téléchargement d'images distantes désactivé" text_body_template: "Le paramètre `download_remote_images_to_local` a été désactivé car la limite (`download_remote_images_threshold`) d'espace disque utilisé par les images vient d'être dépassée." + dashboard_problems: + subject_template: "Des problèmes ont été trouvé" unsubscribe_link: | Pour ne plus recevoir de notifications pour ce sujet, [cliquez ici](%{unsubscribe_url}). Pour ne plus recevoir ces courriels, visitez vos [préférences utilisateur](%{user_preferences_url}). unsubscribe_via_email_link: | @@ -1675,8 +1695,20 @@ fr: posted_by: "Ecrit par %{username} le %{post_date}" user_invited_to_private_message_pm: subject_template: "[%{site_name}] %{username} vous a invité dans la conversation '%{topic_title}'" + text_body_template: | + %{header_instructions} + + %{message} + + %{respond_instructions} user_invited_to_private_message_pm_staged: subject_template: "[%{site_name}] %{username} vous a invité à voir un message '%{topic_title}'" + text_body_template: | + %{header_instructions} + + %{message} + + %{respond_instructions} user_invited_to_topic: subject_template: "[%{site_name}] %{username} vous a invité dans le sujet '%{topic_title}'" user_replied: @@ -1895,10 +1927,7 @@ fr: too_large: "Désolé, l'image que vous essayez d'envoyer est trop grande (taille maximum de %{max_size_kb}Ko), merci de le redimensionner et de réessayer." size_not_found: "Désolé, mais nous n'avons pas pu déterminer la taille de votre image. Peut-être est-elle corrompue ?" avatar: - missing: "Désolé, nous ne parvenons pas à trouver un avatar associé à cette adresse mail. Pouvez-vous essayer de la télécharger à nous plus tard ?" - flag_reason: - sockpuppet: "Un nouvel utilisateur a créé un sujet et un autre nouvel utilisateur avec la même adresse IP a répondu. Voir le paramétrage flag_sockpuppets." - spam_hosts: "Cet utilisateur a essayé de créer plusieurs messages avec des liens vers le même domaine. Voir le paramétrage du site newuser_spam_host_threshold." + missing: "Désolé, nous ne parvenons pas à trouver un avatar associé à cette adresse mail. Pouvez-vous essayer de la télécharger à nouveau ?" email_log: no_user: "Impossible de trouver l'utilisateur avec l'id %{user_id}" anonymous_user: "L'utilisateur est anonyme" @@ -2014,29 +2043,29 @@ fr: badges: editor: name: Editeur - description: Première édition de message + description: Première édition d'un message long_description: | - Ce badge est accordé après édition d'un de vos messages. Bien que vous ne serez pas capable d'éditer vos messages pour toujours, l'édition est toujours une bonne idée -- Vous pouvez améliorer vos messages, réparer des petites erreurs, ou ajouter des choses que vous avez manqué la première fois. Editer vos messages pour les rendre encore mieux ! + Ce badge est accordé après la première édition d'un de vos messages. Bien que vous la possibilité d'éditer un message est limité dans le temps, l'édition est toujours une bonne idée — vous pouvez améliorer vos messages, réparer des petites erreurs, ou ajouter des choses que vous avez oublié la première fois. Editer vos messages pour les rendre encore meilleurs! basic_user: name: Actif - description: Accordé toutes les fonctions communautaires essentielles sont accessibles + description: Accès accordé à toutes les fonctions communautaires essentielles long_description: | Ce badge est accordé lorsque vous atteignez le niveau de confiance 1. Merci d'être resté dans le coin un petit moment et d'avoir lu quelques sujets pour en apprendre plus sur notre communauté. Vos restrictions "nouvel utilisateur" ont été levées, et vous avez accès aux fonctionnalités essentielles telles que la messagerie personnelle, le signalement, l'édition des wikis, et la possibilité de poster des images et de multiples liens. member: name: Membre - description: Accordé invitations, message de groupe, plus de j'aimes + description: Accès accordé aux invitations, messages de groupe, et plus de "J'aime" long_description: | - Ce badge est accordé lorsque vous atteignez le niveau de confiance 2. Merci d'avoir participé durant plusieurs semaines à notre communauté. Vous pouvez désormais envoyer des invitations personnelles depuis votre page utilisateur ou un sujet, des messages groupés, et quelques "J'aime" supplémentaires chaque jour. + Ce badge est accordé lorsque vous atteignez le niveau de confiance 2. Merci d'avoir participé durant plusieurs semaines à notre communauté. Vous pouvez désormais envoyer des invitations personnelles depuis votre page utilisateur ou un sujet, envoyer des messages groupés, et avez quelques "J'aime" supplémentaires chaque jour. regular: name: Habitué - description: Accordé La re-catégorisation, le renommage, le suivi de lien et le salon sont accessibles + description: Accès accordé à la re-catégorisation, le renommage, le suivi de lien, et plus de "J'aime" long_description: | Ce badge est accordé lorsque vous atteignez le niveau de confiance 3. Merci d'avoir été un participant régulier à notre communauté pendant ces quelques mois, l'un de nos lecteurs les plus actifs et un contributeur sérieux à ce qui rend notre communauté si belle. Vous pouvez désormais recatégoriser et renommer des sujets, accéder à la section privée, signaler des spams, et vous avez plein de "J'aime" en plus chaque jour. leader: name: Meneur - description: Accordé L'édition, l'épinglage, la fermeture, l'archivage, la séparation et la fusion sont accessibles + description: Accès accordé à l'édition globale, l'épinglage, la fermeture, l'archivage, la séparation et la fusion, et toujours plus de "J'aime" long_description: | - Ce badge est accordé lorsque vous atteignez le niveau de confiance 4. Vous êtes un meneur choisi par l'équipe dans cette communauté, et vous montrez l'exemple dans vos actions et vos mots. Vous avez la capacité d'éditer tous les messages, utiliser les actions de modérations telles qu'épingler, fermer, cacher, archiver, scinder et réunir, ainsi que des tonnes de "J'aime" par jour. + Ce badge est accordé lorsque vous atteignez le niveau de confiance 4. Vous êtes un meneur choisi par l'équipe dans cette communauté, et vous montrez l'exemple dans vos actions et vos mots. Vous avez la capacité d'éditer tous les messages, utiliser les actions de modérations telles qu'épingler, fermer, cacher, archiver, scinder et fusionner, ainsi que des tonnes de "J'aime" par jour. welcome: name: Bienvenue description: A reçu un j'aime. @@ -2046,25 +2075,25 @@ fr: name: Autobiographe description: A rempli les informations de son profil long_description: | - Ce badge est accordé au remplissage de votre profil utilisateur et au choix d'une photo de profil. En dire plus à la communauté sur vous et vos intérêts permet de la rendre plus agréable et plus connectée. + Ce badge est accordé au remplissage de votre profil utilisateur et au choix d'une photo de profil. En dire plus à la communauté sur vous et vos intérêts permet de la rendre plus agréable et plus connectée. Rejoignez-nous! anniversary: name: Jubilaire description: Membre actif depuis un an, avec au moins un message long_description: | Ce badge est accordé après avoir été membre du site pendant une année, avec au moins un message crée dans cette année. Merci d'être resté avec nous et de contribuer ainsi à notre communauté ! Nous n'aurions pas pu le faire sans vous. nice_post: - name: Belle réponse + name: Jolie réponse description: A reçu 10 j'aime sur une réponse. long_description: | Ce badge est accordé quand une réponse obtient 10 j'aime. Votre réponse a vraiment fait impression sur la communauté et a aidé à faire progresser la conversation. good_post: name: Bonne Réponse - description: A recu 25 j'aime sur une réponse + description: A reçu 25 j'aime sur une réponse long_description: | Ce badge est accordé quand votre réponse obtient 25 j'aime. Votre réponse est exceptionnel et a rendu la conversation bien mieux pour tout le monde. great_post: name: Super Réponse - description: A recu 50 j'aime sur une réponse + description: A reçu 50 j'aime sur une réponse long_description: | Ce badge est accordé quand une réponse obtient 50 j'aime. Votre réponse était inspirante, fascinante, hilarante, ou pertinente et la communauté l'a adorée. nice_topic: @@ -2074,26 +2103,26 @@ fr: Ce badge est accordé quand un sujet obtient 10 j'aime. Vous avez commencé une conversation intéressante que la communauté a apprécié ! good_topic: name: Bon sujet - description: A recu 25 j'aime sur un sujet + description: A reçu 25 j'aime sur un sujet long_description: | Ce badge est accordé quand un sujet obtient 25 j'aime. Vous avez lancé une conversation vibrante autour de laquelle la communauté s'est ralliée et elle l'a adorée. great_topic: name: Super sujet - description: A recu 50 j'aime sur un sujet + description: A reçu 50 j'aime sur un sujet long_description: | Ce badge est accordé quand un sujet obtient 50 j'aime. Vous avez initié une fascinante conversation et la communauté a apprécié la discussion dynamique qui en a résulté ! nice_share: name: Partage sympa description: Message partagé avec 25 visiteurs uniques long_description: | - Ce badge est accordé après le partage d'un lien vers un message consulté par 25 visiteurs extérieurs. Merci de partager le mot à propos de nos discussions et de cette communauté. + Ce badge est accordé après le partage d'un lien vers un message consulté par 25 visiteurs extérieurs. Merci de faire connaître nos discussions et cette communauté. good_share: name: Bon partage description: Message partagé avec 300 visiteurs uniques long_description: | Ce badge est accordé après le partage d'un lien vers un message consulté par 300 visiteurs extérieurs. Bon travail ! Vous avez diffusé une discussion intéressante à beaucoup de nouvelles personnes et nous avez aidés à grandir. great_share: - name: Super Partage + name: Super partage description: Message partagé avec 1000 visiteurs uniques long_description: | Ce badge est accordé après le partage d'un lien vers un message consulté par 1000 visiteurs extérieurs. Wow ! Vous avez fait la promotion d'une discussion intéressante auprès d'une énorme nouvelle audience pour le compte de cette communauté, et nous avez beaucoup aidé à grandir ! @@ -2105,7 +2134,7 @@ fr: name: Premier signalement description: A signalé un message long_description: | - Ce badge est accordé la première fois où vous signalez un message. Les signalements sont essentiels à la santé de votre communauté. Si vous remarquez des messages nécessitant l'intervention d'un modérateur n'hésitez pas à les signaler. Vous pouvez aussi utiliser les boîtes de dialogue de signalement pour envoyer des messages à d'autres utilisateurs. Si vous voyez un problème, :flag_black: signalez-le ! + Ce badge est accordé la première fois que vous signalez un message. Les signalements sont essentiels à la santé de votre communauté. Si vous remarquez des messages nécessitant l'intervention d'un modérateur n'hésitez pas à les signaler. Vous pouvez aussi utiliser les boîtes de dialogue de signalement pour envoyer des messages à d'autres utilisateurs. Si vous voyez un problème, :flag_black: signalez-le ! promoter: name: Ambassadeur description: A invité un utilisateur @@ -2114,47 +2143,80 @@ fr: campaigner: name: Militant description: A invité 3 utilisateurs basiques + long_description: | + Ce badge est accordé lorsque vous avez invité 3 personnes qui ont ensuite passé assez de temps sur le site pour devenir des utilisateurs de base. Une communauté dynamique a besoin d'un apport régulier de nouveaux arrivants qui participent régulièrement et ajouter de nouvelles voix aux conversations. champion: name: Champion description: A invité 5 membres + long_description: | + Ce badge est accordé lorsque vous avez invité 5 personnes qui ont ensuite passé assez de temps sur le site pour devenir membres à part entière. Hou la la! Merci d'élargir la diversité de notre communauté avec de nouveaux membres! first_share: name: Premier partage description: A partagé un message + long_description: | + Ce badge est accordé la première fois que vous partagez un lien vers une réponse ou un sujet en utilisant le bouton de partage. Partager des liens est une excellente façon de montrer des discussions intéressantes avec le reste du monde et faire croître votre communauté. first_link: name: Premier lien description: A ajouté un lien vers un autre sujet + long_description: | + Ce badge est accordé la première fois que vous ajoutez un lien à un autre sujet. Lier les sujets aident d'autres lecteurs à trouver des conversations intéressantes proches, en montrant les liens entre les sujets dans les deux directions. Linker librement! first_quote: name: Première citation description: A cité un message + long_description: | + Ce badge est accordé la première fois que vous citez un message dans votre réponse. Citant les sections pertinentes des messages précédents dans votre réponse permet de garder les discussions reliées entre elles et sur le sujet. La meilleure façon de citer est de mettre en évidence une section d'un poste, puis appuyez sur un bouton de réponse. Citer généreusement! read_guidelines: name: Règlement lu description: A lu le règlement de la communauté + long_description: | + Ce badge est accordé pour en lisant la communauté des directives. En suivant et en partageant ces lignes directrices simples qui aident à construire une communauté sûre, sympa et durable pour tout le monde. Rappelez-vous toujours qu'il y a un autre être humain, très bien comme vous, de l'autre côté de cet écran. Soyez sympa! reader: name: Lecteur description: A lu tous les messages d'un sujet contenant plus de 100 messages + long_description: | + Ce badge est accordé la première fois que vous lisez un long sujet avec plus de 100 réponses. Lire une conversation attentivement, vous aide à suivre la discussion, comprendre différents points de vue, et conduit à des conversations plus intéressantes. Plus vous lisez, mieux la conversation devient. Comme nous aimons le dire, la lecture est fondamentale! : sourire timide: popular_link: name: Lien populaire description: A posté un lien externe avec au moins 50 clics + long_description: | + Ce badge est accordé quand un lien que vous avez partagé obtient 50 clics. Merci de poster un lien utile qui a ajouté un contexte intéressant à la conversation! hot_link: name: Lien tendance description: A posté un lien externe avec au moins 300 clics + long_description: "Ce badge est accordé quand un lien que vous avez partagé obtient 300 clics. Merci de poster un lien fascinant qui a conduit la conversation vers l'avant et a illuminé la discussion! \n" famous_link: name: Lien célèbre description: A posté un lien externe avec 1000 clic + long_description: | + Ce badge est accordé quand un lien que vous avez partagé obtient 1000 clics. Hou la la! Vous avez publié un lien qui a considérablement amélioré la conversation en ajoutant des détails, le contexte et les informations essentielles. Excellent travail! appreciated: name: Apprécié - description: A recu 1 j'aime sur 20 messages + description: A recu 1 j'aime sur 20 messages + long_description: | + Ce badge est accordé lorsque vous recevez au moins un j'aime sur 20 postes différents. La communauté connaît vos contributions aux conversations ici! respected: name: Respecté description: A reçu 2 j'aime sur 100 messages + long_description: | + Ce badge est accordé lorsque vous recevez au moins 2 j'aime sur 100 postes différents. La communauté est en croissance de respecter vos nombreuses contributions aux conversations ici admired: name: Admiré description: A reçu 5 j'aime sur 300 messages + long_description: | + Ce badge est accordé lorsque vous recevez au moins 5 j'aime sur 300 postes différents. Hou la la! La communauté admire vos fréquentes contributions de haute qualité aux conversations ici. out_of_love: name: Trop d'amour description: A utilisé 50 j'aime en une journée + long_description: | + Ce badge est accordé lorsque vous utilisez tous les 50 de vos j'aime quotidiens. Rappelez-vous de prendre un moment pour aimer les messages qui vous plaisent et d'apprécier encourager vos membres de la communauté pour créer encore plus de grandes discussions à l'avenir. + higher_love: + name: Amour plus fort + long_description: | + Ce badge est accordé lorsque vous utilisez tous les 50 j'aime par jour pendant 5 jours. Merci de prendre le temps activement d'encourager les meilleures conversations chaque jour! crazy_in_love: name: Fou amoureux + long_description: | + Ce badge est accordé lorsque vous utilisez tous les 50 de vos j'aime par jour pendant 20 jours. Hou la la! Vous êtes un modèle de régulièrement encourager vos membres de la communauté! thank_you: name: 'Merci ' description: A 20 messages ayant reçu un j'aime et a donné 10 j'aime @@ -2166,16 +2228,19 @@ fr: Ce badge vous est accordé quand vous avez reçu 100 j'aime et en avez donné 100 ou plus en retour. Merci pour tout cela. empathetic: name: Empathique - description: A 500 messages ayant reçu un like et a donné 1000 j'aime + description: A 500 messages ayant reçu un j'aime et a donné 1000 j'aime long_description: "Ce badge vous est accordé quand vous avez reçu 500 j'aime et en avez donné 1000 ou plus en retour. Whaou ! Vous êtes un modèle de générosité et d'amour mutuel :two_hearts:. \n" first_emoji: name: Premier Emoji description: A utilisé un emoji dans un message - long_description: "Ce badge est accordé quand vous ajoutez pour la première fois un Emoji à un message :heart: \n" + long_description: | + Ce badge est accordé la première fois que vous ajoutez un Emoji à votre message: pouce en l'air :. Les Emoji vous permettent de transmettre de l'émotion dans vos messages, du bonheur: smiley: à la tristesse: angoissé: à la colère: colère: et tout le reste: lunettes de soleil:. Il suffit de taper un: (deux points) ou appuyez sur le bouton de la barre d'outils Emoji dans l'éditeur de choisir parmi des centaines de choix: ok_hand: first_mention: name: Première mention description: A mentionné un utilisateur dans un message - long_description: Ce badge est accordé quand vous @mentionnez un utilisateur dans votre message. @mention vous permette de notifiez d'autres membres du forum. + long_description: Ce badge est accordé la première fois que vous mentionnez le @username de quelqu'un dans votre post. Chaque mention génère une notification à cette personne, de sorte qu'ils savent au sujet de votre poste. Il suffit de commencer à taper @ (arobase) de mentionner tout utilisateur ou, si autorisé, groupe - c'est un moyen pratique d'apporter quelque chose à leur attention. + first_onebox: + long_description: Ce badge est accordé la première fois que vous publiez un lien en ligne par lui-même, qui a ensuite été développé automatiquement dans un onebox avec un bref résumé du lien, un titre, et (le cas échéant) une image. admin_login: success: "Courriel envoyé" error: "Erreur !" @@ -2193,3 +2258,4 @@ fr: activemodel: errors: <<: *errors + rss_by_tag: "Sujets portant le tag %{tag}" diff --git a/config/locales/server.id.yml b/config/locales/server.id.yml index a9f7b772f3..24d3933a8b 100644 --- a/config/locales/server.id.yml +++ b/config/locales/server.id.yml @@ -21,25 +21,103 @@ id: loading: "Memuat" powered_by_html: 'Didayakan oleh Discourse, aktifkan JavaScript untuk tampilan terbaik' log_in: "Log In" + purge_reason: "Secara otomatis dihapus sebagai akun yang ditinggalkan, dinon-aktifkan." + disable_remote_images_download_reason: "Unduh gambar jarak jauh dimatikan karena ruang penyimpanan di server tidak cukup." anonymous: "Anonim" + emails: + incoming: + default_subject: "Email masuk dari %{email}" + show_trimmed_content: "Tampilkan konten yang dipersingkat" + errors: + empty_email_error: "Terjadi bila surel mentah yang kami terima tidak berisi apapun (kosong)." + no_message_id_error: "Terjadi bila surel tidak memiliki header 'Message-Id'." + auto_generated_email_error: "Terjadi bila 'precedence' header ditentukan sebagai: list, junk, bulk atau auto_reply, atau ketika header lainnya mengandung: kumpulkan otomatis, balas otomatis, atau buat otomatis." errors: &errors messages: + too_long_validation: "Dibatasi hingga %{max} karakter; Anda memasukkan %{length} karakter." + taken: "sudah diambil" + accepted: harus diterima + blank: tidak boleh kosong + present: harus kosong + confirmation: "tidak cocok dengan %{attribute}" + empty: tidak boleh kosong + equal_to: harus sebanyak %{count} + even: harus genap + exclusion: telah dipratentukan oleh sistem + greater_than: harus lebih besar dari %{count} + greater_than_or_equal_to: harus sama dengan atau lebih besar dari %{count} + has_already_been_used: "telah digunakan" + inclusion: tidak dimasukkan kedalam daftar invalid: tidak benar + is_invalid: "tidak valid; cobalah untuk lebih deskriptif" + less_than: harus kurang dari %{count} + less_than_or_equal_to: harus sama dengan atau kurang dari %{count} not_a_number: bukan numerik not_an_integer: harus integer odd: harus ganjil + record_invalid: 'Validasi gagal: %{errors}' + restrict_dependent_destroy: + one: "Tidak bisa menghapus catatan karena ada catatan yang berkaitan: %{record}" + many: "Tidak bisa menghapus catatan karena ada catatan yang berkaitan: %{record}" + too_long: + other: terlalu panjang (panjang maksimum adalah %{count} karakter) + too_short: + other: terlalu pendek (jumlah minimum adalah %{count} karakter) + wrong_length: + other: jumlah karakter salah (seharusnya %{count} karakter) + other_than: "harus lain dari %{count}" + template: + body: 'Ada masalah dengan objek-objek berikut:' + header: + other: '%{count} kesalahan menyebabkan %{model} ini tidak bisa disimpan' + embed: + load_from_remote: "Ada kesalahan dalam memuat posting itu." + site_settings: + min_username_length_exists: "Anda tidak boleh menentukan jumlah karakter minimum username lebih dari username yang terpendek" + min_username_length_range: "Anda tidak boleh menentukan minimum lebih dari maksimum." + max_username_length_exists: "Anda tidak boleh menentukan jumlah karakter maksimum username dibawah username terpendek. " + max_username_length_range: "Anda tidak bisa menentukan jumlah maksimum dibawah jumlah minimum." + default_categories_already_selected: "Anda tidak boleh memilih kategori yang digunakan di daftar lainnya." backup: operation_already_running: "Proses lain sedang berjalan. Tidak dapat menjalankan proses baru saat ini." backup_file_should_be_tar_gz: "File backup harus berupa arsip .tar.gz." + not_enough_space_on_disk: "Ruang penyimpanan tidak cukup untuk menerima unduhan backup ini." not_logged_in: "Anda harus login untuk melakukan itu." + not_found: "URL atau sumber yang diminta tidak dapat ditemukan." + invalid_access: "Anda tidak diijinkan untuk melihat sumber yang diminta." read_only_mode_enabled: "Situs ini dalam modus read-only. Interaksi dinonaktifkan." + reading_time: "Waktu bacaan" + likes: "Suka" + too_many_replies: + other: "Maaft, bagi pengguna baru sementara ini hanya dibatasi hingga %{count} jawaban dalam topik yang sama." embed: start_discussion: "Mulai Diskusi" continue: "Lanjutkan Diskusi" + more_replies: + other: "%{count} jawaban lainnya" + loading: "Sedang memuat diskusi..." + imported_from: "Ini adalah topik diskusi tambahan untuk topik utama di %{link}" in_reply_to: "▶ %{username}" replies: other: "%{count} balasan" + no_mentions_allowed: "Maaf, Anda tidak dapat menyebut pengguna lain." + too_many_mentions: + other: "Maaf, Anda hanya diperbolehkan untuk menyebut %{count} pengguna dalam satu posting." + no_mentions_allowed_newuser: "Maaf, pengguna baru tidak diijinkan untuk menyebut pengguna lain." + too_many_mentions_newuser: + other: "Maaf, pengguna baru hanya diperbolehkan untuk menyebut %{count} pengguna dalam satu posting." + no_images_allowed: "Maaf, pengguna baru tidak diperbolehkan untuk memasang gambar/foto dalam posting." + too_many_images: + other: "Maaf, pengguna baru hanya diperbolehkan untuk memasang %{count} gambar/foto dalam satu posting." + no_attachments_allowed: "Maaf, pengguna baru tidak diijinkan untuk mengunggah file/attachment dalam posting." + too_many_attachments: + other: "Maaf, pengguna baru hanya diijinkan untuk mengunggah %{count} file/attachment dalam satu posting." + no_links_allowed: "Maaf, pengguna baru tidak diijinkan untuk menulis tautan dalam posting." + too_many_links: + other: "Maaf, pengguna baru hanya diijinkan untuk menulis %{count} tautan dalam satu posting." spamming_host: "Maaf, Anda tidak dapat mencantumkan tautan ke host tersebut." + user_is_suspended: "Pengguna yang dalam masa suspensi tidak diperbolehkan untuk membuat posting." + topic_not_found: "Ada yang salah. Mungkin topik ini ditutup atau dihapus ketika Anda sedang menjelajahinya?" just_posted_that: "tingkat kemiripan dengan post sebelumnya sangat tinggi" has_already_been_used: "telah digunakan" invalid_characters: "memuat karakter yang tidak valid" @@ -59,11 +137,15 @@ id: rss_description: latest: "Topik Terbaru" hot: "Topik Terpanas" + top: "Topik unggulan" posts: "Pos terbaru" + private_posts: "pesan pribadi terkini" + group_posts: "Posting terkini dari %{group_name}" + group_mentions: "Mention terkini dari %{group_name}" excerpt_image: "gambar" groups: errors: - can_not_modify_automatic: "Anda tidak dapat mengubah grup otomatis" + invalid_incoming_email: "'%{email}' bukanlah alamat email yang valid." default_names: everyone: "setiap orang" admins: "admin" @@ -96,6 +178,8 @@ id: title: "Selamat datang di Lounge" category: topic_prefix: "Tentang kategori %{category}" + errors: + invalid_email_in: "'%{email}' bukanlah alamat email yang valid." trust_levels: newuser: title: "pengguna baru" @@ -122,6 +206,16 @@ id: other: "baru saja" x_seconds: other: "%{count} detik yang lalu" + password_reset: + choose_new: "Silahkan memilih password baru" + change_email: + error: "Ada kesalahan dalam merubah alamat email Anda. Mungkinkah alamat ini telah digunakan oleh pengguna lain?" + error_staged: "Ada kesalahan dalam merubah alamat email Anda. Alamat ini telah digunakan oleh pengguna lain." + authorizing_old: + title: "Terima kasih telah mengkonfirmasi alamat email terkini Anda" + description: "Sekarang kami akan mengirimkan surel konfirmasi ke alamat email baru Anda." + activation: + please_continue: "Akun baru Anda telah dikonfirmasi. Anda akan diarahkan ke halaman utama." post_action_types: bookmark: title: 'Penandaan' @@ -131,10 +225,21 @@ id: notify_moderators: email_title: 'Perhatian moderator dibutuhkan di topik "%{title}"' reports: + signups: + title: "Pengguna Baru" + yaxis: "Jumlah pengguna baru" + topics: + yaxis: "Jumlah topik baru" posts: title: "Pos" + yaxis: "Jumlah posting baru" likes: title: "Suka" + yaxis: "Jumlah suka baru" + bookmarks: + yaxis: "Jumlah bookmark baru" + starred: + yaxis: "Jumlah topik berbintang baru" notify_moderators_private_messages: xaxis: "Hari" notify_user_private_messages: @@ -160,16 +265,57 @@ id: site_settings: notify_mods_when_user_blocked: "Jika pengguna diblokir secara otomatis, kirimkan pesan kepada semua moderator." maximum_backups: "Jumlah maksimum backup yang disimpan dalam disk. Backup lama akan dihapus secara otomatis." + email_editable: "Perbolehkan pengguna untuk mengganti alamat email setelah registrasi." + errors: + invalid_email: "Alamat email tidak valid." + topic_statuses: + closed_enabled: "Topik telah ditutup. Jawaban baru tidak lagi diijinkan." + closed_disabled: "Topik telah dibuka. Jawaban baru sekarang diijinkan." + autoclosed_disabled: "Topik telah dibuka. Jawaban baru sekarang diijinkan." + autoclosed_disabled_lastpost: "Topik telah dibuka. Jawaban baru sekarang diijinkan." user: email: + not_allowed: "tidak diijinkan dari penyedia layanan email ini. Silahkan gunakan alamat email yang lain." blocked: "tidak diperbolehkan." + ip_address: + blocked: "Registrasi baru dari alamat IP Anda tidak diijinkan." + max_new_accounts_per_registration_ip: "Registrasi baru dari alamat IP Anda tidak diijinkan (telah mencapai batas maksimum). Silahkan hubungi staff." system_messages: + too_many_spam_flags: + subject_template: "Akun baru disuspensi atas alasan laporan dari komunitas" + user_automatically_blocked: + subject_template: "Pengguna baru %{username} disuspensi atas laporan komunitas" + spam_post_blocked: + subject_template: "Pengguna baru %{username} disuspensi atas penulisan tautan yang berulang-ulang kali" pending_users_reminder: subject_template: other: "%{count} pengguna sedang menunggu persetujuan" user_notifications: previous_discussion: "Balasan Sebelumnya" posted_by: "Dipost oleh %{username} pada %{post_date}" + digest: + new_activity: "Aktifitas baru di topik dan posting Anda:" + more_topics: "Ada %{new_topics_since_seen} topik baru lainnya." + more_topics_category: "Topik baru lebih banyak:" + account_created: + subject_template: "[%{site_name}] Akun Baru Anda" + text_body_template: |+ + Anda mendapatkan akun baru di %{site_name} + + + Silahkan sentuh tautan dibawah ini untuk menentukan sandi dari akun baru Anda: + + %{base_url}/users/password-reset/%{email_token} + + confirm_new_email: + subject_template: "[%{site_name}] Konfirmasi email baru Anda" + text_body_template: | + Silahkan mengkonfirmasi email baru Anda di %{site_name} dengan mengunjungi tautan dibawah: + + + %{base_url}/users/authorize-email/%{email_token} + signup: + subject_template: "[%{site_name}] Konfirmasi akun baru Anda" page_not_found: see_more: "Selengkapnya" terms_of_service: diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml index bf6046b76e..a16c287bd0 100644 --- a/config/locales/server.it.yml +++ b/config/locales/server.it.yml @@ -24,13 +24,18 @@ it: loading: "Caricamento" powered_by_html: 'Powered by Discourse, è consigliato abilitare JavaScript ' log_in: "Accedi" - purge_reason: "Cancellato automaticamente come account abbandonato e mai attivato" + purge_reason: "Account cancellato automaticamente perché abbandonato o disattivato" disable_remote_images_download_reason: "Lo scaricamento delle immagini remote è stato disabilitato perché non c'è abbastanza spazio disco disponibile." anonymous: "Anonimo" emails: incoming: default_subject: "Email in arrivo da %{email}" show_trimmed_content: "Mostra contenuto tagliato" + errors: + empty_email_error: "Succede quando l'email ricevuta era vuota." + no_message_id_error: "Succede quando l'email non ha l'intestazione 'Message-Id'." + inactive_user_error: "Succede quando il mittente non è attivo." + blocked_user_error: "Succede quando il mittente è stato bloccato." errors: &errors format: '%{attribute} %{message}' messages: @@ -429,7 +434,7 @@ it: like: title: 'Mi piace' description: 'Metti "Mi piace" a questo messaggio' - long_form: 'hai messo "Mi piace"' + long_form: 'hanno messo "Mi piace"' vote: title: 'Vota' description: 'Vota questo messaggio' @@ -896,7 +901,7 @@ it: allow_animated_thumbnails: "Genera miniature animate delle gif animate." default_avatars: "URL degli avatar che verranno utilizzati come predefiniti per i nuovi utenti, fintanto che non li cambieranno esplicitamente." automatically_download_gravatars: "Scarica i Gravatars per gli utenti quando viene creato l'account o quando viene modificata l'email" - digest_topics: "Numero massimo di argomenti da mostrare nel riassunto email." + digest_topics: "Numero massimo di argomenti da mostrare nelle email riepilogative." allow_profile_backgrounds: "Permetti agli utenti di caricare immagini di sfondo per il profilo." enable_mobile_theme: "I dispositivi mobili usano un tema apposito, con possibilità di passare alla visualizzazione completa. Disabilita questa opzione se vuoi usare un foglio di stile personalizzato che sia completamente reattivo." suppress_uncategorized_badge: "Non mostrare la targhetta per gli argomenti senza categoria nell'elenco degli argomenti." @@ -951,6 +956,10 @@ it: redirected_to_top_reasons: new_user: "Benvenuto nella nostra comunità! Questi sono gli argomenti recenti più popolari." not_seen_in_a_month: "Bentornato! Non ti si vede da un po'. Questi sono gli argomenti più popolari da quando sei stato via." + move_posts: + existing_topic_moderator_post: + one: "Un messaggio è stato fuso in un argomento esistente: %{topic_link}" + other: "%{count} messaggi sono stati fusi in un argomento esistente: %{topic_link}" change_owner: post_revision_text: "Proprietà trasferita da %{old_user} a %{new_user}" deleted_user: "un utente eliminato" @@ -1141,51 +1150,29 @@ it: subject_template: "[%{site_name}] %{username} ti invita al partecipare al messaggio '%{topic_title}'" user_replied: subject_template: "[%{site_name}] %{topic_title}" - text_body_template: "%{header_instructions} \n\n%{message}\n\n%{context}\n\n---\n%{respond_instructions}\n" user_replied_pm: subject_template: "[%{site_name}] [PM] %{topic_title}" - text_body_template: "%{header_instructions} \n\n%{message}\n\n%{context}\n\n---\n%{respond_instructions}\n" user_quoted: subject_template: "[%{site_name}] %{topic_title}" - text_body_template: "%{header_instructions} \n\n%{message}\n\n%{context}\n\n---\n%{respond_instructions}\n" user_linked: subject_template: "[%{site_name}] %{topic_title} " - text_body_template: "%{header_instructions}\n \n%{message}\n\n%{context}\n\n---\n%{respond_instructions}\n" user_mentioned: subject_template: "[%{site_name}] %{topic_title}" - text_body_template: "%{header_instructions}\n\n%{message}\n \n%{context}\n\n---\n%{respond_instructions}\n" user_group_mentioned: subject_template: "[%{site_name}] %{topic_title}" - text_body_template: "%{header_instructions}\n\n%{message}\n\n%{context}\n \n---\n%{respond_instructions}\n" user_posted: subject_template: "[%{site_name}] %{topic_title}" - text_body_template: "%{header_instructions}\n\n%{message}\n \n%{context}\n\n---\n%{respond_instructions}\n" user_posted_pm: subject_template: "[%{site_name}] [PM] %{topic_title}" - text_body_template: | - %{header_instructions} - - %{message} - - %{context} - - --- - %{respond_instructions} user_posted_pm_staged: subject_template: "%{optional_re}%{topic_title}" - text_body_template: |2 - - %{message} - - --- - %{respond_instructions} digest: why: "Un breve sommario di %{site_link} dalla tua ultima visita il %{last_seen_at}" subject_template: "[%{site_name}] Riepilogo" new_activity: "Nuove attività nei tuoi argomenti e messaggi:" top_topics: "Messaggi di successo" other_new_topics: "Argomenti più attivi" - unsubscribe: "Questo riassunto viene spedito da %{site_link} ogniqualvolta non ti vediamo per un po' di tempo. Per cancellarti %{unsubscribe_link}." + unsubscribe: "Questo riepilogo viene inviato da %{site_link} se non ti si vede da un po'. Per annullare l'iscrizione %{unsubscribe_link}." click_here: "clicca qui" from: "%{site_name} riepilogo" read_more: "Leggi Altro" @@ -1285,6 +1272,20 @@ it: title: "Termini del Servizio" privacy_topic: title: "Politica della Privacy" + badges: + first_like: + name: Primo "Mi piace" + description: Ha messo "Mi piace" a un messaggio + first_flag: + name: Prima Segnalazione + description: Segnalato un messaggio + first_share: + name: Prima Condivisione + description: Ha condiviso un messaggio + first_link: + name: Primo Collegamento + first_quote: + description: Ha citato un messaggio admin_login: success: "email Inviata" error: "Errore!" diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml index 17ed131b81..cc2d66a914 100644 --- a/config/locales/server.ja.yml +++ b/config/locales/server.ja.yml @@ -8,17 +8,16 @@ ja: dates: short_date_no_year: "MMM D" - short_date: "MMM D, YYYY" + short_date: "YYYY MMM D" long_date: "MMMM D, YYYY h:mma" date: - month_names: [null, １月, ２月, ３月, ４月, ５月, ６月, ７月, ８月, ９月, １０月, １１月, １２月] + month_names: [null, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月] title: "Discourse" topics: "トピック" posts: "投稿" loading: "読み込み中" powered_by_html: 'Powered by Discourse, best viewed with JavaScript enabled' log_in: "ログイン" - purge_reason: "アクティブでないアカウントは放棄されたとして削除されました" disable_remote_images_download_reason: "ディスク容量が不足しているため、リモートでの画像ダウンロードは無効になっています。" anonymous: "匿名" emails: @@ -90,8 +89,8 @@ ja: replies: other: "%{count} 通の返信" spamming_host: "申し訳ありませんが、このホストへのリンクを貼ることはできません。" - user_is_suspended: "サスペンド中のユーザーは投稿ができません。" - topic_not_found: "何かがおかしいです。トピックが終了したか、閲覧してる間に削除された可能性があります" + user_is_suspended: "アカウントが凍結中のユーザーは投稿ができません。" + topic_not_found: "問題が発生しました。トピックがクローズしたか、閲覧中に削除された可能性があります。" just_posted_that: "はあなたが最近投稿したポストと内容がほぼ一緒です" has_already_been_used: "は既に使用中です" invalid_characters: "は不正なキャラクターを含んでいます" @@ -252,9 +251,9 @@ ja: x_days: other: "%{count} 日" about_x_months: - other: "%{count} ヶ月" + other: "%{count}ヶ月" x_months: - other: "%{count} ヶ月" + other: "%{count}ヶ月" about_x_years: other: "%{count} 年" over_x_years: @@ -276,9 +275,9 @@ ja: x_days: other: "%{count} 日前" about_x_months: - other: "約 %{count} ヶ月前" + other: "約 %{count}ヶ月前" x_months: - other: "%{count} ヶ月前" + other: "%{count}ヶ月前" about_x_years: other: "約 %{count} 年前" over_x_years: @@ -300,33 +299,34 @@ ja: please_continue: "%{site_name}へ" error: "メールアドレスの更新に失敗しました。アドレスが既に使用されているかもしれません。" activation: + action: "クリックしてアカウントを認証する" already_done: "申し訳ありませんが、このアカウント認証リンクは無効です。既にアカウントがアクティブになっていませんか?" please_continue: "あなたのアカウントは確認されました。ホームにリダイレクトされます" continue_button: "%{site_name} へ" welcome_to: "%{site_name} へようこそ!" approval_required: "このフォーラムにアクセスするにはモデレータによる承認が必要です。承認されるとメールにて通知されます!" - missing_session: "アカウントの作成を検出できません。クッキーが有効になっているか確認してください。" post_action_types: off_topic: title: '関係ない話題' description: 'このポストはタイトルと投稿で定義される現在の議論に関連しておらず、どこかに移動させる必要があります' - long_form: '「関係ない話題」としてフラグを立つ' + long_form: '「関係ない話題」として通報' spam: title: 'スパム' description: 'この投稿は、営利目的、宣伝目的の書き込みの可能性がある。' - long_form: 'スパムフラグをたてる' - email_title: '"%{title}"はスパムとしてフラグされています' + long_form: 'スパムとして通報する' + email_title: '"%{title}"はスパムとして通報されています' email_body: "%{link}\n\n%{message}" inappropriate: title: '不適切' description: 'この投稿は、誹謗中傷、恫喝、名誉毀損、わいせつ、犯罪行為など他人を不快にさせる内容を含んでいる。' - long_form: '不適切フラグをたてる' + long_form: '不適切として通報する' notify_user: long_form: 'メッセージが送られたユーザ' email_title: '「%{title}」にの投稿' email_body: "%{link}\n\n%{message}" notify_moderators: title: "その他" + long_form: 'スタッフへ知らせるために通報する' email_body: "%{link}\n\n%{message}" bookmark: title: 'ブックマーク' @@ -344,19 +344,19 @@ ja: spam: title: 'スパム' description: 'この投稿は、営利目的、宣伝目的の書き込みの可能性がある。' - long_form: 'スパムフラグをたてる' + long_form: 'スパムとして通報' inappropriate: title: '不適切' description: 'この投稿は、誹謗中傷、恫喝、名誉毀損、わいせつ、犯罪行為など他人を不快にさせる内容を含んでいる。' - long_form: '不適切フラグをたてる' + long_form: '不適切として通報する' notify_moderators: title: "その他" - long_form: 'モデレータへの注意としてフラグを立てる' + long_form: 'モデレーターへ知らせるために通報する' email_title: 'トピック"%{title}" は不適切な可能性があるため、管理人による確認を必要とする。' email_body: "%{link}\n\n%{message}" flagging: - you_must_edit: '

      投稿がコミュニティによってフラグがつけられました。投稿したメッセージを確認してください。

      ' - user_must_edit: '

      この投稿はコミュニティにフラグを付けられまして、非表示されています。

      ' + you_must_edit: '

      投稿が他のユーザから通報されました。投稿したメッセージを確認してください。

      ' + user_must_edit: '

      この投稿は他のユーザから通報されたため、非表示にされています。

      ' archetypes: regular: title: "通常のトピック" @@ -399,9 +399,9 @@ ja: xaxis: "日" yaxis: "新規「いいね!」数" flags: - title: "フラグ" + title: "通報" xaxis: "日" - yaxis: "フラグの数" + yaxis: "通報の数" bookmarks: title: "ブックマーク" xaxis: "日" @@ -555,7 +555,7 @@ ja: educate_until_posts: "最初(または複数)の投稿でタイピングを開始したら、ポップアップでガイダンスを表示させるか" title: "サイトの名前です。titleタグで使用されます" site_description: "１文でこのサイトを説明してください。descriptionタグで使用されます" - contact_email: "このサイトへの問い合わせに責任を持つメールアドレス。問い合わせフォームからの緊急事項、回収していないフラグなど、緊急の通知に使用します" + contact_email: "このサイトへのお問い合わせを行うメールアドレス。お問い合わせフォームからの緊急事項、対応されていない通報など、緊急の通知に使用します" contact_url: "このサイトの問い合わせURL。緊急連絡用問い合わせフォームに使用されます" queue_jobs: "開発者ONLY! 警告! デフォルトでキューは sidekiq により処理されます。これを無効にするとサイトが動作不能になります。" crawl_images: "正しい幅と高さを取得するためにURLから画像を取得する" @@ -595,13 +595,13 @@ ja: polling_interval: "ロングポーリングではないときの、ログイン済みクライアントのポーリング間隔(ミリ秒)" anon_polling_interval: "匿名ユーザのクライアントのポーリング間隔 (ミリ秒)" background_polling_interval: "ウィンドウがバックグラウンド時のクライアントのポーリング間隔（ミリ秒)" - cooldown_minutes_after_hiding_posts: "フラグにより非表示状態になったポストをユーザが編集可能になるまでの時間 (分)" + cooldown_minutes_after_hiding_posts: "通報により非表示状態になったポストをユーザが編集可能になるまでの時間 (分)" max_topics_in_first_day: "サイト利用初日にユーザが作成することのできるトピックの最大数" max_replies_in_first_day: "サイト利用日にユーザが作成することのできる回答の最大数" tl2_additional_likes_per_day_multiplier: "この数字を掛けると TL2 (メンバー) の1日あたりの「いいね！」の上限を増やします" tl3_additional_likes_per_day_multiplier: "この数字を掛けると TL3 (レギュラー) の1日あたりの「いいね！」の上限を増やします" tl4_additional_likes_per_day_multiplier: "この数字を掛けると TL4 (リーダー) の1日あたりの「いいね！」の上限を増やします" - num_flags_to_block_new_user: "新規ユーザのポストに対して、何人のユーザによりここで指定した数のスパムフラグが立てられたら、全てのポストを非表示状態にした上でこのユーザからのポストを拒否するか。0 で無効化" + num_flags_to_block_new_user: "新規ユーザの投稿に対して、何人のユーザによりここで指定した数のスパムフラグが立てられたら、全てのポストを非表示状態にした上でこのユーザからのポストを拒否するか。0 で無効化" num_users_to_block_new_user: "新規ユーザのポストに対して、ここで指定した数のユーザにより何個のスパムフラグが立てられたら、全てのポストを非表示状態にした上でこのユーザからのポストを拒否するか。0 で無効化" notify_mods_when_user_blocked: "ユーザが自動的にブロックされた際に、すべてのモデレータにメッセージを送信する。" flag_sockpuppets: "トピックを作成したユーザーと同じIPアドレスで、新規ユーザーがトピックに回答した場合、両者を潜在的なスパムとしてフラグを立てるか" @@ -686,7 +686,7 @@ ja: rate_limit_new_user_create_topic: "トピック作成後、次のトピックを作成するまでに新規ユーザが待たなければならない時間 (秒)" rate_limit_new_user_create_post: "ポスト投稿後、次のポストを投稿するまでに新規ユーザが待たなければならない時間 (秒)" max_likes_per_day: "ユーザが一日に「いいね！」できる最大数" - max_flags_per_day: "ユーザーが一日にフラグを立てる最大数" + max_flags_per_day: "ユーザが一日に行える通報の回数" max_bookmarks_per_day: "ユーザが一日にブックマークできる最大数" max_edits_per_day: "ユーザが一日に編集できる最大数" max_topics_per_day: "ユーザが一日に作成できるトピックの最大数" @@ -909,20 +909,20 @@ ja: topic_statuses: archived_enabled: "このトピックはアーカイブされました。すべての内容は凍結されており、一切の変更ができません。" archived_disabled: "このトピックはアーカイブ解除されました。凍結解除され、変更可能になりました。" - closed_enabled: "このトピックは終了しました。新たに回答を投稿することはできません。" + closed_enabled: "このトピックはクローズされました。返信することはできません。" closed_disabled: "このトピックはオープンされました。新たに回答を投稿することができます。" autoclosed_enabled_days: - other: "このトピックは%{count}日が経過したので自動的に終了しました。新たに回答を投稿することはできません" + other: "このトピックは%{count}日が経過したので自動的にクローズされました。新たに返信することはできません。" autoclosed_enabled_hours: - other: "このトピックは%{count}時間が経過したので自動的に終了しました。新たに回答を投稿することはできません" + other: "このトピックは%{count}時間が経過したので自動的にクローズされました。新たに返信することはできません。" autoclosed_enabled_minutes: - other: "このトピックは%{count}分が経過したので自動的に終了しました。新たに回答を投稿することはできません" + other: "このトピックは%{count}分が経過したので自動的にクローズされました。新たに返信することはできません。" autoclosed_enabled_lastpost_days: - other: "このトピックは最後の返信から%{count}日が経過したので自動的に終了しました。新たに回答を投稿することはできません" + other: "このトピックは最後の返信から%{count}日が経過したので自動的にクローズされました。新たに返信することはできません。" autoclosed_enabled_lastpost_hours: - other: "このトピックは最後の返信から%{count}時間が経過したので自動的に終了しました。新たに回答を投稿することはできません" + other: "このトピックは最後の返信から%{count}時間が経過したので自動的にクローズされました。新たに返信することはできません。" autoclosed_enabled_lastpost_minutes: - other: "このトピックは最後の返信から%{count}分が経過したので自動的に終了しました。新たに回答を投稿することはできません" + other: "このトピックは最後の返信から%{count}分が経過したので自動的にクローズされました。新たに返信することはできません。" autoclosed_disabled: "このトピックは再オープンされました。新しい回答が投稿できるようになりました。。" autoclosed_disabled_lastpost: "このトピックは再オープンされました。新しい回答が投稿できます" pinned_enabled: "このトピックはピン留めされました。スタッフによって全てのユーザのピン留めが解除されるか、ユーザ自身がピン留め解除するまで、カテゴリのトップに表示されます" @@ -933,15 +933,15 @@ ja: visible_disabled: "このトピックは非表示状態になりました。トピックリストには表示されません。直接リンク経由でのみこのトピックにアクセスできます" login: not_approved: "あなたのアカウントはまだ承認されていません。ログイン可能になった際にメールで通知いたします。" - incorrect_username_email_or_password: "ユーザネーム、メールアドレス、またはパスワードが違います" + incorrect_username_email_or_password: "ユーザ名、メールアドレス、またはパスワードが違います" wait_approval: "サインアップありがとうござました。アカウントが承認され次第メールにて通知いたします。" active: "アカウントが利用可能になりました。" - activate_email: "

      ほぼ完了です！ アクティベーションメールを %{email}に送りました。アクティベートするために、メール内の指示に従ってください。

      もし届かない場合、迷惑メールフォルダをチェックするか、アクティベーションメールを再送するために再度ログインしてください

      " + activate_email: "

      あと少しです！アクティベーションメールを %{email} へ送信しました。メール内に記載されている指示に従い、認証を行って下さい。

      もし、届いていない場合は迷惑メールフォルダを確認するか、再度メールを送信してみてください。

      " not_activated: "まだログインできません。メールを送信済ですので、メールの指示に従ってあなたのアカウントを有効にしてください。" not_allowed_from_ip_address: "そのIPアドレスからは%{username} としてログインできません" admin_not_allowed_from_ip_address: "そのIPアドレスからは管理者としてログインできません" suspended: "%{date} までログインできません。" - suspended_with_reason: "%{date} までアカウントがサスペンドされています: %{reason}" + suspended_with_reason: "%{date} までアカウントが凍結されました: %{reason}" errors: "%{errors}" not_available: "利用できません。%{suggestion} を試してみては?" something_already_taken: "エラーが発生しました。ユーザ名またはメールアドレスが既に使用中の可能性があります。パスワードリセットを行ってください。" @@ -969,7 +969,7 @@ ja: max_new_accounts_per_registration_ip: "あなたのIPアドレスからの新規登録は許可されていません(最大数に達しました)。スタッフメンバーに連絡してください" flags_reminder: subject_template: - other: "%{count} 個のフラグが判断待ちです" + other: "%{count}件の通報が対応待ちです" invite_mailer: subject_template: "%{invitee_name} があなたを %{site_domain_name}の'%{topic_title}'に招待しました" text_body_template: | @@ -1015,20 +1015,20 @@ ja: 新規ユーザーの投稿がレビュー待ちになっています。[ 承認、または拒否を行うことができます] (%{base_url}/queued-posts) flag_reasons: - off_topic: "あなたの投稿やトピックは「オフトピック」としてフラグされています" - inappropriate: "あなたの投稿は「不適切」にフラグされています。コミュニティは攻撃的、 [コミュニティガイドライン](/guidelines)に違反だと判断しました" - spam: "あなたの投稿は「スパム」にフラグされています。コミュニティは営利目的、宣伝目的の書き込みの可能性があると判断しました" - notify_moderators: "あなたの投稿は「モデレータに通知」にフラグされています。コミュニティはモデレータの確認が必要の内容を含んでいると判断しました" + off_topic: "あなたの投稿/トピックは「話題に関係ない」として通報されました" + inappropriate: "あなたの投稿は「不適切」として通報されました。攻撃的、 [コミュニティガイドライン](/guidelines)に違反している可能性があります。" + spam: "あなたの投稿は「スパム」として通報されました。営利目的、宣伝目的の投稿を行った可能性があります。" + notify_moderators: "あなたの投稿は「モデレータへ通報」として通報されました。モデレータによる判断が必要な内容を含んでいる可能性があります。" flags_dispositions: agreed: "伝えてくれてありがとうございます。問題に同意し、調査しています" agreed_and_deleted: "伝えてくれてありがとうございます。問題に同意し、投稿を削除します" disagreed: "伝えてくれてありがとうございます。調査しています" deferred: "伝えてくれてありがとうございます。調査しています" deferred_and_deleted: "伝えてくれてありがとうございます。投稿を削除しました" - temporarily_closed_due_to_flags: "多くのコミュニティフラッグのため、トピックは一時的に停止されました" + temporarily_closed_due_to_flags: "このトピックへの通報が多いため、一時的に投稿が制限されています。" system_messages: post_hidden: - subject_template: "コミュニティによるフラグによりポストが非表示になりました" + subject_template: "通報により、投稿が非表示になりました" text_body_template: "こんにちは \n\nこれは あなたの投稿が非表示になったことを　%{site_name}%　からのメッセージです\n\n%{base_url}%{url}\n\n%{flag_reason}\n\n複数のコミュニティメンバーによりこのポストにフラグが立てられた結果としてポストが非表示になったことを理解し、ポスト内容を修正することを検討してください。\nポスト内容の編集は %{edit_delay}後より行うことができます。編集後、非表示状態は解除されます。\n\n編集後、非表示状態は解除されます。 ただし、再度あなたのポストがコミュニティによってフラグ立てされた場合、モデレータに通知が行われます。この結果アカウントの凍結などの処置が行われる可能性もあります。\n\n詳しいガイドラインは、 [community guidelines]を参照してください (%{base_url}/guidelines).\n" welcome_user: subject_template: "%{site_name} へようこそ!" @@ -1109,35 +1109,19 @@ ja: email_reject_topic_not_found: subject_template: "[%{site_name}] Email issue -- 存在しないトピック" email_reject_topic_closed: - subject_template: "[%{site_name}] Email issue -- 停止済みトピック" + subject_template: "[%{site_name}] Email issue -- クローズ済みトピック" email_reject_auto_generated: subject_template: "[%{site_name}] Email issue -- 自動生成された返信" email_error_notification: subject_template: "[%{site_name}] Email issue -- POP認証エラー" too_many_spam_flags: - subject_template: "新規アカウントのブロック" - text_body_template: | - こんにちは - - コミュニティからのフラグによりあなたの投稿が非表示になったことをお知らせするために、%{site_name} から自動的に送信されています - - スタッフメンバーが確認するまで、あなたのアカウントはトピックの作成、返答がブロックされています。 - - 詳細については[コミュニティガイドライン](%{base_url}/guidelines)を参照してください。 - blocked_by_staff: - subject_template: "アカウントのブロック" + subject_template: "新しいアカウントが通報によりブロックされました" user_automatically_blocked: - subject_template: "コミュニティフラッグによって新たにブロックされたユーザ%{username}" + subject_template: "新規ユーザの%{username}が通報によってブロックされました" spam_post_blocked: subject_template: "同一リンクの連続投稿による新規ユーザ %{username} のブロック" unblocked: subject_template: "アカウントのブロック解除" - text_body_template: | - Hello, - - このメールは、スタッフメンバーによってあなたのアカウントがブロック解除されたことをお知らせする %{site_name} からの自動メッセージです。 - - トピックの作成やポストの投稿ができるようになりました。 pending_users_reminder: subject_template: other: "%{count} 人のユーザか承認を待っています。" @@ -1183,12 +1167,11 @@ ja: forgot_password: subject_template: "[%{site_name}] パスワードのリセット" text_body_template: | - [%{site_name}](%{base_url}) のあなたのパスワードに対してリセット依頼が行われました。 + [%{site_name}](%{base_url}) にて、パスワードのリセットリクエストが行われました。 - もし依頼を行ったのがあなたではない場合は、このメールを無視してください。 + もしリクエストを行っていない場合は、このメールを無視してください。 - 新たなパスワードを設定する場合は次のリンクをクリックしてください: - %{base_url}/users/password-reset/%{email_token} + 新たなパスワードを設定する場合は次のリンクをクリックしてください: %{base_url}/users/password-reset/%{email_token} set_password: subject_template: "[%{site_name}] パスワード設定" text_body_template: | @@ -1218,7 +1201,7 @@ ja: 次のリンクをクリックして、新たなアカウントの承認およびアクティベーションを行ってください: %{base_url}/users/activate-account/%{email_token} - もし上記リンクがクリックできない場合は、ブラウザのアドレスバーにリンクアドレスをコピー&ペーストしてください。 + もし、上記のURLがクリックできない場合は、ブラウザのアドレスバーへURLをコピーして貼り付けて下さい。 page_not_found: popular_topics: "人気" recent_topics: "最新" @@ -1243,19 +1226,16 @@ ja: images: too_large: "申し訳ありませんが、画像が大きすぎてアップロードできません (最大サイズは %{max_size_kb}KB です)。リサイズして再アップロードしてください" size_not_found: "申し訳ありませんが、画像のサイズを判定できませんでした。画像が壊れているかもしれません。" - flag_reason: - sockpuppet: "新規ユーザがトピックを作成し、同じ IP アドレスより別の新規ユーザが回答を投稿しました。サイトの flag_sockpuppets 設定を確認してください。" - spam_hosts: "この新規ユーザは同一ドメインへのリンクを含むポストを複数作成しようとしました。サイトの newuser_spam_host_threshold 設定を確認してください" email_log: no_user: "id %{user_id}のユーザーは見つかりませんでした" anonymous_user: "ユーザーは匿名です" - suspended_not_pm: "ユーザーはサスペンド状態です、プライベートメッセージはありません" + suspended_not_pm: "ユーザーは凍結状態です、プライベートメッセージはありません" seen_recently: "最近訪れたユーザ" post_not_found: "id %{post_id}のポストは見つかりません" notification_already_read: "メールが既読になったという通知です" topic_nil: "post.topic is nil" post_deleted: "投稿は投稿者によって削除されました" - user_suspended: "ユーザーはサスペンド状態です" + user_suspended: "ユーザは凍結状態です" already_read: "ユーザーはポストを既に読んだ" message_blank: "メッセージが空" message_to_blank: "メッセージの宛先(to)が空" @@ -1279,6 +1259,10 @@ ja: title: "利用規約" privacy_topic: title: "プライバシーポリシー" + badges: + first_flag: + name: はじめの通報 + description: 通報した投稿 admin_login: success: "メールを送信しました" error: "エラー！" diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml index f8786663a2..a505fe6def 100644 --- a/config/locales/server.pl_PL.yml +++ b/config/locales/server.pl_PL.yml @@ -24,12 +24,14 @@ pl_PL: loading: "Ładowanie" powered_by_html: 'Zasilane przez Discourse, najlepiej oglądać z włączonym JavaScriptem' log_in: "Logowanie" - purge_reason: "Automatycznie usunięto jako porzucone, nieaktywne konto" disable_remote_images_download_reason: "Pobieranie zewnętrznych grafik zostało wyłączone z uwagi na niską ilość wolnego miejsca na dysku." anonymous: "Anonim" emails: incoming: default_subject: "Przychodzący email od %{email}" + show_trimmed_content: "Pokaż skróconą zawartość" + errors: + no_message_id_error: "Zdarza się kiedy email nie posiada nagłówka 'Message-Id'." errors: &errors format: '%{attribute} %{message}' messages: @@ -137,6 +139,7 @@ pl_PL: latest: "Ostatnie wątki" hot: "Popularne wątki" posts: "Aktualne wpisy" + tag: "Otagowane tematy" too_late_to_edit: "Ten wpis został utworzony zbyt dawno. Nie może być edytowany ani usunięty." excerpt_image: "zdjęcie" queue: @@ -821,6 +824,10 @@ pl_PL: approve_unless_trust_level: "Posty użytkowników poniżej tego poziomu zaufania muszą być zatwierdzane" default_categories_watching: "Lista kategorii obserwowanych domyślnie." default_categories_tracking: "Lista kategorii śledzonych domyślnie." + tagging_enabled: "Pozwolić użytkownikom na tagowanie tematów?" + min_trust_to_create_tag: "Minimalny poziom zaufania dla tworzenia nowych tagów." + max_tags_per_topic: "Maksymalna ilość tagów przypisanych do tematu." + max_tag_length: "Maksymalna ilość znaków per tag." errors: invalid_email: "Nieprawidłowy adres email." invalid_username: "Użytkownik o takiej nazwie nie istnieje." @@ -1216,3 +1223,4 @@ pl_PL: activemodel: errors: <<: *errors + rss_by_tag: "Tematy otagowane jako %{tag}" diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml index e1f67d2fc9..5c22281a6e 100644 --- a/config/locales/server.pt_BR.yml +++ b/config/locales/server.pt_BR.yml @@ -170,6 +170,7 @@ pt_BR: private_posts: "Últimas mensagens privadas" user_posts: "Últimos posts por @%{username}" user_topics: "Últimos tópicos por @%{username}" + tag: "Tópicos com tag" too_late_to_edit: "Essa mensagem foi criada há muito tempo. Ela não pode mais ser editada ou apagada." excerpt_image: "imagem" queue: @@ -1002,6 +1003,19 @@ pt_BR: emoji_set: "Como você gostaria do seu emoji?" enforce_square_emoji: "Forçar proporção quadrangular para todos emojis." approve_unless_trust_level: "Mensagens para os usuários abaixo deste nível de confiança devem ser aprovados" + tagging_enabled: "Permitir que usuários coloquem tags em tópicos?" + min_trust_to_create_tag: "O nível de confiança mínimo necessário para criar uma tag." + max_tags_per_topic: "O número máximo de tags que podem ser aplicados a um tópico." + max_tag_length: "O número máximo de caracteres que pode ser usado em uma tag." + max_tag_search_results: "Quando buscando por tags, o número máximo de resultados a exibir." + show_filter_by_tag: "Exibir um dropdown para filtrar uma lista de tópicos por uma tag." + max_tags_in_filter_list: "Número máximo de tags no filtro do dropdown. As tags mais utilizadas serão exibidas." + tags_sort_alphabetically: "Exibir tags em ordem alfabetica. O padrão é exibí-las em ordem de popularidade." + tag_style: "Estilo visual para as insígnias de tag." + staff_tags: "Uma lista de tags que só podem ser aplicadas por membros da moderação" + min_trust_level_to_tag_topics: "Nível de confiança mínimo necessário para aplicar uma tag" + suppress_overlapping_tags_in_list: "Esconder tags das visualizações de lista, se elas se sobreporem ao título" + remove_muted_tags_from_latest: "Não mostrar tópicos com tags silenciadas na lista de tópicos recentes." errors: invalid_email: "Endereço de email inválido" invalid_username: "Não há nenhum usuário com esse nome de usuário." @@ -1516,3 +1530,7 @@ pt_BR: activemodel: errors: <<: *errors + tags: + staff_tag_disallowed: "A tag \"%{tag}\" só pode ser aplicada pela moderação." + staff_tag_remove_disallowed: "A tag \"%{tag}\" só pode ser removida pela moderação." + rss_by_tag: "Tópicos com a tag %{tag}" diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml index 3ff918de2e..1ef4e60c54 100644 --- a/config/locales/server.sq.yml +++ b/config/locales/server.sq.yml @@ -10,13 +10,17 @@ sq: short_date_no_year: "D MMM" short_date: "D MMM, YYYY" long_date: "MMMM D, YYYY h:mma" + datetime_formats: &datetime_formats + formats: + short: "%m-%d-%Y" + short_no_year: "%B %-d" + date_only: "%B %-d, %Y" title: "Discourse" topics: "Tema" posts: "postime" loading: "Loading" powered_by_html: 'Mundësuar nga Discourse, për një eksperience më të mirë aktivizoni JavaScript' log_in: "Identifikohu" - purge_reason: "Automatically deleted as abandoned, unactivated account" disable_remote_images_download_reason: "Remote images download was disabled because there wasn't enough disk space available." anonymous: "Anonim" errors: &errors @@ -73,6 +77,8 @@ sq: not_found: "The requested URL or resource could not be found." invalid_access: "Ju nuk jeni të drejta për të parë burimin e kërkuar." read_only_mode_enabled: "The site is in read only mode. Interactions are disabled." + reading_time: "Koha e leximit" + likes: "Pëlqime" too_many_replies: one: "We're sorry, but new users are temporarily limited to 1 reply in the same topic." other: "We're sorry, but new users are temporarily limited to %{count} replies in the same topic." @@ -269,6 +275,12 @@ sq: title: "anëtar i ri" basic: title: "anëtar basic" + member: + title: "anëtarë" + regular: + title: "i rregullt" + leader: + title: "udhëheqës" change_failed_explanation: "You attempted to demote %{user_name} to '%{new_trust_level}'. However their trust level is already '%{current_trust_level}'. %{user_name} will remain at '%{current_trust_level}' - if you wish to demote user lock trust level first" rate_limiter: too_many_requests: "We have a daily limit on how many times that action can be taken. Please wait %{time_left} before trying again." @@ -453,6 +465,8 @@ sq: title: "New Users" xaxis: "Ditë" yaxis: "Number of new users" + profile_views: + xaxis: "Ditë" topics: title: "Tema" xaxis: "Ditë" @@ -1275,22 +1289,120 @@ sq: subject_pm: "[PM] " user_notifications: previous_discussion: "Previous Replies" + in_reply_to: "Në Përgjigje Të" unsubscribe: title: "Unsubscribe" description: "Not interested in getting these emails? No problem! Click below to unsubscribe instantly:" posted_by: "Posted by %{username} on %{post_date}" user_invited_to_private_message_pm: subject_template: "[%{site_name}] %{username} invited you to a message '%{topic_title}'" + text_body_template: | + %{header_instructions} + + %{message} + + %{respond_instructions} + user_invited_to_private_message_pm_staged: + subject_template: "[%{site_name}] %{username} invited you to a message '%{topic_title}'" + text_body_template: | + %{header_instructions} + + %{message} + + %{respond_instructions} + user_invited_to_topic: + subject_template: "[%{site_name}] %{username} invited you to '%{topic_title}'" + text_body_template: | + %{header_instructions} + + %{message} + + %{respond_instructions} user_replied: subject_template: "[%{site_name}] %{topic_title}" + text_body_template: | + %{header_instructions} + + %{message} + + %{context} + + %{respond_instructions} + user_replied_pm: + subject_template: "[%{site_name}] [PM] %{topic_title}" + text_body_template: | + %{header_instructions} + + %{message} + + %{context} + + %{respond_instructions} user_quoted: subject_template: "[%{site_name}] %{topic_title}" + text_body_template: | + %{header_instructions} + + %{message} + + %{context} + + %{respond_instructions} + user_linked: + subject_template: "[%{site_name}] %{topic_title}" + text_body_template: | + %{header_instructions} + + %{message} + + %{context} + + %{respond_instructions} user_mentioned: subject_template: "[%{site_name}] %{topic_title}" + text_body_template: | + %{header_instructions} + + %{message} + + %{context} + + %{respond_instructions} + user_group_mentioned: + subject_template: "[%{site_name}] %{topic_title}" + text_body_template: | + %{header_instructions} + + %{message} + + %{context} + + %{respond_instructions} user_posted: subject_template: "[%{site_name}] %{topic_title}" + text_body_template: | + %{header_instructions} + + %{message} + + %{context} + + %{respond_instructions} user_posted_pm: subject_template: "[%{site_name}] [PM] %{topic_title}" + text_body_template: | + %{header_instructions} + + %{message} + + %{context} + + %{respond_instructions} + user_posted_pm_staged: + subject_template: "%{optional_re}%{topic_title}" + text_body_template: |2 + + %{message} digest: why: "A brief summary of %{site_link} since your last visit on %{last_seen_at}" subject_template: "[%{site_name}] Digest" @@ -1657,6 +1769,17 @@ sq: Originally adapted from the [WordPress Terms of Service](http://en.wordpress.com/tos/). privacy_topic: title: "Politika e Privatësisë" + badges: + member: + name: Anëtarë + regular: + name: I rregullt + leader: + name: Udhëheqës + welcome: + name: Mirë se vini + anniversary: + name: Përvjetori admin_login: success: "Email Sent" error: "Error!" @@ -1667,6 +1790,10 @@ sq: performance_report: initial_post_raw: This topic includes daily performance reports for your site. initial_topic_title: Raportet e performancës se faqes + date: + <<: *datetime_formats + time: + <<: *datetime_formats activemodel: errors: <<: *errors diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml index 0bf20b9894..0792e09cc6 100644 --- a/config/locales/server.tr_TR.yml +++ b/config/locales/server.tr_TR.yml @@ -145,6 +145,7 @@ tr_TR: top: "En iyi konular" posts: "Son gönderiler" private_posts: "Son özel mesajlar" + tag: "Etiketlenmiş konular" too_late_to_edit: "Gönderi çok uzun zaman önce oluşturulmuş. Artık düzenlenemez ya da silinemez. " excerpt_image: "resim" queue: @@ -984,6 +985,10 @@ tr_TR: default_categories_watching: "Öntanımlı olarak, izlenen kategorilerin listesi." default_categories_tracking: "Öntanımlı olarak, takip edilen kategorilerin listesi." default_categories_muted: "Öntanımlı olarak, sesi kısılan kategorilerin listesi." + tagging_enabled: "Kullanıcılar konularına etiket ekleyebilsinler mi?" + min_trust_to_create_tag: "Etiket oluşturmak için gereken minumum güven seviyesi." + max_tags_per_topic: "Bir konu en fazla kaç adet etiket eklenebilir." + max_tag_length: "Bir etiket en fazla kaç karakterde oluşabilir." errors: invalid_email: "Geçersiz e-posta adresi." invalid_username: "Bu kullanıcı adı ile bir kullanıcı bulunmuyor." @@ -1452,3 +1457,4 @@ tr_TR: activemodel: errors: <<: *errors + rss_by_tag: "Konu %{tag} ile etiketlenmiştir." diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml index 7242a74c30..d7b78460ce 100644 --- a/config/locales/server.vi.yml +++ b/config/locales/server.vi.yml @@ -2214,13 +2214,97 @@ vi: description: Trích dẫn một bài viết long_description: | Huy hiệu này được trao cho lần đầu tiên bạn trích dẫn trong một bài trả lời của bạn. Trích dẫn các phần có liên quan trong trả lời của bạn sẽ giúp cho các cuộc thảo luận tập trung vào chủ đề. Điều đó thật dễ dàng: bạn có thể nhanh chóng trích dẫn bằng cách nêu bật một phần bất kỳ của bài viết nào và sử dụng nút Trích Dẫn Trả Lời xuất hiện ở gần vùng chọn. Trích dẫn thoải mái! + read_guidelines: + name: Xem hướng dẫn + description: Xem nguyên tắc cộng đồng + long_description: | + Huy hiệu này được cấp khi bạn xem nguyên tắc cộng đồng. Xem và làm theo những nguyên tắc này sẽ giúp bạn cùng chúng tôi xây dựng một cộng đồng an toàn, bền vững, và đem lại nhiều niềm vui cho tất cả mọi người! + reader: + name: Người xem + description: Đọc từng trả lời trong một chủ đề có hơn 100 trả lời + long_description: | + Huy hiệu này được cấp cho lần đầu tiên bạn đọc một chủ đề dài với hơn 100 trả lời. Theo dõi sát sao một cuộc hội thoại giúp bạn hiểu được những quan điểm khác nhau, và giúp cho cuộc trò chuyện thú vị hơn. Bạn càng đọc, càng trò chuyện được tốt hơn. :slight_smile: + popular_link: + name: Liên kết phổ biến + description: Đăng một liên kết ngoài được 50 click + long_description: | + Huy hiệu này được cấp khi một liên kết mà bạn chia sẻ được 50 click. Cám ơn bạn đã đăng một liên kết hữu ích! + hot_link: + name: Liên kết hấp dẫn + description: Đăng một liên kết ngoài được 300 click + long_description: | + Huy hiệu này được cấp khi một liên kết mà bạn chia sẻ được 300 click. Cám ơn đã đăng một liên kết hấp dẫn giúp kéo cuộc trò chuyện về phía trước! + famous_link: + name: Liên kết nổi tiếng + description: Đăng một liên kết ngoài được 1000 click + long_description: | + Huy hiệu này được cấp khi một liên kết mà bạn chia sẻ được 1000 click. Tuyệt vời! Bạn đã gửi một liên kết cải thiện đáng kể cuộc hội thoại bằng cách bổ sung chi tiết, bối cảnh và thông tin. Làm tốt lắm! + appreciated: + name: Được đánh giá cao + description: Nhận được 1 like cho 20 bài viết + long_description: | + Huy hiệu này được cấp khi bạn nhận được ít nhất 1 like cho 20 bài viết khác nhau. Cộng đồng thích thú với các đóng góp của bạn trong các cuộc đối thoại! + respected: + name: Được tôn trọng + description: Nhận được 2 like cho 100 bài viết + long_description: | + Huy hiệu này được cấp khi bạn nhận được ít nhất 2 like cho 100 bài viết khác nhau. Cộng đồng đang hướng tới tôn trọng những đóng góp của bạn trong các cuộc đối thoại. + admired: + name: Được ngưỡng mộ + description: Nhận được 5 like cho 300 bài viết + long_description: | + Huy hiệu này được cấp khi bạn nhận được ít nhất 5 like cho 300 bài viết khác nhau. Tuyệt vời! Cộng đồng rất ngưỡng mộ các đóng góp thường xuyên có chất lượng cao của bạn trong các cuộc đối thoại. + out_of_love: + name: Vì yêu thích + description: Sử dụng 50 like trong 1 ngày + long_description: | + Huy hiệu này được cấp khi bạn sử dụng tất cả 50 lượt like hàng ngày của bạn. Ghi nhớ một chút các bài viết mà bạn xem và khuyến khích các thành viên cộng đồng tạo ra các cuộc thảo luận lớn hơn trong tương lai. + higher_love: + name: Thích nhiều hơn + description: Sử dụng 50 like một ngày trong 5 ngày + long_description: | + Huy hiệu này được cấp khi bạn sử dụng 50 lượt like một ngày trong 5 ngày liên tiếp. Cám ơn bạn đã dành thời gian để khuyến khích các cuộc hội thoại tốt nhất mỗi ngày! + crazy_in_love: + name: Thích nhiệt tình + description: Sử dụng 50 like một ngày trong 20 ngày + long_description: | + Huy hiệu này được cấp khi bạn sử dụng 50 lượt like một ngày trong 20 ngày liên tiếp. Tuyệt vời! Bạn là một tấm gương thường xuyên khuyến khích các thành viên trong cộng đồng! + thank_you: + name: Cám ơn bạn + description: Nhận được 20 like và đã like 10 lần + long_description: | + Huy hiệu này được cấp khi bạn đã nhận được 20 like cho các bài viết của mình và đã like 10 lần hoặc hơn các bài viết khác. Khi ai đó like bài viết của bạn, bạn tìm thấy lúc để like những gì người khác đăng lại. + gives_back: + name: Tặng lại + description: Nhận được 100 like và đã like 100 lần + long_description: | + Huy hiệu này được cấp khi bạn đã nhận được 100 like và đã like 100 lần hoặc hơn các bài viết khác. Cám ơn bạn đã cho đi để nhận lại yêu thương! + empathetic: + name: Cảm thông + description: Nhận được 500 like và đã like 1000 lần + long_description: | + Huy hiệu này được cấp khi bạn đã nhận được 500 like và đã like 1000 lần hoặc hơn các bài viết khác. Tuyệt vời! Bạn là mẫu người quảng đại và đầy yêu thương :two_hearts:. + first_emoji: + name: Emoji đầu tiên + description: Sử dụng Emoji trong bài viết + long_description: | + Huy hiệu này được cấp khi bạn thêm một biểu tượng Emoji vào bài đăng :heart: + first_mention: + name: Đề cập đầu tiên + description: Đề cập một thành viên trong bài viết + long_description: Huy hiệu này được cấp khi bạn đề cập @mention một thành viên trong bài viết của bạn. @mentions cho phép bạn gửi thông báo cho các thành viên khác trong diễn đàn. admin_login: success: "Gửi mail lỗi" error: "Lỗi!" email_input: "Email quản trị" submit_button: "Gửi email" + discourse_hub: + access_token_problem: "Dành cho admin: Hãy cập nhật đúng discourse_org_access_key trong thiết lập website." performance_report: + initial_post_raw: Chủ đề này bao gồm các báo cáo hiệu suất hàng ngày của website. initial_topic_title: Báo cáo hiệu suất website + topic_invite: + user_exists: "Xin lỗi, thành viên này đã được mời. Bạn chỉ có thể mời một người dùng đến một chủ đề một lần." time: <<: *datetime_formats activemodel: diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml index a8b27058ed..a9d2052a26 100644 --- a/config/locales/server.zh_CN.yml +++ b/config/locales/server.zh_CN.yml @@ -162,6 +162,7 @@ zh_CN: group_mentions: "%{group_name}组最近的提及" user_posts: "最新贴子由@%{username}发表" user_topics: "最新主题由@%{username}发表" + tag: "加标签的主题" too_late_to_edit: "这个主题在很早之前创建。不能被编辑或者被删除。" revert_version_same: "目前的版本和你想要回退至的版本一样。" excerpt_image: "图片" @@ -277,7 +278,7 @@ zh_CN: no_info_other: "
      %{name} 尚未在他们的资料中的关于我部分填写任何信息
      " vip_category_name: "贵宾室" vip_category_description: "高于信任等级3的用户参与讨论的分类。" - meta_category_name: "页面反馈" + meta_category_name: "站点反馈" meta_category_description: "讨论该站点的站务、组织、如何运作和如何改善它。" staff_category_name: "管理人员" staff_category_description: "管理人员私有的分类。只有管理员和版主才能阅览主题。" @@ -1079,6 +1080,18 @@ zh_CN: default_categories_watching: "分类列表默认跟踪。" default_categories_tracking: "分类列表默认追踪。" default_categories_muted: "分类列表默认不显示。" + tagging_enabled: "允许用户为主题设置标签？" + min_trust_to_create_tag: "允许创建标签的最小信任等级。" + max_tags_per_topic: "一个主题最多允许有多少个标签。" + max_tag_length: "一个标签允许的最大字符数。" + max_tag_search_results: "当搜索标签时，显示的最多几个结果。" + show_filter_by_tag: "显示一个下拉菜单按照标签过滤主题列表。" + max_tags_in_filter_list: "过滤下拉菜单中显示的最大标签数。最常用的标签将优先显示。" + tags_sort_alphabetically: "按照字母顺序显示标签。默认显示顺序是流行度。" + tag_style: "标签的视觉样式。" + staff_tags: "只可由志愿设置的标签列表" + min_trust_level_to_tag_topics: "给主题加标签的最小信任等级" + suppress_overlapping_tags_in_list: "如果在列表视图中标签覆盖了主题，则隐藏标签" errors: invalid_email: "电子邮箱地址无效。" invalid_username: "没有这个用户名的用户。" @@ -2452,3 +2465,7 @@ zh_CN: activemodel: errors: <<: *errors + tags: + staff_tag_disallowed: "标签\"%{tag}\"只可以由职员标记。" + staff_tag_remove_disallowed: "标签\"%{tag}\"只可以由职员删除。" + rss_by_tag: "%{tag}标签的主题" diff --git a/config/routes.rb b/config/routes.rb index 69a57eff7e..31682f385e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -124,6 +124,7 @@ Discourse::Application.routes.draw do post "test" get "sent" get "skipped" + get "bounced" get "received" get "rejected" get "/incoming/:id/raw" => "email#raw_email" @@ -485,6 +486,7 @@ Discourse::Application.routes.draw do delete "t/:id" => "topics#destroy" put "t/:id/archive-message" => "topics#archive_message" put "t/:id/move-to-inbox" => "topics#move_to_inbox" + put "t/:id/convert-topic/:type" => "topics#convert_topic" put "topics/bulk" put "topics/reset-new" => 'topics#reset_new' post "topics/timings" @@ -606,6 +608,29 @@ Discourse::Application.routes.draw do get "manifest.json" => "metadata#manifest", as: :manifest get "opensearch" => "metadata#opensearch", format: :xml + scope "/tags" do + get '/' => 'tags#index' + get '/filter/list' => 'tags#index' + get '/filter/search' => 'tags#search' + get '/check' => 'tags#check_hashtag' + constraints(tag_id: /[^\/]+?/, format: /json|rss/) do + get '/:tag_id.rss' => 'tags#tag_feed' + get '/:tag_id' => 'tags#show', as: 'list_by_tag' + get '/c/:category/:tag_id' => 'tags#show' + get '/c/:parent_category/:category/:tag_id' => 'tags#show' + get '/:tag_id/notifications' => 'tags#notifications' + put '/:tag_id/notifications' => 'tags#update_notifications' + put '/:tag_id' => 'tags#update' + delete '/:tag_id' => 'tags#destroy' + + Discourse.filters.each do |filter| + get "/:tag_id/l/#{filter}" => "tags#show_#{filter}" + get "/c/:category/:tag_id/l/#{filter}" => "tags#show_#{filter}" + get "/c/:parent_category/:category/:tag_id/l/#{filter}" => "tags#show_#{filter}" + end + end + end + Discourse.filters.each do |filter| root to: "list##{filter}", constraints: HomePageConstraint.new("#{filter}"), :as => "list_#{filter}" end diff --git a/config/site_settings.yml b/config/site_settings.yml index 183ff1a555..ca5299c68a 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -26,10 +26,6 @@ required: client: true default: '' type: email - bounce_email: - default: '' - type: email - shadowed_by_global: true contact_url: client: true default: '' @@ -575,6 +571,9 @@ email: default: '' type: list block_auto_generated_emails: true + bounce_score_threshold: + default: 4 + min: 1 files: @@ -1094,6 +1093,17 @@ uncategorized: default: -1 hidden: true + bootstrap_mode_min_users: + default: 50 + client: true + min: 0 + max: 5000 + + bootstrap_mode_enabled: + default: false + client: true + hidden: true + automatically_unpin_topics: default: true client: true @@ -1150,3 +1160,57 @@ user_preferences: default_categories_muted: type: category_list default: '' + +tags: + tagging_enabled: + client: true + default: false + refresh: true + tag_style: + client: true + type: enum + default: 'simple' + choices: + - simple + - bullet + - box + preview: '
      tag1tag2
      ' + max_tags_per_topic: + default: 5 + client: true + max_tag_length: + default: 20 + client: true + min_trust_to_create_tag: + default: 3 + enum: 'TrustLevelSetting' + min_trust_level_to_tag_topics: + default: 0 + enum: 'TrustLevelSetting' + client: true + max_tag_search_results: + client: true + default: 5 + min: 1 + show_filter_by_tag: + client: true + default: false + refresh: true + max_tags_in_filter_list: + default: 30 + min: 1 + refresh: true + tags_sort_alphabetically: + client: true + default: false + refresh: true + staff_tags: + type: list + client: true + default: '' + suppress_overlapping_tags_in_list: + default: false + client: true + remove_muted_tags_from_latest: + default: false + diff --git a/db/migrate/20160425141954_fix_incoming_emails_indices.rb b/db/migrate/20160425141954_fix_incoming_emails_indices.rb new file mode 100644 index 0000000000..4fa6366343 --- /dev/null +++ b/db/migrate/20160425141954_fix_incoming_emails_indices.rb @@ -0,0 +1,5 @@ +class FixIncomingEmailsIndices < ActiveRecord::Migration + def change + add_index :incoming_emails, :post_id + end +end diff --git a/db/migrate/20160427202222_add_support_for_bounced_emails.rb b/db/migrate/20160427202222_add_support_for_bounced_emails.rb new file mode 100644 index 0000000000..6dfb9332e6 --- /dev/null +++ b/db/migrate/20160427202222_add_support_for_bounced_emails.rb @@ -0,0 +1,8 @@ +class AddSupportForBouncedEmails < ActiveRecord::Migration + def change + add_column :email_logs, :bounced, :boolean, null: false, default: false + add_column :incoming_emails, :is_bounce, :boolean, null: false, default: false + add_column :user_stats, :bounce_score, :integer, null: false, default: 0 + add_column :user_stats, :reset_bounce_score_after, :datetime + end +end diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md index 4c0faf053c..e12f6beebf 100644 --- a/docs/INSTALL-cloud.md +++ b/docs/INSTALL-cloud.md @@ -1,6 +1,6 @@ **Set up Discourse in the cloud in under 30 minutes** with zero knowledge of Rails or Linux shell using our [Discourse Docker image][dd]. We recommend [DigitalOcean][do], but these steps will work on any Docker-compatible cloud provider or local server. -# Create New Cloud Server +### Create New Cloud Server [Sign up for DigitalOcean][do], update billing info, then create your new cloud server. @@ -12,64 +12,52 @@ - The default of **New York** is a good choice for most US and European audiences. Or select a region that is geographically closer to your audience. -Create your new Droplet. You will receive an email with the root password to your Droplet. (However, if you know [how to use SSH keys](https://www.google.com/search?q=digitalocean+ssh+keys), you may not need a password to log in.) +Create your new Droplet. You will receive an email with the root password. (However, if you know [how to use SSH keys](https://www.google.com/search?q=digitalocean+ssh+keys), you may not need a password to log in.) -# Access Your Cloud Server +### Access Your Cloud Server -Connect to your server via SSH, or use [Putty][put] on Windows: +Connect to your server via its IP address using SSH, or [Putty][put] on Windows: ssh root@192.168.1.1 -Replace `192.168.1.1` with the IP address of your server. +Enter the root password from the email DigitalOcean sent you when the server was set up. You may be prompted to change the root password, too. -You will be asked for permission to connect, type `yes`, then enter the root password from the email DigitalOcean sent you when the server was set up. You may be prompted to change the root password, too. + - - -# Set up Swap (if needed) - -- If you're using the minimum 1 GB install, you *must* [set up a swap file](https://meta.discourse.org/t/create-a-swapfile-for-your-linux-server/13880). -- If you're using 2 GB+ memory, you can probably get by without a swap file. - -# Install Docker / Git +### Install Docker / Git wget -qO- https://get.docker.com/ | sh -This command installs the latest versions of Docker and Git on your server. Alternately, you can manually install Git and the [Docker package for your OS](https://docs.docker.com/installation/). +This command installs the latest versions of Docker and Git on your server. Alternately, you can manually [install Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) and the [Docker package for your OS](https://docs.docker.com/installation/). -# Install Discourse +### Install Discourse -Create a `/var/discourse` folder, clone the [Official Discourse Docker Image][dd] into it, and make a copy of the config file as `app.yml`: +Create a `/var/discourse` folder, clone the [Official Discourse Docker Image][dd] into it: sudo -s mkdir /var/discourse git clone https://github.com/discourse/discourse_docker.git /var/discourse cd /var/discourse - cp samples/standalone.yml containers/app.yml -You will need to be root through the rest of the bootstrap process. +You will need to be root through the rest of the setup and bootstrap process. -# Edit Discourse Configuration +### Edit Discourse Configuration -Edit the Discourse config file `app.yml`: +Launch the setup tool at - nano containers/app.yml + ./discourse-setup -We recommend Nano because it's simple; just use your arrow keys to edit. +Answer the following questions when prompted: -- Set `DISCOURSE_DEVELOPER_EMAILS` to your email address. + Hostname for your Discourse? [discourse.example.com]: + Email address for admin account? [me@example.com]: + SMTP server address? [smtp.example.com]: + SMTP user name? [postmaster@discourse.example.com]: + SMTP password? []: -- Set `DISCOURSE_HOSTNAME` to `discourse.example.com`, this means you want your Discourse available at `http://discourse.example.com/`. You'll need to update the DNS A record for this domain with the IP address of your server. +This will generate an `app.yml` configuration file on your behalf, and then kicks off bootstrap. Bootstrapping takes between **2-8 minutes** to set up your Discourse. -- Place your [Email Server credentials][mailconfig] in `DISCOURSE_SMTP_ADDRESS`, `DISCOURSE_SMTP_PORT`, `DISCOURSE_SMTP_USER_NAME`, `DISCOURSE_SMTP_PASSWORD`. Be sure you remove the comment `#` character and space from the front of these lines as necessary. - -- If you are using a 1 GB instance, set `UNICORN_WORKERS` to 2 and `db_shared_buffers` to 128MB so you have more memory room. - - - -Please be careful while editing and double check your work; YAML is _very_ sensitive to incorrect spacing and misplaced characters. After completing your edits, press CtrlO then Enter to save and CtrlX to exit. - -# Email Is Important +### Email Is Important **Email is CRITICAL for account creation and notifications in Discourse. If you do not properly configure email before bootstrapping YOU WILL HAVE A BROKEN SITE!** @@ -77,41 +65,29 @@ Please be careful while editing and double check your work; YAML is _very_ sensi - No existing mail server? Check out our [**Recommended Email Providers for Discourse**][mailconfig]. -- For proper email deliverability, you must set correct SPF and DKIM records in your DNS. See your email provider instructions for specifics. +- For proper email deliverability, add valid SPF and DKIM records in your DNS. See your email provider instructions for specifics. -If you need to change or fix your email settings after bootstrapping, you must edit the `app.yml` file again and `./launcher rebuild app`, otherwise your changes will not take effect. If you didn't receive an email from your install, read [Register New Account and Become Admin](#register-new-account-and-become-admin) for troubleshooting. +If you need to change or fix your email settings after bootstrapping, edit your `app.yml` file and `./launcher rebuild app`, otherwise your changes will not take effect. -# Bootstrap Discourse +### Start Discourse -Save the `app.yml` file, and begin bootstrapping Discourse: + Once bootstrapping is complete, your Discourse should be accessible in your web browser via the domain name `discourse.example.com` you entered earlier, provided you configured DNS. If not, you can visit the server IP directly, e.g. `http://192.168.1.1`. - ./launcher bootstrap app + -This command takes between **2-8 minutes** to automagically configure your Discourse. After that completes, start Discourse: +### Register New Account and Become Admin - ./launcher start app +Register a new admin account using one of the email addresses you entered before bootstrapping. - - -Congratulations! You just built your very own Discourse! - -Your Discourse should be accessible in your web browser via the domain name `discourse.example.com` you entered earlier, provided you configured DNS. If not, you can visit the server IP directly, e.g. `http://192.168.1.1`. - - - -# Register New Account and Become Admin - -There is a reminder at the top about the `DISCOURSE_DEVELOPER_EMAILS` you entered previously in `app.yml`; register a new account using one of those email addresses, and your account will automatically be made an Admin. - -(If you *don't* get any email from your install, and are unable to register a new admin account, please check the logs at `/var/discourse/shared/standalone/log/rails/production.log` and see our [Email Troubleshooting checklist](https://meta.discourse.org/t/troubleshooting-email-on-a-new-discourse-install/16326).) +If you are unable to register your admin account, check the logs at `/var/discourse/shared/standalone/log/rails/production.log` and see our [Email Troubleshooting checklist](https://meta.discourse.org/t/troubleshooting-email-on-a-new-discourse-install/16326). You should see Staff topics and **READ ME FIRST: Admin Quick Start Guide**. This guide contains the next steps for further configuring and customizing your Discourse install as an administrator. Read it closely! -(If you are still unable to register a new admin account via email, see [Create Admin Account from Console](https://meta.discourse.org/t/create-admin-account-from-console/17274), but please note that *you will have a broken site* unless you get email working on your instance.) +(If you are still unable to register a new admin account via email, see [Create Admin Account from Console](https://meta.discourse.org/t/create-admin-account-from-console/17274), but note that *you will have a broken site* unless you get email working.) -# Post-Install Maintenance +### Post-Install Maintenance We strongly suggest you: @@ -123,42 +99,36 @@ You will get email reminders as new versions of Discourse are released. Please s The `launcher` command in the `/var/discourse` folder can be used for various kinds of maintenance: ``` -Usage: launcher COMMAND CONFIG [--skip-prereqs] +Usage: launcher COMMAND CONFIG [--skip-prereqs] [--docker-args STRING] Commands: start: Start/initialize a container stop: Stop a running container restart: Restart a container destroy: Stop and remove a container - enter: Enter a container using docker exec - logs: Docker logs for container + enter: Use nsenter to get a shell into a container + logs: View the Docker logs for a container bootstrap: Bootstrap a container for the config based on a template rebuild: Rebuild a container (destroy old, bootstrap, start new) cleanup: Remove all containers that have stopped for > 24 hours Options: - --skip-prereqs Don't check prerequisites - --docker-args Extra arguments to pass when running docker + --skip-prereqs Don't check launcher prerequisites + --docker-args Extra arguments to pass when running docker ``` -# Add More Discourse Features +### Add More Discourse Features Do you want... * Users to log in *only* via your pre-existing website's registration system? [Configure Single-Sign-On](https://meta.discourse.org/t/official-single-sign-on-for-discourse/13045). -- Users to log in via Google? [Configure Google logins](https://meta.discourse.org/t/configuring-google-oauth2-login-for-discourse/15858). - -- Users to log in via Facebook? [Configure Facebook logins](https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394). - -- Users to log in via Twitter? [Configure Twitter logins](https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395). - -- Users to log in via GitHub? [Configure GitHub logins](https://meta.discourse.org/t/configuring-github-login-for-discourse/13745) +- Users to log in via [Google](https://meta.discourse.org/t/configuring-google-oauth2-login-for-discourse/15858), [Twitter](https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395), [GitHub](https://meta.discourse.org/t/configuring-github-login-for-discourse/13745), or [Facebook](https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394)? - Users to post replies via email? [Configure reply via email](https://meta.discourse.org/t/set-up-reply-via-email-support/14003). - Automatic daily backups? [Configure backups](https://meta.discourse.org/t/configure-automatic-backups-for-discourse/14855). -- Free HTTPS / SSL support? [Configure Let's Encrypt](https://meta.discourse.org/t/setting-up-lets-encrypt-cert-with-discourse-docker/40709) +- Free HTTPS / SSL support? [Configure Let's Encrypt](https://meta.discourse.org/t/setting-up-lets-encrypt-cert-with-discourse-docker/40709). - Paid HTTPS / SSL support? [Configure SSL](https://meta.discourse.org/t/allowing-ssl-for-your-discourse-docker-setup/13847). @@ -166,9 +136,9 @@ Do you want... - A Content Delivery Network to speed up worldwide access? [Configure a CDN](https://meta.discourse.org/t/enable-a-cdn-for-your-discourse/14857). We recommend [Fastly](http://www.fastly.com/). -- Import old content from vBulletin, PHPbb, Vanilla, Drupal, BBPress, etc? [See our open source importers](https://github.com/discourse/discourse/tree/master/script/import_scripts) +- Import old content from vBulletin, PHPbb, Vanilla, Drupal, BBPress, etc? [See our open source importers](https://github.com/discourse/discourse/tree/master/script/import_scripts). -- A firewall on your server? [Configure firewall](https://meta.discourse.org/t/configure-a-firewall-for-discourse/20584) +- A firewall on your server? [Configure firewall](https://meta.discourse.org/t/configure-a-firewall-for-discourse/20584). - To embed Discourse [in your WordPress install](https://github.com/discourse/wp-discourse), or [on your static HTML site](https://meta.discourse.org/t/embedding-discourse-comments-via-javascript/31963)? diff --git a/docs/INSTALL-email.md b/docs/INSTALL-email.md index ee499ad470..ea11873ec3 100644 --- a/docs/INSTALL-email.md +++ b/docs/INSTALL-email.md @@ -1,51 +1,37 @@ -## Recommended Email Providers for Discourse +### Recommended Email Providers for Discourse We strongly recommend using a dedicated email service. Email server setup and maintenance is _very_ difficult even for experienced system administrators, and getting any part of the complex required email setup wrong means your email won't be delivered, or worse, delivered erratically. The following are template configurations for email service providers who offer generous free plans that work for most communities. -Use these values when you [edit your Discourse `app.yml` configuration file](https://github.com/discourse/discourse/blob/master/docs/INSTALL-cloud.md#edit-discourse-configuration): +**Please note that in any email provider, you _must_ verify and use the subdomain, e.g. `discourse.example.com`. If you verify the domain only, e.g. `example.com`, mail will not be configured correctly.** -#### [SparkPost][sp] (100k emails/month) +Enter these values when prompted by `./discourse-setup` per the [install guide](https://github.com/discourse/discourse/blob/master/docs/INSTALL-cloud.md#edit-discourse-configuration): -```yml -DISCOURSE_SMTP_ADDRESS: smtp.sparkpostmail.com -DISCOURSE_SMTP_PORT: 587 -DISCOURSE_SMTP_USER_NAME: SMTP_Injection -DISCOURSE_SMTP_PASSWORD: [Any API key with Send via SMTP permission] -``` +#### [SparkPost][sp] — 100k emails/month -If not using **the exact** domain you verified (e.g. you're using a subdomain of it), you must change the default `from` email to match the sending domain. Uncomment (and update with your sending domain) this line in `app.yml`: + SMTP server address? smtp.sparkpostmail.com + SMTP user name? SMTP_Injection + SMTP password? [Any API key with Send via SMTP permission] -```yml -- exec: rails r "SiteSetting.notification_email='info@unconfigured.discourse.org'" -``` +#### [SendGrid][sg] — 12k emails/month -#### [SendGrid][sg] (12k emails/month) + SMTP server address? smtp.sendgrid.net + SMTP user name? apikey + SMTP password? [SendGrid API Key] -```yml -DISCOURSE_SMTP_ADDRESS: smtp.sendgrid.net -DISCOURSE_SMTP_PORT: 587 -DISCOURSE_SMTP_USER_NAME: apikey -DISCOURSE_SMTP_PASSWORD: [SendGrid API Key] -``` We recommend creating an [API Key][sg2] instead of using your SendGrid username and password. -#### [Mailgun][gun] (10k emails/month) +#### [Mailgun][gun] — 10k emails/month + SMTP server address? smtp.mailgun.org + SMTP user name? [SMTP credentials for your domain under domains tab] + SMTP password? [SMTP credentials for your domain under domains tab] -```yml -DISCOURSE_SMTP_ADDRESS: smtp.mailgun.org -DISCOURSE_SMTP_PORT: 587 -DISCOURSE_SMTP_USER_NAME: [SMTP credentials for your domain under Mailgun domains tab] -DISCOURSE_SMTP_PASSWORD: [SMTP credentials for your domain under Mailgun domains tab] -``` - -#### [Mailjet][jet] (6k emails/month) +#### [Mailjet][jet] — 6k emails/month Go to [My Account page](https://www.mailjet.com/account) and click on the ["SMTP and SEND API Settings"](https://www.mailjet.com/account/setup) link. - [sp]: https://www.sparkpost.com/ [jet]: https://www.mailjet.com/pricing [gun]: http://www.mailgun.com/ diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb index 1e5cec773a..0bc2bf34e7 100644 --- a/lib/auth/default_current_user_provider.rb +++ b/lib/auth/default_current_user_provider.rb @@ -68,6 +68,7 @@ class Auth::DefaultCurrentUserProvider end cookies.permanent[TOKEN_COOKIE] = { value: user.auth_token, httponly: true } make_developer_admin(user) + enable_bootstrap_mode(user) @env[CURRENT_USER_KEY] = user end @@ -81,6 +82,10 @@ class Auth::DefaultCurrentUserProvider end end + def enable_bootstrap_mode(user) + Jobs.enqueue(:enable_bootstrap_mode, user_id: user.id) if user.admin && user.last_seen_at.nil? && !SiteSetting.bootstrap_mode_enabled && user.is_singular_admin? + end + def log_off_user(session, cookies) if SiteSetting.log_out_strict && (user = current_user) user.auth_token = nil diff --git a/lib/category_badge.rb b/lib/category_badge.rb index 196d17691a..dd1355f7ba 100644 --- a/lib/category_badge.rb +++ b/lib/category_badge.rb @@ -60,7 +60,7 @@ module CategoryBadge class_names = 'badge-category clear-badge' text_color = "##{category.text_color}" description = category.description_text ? "title='#{category.description_text.html_safe}'" : '' - category_url = opts[:absolute_url] ? "#{Discourse.base_url}#{category.url}" : category.url + category_url = opts[:absolute_url] ? "#{Discourse.base_url_no_prefix}#{category.url}" : category.url extra_span_classes = if opts[:inline_style] case (SiteSetting.category_style || :box).to_sym diff --git a/lib/discourse.rb b/lib/discourse.rb index 4d08038dee..762c1c0eaa 100644 --- a/lib/discourse.rb +++ b/lib/discourse.rb @@ -283,7 +283,7 @@ module Discourse SYSTEM_USER_ID ||= -1 def self.system_user - User.find_by(id: SYSTEM_USER_ID) + @system_user ||= User.find_by(id: SYSTEM_USER_ID) end def self.store diff --git a/lib/discourse_tagging.rb b/lib/discourse_tagging.rb new file mode 100644 index 0000000000..944f8bfeb7 --- /dev/null +++ b/lib/discourse_tagging.rb @@ -0,0 +1,116 @@ +module DiscourseTagging + + TAGS_FIELD_NAME = "tags" + TAGS_FILTER_REGEXP = /[<\\\/\>\#\?\&\s]/ + + # class Engine < ::Rails::Engine + # engine_name "discourse_tagging" + # isolate_namespace DiscourseTagging + # end + + def self.clean_tag(tag) + tag.downcase.strip[0...SiteSetting.max_tag_length].gsub(TAGS_FILTER_REGEXP, '') + end + + def self.staff_only_tags(tags) + return nil if tags.nil? + + staff_tags = SiteSetting.staff_tags.split("|") + + tag_diff = tags - staff_tags + tag_diff = tags - tag_diff + + tag_diff.present? ? tag_diff : nil + end + + def self.tags_for_saving(tags, guardian) + + return [] unless guardian.can_tag_topics? + + return unless tags + + tags.map! {|t| clean_tag(t) } + tags.delete_if {|t| t.blank? } + tags.uniq! + + # If the user can't create tags, remove any tags that don't already exist + # TODO: this is doing a full count, it should just check first or use a cache + unless guardian.can_create_tag? + tag_count = TopicCustomField.where(name: TAGS_FIELD_NAME, value: tags).group(:value).count + tags.delete_if {|t| !tag_count.has_key?(t) } + end + + return tags[0...SiteSetting.max_tags_per_topic] + end + + def self.notification_key(tag_id) + "tags_notification:#{tag_id}" + end + + def self.auto_notify_for(tags, topic) + # This insert will run up to SiteSetting.max_tags_per_topic times + tags.each do |tag| + key_name_sql = ActiveRecord::Base.sql_fragment("('#{notification_key(tag)}')", tag) + + sql = <<-SQL + INSERT INTO topic_users(user_id, topic_id, notification_level, notifications_reason_id) + SELECT ucf.user_id, + #{topic.id.to_i}, + CAST(ucf.value AS INTEGER), + #{TopicUser.notification_reasons[:plugin_changed]} + FROM user_custom_fields AS ucf + WHERE ucf.name IN #{key_name_sql} + AND NOT EXISTS(SELECT 1 FROM topic_users WHERE topic_id = #{topic.id.to_i} AND user_id = ucf.user_id) + AND CAST(ucf.value AS INTEGER) <> #{TopicUser.notification_levels[:regular]} + SQL + + ActiveRecord::Base.exec_sql(sql) + end + end + + def self.rename_tag(current_user, old_id, new_id) + sql = <<-SQL + UPDATE topic_custom_fields AS tcf + SET value = :new_id + WHERE value = :old_id + AND name = :tags_field_name + AND NOT EXISTS(SELECT 1 + FROM topic_custom_fields + WHERE value = :new_id AND name = :tags_field_name AND topic_id = tcf.topic_id) + SQL + + user_sql = <<-SQL + UPDATE user_custom_fields + SET name = :new_user_tag_id + WHERE name = :old_user_tag_id + AND NOT EXISTS(SELECT 1 + FROM user_custom_fields + WHERE name = :new_user_tag_id) + SQL + + ActiveRecord::Base.transaction do + ActiveRecord::Base.exec_sql(sql, new_id: new_id, old_id: old_id, tags_field_name: TAGS_FIELD_NAME) + TopicCustomField.delete_all(name: TAGS_FIELD_NAME, value: old_id) + ActiveRecord::Base.exec_sql(user_sql, new_user_tag_id: notification_key(new_id), + old_user_tag_id: notification_key(old_id)) + UserCustomField.delete_all(name: notification_key(old_id)) + StaffActionLogger.new(current_user).log_custom('renamed_tag', previous_value: old_id, new_value: new_id) + end + end + + def self.top_tags(limit_arg=nil) + # TODO: cache + # TODO: need an index for this (name,value) + TopicCustomField.where(name: TAGS_FIELD_NAME) + .group(:value) + .limit(limit_arg || SiteSetting.max_tags_in_filter_list) + .order('COUNT(value) DESC') + .count + .map {|name, count| name} + end + + def self.muted_tags(user) + return [] unless user + UserCustomField.where(user_id: user.id, value: TopicUser.notification_levels[:muted]).pluck(:name).map { |x| x[0,17] == "tags_notification" ? x[18..-1] : nil}.compact + end +end diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb index abedda36ea..83543fe36a 100644 --- a/lib/email/receiver.rb +++ b/lib/email/receiver.rb @@ -56,7 +56,6 @@ module Email end def process_internal - raise BouncedEmailError if @mail.bounced? && !@mail.retryable? raise ScreenedEmailError if ScreenedEmail.should_block?(@from_email) user = find_or_create_user(@from_email, @from_display_name) @@ -65,6 +64,7 @@ module Email @incoming_email.update_columns(user_id: user.id) + raise BouncedEmailError if is_bounce? raise InactiveUserError if !user.active && !user.staged raise BlockedUserError if user.blocked @@ -129,6 +129,61 @@ module Email end end + SOFT_BOUNCE_SCORE ||= 1 + HARD_BOUNCE_SCORE ||= 2 + + def is_bounce? + return false unless @mail.bounced? || verp + + @incoming_email.update_columns(is_bounce: true) + + if verp + bounce_key = verp[/\+verp-(\h{32})@/, 1] + if bounce_key && (email_log = EmailLog.find_by(bounce_key: bounce_key)) + email_log.update_columns(bounced: true) + + if @mail.error_status.present? + if @mail.error_status.start_with?("4.") + update_bounce_score(email_log.user.email, SOFT_BOUNCE_SCORE) + elsif @mail.error_status.start_with?("5.") + update_bounce_score(email_log.user.email, HARD_BOUNCE_SCORE) + end + end + end + end + + true + end + + def verp + @verp ||= @mail.destinations.select { |to| to[/\+verp-\h{32}@/] }.first + end + + def update_bounce_score(email, score) + # only update bounce score once per day + key = "bounce_score:#{email}:#{Date.today}" + + if $redis.setnx(key, "1") + $redis.expire(key, 25.hours) + + if user = User.find_by(email: email) + user.user_stat.bounce_score += score + user.user_stat.reset_bounce_score_after = 30.days.from_now + user.user_stat.save + + if user.active && user.user_stat.bounce_score >= SiteSetting.bounce_score_threshold + user.deactivate + StaffActionLogger.new(Discourse.system_user).log_revoke_email(user) + EmailToken.where(email: user.email, confirmed: true).update_all(confirmed: false) + end + end + + true + else + false + end + end + def is_auto_generated? return false if SiteSetting.auto_generated_whitelist.split('|').include?(@from_email) @mail[:precedence].to_s[/list|junk|bulk|auto_reply/i] || diff --git a/lib/email/sender.rb b/lib/email/sender.rb index 4a682b20cc..e1d0b320b0 100644 --- a/lib/email/sender.rb +++ b/lib/email/sender.rb @@ -116,16 +116,13 @@ module Email @message.header['List-Post'] = "" end - unless SiteSetting.bounce_email.blank? + if SiteSetting.reply_by_email_address.present? && SiteSetting.reply_by_email_address["+"] email_log.bounce_key = SecureRandom.hex - address,domain = SiteSetting.bounce_email.split('@') - address << (address =~ /[+]/ ? "-" : '+') - address << email_log.bounce_key # WARNING: RFC claims you can not set the Return Path header, this is 100% correct # however Rails has special handling for this header and ends up using this value # as the Envelope From address so stuff works as expected - @message.header[:return_path] = "#{address}@#{domain}" + @message.header[:return_path] = SiteSetting.reply_by_email_address.sub("%{reply_key}", "verp-#{email_log.bounce_key}") end email_log.post_id = post_id if post_id.present? diff --git a/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb b/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb index f827746ea7..58eb0e678c 100644 --- a/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb +++ b/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb @@ -29,7 +29,8 @@ module Tilt end def self.create_new_context - ctx = V8::Context.new(timeout: 10000) + # timeout any eval that takes longer than 15 seconds + ctx = V8::Context.new(timeout: 15000) ctx.eval("var self = this; #{File.read(Babel::Transpiler.script_path)}") ctx.eval("module = {}; exports = {};"); ctx.load("#{Rails.root}/lib/es6_module_transpiler/support/es6-module-transpiler.js") diff --git a/lib/guardian.rb b/lib/guardian.rb index 576d477b13..1a6c9d1375 100644 --- a/lib/guardian.rb +++ b/lib/guardian.rb @@ -122,7 +122,11 @@ class Guardian end def can_see_group?(group) - group.present? && (is_admin? || group.visible?) + return false if group.blank? + return true if is_admin? || group.visible? + return false if user.blank? + + group.group_users.where(user_id: user.id).exists? end @@ -272,6 +276,18 @@ class Guardian UserExport.where(user_id: @user.id, created_at: (Time.zone.now.beginning_of_day..Time.zone.now.end_of_day)).count == 0 end + def can_create_tag? + user && user.has_trust_level?(SiteSetting.min_trust_to_create_tag.to_i) + end + + def can_tag_topics? + user && user.has_trust_level?(SiteSetting.min_trust_level_to_tag_topics.to_i) + end + + def can_admin_tags? + is_staff? + end + private def is_my_own?(obj) diff --git a/lib/guardian/topic_guardian.rb b/lib/guardian/topic_guardian.rb index c6963214d3..d766af64e8 100644 --- a/lib/guardian/topic_guardian.rb +++ b/lib/guardian/topic_guardian.rb @@ -58,6 +58,12 @@ module TopicGuardian !Discourse.static_doc_topic_ids.include?(topic.id) end + def can_convert_topic?(topic) + return false if topic && topic.trashed? + return true if is_admin? + is_moderator? && can_create_post?(topic) + end + def can_reply_as_new_topic?(topic) authenticated? && topic && not(topic.private_message?) && @user.has_trust_level?(TrustLevel[1]) end diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb index 7fb3735de1..cccc8aa677 100644 --- a/lib/plugin/instance.rb +++ b/lib/plugin/instance.rb @@ -30,6 +30,10 @@ class Plugin::Instance [].tap { |plugins| # also follows symlinks - http://stackoverflow.com/q/357754 Dir["#{parent_path}/**/*/**/plugin.rb"].sort.each do |path| + + # tagging is included in core, so don't load it + next if path =~ /discourse-tagging/ + source = File.read(path) metadata = Plugin::Metadata.parse(source) plugins << self.new(metadata, path) diff --git a/lib/post_creator.rb b/lib/post_creator.rb index 39d9711cc3..bd0d67295a 100644 --- a/lib/post_creator.rb +++ b/lib/post_creator.rb @@ -102,6 +102,7 @@ class PostCreator setup_post return true if skip_validations? + if @post.has_host_spam? @spam = true errors[:base] << I18n.t(:spamming_host) @@ -146,6 +147,7 @@ class PostCreator track_latest_on_category enqueue_jobs BadgeGranter.queue_badge_grant(Badge::Trigger::PostRevision, post: @post) + auto_notify_for_tags trigger_after_events(@post) @@ -436,6 +438,15 @@ class PostCreator PostJobsEnqueuer.new(@post, @topic, new_topic?, {import_mode: @opts[:import_mode]}).enqueue_jobs end + def auto_notify_for_tags + tags = DiscourseTagging.tags_for_saving(@opts[:tags], @guardian) + if tags.present? + @topic.custom_fields.update(DiscourseTagging::TAGS_FIELD_NAME => tags) + @topic.save + DiscourseTagging.auto_notify_for(tags, @topic) + end + end + def new_topic? @opts[:topic_id].blank? end diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb index 05c85d0fa5..d1fb4bcea8 100644 --- a/lib/post_revisor.rb +++ b/lib/post_revisor.rb @@ -72,6 +72,54 @@ class PostRevisor tc.check_result(tc.topic.change_category_to_id(category_id)) end + track_topic_field(:tags_empty_array) do |tc, val| + if val.present? + unless tc.guardian.is_staff? + old_tags = tc.topic.tags || [] + staff_tags = DiscourseTagging.staff_only_tags(old_tags) + if staff_tags.present? + tc.topic.errors[:base] << I18n.t("tags.staff_tag_remove_disallowed", tag: staff_tags.join(" ")) + tc.check_result(false) + next + end + end + + tc.record_change(DiscourseTagging::TAGS_FIELD_NAME, tc.topic.custom_fields[DiscourseTagging::TAGS_FIELD_NAME], nil) + tc.topic.custom_fields.delete(DiscourseTagging::TAGS_FIELD_NAME) + end + end + + track_topic_field(:tags) do |tc, tags| + if tags.present? && tc.guardian.can_tag_topics? + tags = DiscourseTagging.tags_for_saving(tags, tc.guardian) + old_tags = tc.topic.tags || [] + + new_tags = tags - old_tags + removed_tags = old_tags - tags + + unless tc.guardian.is_staff? + staff_tags = DiscourseTagging.staff_only_tags(new_tags) + if staff_tags.present? + tc.topic.errors[:base] << I18n.t("tags.staff_tag_disallowed", tag: staff_tags.join(" ")) + tc.check_result(false) + next + end + + staff_tags = DiscourseTagging.staff_only_tags(removed_tags) + if staff_tags.present? + tc.topic.errors[:base] << I18n.t("tags.staff_tag_remove_disallowed", tag: staff_tags.join(" ")) + tc.check_result(false) + next + end + end + + tc.record_change(DiscourseTagging::TAGS_FIELD_NAME, tc.topic.custom_fields[DiscourseTagging::TAGS_FIELD_NAME], tags) + tc.topic.custom_fields.update(DiscourseTagging::TAGS_FIELD_NAME => tags) + + DiscourseTagging.auto_notify_for(new_tags, tc.topic) if new_tags.present? + end + end + # AVAILABLE OPTIONS: # - revised_at: changes the date of the revision # - force_new_version: bypass ninja-edit window @@ -363,7 +411,7 @@ class PostRevisor end def bypass_bump? - !@post_successfully_saved || @opts[:bypass_bump] == true + !@post_successfully_saved || @topic_changes.errored? || @opts[:bypass_bump] == true end def is_last_post? diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb index d72496074c..bfdcbbcd92 100644 --- a/lib/pretty_text.rb +++ b/lib/pretty_text.rb @@ -3,6 +3,7 @@ require 'nokogiri' require_dependency 'url_helper' require_dependency 'excerpt_parser' require_dependency 'post' +require_dependency 'discourse_tagging' module PrettyText @@ -67,6 +68,19 @@ module PrettyText } end end + + def category_tag_hashtag_lookup(text) + tag_postfix = '::tag' + is_tag = text =~ /#{tag_postfix}$/ + + if !is_tag && category = Category.query_from_hashtag_slug(text) + [category.url_with_id, text] + elsif is_tag && tag = TopicCustomField.find_by(name: DiscourseTagging::TAGS_FIELD_NAME, value: text.gsub!("#{tag_postfix}", '')) + ["#{Discourse.base_url}/tags/#{tag.value}", text] + else + nil + end + end end @mutex = Mutex.new @@ -77,8 +91,8 @@ module PrettyText end def self.create_new_context - # timeout any eval that takes longer that 5 seconds - ctx = V8::Context.new(timeout: 10000) + # timeout any eval that takes longer than 15 seconds + ctx = V8::Context.new(timeout: 15000) ctx["helpers"] = Helpers.new @@ -220,6 +234,7 @@ module PrettyText context.eval('opts["categoryHashtagLookup"] = function(c){return helpers.category_hashtag_lookup(c);}') context.eval('opts["lookupAvatar"] = function(p){return Discourse.Utilities.avatarImg({size: "tiny", avatarTemplate: helpers.avatar_template(p)});}') context.eval('opts["getTopicInfo"] = function(i){return helpers.get_topic_info(i)};') + context.eval('opts["categoryHashtagLookup"] = function(c){return helpers.category_tag_hashtag_lookup(c);}') DiscourseEvent.trigger(:markdown_context, context) baked = context.eval('Discourse.Markdown.markdownConverter(opts).makeHtml(raw)') end diff --git a/lib/search.rb b/lib/search.rb index 5bfd9d4e2e..224c14c35c 100644 --- a/lib/search.rb +++ b/lib/search.rb @@ -313,6 +313,17 @@ class Search end end + advanced_filter(/tags?:([a-zA-Z0-9,\-_]+)/) do |posts, match| + tags = match.split(",") + + posts.where("topics.id IN ( + SELECT tc.topic_id + FROM topic_custom_fields tc + WHERE tc.name = '#{DiscourseTagging::TAGS_FIELD_NAME}' AND + tc.value in (?) + )", tags) + end + private diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rb index 90870a4673..4395a8c907 100644 --- a/lib/site_setting_extension.rb +++ b/lib/site_setting_extension.rb @@ -371,6 +371,12 @@ module SiteSettingExtension end end + def set_and_log(name, value, user=Discourse.system_user) + prev_value = send(name) + set(name, value) + StaffActionLogger.new(user).log_site_setting_change(name, prev_value, value) if has_setting?(name) + end + protected def clear_cache! diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake index 3e68b4213b..dd71a22f84 100644 --- a/lib/tasks/assets.rake +++ b/lib/tasks/assets.rake @@ -116,6 +116,16 @@ def compress(from,to) end end +def concurrent? + if ENV["CONCURRENT"] == "1" + concurrent_compressors = [] + yield(Proc.new { |&block| concurrent_compressors << Concurrent::Future.execute { block.call } }) + concurrent_compressors.each(&:wait!) + else + yield(Proc.new { |&block| block.call }) + end +end + task 'assets:precompile' => 'assets:precompile:before' do # Run after assets:precompile Rake::Task["assets:precompile:css"].invoke @@ -124,30 +134,34 @@ task 'assets:precompile' => 'assets:precompile:before' do puts "Compressing Javascript and Generating Source Maps" manifest = Sprockets::Manifest.new(assets_path) - to_skip = Rails.configuration.assets.skip_minification || [] - manifest.files - .select{|k,v| k =~ /\.js$/} - .each do |file, info| + concurrent? do |proc| + to_skip = Rails.configuration.assets.skip_minification || [] + manifest.files + .select{|k,v| k =~ /\.js$/} + .each do |file, info| - path = "#{assets_path}/#{file}" - _file = (d = File.dirname(file)) == "." ? "_#{file}" : "#{d}/_#{File.basename(file)}" - _path = "#{assets_path}/#{_file}" + path = "#{assets_path}/#{file}" + _file = (d = File.dirname(file)) == "." ? "_#{file}" : "#{d}/_#{File.basename(file)}" + _path = "#{assets_path}/#{_file}" - if File.exists?(_path) - STDERR.puts "Skipping: #{file} already compressed" - else - STDERR.puts "Compressing: #{file}" + if File.exists?(_path) + STDERR.puts "Skipping: #{file} already compressed" + else + STDERR.puts "Compressing: #{file}" - # We can specify some files to never minify - unless (ENV["DONT_MINIFY"] == "1") || to_skip.include?(info['logical_path']) - FileUtils.mv(path, _path) - compress(_file,file) + proc.call do + # We can specify some files to never minify + unless (ENV["DONT_MINIFY"] == "1") || to_skip.include?(info['logical_path']) + FileUtils.mv(path, _path) + compress(_file,file) + end + + info["size"] = File.size(path) + info["mtime"] = File.mtime(path).iso8601 + gzip(path) + end end - - info["size"] = File.size(path) - info["mtime"] = File.mtime(path).iso8601 - gzip(path) - end + end end # protected diff --git a/lib/topic_creator.rb b/lib/topic_creator.rb index d0548885d3..53409a1837 100644 --- a/lib/topic_creator.rb +++ b/lib/topic_creator.rb @@ -23,6 +23,12 @@ class TopicCreator # so we fire the validation event after # this allows us to add errors valid = topic.valid? + + # not sure where this should go + if !@guardian.is_staff? && staff_only = DiscourseTagging.staff_only_tags(@opts[:tags]) + topic.errors[:base] << I18n.t("tags.staff_tag_disallowed", tag: staff_only.join(" ")) + end + DiscourseEvent.trigger(:after_validate_topic, topic, self) valid &&= topic.errors.empty? diff --git a/lib/topic_query.rb b/lib/topic_query.rb index 1c061107c4..f14c3dca42 100644 --- a/lib/topic_query.rb +++ b/lib/topic_query.rb @@ -308,6 +308,7 @@ class TopicQuery result = default_results(options) result = remove_muted_topics(result, @user) unless options && options[:state] == "muted".freeze result = remove_muted_categories(result, @user, exclude: options[:category]) + result = remove_muted_tags(result, @user, options) # plugins can remove topics here: self.class.results_filter_callbacks.each do |filter_callback| @@ -334,6 +335,7 @@ class TopicQuery result = TopicQuery.new_filter(default_results(options.reverse_merge(:unordered => true)), @user.user_option.treat_as_new_topic_start_date) result = remove_muted_topics(result, @user) result = remove_muted_categories(result, @user, exclude: options[:category]) + result = remove_muted_tags(result, @user, options) self.class.results_filter_callbacks.each do |filter_callback| result = filter_callback.call(:new, result, @user, options) @@ -562,6 +564,36 @@ class TopicQuery list end + def remove_muted_tags(list, user, opts=nil) + if user.nil? || !SiteSetting.tagging_enabled || !SiteSetting.remove_muted_tags_from_latest + list + else + muted_tags = DiscourseTagging.muted_tags(user) + if muted_tags.empty? + list + else + showing_tag = if opts[:filter] + f = opts[:filter].split('/') + f[0] == 'tags' ? f[1] : nil + else + nil + end + + if muted_tags.include?(showing_tag) + list # if viewing the topic list for a muted tag, show all the topics + else + arr = muted_tags.map{ |z| "'#{z}'" }.join(',') + list.where("EXISTS ( + SELECT 1 + FROM topic_custom_fields tcf + WHERE tcf.name = 'tags' + AND tcf.value NOT IN (#{arr}) + AND tcf.topic_id = topics.id + ) OR NOT EXISTS (select 1 from topic_custom_fields tcf where tcf.name = 'tags' and tcf.topic_id = topics.id)") + end + end + end + end def new_messages(params) diff --git a/lib/topic_view.rb b/lib/topic_view.rb index da72aa5bd2..27d898b4df 100644 --- a/lib/topic_view.rb +++ b/lib/topic_view.rb @@ -386,7 +386,8 @@ class TopicView def unfiltered_posts result = filter_post_types(@topic.posts) result = result.with_deleted if @guardian.can_see_deleted_posts? - result = @topic.posts.where("user_id IS NOT NULL") if @exclude_deleted_users + result = result.where("user_id IS NOT NULL") if @exclude_deleted_users + result = result.where(hidden: false) if @exclude_hidden result end diff --git a/lib/topics_bulk_action.rb b/lib/topics_bulk_action.rb index 541d283a1a..36c17f228e 100644 --- a/lib/topics_bulk_action.rb +++ b/lib/topics_bulk_action.rb @@ -11,7 +11,7 @@ class TopicsBulkAction def self.operations @operations ||= %w(change_category close archive change_notification_level reset_read dismiss_posts delete unlist archive_messages - move_messages_to_inbox) + move_messages_to_inbox change_tags) end def self.register_operation(name, &block) @@ -130,6 +130,23 @@ class TopicsBulkAction end end + def change_tags + tags = @operation[:tags] + tags = DiscourseTagging.tags_for_saving(tags, guardian) if tags.present? + + topics.each do |t| + if guardian.can_edit?(t) + if tags.present? + t.custom_fields.update(DiscourseTagging::TAGS_FIELD_NAME => tags) + t.save + DiscourseTagging.auto_notify_for(tags, t) + else + t.custom_fields.delete(DiscourseTagging::TAGS_FIELD_NAME) + end + end + end + end + def guardian @guardian ||= Guardian.new(@user) end diff --git a/lib/version.rb b/lib/version.rb index 3431cc5334..c991f58695 100644 --- a/lib/version.rb +++ b/lib/version.rb @@ -5,7 +5,7 @@ module Discourse MAJOR = 1 MINOR = 6 TINY = 0 - PRE = 'beta2' + PRE = 'beta3' STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/plugins/discourse-details/plugin.rb b/plugins/discourse-details/plugin.rb index 41a1a61a71..e51011e086 100644 --- a/plugins/discourse-details/plugin.rb +++ b/plugins/discourse-details/plugin.rb @@ -19,9 +19,14 @@ after_initialize do # replace all details with their summary in emails fragment.css("details").each do |details| - summary = details.css("summary")[0] - summary.name = "p" - details.replace(summary) + summary = details.css("summary") + if summary && summary[0] + summary = summary[0] + if summary && summary.respond_to?(:name) + summary.name = "p" + details.replace(summary) + end + end end end diff --git a/plugins/poll/config/locales/client.sq.yml b/plugins/poll/config/locales/client.sq.yml index 36f8b9af85..a906a9b551 100644 --- a/plugins/poll/config/locales/client.sq.yml +++ b/plugins/poll/config/locales/client.sq.yml @@ -12,14 +12,23 @@ sq: one: "votues" other: "votuesit" total_votes: - one: "total vote" - other: "total votes" + one: "total vota" + other: "totali votave" average_rating: "Vlerësimi mesatar: %{average}." multiple: help: + at_least_min_options: + one: "Ju duhet të zgjidhni të paktën 1 opsion." + other: "Ju duhet të zgjidhni të paktën %{count} opsione." + up_to_max_options: + one: "Ju mund të zgjidhni 1 opsion." + other: "Ju mund të zgjidhni %{count} opsione." + x_options: + one: "Ju duhet të zgjidhni 1 opsion." + other: "Ju duhet të zgjidhni %{count} opsione." between_min_and_max_options: "You may choose between %{min} and %{max} options." cast-votes: - title: "Cast your votes" + title: "Jepni votën tuaj" label: "Voto Tani" show-results: title: "Display the poll results" @@ -30,10 +39,10 @@ sq: open: title: "Fillo një Sondazh" label: "Fillo" - confirm: "Are you sure you want to open this poll?" + confirm: "Jeni të sigurt për të hapur këtë sondazh?" close: title: "Mbyll sondazhin" label: "Mbyll" - confirm: "Are you sure you want to close this poll?" - error_while_toggling_status: "There was an error while toggling the status of this poll." - error_while_casting_votes: "There was an error while casting your votes." + confirm: "Jeni të sigurt për të mbyllur këtë sondazh?" + error_while_toggling_status: "Ndodhi një gabim gjatë ndryshimit të statusit të këtij sondazhi." + error_while_casting_votes: "Ndodhi një gabim gjatë votimit!" diff --git a/plugins/poll/config/locales/server.ja.yml b/plugins/poll/config/locales/server.ja.yml index 6353abfeb5..7b42aca449 100644 --- a/plugins/poll/config/locales/server.ja.yml +++ b/plugins/poll/config/locales/server.ja.yml @@ -7,7 +7,7 @@ ja: site_settings: - poll_enabled: "ユーザによる投票の作成を許可しますか？" + poll_enabled: "ユーザによる投票を許可しますか？" poll_maximum_options: "投票で許可されるオプションの最大数。" poll: multiple_polls_without_name: "名前のない複数の投票があります。一意に投票結果を識別するために、属性'name'を使用します。" @@ -34,4 +34,4 @@ ja: topic_must_be_open_to_toggle_status: "状態を切り替えるには、トピックがオープンになっている必要があります。" only_staff_or_op_can_toggle_status: "スタッフやオリジナル投稿者のみが投票状態を切り替えることができます。" email: - link_to_poll: "クリックして投票を表示。" + link_to_poll: "クリックして投票を見る" diff --git a/plugins/poll/config/locales/server.sq.yml b/plugins/poll/config/locales/server.sq.yml index a876e94dab..4b03f0ea25 100644 --- a/plugins/poll/config/locales/server.sq.yml +++ b/plugins/poll/config/locales/server.sq.yml @@ -28,12 +28,12 @@ sq: cannot_change_polls_after_5_minutes: "You cannot add, remove or rename polls after the first 5 minutes." op_cannot_edit_options_after_5_minutes: "You cannot add or remove poll options after the first 5 minutes. Please contact a moderator if you need to edit a poll option." staff_cannot_add_or_remove_options_after_5_minutes: "You cannot add or remove poll options after the first 5 minutes. You should close this topic and create a new one instead." - no_polls_associated_with_this_post: "No polls are associated with this post." + no_polls_associated_with_this_post: "Asnjë sondazh nuk është bashkangjitur me këtë postim." no_poll_with_this_name: "No poll named %{name} associated with this post." post_is_deleted: "S'mund të veproj në një postim të eliminuar." - topic_must_be_open_to_vote: "The topic must be open to vote." + topic_must_be_open_to_vote: "Tema duhet të jetë e hapur për të votuar." poll_must_be_open_to_vote: "Sondazhi duhet të jetë i hapur për të votuar." - topic_must_be_open_to_toggle_status: "The topic must be open to toggle status." + topic_must_be_open_to_toggle_status: "Tema duhet të jetë e hapur për të ndryshuar statusin." only_staff_or_op_can_toggle_status: "Vetëm stafi ose autori temës mund të ndryshoje statusin e sondazhit." email: link_to_poll: "Kliko për të shfaqur sondazhin." diff --git a/plugins/poll/plugin.rb b/plugins/poll/plugin.rb index 8e8d778b21..b5d6a84f15 100644 --- a/plugins/poll/plugin.rb +++ b/plugins/poll/plugin.rb @@ -61,7 +61,7 @@ after_initialize do raise StandardError.new I18n.t("poll.requires_at_least_1_valid_option") if options.empty? - poll["voters"] = 0 + poll["voters"] = poll["anonymous_voters"] || 0 all_options = Hash.new(0) post.custom_fields[VOTES_CUSTOM_FIELD] ||= {} @@ -74,7 +74,10 @@ after_initialize do poll["voters"] += 1 if (available_options & votes.to_set).size > 0 end - poll["options"].each { |o| o["votes"] = all_options[o["id"]] } + poll["options"].each do |option| + anonymous_votes = option["anonymous_votes"] || 0 + option["votes"] = all_options[option["id"]] + anonymous_votes + end post.custom_fields[POLLS_CUSTOM_FIELD] = polls post.save_custom_fields(true) @@ -327,8 +330,14 @@ after_initialize do end polls[poll_name]["voters"] = previous_polls[poll_name]["voters"] + polls[poll_name]["anonymous_voters"] = previous_polls[poll_name]["anonymous_voters"] if previous_polls[poll_name].has_key?("anonymous_voters") + for o in 0...polls[poll_name]["options"].size - polls[poll_name]["options"][o]["votes"] = previous_polls[poll_name]["options"][o]["votes"] + current_option = polls[poll_name]["options"][o] + previous_option = previous_polls[poll_name]["options"][o] + + current_option["votes"] = previous_option["votes"] + current_option["anonymous_votes"] = previous_option["anonymous_votes"] if previous_option.has_key?("anonymous_votes") end end diff --git a/plugins/poll/spec/controllers/polls_controller_spec.rb b/plugins/poll/spec/controllers/polls_controller_spec.rb index b1679d7d6e..8a8ce7190e 100644 --- a/plugins/poll/spec/controllers/polls_controller_spec.rb +++ b/plugins/poll/spec/controllers/polls_controller_spec.rb @@ -1,4 +1,5 @@ require "rails_helper" +require_relative "../helpers" describe ::DiscoursePoll::PollsController do routes { ::DiscoursePoll::Engine.routes } @@ -85,6 +86,18 @@ describe ::DiscoursePoll::PollsController do expect(json["errors"][0]).to eq(I18n.t("poll.poll_must_be_open_to_vote")) end + it "doesn't discard anonymous votes when someone votes" do + default_poll = poll.custom_fields["polls"]["poll"] + add_anonymous_votes(poll, default_poll, 17, {"5c24fc1df56d764b550ceae1b9319125" => 11, "e89dec30bbd9bf50fabf6a05b4324edf" => 6}) + + xhr :put, :vote, { post_id: poll.id, poll_name: "poll", options: ["5c24fc1df56d764b550ceae1b9319125"] } + expect(response).to be_success + + json = ::JSON.parse(response.body) + expect(json["poll"]["voters"]).to eq(18) + expect(json["poll"]["options"][0]["votes"]).to eq(12) + expect(json["poll"]["options"][1]["votes"]).to eq(6) + end end describe "#toggle_status" do diff --git a/plugins/poll/spec/controllers/posts_controller_spec.rb b/plugins/poll/spec/controllers/posts_controller_spec.rb index bc86459637..990ead74d8 100644 --- a/plugins/poll/spec/controllers/posts_controller_spec.rb +++ b/plugins/poll/spec/controllers/posts_controller_spec.rb @@ -1,4 +1,5 @@ require "rails_helper" +require_relative "../helpers" describe PostsController do let!(:user) { log_in } @@ -165,12 +166,31 @@ describe PostsController do expect(json["errors"][0]).to eq(I18n.t("poll.op_cannot_edit_options_after_5_minutes")) end - it "staff can change the options" do + it "staff can change the options and votes are merged" do log_in_user(Fabricate(:moderator)) xhr :put, :update, { id: post_id, post: { raw: new_option } } expect(response).to be_success json = ::JSON.parse(response.body) expect(json["post"]["polls"]["poll"]["options"][1]["html"]).to eq("C") + expect(json["post"]["polls"]["poll"]["voters"]).to eq(1) + expect(json["post"]["polls"]["poll"]["options"][0]["votes"]).to eq(1) + expect(json["post"]["polls"]["poll"]["options"][1]["votes"]).to eq(0) + end + + it "staff can change the options and anonymous votes are merged" do + post = Post.find_by(id: post_id) + default_poll = post.custom_fields["polls"]["poll"] + add_anonymous_votes(post, default_poll, 7, {"5c24fc1df56d764b550ceae1b9319125" => 7}) + + log_in_user(Fabricate(:moderator)) + xhr :put, :update, { id: post_id, post: { raw: new_option } } + expect(response).to be_success + + json = ::JSON.parse(response.body) + expect(json["post"]["polls"]["poll"]["options"][1]["html"]).to eq("C") + expect(json["post"]["polls"]["poll"]["voters"]).to eq(8) + expect(json["post"]["polls"]["poll"]["options"][0]["votes"]).to eq(8) + expect(json["post"]["polls"]["poll"]["options"][1]["votes"]).to eq(0) end it "support changes on the post" do diff --git a/plugins/poll/spec/helpers.rb b/plugins/poll/spec/helpers.rb new file mode 100644 index 0000000000..a0584810ab --- /dev/null +++ b/plugins/poll/spec/helpers.rb @@ -0,0 +1,17 @@ +module Helpers + def add_anonymous_votes(post, poll, voters, options_with_votes) + poll["voters"] += voters + poll["anonymous_voters"] = voters + + poll["options"].each do |option| + anonymous_votes = options_with_votes[option["id"]] || 0 + + if anonymous_votes > 0 + option["votes"] += anonymous_votes + option["anonymous_votes"] = anonymous_votes + end + end + + post.save_custom_fields(true) + end +end diff --git a/public/422.sk.html b/public/422.sk.html index 36e3684c14..3cde526192 100644 --- a/public/422.sk.html +++ b/public/422.sk.html @@ -18,7 +18,7 @@
      -

      Požadovaná zmena bola zamietnutá.

      +

      Požadovaná zmena bola zamietnutá (422)

      Možno ste skúšali zmeniť niečo k čomu nemáte prístup.

      diff --git a/public/javascripts/embed.js b/public/javascripts/embed.js index 33c11d337a..4412a33c11 100644 --- a/public/javascripts/embed.js +++ b/public/javascripts/embed.js @@ -63,9 +63,13 @@ return top; } + function normalizeUrl(url) { + return url.replace(/^https?(\:\/\/)?/, ''); + } + function postMessageReceived(e) { if (!e) { return; } - if (DE.discourseUrl.indexOf(e.origin) === -1) { return; } + if (normalizeUrl(DE.discourseUrl).indexOf(normalizeUrl(e.origin)) === -1) { return; } if (e.data) { if (e.data.type === 'discourse-resize' && e.data.height) { diff --git a/script/import_scripts/phpbb3/database/database_3_0.rb b/script/import_scripts/phpbb3/database/database_3_0.rb index b25395abad..f6ebc9223e 100644 --- a/script/import_scripts/phpbb3/database/database_3_0.rb +++ b/script/import_scripts/phpbb3/database/database_3_0.rb @@ -12,8 +12,8 @@ module ImportScripts::PhpBB3 SQL end - def fetch_users(offset) - query(<<-SQL) + def fetch_users(last_user_id) + query(<<-SQL, :user_id) SELECT u.user_id, u.user_email, u.username, u.user_password, u.user_regdate, u.user_lastvisit, u.user_ip, u.user_type, u.user_inactive_reason, g.group_name, b.ban_start, b.ban_end, b.ban_reason, u.user_posts, u.user_website, u.user_from, u.user_birthday, u.user_avatar_type, u.user_avatar @@ -23,10 +23,9 @@ module ImportScripts::PhpBB3 u.user_id = b.ban_userid AND b.ban_exclude = 0 AND (b.ban_end = 0 OR b.ban_end >= UNIX_TIMESTAMP()) ) - WHERE u.user_type != #{Constants::USER_TYPE_IGNORE} - ORDER BY u.user_id ASC + WHERE u.user_id > #{last_user_id} AND u.user_type != #{Constants::USER_TYPE_IGNORE} + ORDER BY u.user_id LIMIT #{@batch_size} - OFFSET #{offset} SQL end @@ -38,15 +37,16 @@ module ImportScripts::PhpBB3 SQL end - def fetch_anonymous_users(offset) - query(<<-SQL) + def fetch_anonymous_users(last_username) + last_username = escape(last_username) + + query(<<-SQL, :post_username) SELECT post_username, MIN(post_time) AS first_post_time FROM #{@table_prefix}_posts - WHERE post_username <> '' + WHERE post_username > '#{last_username}' GROUP BY post_username - ORDER BY post_username ASC + ORDER BY post_username LIMIT #{@batch_size} - OFFSET #{offset} SQL end @@ -60,7 +60,7 @@ module ImportScripts::PhpBB3 GROUP BY forum_id ) x ON (f.forum_id = x.forum_id) WHERE f.forum_type != #{Constants::FORUM_TYPE_LINK} - ORDER BY f.parent_id ASC, f.left_id ASC + ORDER BY f.parent_id, f.left_id SQL end @@ -71,17 +71,17 @@ module ImportScripts::PhpBB3 SQL end - def fetch_posts(offset) - query(<<-SQL) + def fetch_posts(last_post_id) + query(<<-SQL, :post_id) SELECT p.post_id, p.topic_id, t.forum_id, t.topic_title, t.topic_first_post_id, p.poster_id, p.post_text, p.post_time, p.post_username, t.topic_status, t.topic_type, t.poll_title, CASE WHEN t.poll_length > 0 THEN t.poll_start + t.poll_length ELSE NULL END AS poll_end, t.poll_max_options, p.post_attachment FROM #{@table_prefix}_posts p JOIN #{@table_prefix}_topics t ON (p.topic_id = t.topic_id) - ORDER BY p.post_id ASC + WHERE p.post_id > #{last_post_id} + ORDER BY p.post_id LIMIT #{@batch_size} - OFFSET #{offset} SQL end @@ -95,33 +95,50 @@ module ImportScripts::PhpBB3 def fetch_poll_options(topic_id) query(<<-SQL) - SELECT poll_option_id, poll_option_text, poll_option_total - FROM #{@table_prefix}_poll_options - WHERE topic_id = #{topic_id} - ORDER BY poll_option_id + SELECT o.poll_option_id, o.poll_option_text, o.poll_option_total AS total_votes, + o.poll_option_total - ( + SELECT COUNT(DISTINCT v.vote_user_id) + FROM #{@table_prefix}_poll_votes v + JOIN #{@table_prefix}_users u ON (v.vote_user_id = u.user_id) + JOIN #{@table_prefix}_topics t ON (v.topic_id = t.topic_id) + WHERE v.poll_option_id = o.poll_option_id AND v.topic_id = o.topic_id + ) AS anonymous_votes + FROM #{@table_prefix}_poll_options o + WHERE o.topic_id = #{topic_id} + ORDER BY o.poll_option_id SQL end def fetch_poll_votes(topic_id) - # this query ignores votes from users that do not exist anymore + # this query ignores invalid votes that belong to non-existent users or topics query(<<-SQL) SELECT u.user_id, v.poll_option_id FROM #{@table_prefix}_poll_votes v + JOIN #{@table_prefix}_poll_options o ON (v.poll_option_id = o.poll_option_id AND v.topic_id = o.topic_id) JOIN #{@table_prefix}_users u ON (v.vote_user_id = u.user_id) + JOIN #{@table_prefix}_topics t ON (v.topic_id = t.topic_id) WHERE v.topic_id = #{topic_id} SQL end - def count_voters(topic_id) + def get_voters(topic_id) # anonymous voters can't be counted, but lets try to make the count look "correct" anyway - count(<<-SQL) - SELECT MAX(count) AS count + query(<<-SQL).first + SELECT MAX(x.total_voters) AS total_voters, + MAX(x.total_voters) - ( + SELECT COUNT(DISTINCT v.vote_user_id) + FROM #{@table_prefix}_poll_votes v + JOIN #{@table_prefix}_poll_options o ON (v.poll_option_id = o.poll_option_id AND v.topic_id = o.topic_id) + JOIN #{@table_prefix}_users u ON (v.vote_user_id = u.user_id) + JOIN #{@table_prefix}_topics t ON (v.topic_id = t.topic_id) + WHERE v.topic_id = #{topic_id} + ) AS anonymous_voters FROM ( - SELECT COUNT(DISTINCT vote_user_id) AS count + SELECT COUNT(DISTINCT vote_user_id) AS total_voters FROM #{@table_prefix}_poll_votes WHERE topic_id = #{topic_id} UNION - SELECT MAX(poll_option_total) AS count + SELECT MAX(poll_option_total) AS total_voters FROM #{@table_prefix}_poll_options WHERE topic_id = #{topic_id} ) x @@ -140,7 +157,7 @@ module ImportScripts::PhpBB3 SELECT physical_filename, real_filename FROM #{@table_prefix}_attachments WHERE topic_id = #{topic_id} AND post_msg_id = #{post_id} - ORDER BY filetime DESC, post_msg_id ASC + ORDER BY filetime DESC, post_msg_id SQL end @@ -158,9 +175,9 @@ module ImportScripts::PhpBB3 end end - def fetch_messages(use_fixed_messages, offset) + def fetch_messages(use_fixed_messages, last_msg_id) if use_fixed_messages - query(<<-SQL) + query(<<-SQL, :msg_id) SELECT m.msg_id, i.root_msg_id, m.author_id, m.message_time, m.message_subject, m.message_text, IFNULL(a.attachment_count, 0) AS attachment_count FROM #{@table_prefix}_privmsgs m @@ -171,12 +188,12 @@ module ImportScripts::PhpBB3 WHERE topic_id = 0 GROUP BY post_msg_id ) a ON (m.msg_id = a.post_msg_id) - ORDER BY i.root_msg_id ASC, m.msg_id ASC + WHERE m.msg_id > #{last_msg_id} + ORDER BY i.root_msg_id, m.msg_id LIMIT #{@batch_size} - OFFSET #{offset} SQL else - query(<<-SQL) + query(<<-SQL, :msg_id) SELECT m.msg_id, m.root_level AS root_msg_id, m.author_id, m.message_time, m.message_subject, m.message_text, IFNULL(a.attachment_count, 0) AS attachment_count FROM #{@table_prefix}_privmsgs m @@ -186,9 +203,9 @@ module ImportScripts::PhpBB3 WHERE topic_id = 0 GROUP BY post_msg_id ) a ON (m.msg_id = a.post_msg_id) - ORDER BY m.root_level ASC, m.msg_id ASC + WHERE m.msg_id > #{last_msg_id} + ORDER BY m.root_level, m.msg_id LIMIT #{@batch_size} - OFFSET #{offset} SQL end end @@ -229,14 +246,14 @@ module ImportScripts::PhpBB3 SQL end - def fetch_bookmarks(offset) - query(<<-SQL) + def fetch_bookmarks(last_user_id, last_topic_id) + query(<<-SQL, :user_id, :topic_first_post_id) SELECT b.user_id, t.topic_first_post_id FROM #{@table_prefix}_bookmarks b JOIN #{@table_prefix}_topics t ON (b.topic_id = t.topic_id) - ORDER BY b.user_id ASC, b.topic_id ASC + WHERE b.user_id > #{last_user_id} AND b.topic_id > #{last_topic_id} + ORDER BY b.user_id, b.topic_id LIMIT #{@batch_size} - OFFSET #{offset} SQL end @@ -322,7 +339,7 @@ module ImportScripts::PhpBB3 AND b.normalized_subject = i.normalized_subject AND a.msg_id <> m.msg_id AND a.message_time < m.message_time - ORDER BY a.message_time ASC + ORDER BY a.message_time LIMIT 1 ), 0) ELSE i.root_msg_id END AS root_msg_id FROM #{@table_prefix}_privmsgs m diff --git a/script/import_scripts/phpbb3/database/database_3_1.rb b/script/import_scripts/phpbb3/database/database_3_1.rb index 2dfc5054a8..c9368edf33 100644 --- a/script/import_scripts/phpbb3/database/database_3_1.rb +++ b/script/import_scripts/phpbb3/database/database_3_1.rb @@ -3,7 +3,7 @@ require_relative '../support/constants' module ImportScripts::PhpBB3 class Database_3_1 < Database_3_0 - def fetch_users(offset) + def fetch_users(last_user_id) query(<<-SQL) SELECT u.user_id, u.user_email, u.username, CASE WHEN u.user_password LIKE '$2y$%' @@ -20,10 +20,9 @@ module ImportScripts::PhpBB3 u.user_id = b.ban_userid AND b.ban_exclude = 0 AND (b.ban_end = 0 OR b.ban_end >= UNIX_TIMESTAMP()) ) - WHERE u.user_type != #{Constants::USER_TYPE_IGNORE} + WHERE u.user_id > #{last_user_id} AND u.user_type != #{Constants::USER_TYPE_IGNORE} ORDER BY u.user_id ASC LIMIT #{@batch_size} - OFFSET #{offset} SQL end end diff --git a/script/import_scripts/phpbb3/database/database_base.rb b/script/import_scripts/phpbb3/database/database_base.rb index a63cecf4c2..fa8cb3d454 100644 --- a/script/import_scripts/phpbb3/database/database_base.rb +++ b/script/import_scripts/phpbb3/database/database_base.rb @@ -12,13 +12,36 @@ module ImportScripts::PhpBB3 protected # Executes a database query. - def query(sql) - @database_client.query(sql, cache_rows: true, symbolize_keys: true) + def query(sql, *last_columns) + rows = @database_client.query(sql, cache_rows: true, symbolize_keys: true) + return rows if last_columns.length == 0 + + result = [rows] + last_row = find_last_row(rows) + + last_columns.each { |column| result.push(last_row ? last_row[column] : nil) } + result end # Executes a database query and returns the value of the 'count' column. def count(sql) query(sql).first[:count] end + + def escape(value) + @database_client.escape(value) + end + + private + + def find_last_row(rows) + last_index = rows.size - 1 + + rows.each_with_index do |row, index| + return row if index == last_index + end + + nil + end end end diff --git a/script/import_scripts/phpbb3/importer.rb b/script/import_scripts/phpbb3/importer.rb index d0e39eea14..b0c46c870a 100644 --- a/script/import_scripts/phpbb3/importer.rb +++ b/script/import_scripts/phpbb3/importer.rb @@ -57,9 +57,10 @@ module ImportScripts::PhpBB3 puts '', 'creating users' total_count = @database.count_users importer = @importers.user_importer + last_user_id = 0 batches do |offset| - rows = @database.fetch_users(offset) + rows, last_user_id = @database.fetch_users(last_user_id) break if rows.size < 1 next if all_records_exist?(:users, importer.map_users_to_import_ids(rows)) @@ -74,9 +75,10 @@ module ImportScripts::PhpBB3 puts '', 'creating anonymous users' total_count = @database.count_anonymous_users importer = @importers.user_importer + last_username = '' batches do |offset| - rows = @database.fetch_anonymous_users(offset) + rows, last_username = @database.fetch_anonymous_users(last_username) break if rows.size < 1 next if all_records_exist?(:users, importer.map_anonymous_users_to_import_ids(rows)) @@ -101,9 +103,10 @@ module ImportScripts::PhpBB3 puts '', 'creating topics and posts' total_count = @database.count_posts importer = @importers.post_importer + last_post_id = 0 batches do |offset| - rows = @database.fetch_posts(offset) + rows, last_post_id = @database.fetch_posts(last_post_id) break if rows.size < 1 next if all_records_exist?(:posts, importer.map_to_import_ids(rows)) @@ -123,9 +126,10 @@ module ImportScripts::PhpBB3 puts '', 'creating private messages' total_count = @database.count_messages(@settings.fix_private_messages) importer = @importers.message_importer + last_msg_id = 0 batches do |offset| - rows = @database.fetch_messages(@settings.fix_private_messages, offset) + rows, last_msg_id = @database.fetch_messages(@settings.fix_private_messages, last_msg_id) break if rows.size < 1 next if all_records_exist?(:posts, importer.map_to_import_ids(rows)) @@ -140,9 +144,10 @@ module ImportScripts::PhpBB3 puts '', 'creating bookmarks' total_count = @database.count_bookmarks importer = @importers.bookmark_importer + last_user_id = last_topic_id = 0 batches do |offset| - rows = @database.fetch_bookmarks(offset) + rows, last_user_id, last_topic_id = @database.fetch_bookmarks(last_user_id, last_topic_id) break if rows.size < 1 create_bookmarks(rows, total: total_count, offset: offset) do |row| diff --git a/script/import_scripts/phpbb3/importers/poll_importer.rb b/script/import_scripts/phpbb3/importers/poll_importer.rb index e6bae5b40b..da3e1d0b65 100644 --- a/script/import_scripts/phpbb3/importers/poll_importer.rb +++ b/script/import_scripts/phpbb3/importers/poll_importer.rb @@ -24,15 +24,17 @@ module ImportScripts::PhpBB3 return if extracted_poll.nil? - update_poll(extracted_poll, options, topic_id, poll) + update_poll_metadata(extracted_poll, topic_id, poll) + update_poll_options(extracted_poll, options, poll) mapped_poll = { raw: poll_text, custom_fields: {} } - add_polls_field(mapped_poll[:custom_fields], extracted_poll) - add_vote_fields(mapped_poll[:custom_fields], topic_id, poll) + add_poll_to_custom_fields(mapped_poll[:custom_fields], extracted_poll) + add_votes_to_custom_fields(mapped_poll[:custom_fields], topic_id, poll) + mapped_poll end @@ -40,23 +42,17 @@ module ImportScripts::PhpBB3 def get_poll_options(topic_id) rows = @database.fetch_poll_options(topic_id) - options_by_text = {} + options_by_text = Hash.new { |h, k| h[k] = {ids: [], total_votes: 0, anonymous_votes: 0} } rows.each do |row| option_text = @text_processor.process_raw_text(row[:poll_option_text]).delete("\n") - if options_by_text.key?(option_text) - # phpBB allows duplicate options (why?!) - we need to merge them - option = options_by_text[option_text] - option[:ids] << row[:poll_option_id] - option[:votes] += row[:poll_option_total] - else - options_by_text[option_text] = { - ids: [row[:poll_option_id]], - text: option_text, - votes: row[:poll_option_total] - } - end + # phpBB allows duplicate options (why?!) - we need to merge them + option = options_by_text[option_text] + option[:ids] << row[:poll_option_id] + option[:text] = option_text + option[:total_votes] += row[:total_votes] + option[:anonymous_votes] += row[:anonymous_votes] end options_by_text.values @@ -91,47 +87,47 @@ module ImportScripts::PhpBB3 end # @param poll [ImportScripts::PhpBB3::Poll] - def update_poll(default_poll, imported_options, topic_id, poll) - default_poll['voters'] = @database.count_voters(topic_id) # this includes anonymous voters - default_poll['status'] = poll.has_ended? ? :open : :closed + def update_poll_metadata(extracted_poll, topic_id, poll) + row = @database.get_voters(topic_id) - default_poll['options'].each_with_index do |option, index| + extracted_poll['voters'] = row[:total_voters] + extracted_poll['anonymous_voters'] = row[:anonymous_voters] if row[:anonymous_voters] > 0 + extracted_poll['status'] = poll.has_ended? ? :open : :closed + end + + # @param poll [ImportScripts::PhpBB3::Poll] + def update_poll_options(extracted_poll, imported_options, poll) + extracted_poll['options'].each_with_index do |option, index| imported_option = imported_options[index] - option['votes'] = imported_option[:votes] + option['votes'] = imported_option[:total_votes] + option['anonymous_votes'] = imported_option[:anonymous_votes] if imported_option[:anonymous_votes] > 0 poll.add_option_id(imported_option[:ids], option['id']) end end - def add_polls_field(custom_fields, default_poll) - custom_fields[@polls_field] = {@default_poll_name => default_poll} + # @param custom_fields [Hash] + def add_poll_to_custom_fields(custom_fields, extracted_poll) + custom_fields[@polls_field] = {@default_poll_name => extracted_poll} end # @param custom_fields [Hash] # @param poll [ImportScripts::PhpBB3::Poll] - def add_vote_fields(custom_fields, topic_id, poll) + def add_votes_to_custom_fields(custom_fields, topic_id, poll) rows = @database.fetch_poll_votes(topic_id) - warned = false + votes = {} rows.each do |row| option_id = poll.option_id_from_imported_option_id(row[:poll_option_id]) user_id = @lookup.user_id_from_imported_user_id(row[:user_id]) if option_id.present? && user_id.present? - key = "#{@votes_field}-#{user_id}" - - if custom_fields.key?(key) - votes = custom_fields[key][@default_poll_name] - else - votes = [] - custom_fields[key] = {@default_poll_name => votes} - end - - votes << option_id - elsif !warned - warned = true - Rails.logger.warn("Topic with id #{topic_id} has invalid votes.") + user_votes = votes["#{user_id}"] ||= {} + user_votes = user_votes[@default_poll_name] ||= [] + user_votes << option_id end end + + custom_fields[@votes_field] = votes end end diff --git a/spec/components/email/receiver_spec.rb b/spec/components/email/receiver_spec.rb index 805e9dfa45..b6b33fefd4 100644 --- a/spec/components/email/receiver_spec.rb +++ b/spec/components/email/receiver_spec.rb @@ -55,14 +55,57 @@ describe Email::Receiver do expect { process(:bad_destinations) }.to raise_error(Email::Receiver::BadDestinationAddress) end - it "raises an BouncerEmailError when email is a bounced email" do + it "raises a BouncerEmailError when email is a bounced email" do expect { process(:bounced_email) }.to raise_error(Email::Receiver::BouncedEmailError) + expect(IncomingEmail.last.is_bounce).to eq(true) end it "raises an AutoGeneratedEmailReplyError when email contains a marked reply" do expect { process(:bounced_email_2) }.to raise_error(Email::Receiver::AutoGeneratedEmailReplyError) end + context "bounces to VERP" do + + let(:bounce_key) { "14b08c855160d67f2e0c2f8ef36e251e" } + let(:bounce_key_2) { "b542fb5a9bacda6d28cc061d18e4eb83" } + let!(:user) { Fabricate(:user, email: "foo@bar.com", active: true) } + let!(:email_log) { Fabricate(:email_log, user: user, bounce_key: bounce_key) } + let!(:email_log_2) { Fabricate(:email_log, user: user, bounce_key: bounce_key_2) } + + before do + $redis.del("bounce_score:#{user.email}:#{Date.today}") + $redis.del("bounce_score:#{user.email}:#{2.days.from_now.to_date}") + end + + it "deals with soft bounces" do + expect { process(:soft_bounce_via_verp) }.to raise_error(Email::Receiver::BouncedEmailError) + + email_log.reload + expect(email_log.bounced).to eq(true) + expect(email_log.user.active).to eq(true) + expect(email_log.user.user_stat.bounce_score).to eq(1) + end + + it "deals with hard bounces" do + expect { process(:hard_bounce_via_verp) }.to raise_error(Email::Receiver::BouncedEmailError) + + email_log.reload + expect(email_log.bounced).to eq(true) + expect(email_log.user.active).to eq(true) + expect(email_log.user.user_stat.bounce_score).to eq(2) + + Timecop.freeze(2.days.from_now) do + expect { process(:hard_bounce_via_verp_2) }.to raise_error(Email::Receiver::BouncedEmailError) + + email_log_2.reload + expect(email_log_2.bounced).to eq(true) + expect(email_log_2.user.active).to eq(false) + expect(email_log_2.user.user_stat.bounce_score).to eq(4) + end + end + + end + context "reply" do let(:reply_key) { "4f97315cc828096c9cb34c6f1a0d6fe8" } diff --git a/spec/components/email/sender_spec.rb b/spec/components/email/sender_spec.rb index 073890b2fb..89d299dda4 100644 --- a/spec/components/email/sender_spec.rb +++ b/spec/components/email/sender_spec.rb @@ -77,25 +77,21 @@ describe Email::Sender do email_sender.send end - context "adds return_path correctly when no plus addressing" do - before do - SiteSetting.bounce_email = 'bounce@test.com' - end + context "doesn't add return_path when no plus addressing" do + before { SiteSetting.reply_by_email_address = '%{reply_key}@test.com' } When { email_sender.send } Then { - expect(message.header[:return_path].to_s).to eq("bounce+#{EmailLog.last.bounce_key}@test.com") + expect(message.header[:return_path].to_s).to eq("") } end - context "adds return_path correctly with plus addressing" do - before do - SiteSetting.bounce_email = 'bounce+meta@test.com' - end + context "adds return_path with plus addressing" do + before { SiteSetting.reply_by_email_address = 'replies+%{reply_key}@test.com' } When { email_sender.send } Then { - expect(message.header[:return_path].to_s).to eq("bounce+meta-#{EmailLog.last.bounce_key}@test.com") + expect(message.header[:return_path].to_s).to eq("replies+verp-#{EmailLog.last.bounce_key}@test.com") } end diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb index c7a5146f63..13fbd297ad 100644 --- a/spec/components/guardian_spec.rb +++ b/spec/components/guardian_spec.rb @@ -362,17 +362,24 @@ describe Guardian do describe 'a Group' do let(:group) { Group.new } - let(:invisible_group) { Group.new(visible: false) } + let(:invisible_group) { Group.new(visible: false, name: 'invisible') } it "returns true when the group is visible" do expect(Guardian.new.can_see?(group)).to be_truthy end - it "returns true when the group is visible but the user is an admin" do + it "returns true when the group is invisible but the user is an admin" do admin = Fabricate.build(:admin) expect(Guardian.new(admin).can_see?(invisible_group)).to be_truthy end + it "returns true when the group is invisible but the user is a member" do + invisible_group.save! + member = Fabricate.build(:user) + GroupUser.create(group: invisible_group, user: member) + expect(Guardian.new(member).can_see?(invisible_group)).to be_truthy + end + it "returns false when the group is invisible" do expect(Guardian.new.can_see?(invisible_group)).to be_falsey end @@ -865,6 +872,28 @@ describe Guardian do end + context 'can_convert_topic?' do + it 'returns false with a nil object' do + expect(Guardian.new(user).can_convert_topic?(nil)).to be_falsey + end + + it 'returns false when not logged in' do + expect(Guardian.new.can_convert_topic?(topic)).to be_falsey + end + + it 'returns false when not staff' do + expect(Guardian.new(trust_level_4).can_convert_topic?(topic)).to be_falsey + end + + it 'returns true when a moderator' do + expect(Guardian.new(moderator).can_convert_topic?(topic)).to be_truthy + end + + it 'returns true when an admin' do + expect(Guardian.new(admin).can_convert_topic?(topic)).to be_truthy + end + end + describe 'can_edit?' do it 'returns false with a nil object' do diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb index c30be629f6..63e2eca471 100644 --- a/spec/components/pretty_text_spec.rb +++ b/spec/components/pretty_text_spec.rb @@ -421,4 +421,15 @@ HTML end end + describe "tag and category links" do + + it "produces tag links" do + # TODO where is our tags table? + TopicCustomField.create!(topic_id: 1, name: DiscourseTagging::TAGS_FIELD_NAME, value: "known") + # TODO does it make sense to generate hashtags for tags that are missing in action? + expect(PrettyText.cook(" #unknown::tag #known::tag")).to match_html("

      #unknown::tag #known

      ") + end + + end + end diff --git a/spec/controllers/categories_controller_spec.rb b/spec/controllers/categories_controller_spec.rb index d9d9240b54..4850d5f36a 100644 --- a/spec/controllers/categories_controller_spec.rb +++ b/spec/controllers/categories_controller_spec.rb @@ -64,7 +64,7 @@ describe CategoriesController do expect(category.slug).to eq("hello-cat") expect(category.color).to eq("ff0") expect(category.auto_close_hours).to eq(72) - expect(UserHistory.count).to eq(1) + expect(UserHistory.count).to eq(4) # 1 + 3 (bootstrap mode) end end end @@ -228,7 +228,7 @@ describe CategoriesController do "everyone" => CategoryGroup.permission_types[:create_post] } - expect(UserHistory.count).to eq(2) + expect(UserHistory.count).to eq(5) # 2 + 3 (bootstrap mode) end end end diff --git a/spec/controllers/embed_controller_spec.rb b/spec/controllers/embed_controller_spec.rb index 9539666d6c..bd906895ea 100644 --- a/spec/controllers/embed_controller_spec.rb +++ b/spec/controllers/embed_controller_spec.rb @@ -92,7 +92,7 @@ describe EmbedController do it "creates a topic view when a topic_id is found" do TopicEmbed.expects(:topic_id_for_embed).returns(123) - TopicView.expects(:new).with(123, nil, {limit: 100, exclude_first: true, exclude_deleted_users: true}) + TopicView.expects(:new).with(123, nil, {limit: 100, exclude_first: true, exclude_deleted_users: true, exclude_hidden: true}) get :comments, embed_url: embed_url end diff --git a/spec/controllers/topics_controller_spec.rb b/spec/controllers/topics_controller_spec.rb index 4a82c8074f..780e6f4a48 100644 --- a/spec/controllers/topics_controller_spec.rb +++ b/spec/controllers/topics_controller_spec.rb @@ -1235,4 +1235,63 @@ describe TopicsController do expect(response.headers['X-Robots-Tag']).to eq(nil) end end + + context "convert_topic" do + it 'needs you to be logged in' do + expect { xhr :put, :convert_topic, id: 111, type: "private" }.to raise_error(Discourse::NotLoggedIn) + end + + describe 'converting public topic to private message' do + let(:user) { Fabricate(:user) } + let(:topic) { Fabricate(:topic, user: user) } + + it "raises an error when the user doesn't have permission to convert topic" do + log_in + xhr :put, :convert_topic, id: topic.id, type: "private" + expect(response).to be_forbidden + end + + context "success" do + before do + admin = log_in(:admin) + Topic.any_instance.expects(:convert_to_private_message).with(admin).returns(topic) + xhr :put, :convert_topic, id: topic.id, type: "private" + end + + it "returns success" do + expect(response).to be_success + result = ::JSON.parse(response.body) + expect(result['success']).to eq(true) + expect(result['url']).to be_present + end + end + end + + describe 'converting private message to public topic' do + let(:user) { Fabricate(:user) } + let(:topic) { Fabricate(:topic, user: user) } + + it "raises an error when the user doesn't have permission to convert topic" do + log_in + xhr :put, :convert_topic, id: topic.id, type: "public" + expect(response).to be_forbidden + end + + context "success" do + before do + admin = log_in(:admin) + Topic.any_instance.expects(:convert_to_public_topic).with(admin).returns(topic) + xhr :put, :convert_topic, id: topic.id, type: "public" + end + + it "returns success" do + expect(response).to be_success + result = ::JSON.parse(response.body) + expect(result['success']).to eq(true) + expect(result['url']).to be_present + end + end + end + end + end diff --git a/spec/controllers/uploads_controller_spec.rb b/spec/controllers/uploads_controller_spec.rb index 4a57897e77..90c3426b17 100644 --- a/spec/controllers/uploads_controller_spec.rb +++ b/spec/controllers/uploads_controller_spec.rb @@ -77,9 +77,8 @@ describe UploadsController do end it 'correctly sets retain_hours for admins' do - Jobs.expects(:enqueue).with(:create_thumbnails, anything) - log_in :admin + Jobs.expects(:enqueue).with(:create_thumbnails, anything) message = MessageBus.track_publish do xhr :post, :create, file: logo, retain_hours: 100, type: "profile_background" diff --git a/spec/fixtures/emails/hard_bounce_via_verp.eml b/spec/fixtures/emails/hard_bounce_via_verp.eml new file mode 100644 index 0000000000..d67d7ac9a3 --- /dev/null +++ b/spec/fixtures/emails/hard_bounce_via_verp.eml @@ -0,0 +1,39 @@ +Delivered-To: foo+verp-14b08c855160d67f2e0c2f8ef36e251e@discourse.org +Date: Thu, 7 Apr 2016 19:04:30 +0900 (JST) +From: MAILER-DAEMON@b-s-c.co.jp (Mail Delivery System) +Subject: Undelivered Mail Returned to Sender +To: foo+verp-14b08c855160d67f2e0c2f8ef36e251e@discourse.org +MIME-Version: 1.0 +Content-Type: multipart/report; report-type=delivery-status; + boundary="18F5D18A0075.1460023470/some@daemon.com" + +This is a MIME-encapsulated message. + +--18F5D18A0075.1460023470/some@daemon.com +Content-Description: Notification +Content-Type: text/plain; charset=us-ascii + +Your email bounced + +--18F5D18A0075.1460023470/some@daemon.com +Content-Description: Delivery report +Content-Type: message/delivery-status + +Final-Recipient: rfc822; linux-admin@b-s-c.co.jp +Original-Recipient: rfc822;linux-admin@b-s-c.co.jp +Action: failed +Status: 5.1.1 +Diagnostic-Code: X-Postfix; unknown user: "linux-admin" + +--18F5D18A0075.1460023470/some@daemon.com +Content-Description: Undelivered Message +Content-Type: message/rfc822 + +Return-Path: +Date: Thu, 07 Apr 2016 03:04:28 -0700 (PDT) +From: foo+verp-14b08c855160d67f2e0c2f8ef36e251e@discourse.org +X-Discourse-Auto-Generated: marked + +This is the body + +--18F5D18A0075.1460023470/some@daemon.com-- diff --git a/spec/fixtures/emails/hard_bounce_via_verp_2.eml b/spec/fixtures/emails/hard_bounce_via_verp_2.eml new file mode 100644 index 0000000000..b4f9ab8a91 --- /dev/null +++ b/spec/fixtures/emails/hard_bounce_via_verp_2.eml @@ -0,0 +1,40 @@ +Delivered-To: foo+verp-b542fb5a9bacda6d28cc061d18e4eb83@discourse.org +Date: Thu, 7 Apr 2016 19:04:30 +0900 (JST) +From: MAILER-DAEMON@b-s-c.co.jp (Mail Delivery System) +Message-ID: +Subject: Undelivered Mail Returned to Sender +To: foo+verp-b542fb5a9bacda6d28cc061d18e4eb83@discourse.org +MIME-Version: 1.0 +Content-Type: multipart/report; report-type=delivery-status; + boundary="18F5D18A0075.1460023470/some@daemon.com" + +This is a MIME-encapsulated message. + +--18F5D18A0075.1460023470/some@daemon.com +Content-Description: Notification +Content-Type: text/plain; charset=us-ascii + +Your email bounced + +--18F5D18A0075.1460023470/some@daemon.com +Content-Description: Delivery report +Content-Type: message/delivery-status + +Final-Recipient: rfc822; linux-admin@b-s-c.co.jp +Original-Recipient: rfc822;linux-admin@b-s-c.co.jp +Action: failed +Status: 5.1.1 +Diagnostic-Code: X-Postfix; unknown user: "linux-admin" + +--18F5D18A0075.1460023470/some@daemon.com +Content-Description: Undelivered Message +Content-Type: message/rfc822 + +Return-Path: +Date: Thu, 07 Apr 2016 03:04:28 -0700 (PDT) +From: foo+verp-b542fb5a9bacda6d28cc061d18e4eb83@discourse.org +X-Discourse-Auto-Generated: marked + +This is the body + +--18F5D18A0075.1460023470/some@daemon.com-- diff --git a/spec/fixtures/emails/soft_bounce_via_verp.eml b/spec/fixtures/emails/soft_bounce_via_verp.eml new file mode 100644 index 0000000000..3ed66aa7bf --- /dev/null +++ b/spec/fixtures/emails/soft_bounce_via_verp.eml @@ -0,0 +1,39 @@ +Delivered-To: foo+verp-14b08c855160d67f2e0c2f8ef36e251e@discourse.org +Date: Thu, 7 Apr 2016 19:04:30 +0900 (JST) +From: MAILER-DAEMON@b-s-c.co.jp (Mail Delivery System) +Subject: Undelivered Mail Returned to Sender +To: foo+verp-14b08c855160d67f2e0c2f8ef36e251e@discourse.org +MIME-Version: 1.0 +Content-Type: multipart/report; report-type=delivery-status; + boundary="18F5D18A0075.1460023470/some@daemon.com" + +This is a MIME-encapsulated message. + +--18F5D18A0075.1460023470/some@daemon.com +Content-Description: Notification +Content-Type: text/plain; charset=us-ascii + +Your email bounced + +--18F5D18A0075.1460023470/some@daemon.com +Content-Description: Delivery report +Content-Type: message/delivery-status + +Final-Recipient: rfc822; linux-admin@b-s-c.co.jp +Original-Recipient: rfc822;linux-admin@b-s-c.co.jp +Action: failed +Status: 4.1.1 +Diagnostic-Code: X-Postfix; unknown user: "linux-admin" + +--18F5D18A0075.1460023470/some@daemon.com +Content-Description: Undelivered Message +Content-Type: message/rfc822 + +Return-Path: +Date: Thu, 07 Apr 2016 03:04:28 -0700 (PDT) +From: foo+verp-14b08c855160d67f2e0c2f8ef36e251e@discourse.org +X-Discourse-Auto-Generated: marked + +This is the body + +--18F5D18A0075.1460023470/some@daemon.com-- diff --git a/spec/jobs/about_stats_spec.rb b/spec/jobs/about_stats_spec.rb index 25ae8291f8..85a1020e6d 100644 --- a/spec/jobs/about_stats_spec.rb +++ b/spec/jobs/about_stats_spec.rb @@ -1,10 +1,16 @@ require 'rails_helper' describe Jobs::AboutStats do + after do + $redis.flushall + end + it 'caches the stats' do - stats = { "visited" => 10 } - About.any_instance.expects(:stats).returns(stats) - $redis.expects(:setex).with(About.stats_cache_key, 35.minutes, stats.to_json) + stats = About.fetch_stats.to_json + cache_key = About.stats_cache_key + + expect($redis.get(cache_key)).to eq(nil) expect(described_class.new.execute({})).to eq(stats) + expect($redis.get(cache_key)).to eq(stats) end end diff --git a/spec/jobs/dashboard_stats_spec.rb b/spec/jobs/dashboard_stats_spec.rb index b00130d02d..82ff12edc6 100644 --- a/spec/jobs/dashboard_stats_spec.rb +++ b/spec/jobs/dashboard_stats_spec.rb @@ -1,10 +1,18 @@ require 'rails_helper' describe Jobs::DashboardStats do + after do + $redis.flushall + end + it 'caches the stats' do - json = { "visited" => 10 } - AdminDashboardData.any_instance.expects(:as_json).returns(json) - $redis.expects(:setex).with(AdminDashboardData.stats_cache_key, 35.minutes, json.to_json) - expect(described_class.new.execute({})).to eq(json) + Timecop.freeze do + stats = AdminDashboardData.fetch_stats.to_json + cache_key = AdminDashboardData.stats_cache_key + + expect($redis.get(cache_key)).to eq(nil) + expect(described_class.new.execute({})).to eq(stats) + expect($redis.get(cache_key)).to eq(stats) + end end end diff --git a/spec/jobs/disable_bootstrap_mode_spec.rb b/spec/jobs/disable_bootstrap_mode_spec.rb new file mode 100644 index 0000000000..b8be00bf4d --- /dev/null +++ b/spec/jobs/disable_bootstrap_mode_spec.rb @@ -0,0 +1,42 @@ +require 'rails_helper' + +describe Jobs::DisableBootstrapMode do + + context '.execute' do + let(:admin) { Fabricate(:admin) } + + before do + SiteSetting.bootstrap_mode_enabled = true + SiteSetting.default_trust_level = TrustLevel[1] + SiteSetting.default_email_digest_frequency = 1440 + end + + it 'does not execute if bootstrap mode is already disabled' do + SiteSetting.bootstrap_mode_enabled = false + StaffActionLogger.any_instance.expects(:log_site_setting_change).never + Jobs::DisableBootstrapMode.new.execute(user_id: admin.id) + end + + it 'turns off bootstrap mode if bootstrap_mode_min_users is set to 0' do + SiteSetting.bootstrap_mode_min_users = 0 + StaffActionLogger.any_instance.expects(:log_site_setting_change).times(3) + Jobs::DisableBootstrapMode.new.execute(user_id: admin.id) + end + + it 'does not amend setting that is not in bootstrap state' do + SiteSetting.bootstrap_mode_min_users = 0 + SiteSetting.default_trust_level = TrustLevel[3] + StaffActionLogger.any_instance.expects(:log_site_setting_change).twice + Jobs::DisableBootstrapMode.new.execute(user_id: admin.id) + end + + it 'successfully turns off bootstrap mode' do + SiteSetting.bootstrap_mode_min_users = 5 + 6.times do + Fabricate(:user) + end + StaffActionLogger.any_instance.expects(:log_site_setting_change).times(3) + Jobs::DisableBootstrapMode.new.execute(user_id: admin.id) + end + end +end diff --git a/spec/jobs/enable_bootstrap_mode_spec.rb b/spec/jobs/enable_bootstrap_mode_spec.rb new file mode 100644 index 0000000000..8cf653b46f --- /dev/null +++ b/spec/jobs/enable_bootstrap_mode_spec.rb @@ -0,0 +1,39 @@ +require 'rails_helper' + +describe Jobs::EnableBootstrapMode do + + context '.execute' do + let(:admin) { Fabricate(:admin) } + + before do + SiteSetting.bootstrap_mode_enabled = false + end + + it 'raises an error when user_id is missing' do + expect { Jobs::EnableBootstrapMode.new.execute({}) }.to raise_error(Discourse::InvalidParameters) + end + + it 'does not execute if bootstrap mode is already enabled' do + SiteSetting.bootstrap_mode_enabled = true + StaffActionLogger.any_instance.expects(:log_site_setting_change).never + Jobs::EnableBootstrapMode.new.execute(user_id: admin.id) + end + + it 'does not turn on bootstrap mode if first admin already exists' do + first_admin = Fabricate(:admin) + StaffActionLogger.any_instance.expects(:log_site_setting_change).never + Jobs::EnableBootstrapMode.new.execute(user_id: admin.id) + end + + it 'does not amend setting that is not in default state' do + SiteSetting.default_trust_level = TrustLevel[3] + StaffActionLogger.any_instance.expects(:log_site_setting_change).twice + Jobs::EnableBootstrapMode.new.execute(user_id: admin.id) + end + + it 'successfully turns on bootstrap mode' do + StaffActionLogger.any_instance.expects(:log_site_setting_change).times(3) + Jobs::EnableBootstrapMode.new.execute(user_id: admin.id) + end + end +end diff --git a/spec/jobs/user_email_spec.rb b/spec/jobs/user_email_spec.rb index e7405bade7..709254a1ad 100644 --- a/spec/jobs/user_email_spec.rb +++ b/spec/jobs/user_email_spec.rb @@ -204,6 +204,12 @@ describe Jobs::UserEmail do expect(EmailLog.where(user_id: user.id, skipped: true).count).to eq(1) end + it "does not send notification if bounce threshold is reached" do + user.user_stat.update(bounce_score: SiteSetting.bounce_score_threshold) + Jobs::UserEmail.new.execute(type: :user_mentioned, user_id: user.id, notification_id: notification.id, post_id: post.id) + expect(EmailLog.where(user_id: user.id, skipped: true).count).to eq(1) + end + it "doesn't send the mail if the user is using mailing list mode" do Email::Sender.any_instance.expects(:send).never user.user_option.update_column(:mailing_list_mode, true) diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb index 4506c0bbe3..c35875b0b8 100644 --- a/spec/models/category_spec.rb +++ b/spec/models/category_spec.rb @@ -316,6 +316,30 @@ describe Category do expect { @category.update_attributes(name: 'Troutfishing', topic_id: nil) }.to_not raise_error end + it "creates permalink when category slug is changed" do + @category.update_attributes(slug: 'new-category') + expect(Permalink.count).to eq(1) + end + + it "creates permalink when sub category slug is changed" do + sub_category = Fabricate(:category, slug: 'sub-category', parent_category_id: @category.id) + sub_category.update_attributes(slug: 'new-sub-category') + expect(Permalink.count).to eq(1) + end + + it "deletes permalink when category slug is reused" do + Fabricate(:permalink, url: "/c/bikeshed-category") + Fabricate(:category, slug: 'bikeshed-category') + expect(Permalink.count).to eq(0) + end + + it "deletes permalink when sub category slug is reused" do + Fabricate(:permalink, url: "/c/main-category/sub-category") + main_category = Fabricate(:category, slug: 'main-category') + Fabricate(:category, slug: 'sub-category', parent_category_id: main_category.id) + expect(Permalink.count).to eq(0) + end + it "should not set its description topic to auto-close" do category = Fabricate(:category, name: 'Closing Topics', auto_close_hours: 1) expect(category.topic.auto_close_at).to be_nil diff --git a/spec/models/topic_converter_spec.rb b/spec/models/topic_converter_spec.rb new file mode 100644 index 0000000000..96bd61e915 --- /dev/null +++ b/spec/models/topic_converter_spec.rb @@ -0,0 +1,68 @@ +require 'rails_helper' + +describe TopicConverter do + + context 'convert_to_public_topic' do + let(:admin) { Fabricate(:admin) } + let(:author) { Fabricate(:user) } + let(:private_message) { Fabricate(:private_message_topic, user: author) } + + context 'success' do + it "converts private message to regular topic" do + topic = private_message.convert_to_public_topic(admin) + expect(topic).to be_valid + expect(topic.archetype).to eq("regular") + end + + it "updates user stats" do + topic_user = TopicUser.create!(user_id: author.id, topic_id: private_message.id, posted: true) + expect(private_message.user.user_stat.topic_count).to eq(0) + private_message.convert_to_public_topic(admin) + expect(private_message.reload.user.user_stat.topic_count).to eq(1) + expect(topic_user.reload.notification_level).to eq(TopicUser.notification_levels[:watching]) + end + end + end + + context 'convert_to_private_message' do + let(:admin) { Fabricate(:admin) } + let(:author) { Fabricate(:user) } + let(:topic) { Fabricate(:topic, user: author) } + + context 'success' do + it "converts regular topic to private message" do + private_message = topic.convert_to_private_message(admin) + expect(private_message).to be_valid + expect(topic.archetype).to eq("private_message") + end + + it "updates user stats" do + Fabricate(:post, topic: topic, user: author) + topic_user = TopicUser.create!(user_id: author.id, topic_id: topic.id, posted: true) + author.user_stat.topic_count = 1 + author.user_stat.save + expect(topic.user.user_stat.topic_count).to eq(1) + topic.convert_to_private_message(admin) + + expect(topic.reload.topic_allowed_users.where(user_id: author.id).count).to eq(1) + expect(topic.reload.user.user_stat.topic_count).to eq(0) + expect(topic_user.reload.notification_level).to eq(TopicUser.notification_levels[:watching]) + end + end + + context 'topic has replies' do + before do + @replied_user = Fabricate(:coding_horror) + create_post(topic: topic, user: @replied_user) + topic.reload + end + + it 'adds users who replied to topic in Private Message' do + topic.convert_to_private_message(admin) + + expect(topic.reload.topic_allowed_users.where(user_id: @replied_user.id).count).to eq(1) + expect(topic.reload.user.user_stat.post_count).to eq(0) + end + end + end +end diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb index 4ae8009f37..e9b8b84cff 100644 --- a/spec/models/topic_spec.rb +++ b/spec/models/topic_spec.rb @@ -488,6 +488,13 @@ describe Topic do @topic.reload }.not_to change(@topic, :bumped_at) end + + it "doesn't bump the topic when a post have invalid topic title while edit" do + expect { + @last_post.revise(Fabricate(:moderator), { title: 'invalid title' }) + @topic.reload + }.not_to change(@topic, :bumped_at) + end end end diff --git a/spec/models/upload_spec.rb b/spec/models/upload_spec.rb index deddf2b795..b7ff3ab8de 100644 --- a/spec/models/upload_spec.rb +++ b/spec/models/upload_spec.rb @@ -63,7 +63,7 @@ describe Upload do it "computes width & height for images" do ImageSizer.expects(:resize) - image.expects(:rewind).twice + image.expects(:rewind).times(3) Upload.create_for(user_id, image, image_filename, image_filesize) end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 42575c62f5..92e12e9e71 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -330,6 +330,20 @@ describe User do end end + describe '.is_singular_admin?' do + it 'returns true if user is singular admin' do + admin = Fabricate(:admin) + expect(admin.is_singular_admin?).to eq(true) + end + + it 'returns false if user is not the only admin' do + admin = Fabricate(:admin) + second_admin = Fabricate(:admin) + + expect(admin.is_singular_admin?).to eq(false) + end + end + describe 'name heuristics' do it 'is able to guess a decent name from an email' do expect(User.suggest_name('sam.saffron@gmail.com')).to eq('Sam Saffron') diff --git a/spec/support/shared_examples_for_stats_cacheable.rb b/spec/support/shared_examples_for_stats_cacheable.rb index d47877c582..b6a2b4dfef 100644 --- a/spec/support/shared_examples_for_stats_cacheable.rb +++ b/spec/support/shared_examples_for_stats_cacheable.rb @@ -1,22 +1,25 @@ shared_examples_for 'stats cachable' do describe 'fetch_cached_stats' do - it 'returns the cached stats' do - begin - stats = { "visits" => 10 } - $redis.set(described_class.stats_cache_key, stats.to_json) - expect(described_class.fetch_cached_stats).to eq(stats) - ensure - $redis.del(described_class.stats_cache_key) - end + after do + $redis.flushall end - it 'returns nil if no stats has been cached' do - expect(described_class.fetch_cached_stats).to eq(nil) + it 'returns the cached stats' do + stats = described_class.fetch_stats.to_json + $redis.set(described_class.stats_cache_key, stats) + expect(described_class.fetch_cached_stats).to eq(JSON.parse(stats)) + end + + it 'returns fetches the stats if stats has not been cached' do + Timecop.freeze do + $redis.del(described_class.stats_cache_key) + expect(described_class.fetch_cached_stats).to eq(JSON.parse(described_class.fetch_stats.to_json)) + end end end describe 'fetch_stats' do - it 'has been implemented' do + it 'has not been implemented' do expect{ described_class.fetch_stats }.to_not raise_error end end diff --git a/test/javascripts/acceptance/hamburger-menu-staff-test.js.es6 b/test/javascripts/acceptance/hamburger-menu-staff-test.js.es6 deleted file mode 100644 index d4bdd05f6f..0000000000 --- a/test/javascripts/acceptance/hamburger-menu-staff-test.js.es6 +++ /dev/null @@ -1,13 +0,0 @@ -import { acceptance } from "helpers/qunit-helpers"; - -acceptance("Hamburger Menu - Staff", { loggedIn: true }); - -test("Menu Items", (assert) => { - visit("/"); - click("#toggle-hamburger-menu"); - andThen(() => { - assert.ok(exists(".hamburger-panel .admin-link")); - assert.ok(exists(".hamburger-panel .flagged-posts-link")); - assert.ok(exists(".hamburger-panel .flagged-posts.badge-notification"), "it displays flag notifications"); - }); -}); diff --git a/test/javascripts/acceptance/hamburger-menu-test.js.es6 b/test/javascripts/acceptance/hamburger-menu-test.js.es6 deleted file mode 100644 index 421acf9165..0000000000 --- a/test/javascripts/acceptance/hamburger-menu-test.js.es6 +++ /dev/null @@ -1,21 +0,0 @@ -import { acceptance } from "helpers/qunit-helpers"; - -acceptance("Hamburger Menu"); - -test("Menu Items", (assert) => { - visit("/"); - click("#toggle-hamburger-menu"); - andThen(() => { - assert.ok(!exists(".hamburger-panel .admin-link"), 'does not have admin link'); - assert.ok(!exists(".hamburger-panel .flagged-posts-link"), 'does not have flagged posts link'); - - assert.ok(exists(".hamburger-panel .latest-topics-link"), 'last link to latest'); - assert.ok(exists(".hamburger-panel .badge-link"), 'has link to badges'); - assert.ok(exists(".hamburger-panel .user-directory-link"), 'has user directory link'); - assert.ok(exists(".hamburger-panel .faq-link"), 'has faq link'); - assert.ok(exists(".hamburger-panel .about-link"), 'has about link'); - assert.ok(exists(".hamburger-panel .categories-link"), 'has categories link'); - - assert.ok(exists('.hamburger-panel .category-link'), 'has at least one category'); - }); -}); diff --git a/test/javascripts/acceptance/header-anonymous-test.js.es6 b/test/javascripts/acceptance/header-anonymous-test.js.es6 deleted file mode 100644 index 088cb4a30f..0000000000 --- a/test/javascripts/acceptance/header-anonymous-test.js.es6 +++ /dev/null @@ -1,30 +0,0 @@ -import { acceptance } from "helpers/qunit-helpers"; -acceptance("Header (Anonymous)"); - -test("header", () => { - visit("/"); - andThen(() => { - ok(exists("header"), "is rendered"); - ok(exists(".logo-big"), "it renders the large logo by default"); - not(exists("#notifications-dropdown li"), "no notifications at first"); - not(exists("#user-dropdown:visible"), "initially user dropdown is closed"); - not(exists("#search-dropdown:visible"), "initially search box is closed"); - }); - - // Logo changing - andThen(() => { - controllerFor('header').set("showExtraInfo", true); - }); - - andThen(() => { - ok(exists(".logo-small"), "it shows the small logo when `showExtraInfo` is enabled"); - }); - - // Search - click("#search-button"); - andThen(() => { - ok(exists(".search-menu:visible"), "after clicking a button search box opens"); - not(exists(".search-menu .heading"), "initially, immediately after opening, search box is empty"); - }); - -}); diff --git a/test/javascripts/acceptance/header-test-staff.js.es6 b/test/javascripts/acceptance/header-test-staff.js.es6 deleted file mode 100644 index 9312db0212..0000000000 --- a/test/javascripts/acceptance/header-test-staff.js.es6 +++ /dev/null @@ -1,14 +0,0 @@ -import { acceptance } from "helpers/qunit-helpers"; - -acceptance("Header (Staff)", { loggedIn: true }); - -test("header", () => { - visit("/"); - - // User dropdown - click("#current-user"); - andThen(() => { - ok(exists(".user-menu:visible"), "is lazily rendered after user opens it"); - ok(exists(".user-menu .menu-links-header"), "has showing / hiding user-dropdown links correctly bound"); - }); -}); diff --git a/test/javascripts/acceptance/search-test.js.es6 b/test/javascripts/acceptance/search-test.js.es6 index 71208a7464..7b0c8dc9b7 100644 --- a/test/javascripts/acceptance/search-test.js.es6 +++ b/test/javascripts/acceptance/search-test.js.es6 @@ -12,6 +12,7 @@ test("search", (assert) => { }); fillIn('#search-term', 'dev'); + keyEvent('#search-term', 'keyup', 16); andThen(() => { assert.ok(exists('.search-menu .results ul li'), 'it shows results'); }); diff --git a/test/javascripts/components/menu-panel-test.js.es6 b/test/javascripts/components/menu-panel-test.js.es6 deleted file mode 100644 index 6c586eed7c..0000000000 --- a/test/javascripts/components/menu-panel-test.js.es6 +++ /dev/null @@ -1,65 +0,0 @@ -import componentTest from 'helpers/component-test'; -moduleForComponent('menu-panel', {integration: true}); - -componentTest('as a dropdown', { - template: ` -
      click me
      - -
      - - {{#menu-panel visible=panelVisible markActive=".menu-selected" force="drop-down"}} - Some content - {{/menu-panel}} - `, - - setup() { - this.set('panelVisible', false); - }, - - test(assert) { - assert.ok(exists(".menu-panel.hidden"), "hidden by default"); - - this.set('panelVisible', true); - andThen(() => { - assert.ok(!exists(".menu-panel.hidden"), "toggling visible makes it appear"); - }); - - click('#outside-area'); - andThen(() => { - assert.ok(exists(".menu-panel.hidden"), "clicking the body hides the menu"); - assert.equal(this.get('panelVisible'), false, 'it updates the bound variable'); - }); - } -}); - -componentTest('as a slide-in', { - template: ` -
      click me
      -
      - - {{#menu-panel visible=panelVisible markActive=".menu-selected" force="slide-in"}} - Some content - {{/menu-panel}} - `, - - setup() { - this.set('panelVisible', false); - }, - - test(assert) { - assert.ok(exists(".menu-panel.hidden"), "hidden by default"); - - this.set('panelVisible', true); - andThen(() => { - assert.ok(!exists(".menu-panel.hidden"), "toggling visible makes it appear"); - }); - - click('#outside-area'); - andThen(() => { - assert.ok(exists(".menu-panel.hidden"), "clicking the body hides the menu"); - assert.equal(this.get('panelVisible'), false, 'it updates the bound variable'); - this.set('panelVisible', true); - }); - - } -}); diff --git a/test/javascripts/controllers/topic-test.js.es6 b/test/javascripts/controllers/topic-test.js.es6 index 48f0bcdbd0..90f4dda169 100644 --- a/test/javascripts/controllers/topic-test.js.es6 +++ b/test/javascripts/controllers/topic-test.js.es6 @@ -1,7 +1,7 @@ import { blank, present } from 'helpers/qunit-helpers'; moduleFor('controller:topic', 'controller:topic', { - needs: ['controller:header', 'controller:modal', 'controller:composer', 'controller:quote-button', + needs: ['controller:modal', 'controller:composer', 'controller:quote-button', 'controller:topic-progress', 'controller:application'] }); diff --git a/test/javascripts/helpers/component-test.js.es6 b/test/javascripts/helpers/component-test.js.es6 index 995fb47621..7e8fc08eeb 100644 --- a/test/javascripts/helpers/component-test.js.es6 +++ b/test/javascripts/helpers/component-test.js.es6 @@ -1,6 +1,7 @@ import AppEvents from 'discourse/lib/app-events'; import createStore from 'helpers/create-store'; import { autoLoadModules } from 'discourse/initializers/auto-load-modules'; +import TopicTrackingState from 'discourse/models/topic-tracking-state'; export default function(name, opts) { opts = opts || {}; @@ -22,11 +23,19 @@ export default function(name, opts) { autoLoadModules(); - if (opts.setup) { - const store = createStore(); - this.currentUser = Discourse.User.create(); - this.container.register('store:main', store, { instantiate: false }); + const store = createStore(); + if (!opts.anonymous) { + const currentUser = Discourse.User.create({ username: 'eviltrout' }); + this.currentUser = currentUser; this.container.register('current-user:main', this.currentUser, { instantiate: false }); + this.container.register('topic-tracking-state:main', + TopicTrackingState.create({ currentUser }), + { instantiate: false }); + } + + this.container.register('store:main', store, { instantiate: false }); + + if (opts.setup) { opts.setup.call(this, store); } diff --git a/test/javascripts/helpers/fixture-pretender.js.es6 b/test/javascripts/helpers/fixture-pretender.js.es6 index dea96b35a9..80b208099e 100644 --- a/test/javascripts/helpers/fixture-pretender.js.es6 +++ b/test/javascripts/helpers/fixture-pretender.js.es6 @@ -3,12 +3,12 @@ export default function(helpers) { const fixturesByUrl = {}; // Load any fixtures automatically - Ember.keys(require._eak_seen).forEach(entry => { + Object.keys(require._eak_seen).forEach(entry => { if (/^fixtures/.test(entry)) { const fixture = require(entry, null, null, true); if (fixture && fixture.default) { const obj = fixture.default; - Ember.keys(obj).forEach(url => { + Object.keys(obj).forEach(url => { fixturesByUrl[url] = obj[url]; this.get(url, () => response(obj[url])); }); diff --git a/test/javascripts/helpers/qunit-helpers.js.es6 b/test/javascripts/helpers/qunit-helpers.js.es6 index c690585661..63288ef7ab 100644 --- a/test/javascripts/helpers/qunit-helpers.js.es6 +++ b/test/javascripts/helpers/qunit-helpers.js.es6 @@ -2,7 +2,7 @@ import sessionFixtures from 'fixtures/session-fixtures'; import siteFixtures from 'fixtures/site-fixtures'; -import HeaderView from 'discourse/views/header'; +import HeaderComponent from 'discourse/components/site-header'; function currentUser() { return Discourse.User.create(sessionFixtures['/session/current.json'].current_user); @@ -41,7 +41,7 @@ function acceptance(name, options) { Discourse.Utilities.avatarImg = () => ""; // For now don't do scrolling stuff in Test Mode - HeaderView.reopen({examineDockHeader: Ember.K}); + HeaderComponent.reopen({examineDockHeader: Ember.K}); var siteJson = siteFixtures['site.json'].site; if (options) { diff --git a/test/javascripts/lib/click-track-edit-history-test.js.es6 b/test/javascripts/lib/click-track-edit-history-test.js.es6 new file mode 100644 index 0000000000..f0973679be --- /dev/null +++ b/test/javascripts/lib/click-track-edit-history-test.js.es6 @@ -0,0 +1,193 @@ +import { blank } from 'helpers/qunit-helpers'; +import DiscourseURL from "discourse/lib/url"; +import ClickTrack from "discourse/lib/click-track"; + +var windowOpen, + win, + redirectTo; + +module("lib:click-track-edit-history", { + setup: function() { + + // Prevent any of these tests from navigating away + win = {focus: function() { } }; + redirectTo = sandbox.stub(DiscourseURL, "redirectTo"); + sandbox.stub(Discourse, "ajax"); + windowOpen = sandbox.stub(window, "open").returns(win); + sandbox.stub(win, "focus"); + + fixture().html( + `
      +
      + `); + } +}); + +var track = ClickTrack.trackClick; + +// test +var generateClickEventOn = function(selector) { + return $.Event("click", { currentTarget: fixture(selector)[0] }); +}; + +test("does not track clicks on lightboxes", function() { + var clickEvent = generateClickEventOn('.lightbox'); + sandbox.stub(clickEvent, "preventDefault"); + ok(track(clickEvent)); + ok(!clickEvent.preventDefault.calledOnce); +}); + +test("it calls preventDefault when clicking on an a", function() { + var clickEvent = generateClickEventOn('a'); + sandbox.stub(clickEvent, "preventDefault"); + track(clickEvent); + ok(clickEvent.preventDefault.calledOnce); + ok(DiscourseURL.redirectTo.calledOnce); +}); + +test("does not track clicks when forcibly disabled", function() { + ok(track(generateClickEventOn('.no-track-link'))); +}); + +test("does not track clicks on back buttons", function() { + ok(track(generateClickEventOn('.back'))); +}); + +test("does not track clicks on quote buttons", function() { + ok(track(generateClickEventOn('.quote-other-topic'))); +}); + +test("does not track clicks on category badges", () => { + ok(track(generateClickEventOn('.hashtag'))); +}); + +test("removes the href and put it as a data attribute", function() { + track(generateClickEventOn('a')); + + var $link = fixture('a').first(); + ok($link.hasClass('no-href')); + equal($link.data('href'), 'http://www.google.com'); + blank($link.attr('href')); + ok($link.data('auto-route')); + ok(DiscourseURL.redirectTo.calledOnce); +}); + +asyncTestDiscourse("restores the href after a while", function() { + expect(1); + + track(generateClickEventOn('a')); + + setTimeout(function() { + start(); + equal(fixture('a').attr('href'), "http://www.google.com"); + }, 75); +}); + +var trackRightClick = function(target) { + var clickEvent = generateClickEventOn(target); + clickEvent.which = 3; + return track(clickEvent); +}; + +test("right clicks change the href", function() { + ok(trackRightClick('a')); + equal(fixture('a').first().prop('href'), "http://www.google.com/"); +}); + +test("right clicks are tracked", function() { + Discourse.SiteSettings.track_external_right_clicks = true; + trackRightClick('a'); + equal(fixture('a').first().attr('href'), "/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337"); +}); + +test("preventDefault is not called for right clicks", function() { + var clickEvent = generateClickEventOn('a'); + clickEvent.which = 3; + sandbox.stub(clickEvent, "preventDefault"); + ok(track(clickEvent)); + ok(!clickEvent.preventDefault.calledOnce); +}); + +var testOpenInANewTab = function(description, clickEventModifier) { + test(description, function() { + var clickEvent = generateClickEventOn('a'); + clickEventModifier(clickEvent); + sandbox.stub(clickEvent, "preventDefault"); + ok(track(clickEvent)); + ok(Discourse.ajax.calledOnce); + ok(!clickEvent.preventDefault.calledOnce); + }); +}; + +testOpenInANewTab("it opens in a new tab when pressing shift", function(clickEvent) { + clickEvent.shiftKey = true; +}); + +testOpenInANewTab("it opens in a new tab when pressing meta", function(clickEvent) { + clickEvent.metaKey = true; +}); + +testOpenInANewTab("it opens in a new tab when pressing ctrl", function(clickEvent) { + clickEvent.ctrlKey = true; +}); + +testOpenInANewTab("it opens in a new tab on middle click", function(clickEvent) { + clickEvent.button = 2; +}); + +test("tracks via AJAX if we're on the same site", function() { + sandbox.stub(DiscourseURL, "routeTo"); + sandbox.stub(DiscourseURL, "origin").returns("http://discuss.domain.com"); + + ok(!track(generateClickEventOn('#same-site'))); + ok(Discourse.ajax.calledOnce); + ok(DiscourseURL.routeTo.calledOnce); +}); + +test("does not track via AJAX for attachments", function() { + sandbox.stub(DiscourseURL, "routeTo"); + sandbox.stub(DiscourseURL, "origin").returns("http://discuss.domain.com"); + + ok(!track(generateClickEventOn('.attachment'))); + ok(DiscourseURL.redirectTo.calledOnce); +}); + +test("tracks custom urls when opening in another window", function() { + var clickEvent = generateClickEventOn('a'); + sandbox.stub(Discourse.User, "currentProp").withArgs('external_links_in_new_tab').returns(true); + ok(!track(clickEvent)); + ok(windowOpen.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337', '_blank')); +}); + +test("tracks custom urls when opening in another window", function() { + var clickEvent = generateClickEventOn('a'); + ok(!track(clickEvent)); + ok(redirectTo.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337')); +}); diff --git a/test/javascripts/lib/click-track-profile-page-test.js.es6 b/test/javascripts/lib/click-track-profile-page-test.js.es6 new file mode 100644 index 0000000000..cf6233fc3f --- /dev/null +++ b/test/javascripts/lib/click-track-profile-page-test.js.es6 @@ -0,0 +1,206 @@ +import { blank } from 'helpers/qunit-helpers'; +import DiscourseURL from "discourse/lib/url"; +import ClickTrack from "discourse/lib/click-track"; + +var windowOpen, + win, + redirectTo; + +module("lib:click-track-profile-page", { + setup: function() { + + // Prevent any of these tests from navigating away + win = {focus: function() { } }; + redirectTo = sandbox.stub(DiscourseURL, "redirectTo"); + sandbox.stub(Discourse, "ajax"); + windowOpen = sandbox.stub(window, "open").returns(win); + sandbox.stub(win, "focus"); + + fixture().html( + `

      + google.com + google.com +

      + google.com1 + google.com1 +
      + google.com + forum + log.txt + #hashtag +

      +

      + google.com + google.com +

      + google.com1 + google.com1 +
      + google.com + forum + log.txt + #hashtag +

      `); + } +}); + +var track = ClickTrack.trackClick; + +// test +var generateClickEventOn = function(selector) { + return $.Event("click", { currentTarget: fixture(selector)[0] }); +}; + +test("does not track clicks on lightboxes", function() { + var clickEvent = generateClickEventOn('.lightbox'); + sandbox.stub(clickEvent, "preventDefault"); + ok(track(clickEvent)); + ok(!clickEvent.preventDefault.calledOnce); +}); + +test("it calls preventDefault when clicking on an a", function() { + var clickEvent = generateClickEventOn('a'); + sandbox.stub(clickEvent, "preventDefault"); + track(clickEvent); + ok(clickEvent.preventDefault.calledOnce); + ok(DiscourseURL.redirectTo.calledOnce); +}); + +test("does not track clicks when forcibly disabled", function() { + ok(track(generateClickEventOn('.no-track-link'))); +}); + +test("does not track clicks on back buttons", function() { + ok(track(generateClickEventOn('.back'))); +}); + +test("does not track clicks on quote buttons", function() { + ok(track(generateClickEventOn('.quote-other-topic'))); +}); + +test("does not track clicks on category badges", () => { + ok(track(generateClickEventOn('.hashtag'))); +}); + +test("removes the href and put it as a data attribute", function() { + track(generateClickEventOn('a')); + + var $link = fixture('a').first(); + ok($link.hasClass('no-href')); + equal($link.data('href'), 'http://www.google.com'); + blank($link.attr('href')); + ok($link.data('auto-route')); + ok(DiscourseURL.redirectTo.calledOnce); +}); + +asyncTestDiscourse("restores the href after a while", function() { + expect(1); + + track(generateClickEventOn('a')); + + setTimeout(function() { + start(); + equal(fixture('a').attr('href'), "http://www.google.com"); + }, 75); +}); + +var trackRightClick = function(target) { + var clickEvent = generateClickEventOn(target); + clickEvent.which = 3; + return track(clickEvent); +}; + +test("right clicks change the href", function() { + ok(trackRightClick('a')); + equal(fixture('a').first().prop('href'), "http://www.google.com/"); +}); + +test("right clicks are tracked", function() { + Discourse.SiteSettings.track_external_right_clicks = true; + trackRightClick('a'); + equal(fixture('.first a').first().attr('href'), "/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337"); +}); + +test("right clicks are tracked for second excerpt", function() { + Discourse.SiteSettings.track_external_right_clicks = true; + trackRightClick('.second a'); + equal(fixture('.second a').first().attr('href'), "/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=24&topic_id=7331"); +}); + +test("preventDefault is not called for right clicks", function() { + var clickEvent = generateClickEventOn('a'); + clickEvent.which = 3; + sandbox.stub(clickEvent, "preventDefault"); + ok(track(clickEvent)); + ok(!clickEvent.preventDefault.calledOnce); +}); + +var testOpenInANewTab = function(description, clickEventModifier) { + test(description, function() { + var clickEvent = generateClickEventOn('a'); + clickEventModifier(clickEvent); + sandbox.stub(clickEvent, "preventDefault"); + ok(track(clickEvent)); + ok(Discourse.ajax.calledOnce); + ok(!clickEvent.preventDefault.calledOnce); + }); +}; + +testOpenInANewTab("it opens in a new tab when pressing shift", function(clickEvent) { + clickEvent.shiftKey = true; +}); + +testOpenInANewTab("it opens in a new tab when pressing meta", function(clickEvent) { + clickEvent.metaKey = true; +}); + +testOpenInANewTab("it opens in a new tab when pressing ctrl", function(clickEvent) { + clickEvent.ctrlKey = true; +}); + +testOpenInANewTab("it opens in a new tab on middle click", function(clickEvent) { + clickEvent.button = 2; +}); + +test("tracks via AJAX if we're on the same site", function() { + sandbox.stub(DiscourseURL, "routeTo"); + sandbox.stub(DiscourseURL, "origin").returns("http://discuss.domain.com"); + + ok(!track(generateClickEventOn('#same-site'))); + ok(Discourse.ajax.calledOnce); + ok(DiscourseURL.routeTo.calledOnce); +}); + +test("does not track via AJAX for attachments", function() { + sandbox.stub(DiscourseURL, "routeTo"); + sandbox.stub(DiscourseURL, "origin").returns("http://discuss.domain.com"); + + ok(!track(generateClickEventOn('.attachment'))); + ok(DiscourseURL.redirectTo.calledOnce); +}); + +test("tracks custom urls when opening in another window", function() { + var clickEvent = generateClickEventOn('a'); + sandbox.stub(Discourse.User, "currentProp").withArgs('external_links_in_new_tab').returns(true); + ok(!track(clickEvent)); + ok(windowOpen.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337', '_blank')); +}); + +test("tracks custom urls on second excerpt when opening in another window", function() { + var clickEvent = generateClickEventOn('.second a'); + sandbox.stub(Discourse.User, "currentProp").withArgs('external_links_in_new_tab').returns(true); + ok(!track(clickEvent)); + ok(windowOpen.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=24&topic_id=7331', '_blank')); +}); + +test("tracks custom urls when opening in another window", function() { + var clickEvent = generateClickEventOn('a'); + ok(!track(clickEvent)); + ok(redirectTo.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337')); +}); + +test("tracks custom urls on second excerpt when opening in another window", function() { + var clickEvent = generateClickEventOn('.second a'); + ok(!track(clickEvent)); + ok(redirectTo.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=24&topic_id=7331')); +}); diff --git a/test/javascripts/lib/click-track-test.js.es6 b/test/javascripts/lib/click-track-test.js.es6 index ae571b742a..806b6b5575 100644 --- a/test/javascripts/lib/click-track-test.js.es6 +++ b/test/javascripts/lib/click-track-test.js.es6 @@ -17,7 +17,7 @@ module("lib:click-track", { sandbox.stub(win, "focus"); fixture().html( - `
      + `
      `); } @@ -66,12 +70,20 @@ test("does not track clicks on back buttons", function() { ok(track(generateClickEventOn('.back'))); }); +test("does not track clicks in quotes", function() { + ok(track(generateClickEventOn('.inside-quote'))); +}); + test("does not track clicks on quote buttons", function() { ok(track(generateClickEventOn('.quote-other-topic'))); }); test("does not track clicks on category badges", () => { - ok(!track(generateClickEventOn('.hashtag'))); + ok(track(generateClickEventOn('.hashtag'))); +}); + +test("does not track clicks on mailto", function() { + ok(track(generateClickEventOn('.mailto'))); }); test("removes the href and put it as a data attribute", function() { @@ -132,7 +144,7 @@ test("right clicks change the href", function() { test("right clicks are tracked", function() { Discourse.SiteSettings.track_external_right_clicks = true; trackRightClick(); - equal(fixture('a').first().attr('href'), "/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42"); + equal(fixture('a').first().attr('href'), "/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337"); }); test("preventDefault is not called for right clicks", function() { @@ -167,7 +179,7 @@ testOpenInANewTab("it opens in a new tab when pressing ctrl", function(clickEven }); testOpenInANewTab("it opens in a new tab on middle click", function(clickEvent) { - clickEvent.which = 2; + clickEvent.button = 2; }); test("tracks via AJAX if we're on the same site", function() { @@ -191,11 +203,11 @@ test("tracks custom urls when opening in another window", function() { var clickEvent = generateClickEventOn('a'); sandbox.stub(Discourse.User, "currentProp").withArgs('external_links_in_new_tab').returns(true); ok(!track(clickEvent)); - ok(windowOpen.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42', '_blank')); + ok(windowOpen.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337', '_blank')); }); test("tracks custom urls when opening in another window", function() { var clickEvent = generateClickEventOn('a'); ok(!track(clickEvent)); - ok(redirectTo.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42')); + ok(redirectTo.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337')); }); diff --git a/test/javascripts/mixins/selected-posts-count-test.js.es6 b/test/javascripts/mixins/selected-posts-count-test.js.es6 index b07122fc5f..c6233a52a3 100644 --- a/test/javascripts/mixins/selected-posts-count-test.js.es6 +++ b/test/javascripts/mixins/selected-posts-count-test.js.es6 @@ -4,7 +4,7 @@ import SelectedPostsCount from 'discourse/mixins/selected-posts-count'; import Topic from 'discourse/models/topic'; var buildTestObj = function(params) { - return Ember.Object.createWithMixins(SelectedPostsCount, params || {}); + return Ember.Object.extend(SelectedPostsCount).create(params || {}); }; test("without selectedPosts", function () { diff --git a/test/javascripts/models/composer-test.js.es6 b/test/javascripts/models/composer-test.js.es6 index c156c92306..d541aaeb08 100644 --- a/test/javascripts/models/composer-test.js.es6 +++ b/test/javascripts/models/composer-test.js.es6 @@ -95,6 +95,21 @@ test("appendText", function() { equal(composer.get("reply"), "c\n\nab"); }); +test("prependText", function() { + const composer = createComposer(); + + blank(composer.get('reply'), "the reply is blank by default"); + + composer.prependText("hello"); + equal(composer.get('reply'), "hello", "it prepends text to nothing"); + + composer.prependText("world "); + equal(composer.get('reply'), "world hello", "it prepends text to existing text"); + + composer.prependText("before new line", {new_line: true}); + equal(composer.get('reply'), "before new line\n\nworld hello", "it prepends text with new line to existing text"); +}); + test("Title length for regular topics", function() { Discourse.SiteSettings.min_topic_title_length = 5; Discourse.SiteSettings.max_topic_title_length = 10; diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js index 852a67d18f..7362298d15 100644 --- a/test/javascripts/test_helper.js +++ b/test/javascripts/test_helper.js @@ -132,7 +132,7 @@ window.asyncTestDiscourse = helpers.asyncTestDiscourse; window.controllerFor = helpers.controllerFor; window.fixture = helpers.fixture; -Ember.keys(requirejs.entries).forEach(function(entry) { +Object.keys(requirejs.entries).forEach(function(entry) { if ((/\-test/).test(entry)) { require(entry, null, null, true); } diff --git a/test/javascripts/widgets/actions-summary-test.js.es6 b/test/javascripts/widgets/actions-summary-test.js.es6 index 8d549ff499..9b7f9cea23 100644 --- a/test/javascripts/widgets/actions-summary-test.js.es6 +++ b/test/javascripts/widgets/actions-summary-test.js.es6 @@ -7,8 +7,8 @@ widgetTest('listing actions', { setup() { this.set('args', { actionsSummary: [ - {action: 'off_topic', description: 'very off topic'}, - {action: 'spam', description: 'suspicious message'} + {id: 1, action: 'off_topic', description: 'very off topic'}, + {id: 2, action: 'spam', description: 'suspicious message'} ] }); }, diff --git a/test/javascripts/widgets/hamburger-menu-test.js.es6 b/test/javascripts/widgets/hamburger-menu-test.js.es6 new file mode 100644 index 0000000000..a6ed500761 --- /dev/null +++ b/test/javascripts/widgets/hamburger-menu-test.js.es6 @@ -0,0 +1,173 @@ +import { moduleForWidget, widgetTest } from 'helpers/widget-test'; + +moduleForWidget('hamburger-menu'); + +widgetTest('prioritize faq', { + template: '{{mount-widget widget="hamburger-menu"}}', + + setup() { + this.siteSettings.faq_url = 'http://example.com/faq'; + this.currentUser.set('read_faq', false); + }, + + test(assert) { + assert.ok(this.$('.faq-priority').length); + assert.ok(!this.$('.faq-link').length); + } +}); + +widgetTest('prioritize faq - user has read', { + template: '{{mount-widget widget="hamburger-menu"}}', + + setup() { + this.siteSettings.faq_url = 'http://example.com/faq'; + this.currentUser.set('read_faq', true); + }, + + test(assert) { + assert.ok(!this.$('.faq-priority').length); + assert.ok(this.$('.faq-link').length); + } +}); + +widgetTest('staff menu - not staff', { + template: '{{mount-widget widget="hamburger-menu"}}', + + setup() { + this.currentUser.set('staff', false); + }, + + test(assert) { + assert.ok(!this.$('.admin-link').length); + } +}); + +widgetTest('staff menu', { + template: '{{mount-widget widget="hamburger-menu"}}', + + setup() { + this.currentUser.setProperties({ staff: true, site_flagged_posts_count: 3 }); + }, + + test(assert) { + assert.ok(this.$('.admin-link').length); + assert.ok(this.$('.flagged-posts-link').length); + assert.equal(this.$('.flagged-posts').text(), '3'); + assert.ok(!this.$('.settings-link').length); + } +}); + +widgetTest('staff menu - admin', { + template: '{{mount-widget widget="hamburger-menu"}}', + + setup() { + this.currentUser.setProperties({ staff: true, admin: true }); + }, + + test(assert) { + assert.ok(this.$('.settings-link').length); + } +}); + + +widgetTest('queued posts', { + template: '{{mount-widget widget="hamburger-menu"}}', + + setup() { + this.currentUser.setProperties({ + staff: true, + show_queued_posts: true, + post_queue_new_count: 5 + }); + }, + + test(assert) { + assert.ok(this.$('.queued-posts-link').length); + assert.equal(this.$('.queued-posts').text(), '5'); + } +}); + +widgetTest('queued posts - disabled', { + template: '{{mount-widget widget="hamburger-menu"}}', + + setup() { + this.currentUser.setProperties({ staff: true, show_queued_posts: false }); + }, + + test(assert) { + assert.ok(!this.$('.queued-posts-link').length); + } +}); + + +widgetTest('logged in links', { + template: '{{mount-widget widget="hamburger-menu"}}', + + test(assert) { + assert.ok(this.$('.new-topics-link').length); + assert.ok(this.$('.unread-topics-link').length); + } +}); + +widgetTest('general links', { + template: '{{mount-widget widget="hamburger-menu"}}', + anonymous: true, + + test(assert) { + assert.ok(this.$('.latest-topics-link').length); + assert.ok(!this.$('.new-topics-link').length); + assert.ok(!this.$('.unread-topics-link').length); + assert.ok(this.$('.top-topics-link').length); + assert.ok(this.$('.badge-link').length); + assert.ok(this.$('.category-link').length > 0); + } +}); + +widgetTest('badges link - disabled', { + template: '{{mount-widget widget="hamburger-menu"}}', + + setup() { + this.siteSettings.enable_badges = false; + }, + + test(assert) { + assert.ok(!this.$('.badge-link').length); + } +}); + +widgetTest('badges link', { + template: '{{mount-widget widget="hamburger-menu"}}', + + test(assert) { + assert.ok(this.$('.badge-link').length); + } +}); + +widgetTest('user directory link', { + template: '{{mount-widget widget="hamburger-menu"}}', + + test(assert) { + assert.ok(this.$('.user-directory-link').length); + } +}); + +widgetTest('user directory link - disabled', { + template: '{{mount-widget widget="hamburger-menu"}}', + + setup() { + this.siteSettings.enable_user_directory = false; + }, + + test(assert) { + assert.ok(!this.$('.user-directory-link').length); + } +}); + +widgetTest('general links', { + template: '{{mount-widget widget="hamburger-menu"}}', + + test(assert) { + assert.ok(this.$('.about-link').length); + assert.ok(this.$('.keyboard-shortcuts-link').length); + } +}); diff --git a/test/javascripts/widgets/header-test.js.es6 b/test/javascripts/widgets/header-test.js.es6 new file mode 100644 index 0000000000..f3a7b8f907 --- /dev/null +++ b/test/javascripts/widgets/header-test.js.es6 @@ -0,0 +1,37 @@ +import { moduleForWidget, widgetTest } from 'helpers/widget-test'; + +moduleForWidget('header'); + +widgetTest('rendering basics', { + template: '{{mount-widget widget="header"}}', + test(assert) { + assert.ok(this.$('header.d-header').length); + assert.ok(this.$('#site-logo').length); + } +}); + +widgetTest('sign up / login buttons', { + template: '{{mount-widget widget="header" showCreateAccount="showCreateAccount" showLogin="showLogin" args=args}}', + anonymous: true, + + setup() { + this.set('args', { canSignUp: true }); + this.on('showCreateAccount', () => this.signupShown = true); + this.on('showLogin', () => this.loginShown = true); + }, + + test(assert) { + assert.ok(this.$('button.sign-up-button').length); + assert.ok(this.$('button.login-button').length); + + click('button.sign-up-button'); + andThen(() => { + assert.ok(this.signupShown); + }); + + click('button.login-button'); + andThen(() => { + assert.ok(this.loginShown); + }); + } +}); diff --git a/test/javascripts/components/home-logo-test.js.es6 b/test/javascripts/widgets/home-logo-test.js.es6 similarity index 51% rename from test/javascripts/components/home-logo-test.js.es6 rename to test/javascripts/widgets/home-logo-test.js.es6 index 60eefd94b9..e2acb50382 100644 --- a/test/javascripts/components/home-logo-test.js.es6 +++ b/test/javascripts/widgets/home-logo-test.js.es6 @@ -1,62 +1,77 @@ -import componentTest from 'helpers/component-test'; +import { moduleForWidget, widgetTest } from 'helpers/widget-test'; -moduleForComponent('home-logo', {integration: true}); +moduleForWidget('home-logo'); const bigLogo = '/images/d-logo-sketch.png?test'; const smallLogo = '/images/d-logo-sketch-small.png?test'; const mobileLogo = '/images/d-logo-sketch.png?mobile'; const title = "Cool Forum"; -componentTest('basics', { - template: '{{home-logo minimized=minimized}}', +widgetTest('basics', { + template: '{{mount-widget widget="home-logo" args=args}}', setup() { this.siteSettings.logo_url = bigLogo; this.siteSettings.logo_small_url= smallLogo; this.siteSettings.title = title; - this.set('minimized', false); + this.set('args', { minimized: false }); }, test(assert) { assert.ok(this.$('.title').length === 1); - assert.ok(this.$('a[data-auto-route]').length === 1); assert.ok(this.$('img#site-logo.logo-big').length === 1); assert.equal(this.$('#site-logo').attr('src'), bigLogo); assert.equal(this.$('#site-logo').attr('alt'), title); - - this.set('minimized', true); - andThen(() => { - assert.ok(this.$('img.logo-small').length === 1); - assert.equal(this.$('img.logo-small').attr('src'), smallLogo); - assert.equal(this.$('img.logo-small').attr('alt'), title); - }); } }); -componentTest('no logo', { - template: '{{home-logo minimized=minimized}}', +widgetTest('basics - minmized', { + template: '{{mount-widget widget="home-logo" args=args}}', + setup() { + this.siteSettings.logo_url = bigLogo; + this.siteSettings.logo_small_url= smallLogo; + this.siteSettings.title = title; + this.set('args', { minimized: true }); + }, + + test(assert) { + assert.ok(this.$('img.logo-small').length === 1); + assert.equal(this.$('img.logo-small').attr('src'), smallLogo); + assert.equal(this.$('img.logo-small').attr('alt'), title); + } +}); + +widgetTest('no logo', { + template: '{{mount-widget widget="home-logo" args=args}}', setup() { this.siteSettings.logo_url = ''; this.siteSettings.logo_small_url = ''; this.siteSettings.title = title; - this.set('minimized', false); + this.set('args', { minimized: false }); }, test(assert) { - assert.ok(this.$('a[data-auto-route]').length === 1); - assert.ok(this.$('h2#site-text-logo.text-logo').length === 1); assert.equal(this.$('#site-text-logo').text(), title); - - this.set('minimized', true); - andThen(() => { - assert.ok(this.$('i.fa-home').length === 1); - }); } }); -componentTest('mobile logo', { - template: "{{home-logo}}", +widgetTest('no logo - minimized', { + template: '{{mount-widget widget="home-logo" args=args}}', + setup() { + this.siteSettings.logo_url = ''; + this.siteSettings.logo_small_url = ''; + this.siteSettings.title = title; + this.set('args', { minimized: true }); + }, + + test(assert) { + assert.ok(this.$('i.fa-home').length === 1); + } +}); + +widgetTest('mobile logo', { + template: '{{mount-widget widget="home-logo" args=args}}', setup() { this.siteSettings.mobile_logo_url = mobileLogo; this.siteSettings.logo_small_url= smallLogo; @@ -69,8 +84,8 @@ componentTest('mobile logo', { } }); -componentTest('mobile without logo', { - template: "{{home-logo}}", +widgetTest('mobile without logo', { + template: '{{mount-widget widget="home-logo" args=args}}', setup() { this.siteSettings.logo_url = bigLogo; this.site.mobileView = true; @@ -81,10 +96,3 @@ componentTest('mobile without logo', { assert.equal(this.$('#site-logo').attr('src'), bigLogo); } }); - -componentTest("changing url", { - template: '{{home-logo targetUrl="https://www.discourse.org"}}', - test(assert) { - assert.equal(this.$('a').attr('href'), 'https://www.discourse.org'); - } -}); diff --git a/test/javascripts/widgets/post-gutter-test.js.es6 b/test/javascripts/widgets/post-gutter-test.js.es6 index 55c4152cb2..2de86d6761 100644 --- a/test/javascripts/widgets/post-gutter-test.js.es6 +++ b/test/javascripts/widgets/post-gutter-test.js.es6 @@ -6,6 +6,7 @@ widgetTest("duplicate links", { template: '{{mount-widget widget="post-gutter" args=args}}', setup() { this.set('args', { + id: 2, links: [ { title: "Evil Trout Link", url: "http://eviltrout.com" }, { title: "Evil Trout Link", url: "http://dupe.eviltrout.com" } @@ -21,6 +22,7 @@ widgetTest("collapsed links", { template: '{{mount-widget widget="post-gutter" args=args}}', setup() { this.set('args', { + id: 1, links: [ { title: "Link 1", url: "http://eviltrout.com?1" }, { title: "Link 2", url: "http://eviltrout.com?2" }, diff --git a/test/javascripts/widgets/user-menu-test.js.es6 b/test/javascripts/widgets/user-menu-test.js.es6 new file mode 100644 index 0000000000..3c043090eb --- /dev/null +++ b/test/javascripts/widgets/user-menu-test.js.es6 @@ -0,0 +1,106 @@ +import { moduleForWidget, widgetTest } from 'helpers/widget-test'; + +moduleForWidget('user-menu'); + +widgetTest('basics', { + template: '{{mount-widget widget="user-menu"}}', + + test(assert) { + assert.ok(this.$('.user-menu').length); + assert.ok(this.$('.user-activity-link').length); + assert.ok(this.$('.user-bookmarks-link').length); + assert.ok(this.$('.user-preferences-link').length); + assert.ok(this.$('.notifications').length); + } +}); + +widgetTest('log out', { + template: '{{mount-widget widget="user-menu" logout="logout"}}', + + setup() { + this.on('logout', () => this.loggedOut = true); + }, + + test(assert) { + assert.ok(this.$('.logout').length); + + click('.logout'); + andThen(() => { + assert.ok(this.loggedOut); + }); + } +}); + +widgetTest('private messages - disabled', { + template: '{{mount-widget widget="user-menu"}}', + setup() { + this.siteSettings.enable_private_messages = false; + }, + + test(assert) { + assert.ok(!this.$('.user-pms-link').length); + } +}); + +widgetTest('private messages - enabled', { + template: '{{mount-widget widget="user-menu"}}', + setup() { + this.siteSettings.enable_private_messages = true; + }, + + test(assert) { + assert.ok(this.$('.user-pms-link').length); + } +}); + +widgetTest('anonymous', { + template: '{{mount-widget widget="user-menu" toggleAnonymous="toggleAnonymous"}}', + + setup() { + this.currentUser.setProperties({ is_anonymous: false, trust_level: 3 }); + this.siteSettings.allow_anonymous_posting = true; + this.siteSettings.anonymous_posting_min_trust_level = 3; + + this.on('toggleAnonymous', () => this.anonymous = true); + }, + + test(assert) { + assert.ok(this.$('.enable-anonymous').length); + click('.enable-anonymous'); + andThen(() => { + assert.ok(this.anonymous); + }); + } +}); + +widgetTest('anonymous - disabled', { + template: '{{mount-widget widget="user-menu"}}', + + setup() { + this.siteSettings.allow_anonymous_posting = false; + }, + + test(assert) { + assert.ok(!this.$('.enable-anonymous').length); + } +}); + +widgetTest('anonymous - switch back', { + template: '{{mount-widget widget="user-menu" toggleAnonymous="toggleAnonymous"}}', + + setup() { + this.currentUser.setProperties({ is_anonymous: true }); + this.siteSettings.allow_anonymous_posting = true; + + this.on('toggleAnonymous', () => this.anonymous = true); + }, + + test(assert) { + assert.ok(this.$('.disable-anonymous').length); + click('.disable-anonymous'); + andThen(() => { + assert.ok(this.anonymous); + }); + } +}); + diff --git a/test/javascripts/widgets/widget-test.js.es6 b/test/javascripts/widgets/widget-test.js.es6 index 5680516f6b..ed52f81bee 100644 --- a/test/javascripts/widgets/widget-test.js.es6 +++ b/test/javascripts/widgets/widget-test.js.es6 @@ -89,6 +89,7 @@ widgetTest('widget state', { setup() { createWidget('state-test', { tagName: 'button.test', + buildKey: () => `button-test`, defaultState() { return { clicks: 0 }; @@ -121,6 +122,7 @@ widgetTest('widget update with promise', { setup() { createWidget('promise-test', { tagName: 'button.test', + buildKey: () => 'promise-test', html(attrs, state) { return state.name || "No name"; diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.ja.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.ja.yml index aa33da17f3..32f9bbc0f8 100644 --- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.ja.yml +++ b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.ja.yml @@ -8,5 +8,5 @@ ja: site_settings: enable_imgur: "アップロードするため、imgur apiを有効にしています、ファイルはローカルにホストされません" - imgur_client_id: "画像をアップロードするのに、あなたのimgur.comのクライアントIDが必要です" + imgur_client_id: "画像をアップロードするためには、imgur.comのアカウントが必要です。" imgur_client_secret: "あなたのimgur.comクライアントは秘密です。今は使用されていない画像アップロードに必要です、しかしいずれは必要になるでしょう。"