diff --git a/.eslintrc b/.eslintrc index d2a13ae262..2b3ed3ba7d 100644 --- a/.eslintrc +++ b/.eslintrc @@ -90,6 +90,7 @@ "no-undef": 2, "no-unused-vars": 2, "no-with": 2, + "no-this-before-super": 2, "semi": 2, "strict": 0, "valid-typeof": 2, diff --git a/.travis.yml b/.travis.yml index ad89a9befe..b06b741d92 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ cache: before_install: - gem install bundler - - npm i -g eslint babel-eslint + - npm i -g eslint@2.2 babel-eslint - eslint app/assets/javascripts - eslint --ext .es6 app/assets/javascripts - eslint --ext .es6 test/javascripts diff --git a/Gemfile b/Gemfile index 3f5a46fb76..832d95315b 100644 --- a/Gemfile +++ b/Gemfile @@ -45,12 +45,14 @@ gem 'active_model_serializers', '~> 0.8.3' gem 'onebox' +gem 'http_accept_language', '~>2.0.5', require: false + gem 'ember-rails' gem 'ember-source', '1.12.2' gem 'barber' gem 'babel-transpiler' -gem 'message_bus', '2.0.0.beta.2' +gem 'message_bus', '2.0.0.beta.4' gem 'rails_multisite' @@ -78,6 +80,7 @@ gem 'omniauth-openid' gem 'openid-redis-store' gem 'omniauth-facebook' gem 'omniauth-twitter' +gem 'omniauth-instagram' # forked while https://github.com/intridea/omniauth-github/pull/41 is being upstreamd gem 'omniauth-github-discourse', require: 'omniauth-github' diff --git a/Gemfile.lock b/Gemfile.lock index 2bc7adb15d..875f984536 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,38 +1,38 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.5.1) - actionpack (= 4.2.5.1) - actionview (= 4.2.5.1) - activejob (= 4.2.5.1) + actionmailer (4.2.5.2) + actionpack (= 4.2.5.2) + actionview (= 4.2.5.2) + activejob (= 4.2.5.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.5.1) - actionview (= 4.2.5.1) - activesupport (= 4.2.5.1) + actionpack (4.2.5.2) + actionview (= 4.2.5.2) + activesupport (= 4.2.5.2) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.5.1) - activesupport (= 4.2.5.1) + actionview (4.2.5.2) + activesupport (= 4.2.5.2) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) active_model_serializers (0.8.3) activemodel (>= 3.0) - activejob (4.2.5.1) - activesupport (= 4.2.5.1) + activejob (4.2.5.2) + activesupport (= 4.2.5.2) globalid (>= 0.3.0) - activemodel (4.2.5.1) - activesupport (= 4.2.5.1) + activemodel (4.2.5.2) + activesupport (= 4.2.5.2) builder (~> 3.1) - activerecord (4.2.5.1) - activemodel (= 4.2.5.1) - activesupport (= 4.2.5.1) + activerecord (4.2.5.2) + activemodel (= 4.2.5.2) + activesupport (= 4.2.5.2) arel (~> 6.0) - activesupport (4.2.5.1) + activesupport (4.2.5.2) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -127,6 +127,7 @@ GEM htmlentities (4.3.4) http-cookie (1.0.2) domain_name (~> 0.5) + http_accept_language (2.0.5) i18n (0.7.0) image_optim (0.20.2) exifr (~> 1.1, >= 1.1.3) @@ -156,12 +157,11 @@ GEM mail (2.6.3) mime-types (>= 1.16, < 3) memory_profiler (0.9.6) - message_bus (2.0.0.beta.2) + message_bus (2.0.0.beta.4) rack (>= 1.1.3) - redis metaclass (0.0.4) method_source (0.8.2) - mime-types (2.99) + mime-types (2.99.1) mini_portile2 (2.0.0) minitest (5.8.4) mocha (1.1.0) @@ -199,6 +199,9 @@ GEM multi_json (~> 1.3) omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.3.1) + omniauth-instagram (1.0.2) + omniauth (~> 1) + omniauth-oauth2 (~> 1) omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) @@ -232,8 +235,8 @@ GEM puma (2.15.3) r2 (0.2.6) rack (1.6.4) - rack-mini-profiler (0.9.8) - rack (>= 1.1.3) + rack-mini-profiler (0.9.9.2) + rack (>= 1.2.0) rack-openid (1.3.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) @@ -241,16 +244,16 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.5.1) - actionmailer (= 4.2.5.1) - actionpack (= 4.2.5.1) - actionview (= 4.2.5.1) - activejob (= 4.2.5.1) - activemodel (= 4.2.5.1) - activerecord (= 4.2.5.1) - activesupport (= 4.2.5.1) + rails (4.2.5.2) + actionmailer (= 4.2.5.2) + actionpack (= 4.2.5.2) + actionview (= 4.2.5.2) + activejob (= 4.2.5.2) + activemodel (= 4.2.5.2) + activerecord (= 4.2.5.2) + activesupport (= 4.2.5.2) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.5.1) + railties (= 4.2.5.2) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -263,9 +266,9 @@ GEM rails-observers (0.1.2) activemodel (~> 4.0) rails_multisite (1.0.3) - railties (4.2.5.1) - actionpack (= 4.2.5.1) - activesupport (= 4.2.5.1) + railties (4.2.5.2) + actionpack (= 4.2.5.2) + activesupport (= 4.2.5.2) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.15.0) @@ -427,6 +430,7 @@ DEPENDENCIES highline hiredis htmlentities + http_accept_language (~> 2.0.5) image_optim (= 0.20.2) librarian (>= 0.0.25) listen (= 0.7.3) @@ -434,7 +438,7 @@ DEPENDENCIES lru_redux mail memory_profiler - message_bus (= 2.0.0.beta.2) + message_bus (= 2.0.0.beta.4) mime-types minitest mocha @@ -447,6 +451,7 @@ DEPENDENCIES omniauth-facebook omniauth-github-discourse omniauth-google-oauth2 + omniauth-instagram omniauth-oauth2 omniauth-openid omniauth-twitter diff --git a/app/assets/javascripts/admin/models/admin-user.js.es6 b/app/assets/javascripts/admin/models/admin-user.js.es6 index 14b7e3edc3..5c0660fedd 100644 --- a/app/assets/javascripts/admin/models/admin-user.js.es6 +++ b/app/assets/javascripts/admin/models/admin-user.js.es6 @@ -328,7 +328,7 @@ const AdminUser = Discourse.User.extend({ }).then(function(data) { if (data.success) { if (data.username) { - document.location = Discourse.getURL("/admin/users/" + data.username); + document.location = Discourse.getURL("/admin/users/" + user.get('id') + "/" + data.username); } else { document.location = Discourse.getURL("/admin/users/list/active"); } diff --git a/app/assets/javascripts/admin/routes/admin-users-list.js.es6 b/app/assets/javascripts/admin/routes/admin-users-list.js.es6 index cb7cfdd9bd..ab72eb893c 100644 --- a/app/assets/javascripts/admin/routes/admin-users-list.js.es6 +++ b/app/assets/javascripts/admin/routes/admin-users-list.js.es6 @@ -6,7 +6,7 @@ export default Discourse.Route.extend({ actions: { exportUsers() { - exportEntity('user_list').then(outputExportResult); + exportEntity('user_list', {trust_level: this.controllerFor('admin-users-list-show').get('query')}).then(outputExportResult); }, sendInvites() { diff --git a/app/assets/javascripts/admin/templates/dashboard.hbs b/app/assets/javascripts/admin/templates/dashboard.hbs index ed98e21fcb..74356abfa6 100644 --- a/app/assets/javascripts/admin/templates/dashboard.hbs +++ b/app/assets/javascripts/admin/templates/dashboard.hbs @@ -285,7 +285,7 @@ {{#each r in top_referrers.data}} - {{#link-to 'adminUser' r}}{{unbound r.username}}{{/link-to}} + {{#link-to 'adminUser' r.user_id r.username}}{{unbound r.username}}{{/link-to}} {{r.num_clicks}} {{r.num_topics}} diff --git a/app/assets/javascripts/discourse.js b/app/assets/javascripts/discourse.js index 5b16593a82..ab0a429832 100644 --- a/app/assets/javascripts/discourse.js +++ b/app/assets/javascripts/discourse.js @@ -152,21 +152,20 @@ window.Discourse = Ember.Application.createWithMixins(Discourse.Ajax, { }) }); -function proxyDep(propName, moduleFunc, msg) { - if (Discourse.hasOwnProperty(propName)) { return; } - Object.defineProperty(Discourse, propName, { - get: function() { - msg = msg || "import the module"; - Ember.warn("DEPRECATION: `Discourse." + propName + "` is deprecated, " + msg + "."); - return moduleFunc(); - } - }); +function RemovedObject(name) { + this._removedName = name; } -proxyDep('computed', function() { return require('discourse/lib/computed'); }); -proxyDep('Formatter', function() { return require('discourse/lib/formatter'); }); -proxyDep('PageTracker', function() { return require('discourse/lib/page-tracker').default; }); -proxyDep('URL', function() { return require('discourse/lib/url').default; }); -proxyDep('Quote', function() { return require('discourse/lib/quote').default; }); -proxyDep('debounce', function() { return require('discourse/lib/debounce').default; }); -proxyDep('View', function() { return Ember.View; }, "Use `Ember.View` instead"); +function methodMissing() { + console.warn("The " + this._removedName + " object has been removed from Discourse " + + "and your plugin needs to be updated."); +}; + +Discourse.RemovedObject = RemovedObject; + +['reopen', 'registerButton', 'on', 'off'].forEach(function(m) { RemovedObject.prototype[m] = methodMissing; }); + +['discourse/views/post', 'discourse/components/post-menu'].forEach(function(moduleName) { + define(moduleName, [], function() { return new RemovedObject(moduleName); }); +}); + diff --git a/app/assets/javascripts/discourse/adapters/post-reply-history.js.es6 b/app/assets/javascripts/discourse/adapters/post-reply-history.js.es6 new file mode 100644 index 0000000000..335c22b6b5 --- /dev/null +++ b/app/assets/javascripts/discourse/adapters/post-reply-history.js.es6 @@ -0,0 +1,10 @@ +import RestAdapter from 'discourse/adapters/rest'; + +export default RestAdapter.extend({ + find(store, type, findArgs) { + const maxReplies = Discourse.SiteSettings.max_reply_history; + return Discourse.ajax(`/posts/${findArgs.postId}/reply-history?max_replies=${maxReplies}`).then(replies => { + return { post_reply_histories: replies }; + }); + }, +}); diff --git a/app/assets/javascripts/discourse/adapters/post-reply.js.es6 b/app/assets/javascripts/discourse/adapters/post-reply.js.es6 new file mode 100644 index 0000000000..f36299d002 --- /dev/null +++ b/app/assets/javascripts/discourse/adapters/post-reply.js.es6 @@ -0,0 +1,9 @@ +import RestAdapter from 'discourse/adapters/rest'; + +export default RestAdapter.extend({ + find(store, type, findArgs) { + return Discourse.ajax(`/posts/${findArgs.postId}/replies`).then(replies => { + return { post_replies: replies }; + }); + }, +}); diff --git a/app/assets/javascripts/discourse/components/actions-summary.js.es6 b/app/assets/javascripts/discourse/components/actions-summary.js.es6 deleted file mode 100644 index 533438852c..0000000000 --- a/app/assets/javascripts/discourse/components/actions-summary.js.es6 +++ /dev/null @@ -1,122 +0,0 @@ -import StringBuffer from 'discourse/mixins/string-buffer'; -import { iconHTML } from 'discourse/helpers/fa-icon'; -import { autoUpdatingRelativeAge } from 'discourse/lib/formatter'; -import { on } from 'ember-addons/ember-computed-decorators'; - -export default Ember.Component.extend(StringBuffer, { - tagName: 'section', - classNameBindings: [':post-actions', 'hidden'], - actionsSummary: Em.computed.alias('post.actionsWithoutLikes'), - emptySummary: Em.computed.empty('actionsSummary'), - hidden: Em.computed.and('emptySummary', 'post.notDeleted'), - usersByType: null, - - rerenderTriggers: ['actionsSummary.@each', 'post.deleted'], - - @on('init') - initUsersByType() { - this.set('usersByType', {}); - }, - - // This was creating way too many bound ifs and subviews in the handlebars version. - renderString(buffer) { - const usersByType = this.get('usersByType'); - - if (!this.get('emptySummary')) { - this.get('actionsSummary').forEach(function(c) { - const id = c.get('id'); - const users = usersByType[id] || []; - - buffer.push("
"); - - const renderLink = (dataAttribute, text) => { - buffer.push(` ${text}.`); - }; - - // TODO multi line expansion for flags - let iconsHtml = ""; - if (users.length) { - let postUrl; - users.forEach(function(u) { - const username = u.get('username'); - - iconsHtml += ``; - if (u.post_url) { - postUrl = postUrl || u.post_url; - } - iconsHtml += Discourse.Utilities.avatarImg({ - size: 'small', - avatarTemplate: u.get('avatar_template'), - title: u.get('username') - }); - iconsHtml += ""; - }); - - let key = 'post.actions.people.' + c.get('actionType.name_key'); - if (postUrl) { key = key + "_with_url"; } - - // TODO postUrl might be uninitialized? pick a good default - buffer.push(" " + I18n.t(key, { icons: iconsHtml, postUrl }) + "."); - } - - if (users.length === 0) { - renderLink('who-acted', c.get('description')); - } - - if (c.get('can_undo')) { - renderLink('undo', I18n.t("post.actions.undo." + c.get('actionType.name_key'))); - } - if (c.get('can_defer_flags')) { - renderLink('defer-flags', I18n.t("post.actions.defer_flags", { count: c.count })); - } - - - buffer.push("
"); - }); - } - - const post = this.get('post'); - if (post.get('deleted')) { - buffer.push("
" + - iconHTML('fa-trash-o') + ' ' + - Discourse.Utilities.tinyAvatar(post.get('postDeletedBy.avatar_template'), {title: post.get('postDeletedBy.username')}) + - autoUpdatingRelativeAge(new Date(post.get('postDeletedAt'))) + - "
"); - } - - buffer.push("
"); - }, - - actionTypeById(actionTypeId) { - return this.get('actionsSummary').findProperty('id', actionTypeId); - }, - - click(e) { - const $target = $(e.target); - let actionTypeId; - - const post = this.get('post'); - - if (actionTypeId = $target.data('defer-flags')) { - this.actionTypeById(actionTypeId).deferFlags(post); - return false; - } - - // User wants to know who actioned it - const usersByType = this.get('usersByType'); - if (actionTypeId = $target.data('who-acted')) { - this.actionTypeById(actionTypeId).loadUsers(post).then(users => { - usersByType[actionTypeId] = users; - this.rerender(); - }); - return false; - } - - if (actionTypeId = $target.data('undo')) { - this.get('actionsSummary').findProperty('id', actionTypeId).undo(post); - return false; - } - - return false; - } -}); diff --git a/app/assets/javascripts/discourse/components/bread-crumbs.js.es6 b/app/assets/javascripts/discourse/components/bread-crumbs.js.es6 index 66fcd65a37..6841e8e456 100644 --- a/app/assets/javascripts/discourse/components/bread-crumbs.js.es6 +++ b/app/assets/javascripts/discourse/components/bread-crumbs.js.es6 @@ -12,8 +12,8 @@ export default Ember.Component.extend({ return !c.get('parentCategory'); }), - hidden: function(){ - return Discourse.Mobile.mobileView && !this.get('category'); + hidden: function() { + return this.site.mobileView && !this.get('category'); }.property('category'), firstCategory: function() { @@ -35,7 +35,7 @@ export default Ember.Component.extend({ }); }.property('firstCategory', 'hideSubcategories'), - render: function(buffer) { + render(buffer) { if (this.get('hidden')) { return; } this._super(buffer); } diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6 index ddc86134cf..816a7e37de 100644 --- a/app/assets/javascripts/discourse/components/composer-editor.js.es6 +++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6 @@ -18,7 +18,7 @@ export default Ember.Component.extend({ @on('init') _setupPreview() { - const val = (Discourse.Mobile.mobileView ? false : (this.keyValueStore.get('composer.showPreview') || 'true')); + const val = (this.site.mobileView ? false : (this.keyValueStore.get('composer.showPreview') || 'true')); this.set('showPreview', val === 'true'); }, @@ -91,6 +91,8 @@ export default Ember.Component.extend({ _syncEditorAndPreviewScroll() { const $input = this.$('.d-editor-input'); + if (!$input) { return; } + const $preview = this.$('.d-editor-preview'); if ($input.scrollTop() === 0) { @@ -216,7 +218,7 @@ export default Ember.Component.extend({ } }); - if (Discourse.Mobile.mobileView) { + if (this.site.mobileView) { this.$(".mobile-file-upload").on("click.uploader", function () { // redirect the click on the hidden file input $("#mobile-uploader").click(); diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6 index e81f14c212..a0737079aa 100644 --- a/app/assets/javascripts/discourse/components/d-editor.js.es6 +++ b/app/assets/javascripts/discourse/components/d-editor.js.es6 @@ -25,156 +25,164 @@ const OP = { const _createCallbacks = []; -function Toolbar() { - this.shortcuts = {}; +class Toolbar { - this.groups = [ - {group: 'fontStyles', buttons: []}, - {group: 'insertions', buttons: []}, - {group: 'extras', buttons: []} - ]; + constructor(site) { + this.shortcuts = {}; - this.addButton({ - id: 'bold', - group: 'fontStyles', - shortcut: 'B', - perform: e => e.applySurround('**', '**', 'bold_text') - }); - - this.addButton({ - id: 'italic', - group: 'fontStyles', - shortcut: 'I', - perform: e => e.applySurround('_', '_', 'italic_text') - }); - - this.addButton({id: 'link', group: 'insertions', shortcut: 'K', action: 'showLinkModal'}); - - this.addButton({ - id: 'quote', - group: 'insertions', - icon: 'quote-right', - shortcut: 'Shift+9', - perform: e => e.applySurround('> ', '', 'code_text') - }); - - this.addButton({ - id: 'code', - group: 'insertions', - shortcut: 'Shift+C', - perform(e) { - if (e.selected.value.indexOf("\n") !== -1) { - e.applySurround(' ', '', 'code_text'); - } else { - e.applySurround('`', '`', 'code_text'); - } - }, - }); - - this.addButton({ - id: 'bullet', - group: 'extras', - icon: 'list-ul', - shortcut: 'Shift+8', - title: 'composer.ulist_title', - perform: e => e.applyList('* ', 'list_item') - }); - - this.addButton({ - id: 'list', - group: 'extras', - icon: 'list-ol', - shortcut: 'Shift+7', - title: 'composer.olist_title', - perform: e => e.applyList(i => !i ? "1. " : `${parseInt(i) + 1}. `, 'list_item') - }); - - this.addButton({ - id: 'heading', - group: 'extras', - icon: 'font', - shortcut: 'Alt+1', - perform: e => e.applyList('## ', 'heading_text') - }); - - this.addButton({ - id: 'rule', - group: 'extras', - icon: 'minus', - shortcut: 'Alt+R', - title: 'composer.hr_title', - perform: e => e.addText("\n\n----------\n") - }); - - if (Discourse.Mobile.mobileView) { - this.groups.push({group: 'mobileExtras', buttons: []}); + this.groups = [ + {group: 'fontStyles', buttons: []}, + {group: 'insertions', buttons: []}, + {group: 'extras', buttons: []} + ]; this.addButton({ - id: 'preview', - group: 'mobileExtras', - icon: 'television', - title: 'composer.hr_preview', - perform: e => e.preview() + id: 'bold', + group: 'fontStyles', + shortcut: 'B', + perform: e => e.applySurround('**', '**', 'bold_text') }); - } - this.groups[this.groups.length-1].lastGroup = true; -}; + this.addButton({ + id: 'italic', + group: 'fontStyles', + shortcut: 'I', + perform: e => e.applySurround('_', '_', 'italic_text') + }); -Toolbar.prototype.addButton = function(button) { - const g = this.groups.findProperty('group', button.group); - if (!g) { - throw `Couldn't find toolbar group ${button.group}`; - } + this.addButton({id: 'link', group: 'insertions', shortcut: 'K', action: 'showLinkModal'}); - const createdButton = { - id: button.id, - className: button.className || button.id, - icon: button.icon || button.id, - action: button.action || 'toolbarButton', - perform: button.perform || Ember.K - }; + this.addButton({ + id: 'quote', + group: 'insertions', + icon: 'quote-right', + shortcut: 'Shift+9', + perform: e => e.applySurround('> ', '', 'code_text') + }); - if (button.sendAction) { - createdButton.sendAction = button.sendAction; - } + this.addButton({ + id: 'code', + group: 'insertions', + shortcut: 'Shift+C', + perform(e) { + if (e.selected.value.indexOf("\n") !== -1) { + e.applySurround(' ', '', 'code_text'); + } else { + e.applySurround('`', '`', 'code_text'); + } + }, + }); - const title = I18n.t(button.title || `composer.${button.id}_title`); - if (button.shortcut) { - const mac = /Mac|iPod|iPhone|iPad/.test(navigator.platform); - const mod = mac ? 'Meta' : 'Ctrl'; - var shortcutTitle = `${mod}+${button.shortcut}`; + this.addButton({ + id: 'bullet', + group: 'extras', + icon: 'list-ul', + shortcut: 'Shift+8', + title: 'composer.ulist_title', + perform: e => e.applyList('* ', 'list_item') + }); - // Mac users are used to glyphs for shortcut keys - if (mac) { - shortcutTitle = shortcutTitle - .replace('Shift', "\u21E7") - .replace('Meta', "\u2318") - .replace('Alt', "\u2325") - .replace(/\+/g, ''); - } else { - shortcutTitle = shortcutTitle - .replace('Shift', I18n.t('shortcut_modifier_key.shift')) - .replace('Ctrl', I18n.t('shortcut_modifier_key.ctrl')) - .replace('Alt', I18n.t('shortcut_modifier_key.alt')); + this.addButton({ + id: 'list', + group: 'extras', + icon: 'list-ol', + shortcut: 'Shift+7', + title: 'composer.olist_title', + perform: e => e.applyList(i => !i ? "1. " : `${parseInt(i) + 1}. `, 'list_item') + }); + + this.addButton({ + id: 'heading', + group: 'extras', + icon: 'font', + shortcut: 'Alt+1', + perform: e => e.applyList('## ', 'heading_text') + }); + + this.addButton({ + id: 'rule', + group: 'extras', + icon: 'minus', + shortcut: 'Alt+R', + title: 'composer.hr_title', + perform: e => e.addText("\n\n----------\n") + }); + + if (site.mobileView) { + this.groups.push({group: 'mobileExtras', buttons: []}); + + this.addButton({ + id: 'preview', + group: 'mobileExtras', + icon: 'television', + title: 'composer.hr_preview', + perform: e => e.preview() + }); } - createdButton.title = `${title} (${shortcutTitle})`; - - this.shortcuts[`${mod}+${button.shortcut}`.toLowerCase()] = createdButton; - } else { - createdButton.title = title; + this.groups[this.groups.length-1].lastGroup = true; } - if (button.unshift) { - g.buttons.unshift(createdButton); - } else { - g.buttons.push(createdButton); + addButton(button) { + const g = this.groups.findProperty('group', button.group); + if (!g) { + throw `Couldn't find toolbar group ${button.group}`; + } + + const createdButton = { + id: button.id, + className: button.className || button.id, + icon: button.icon || button.id, + action: button.action || 'toolbarButton', + perform: button.perform || Ember.K + }; + + if (button.sendAction) { + createdButton.sendAction = button.sendAction; + } + + const title = I18n.t(button.title || `composer.${button.id}_title`); + if (button.shortcut) { + const mac = /Mac|iPod|iPhone|iPad/.test(navigator.platform); + const mod = mac ? 'Meta' : 'Ctrl'; + var shortcutTitle = `${mod}+${button.shortcut}`; + + // Mac users are used to glyphs for shortcut keys + if (mac) { + shortcutTitle = shortcutTitle + .replace('Shift', "\u21E7") + .replace('Meta', "\u2318") + .replace('Alt', "\u2325") + .replace(/\+/g, ''); + } else { + shortcutTitle = shortcutTitle + .replace('Shift', I18n.t('shortcut_modifier_key.shift')) + .replace('Ctrl', I18n.t('shortcut_modifier_key.ctrl')) + .replace('Alt', I18n.t('shortcut_modifier_key.alt')); + } + + createdButton.title = `${title} (${shortcutTitle})`; + + this.shortcuts[`${mod}+${button.shortcut}`.toLowerCase()] = createdButton; + } else { + createdButton.title = title; + } + + if (button.unshift) { + g.buttons.unshift(createdButton); + } else { + g.buttons.push(createdButton); + } } -}; +} + +export function addToolbarCallback(func) { + _createCallbacks.push(func); +} export function onToolbarCreate(func) { - _createCallbacks.push(func); + console.warn('`onToolbarCreate` is deprecated, use the plugin api instead.'); + addToolbarCallback(func); }; export default Ember.Component.extend({ @@ -237,7 +245,7 @@ export default Ember.Component.extend({ @computed toolbar() { - const toolbar = new Toolbar(); + const toolbar = new Toolbar(this.site); _createCallbacks.forEach(cb => cb(toolbar)); this.sendAction('extraButtons', toolbar); return toolbar; @@ -293,6 +301,9 @@ export default Ember.Component.extend({ $editorInput.autocomplete({ template: template, key: ":", + afterComplete(text) { + self.set('value', text); + }, transformComplete(v) { if (v.code) { @@ -301,7 +312,16 @@ export default Ember.Component.extend({ showSelector({ appendTo: self.$(), container, - onSelect: title => self._addText(self._getSelected(), `${title}:`) + onSelect: title => { + // Remove the previously type characters when a new emoji is selected from the selector. + let selected = self._getSelected(); + let newPre = selected.pre.replace(/:[^:]+$/, ":"); + let numOfRemovedChars = selected.pre.length - newPre.length; + selected.pre = newPre; + selected.start -= numOfRemovedChars; + selected.end -= numOfRemovedChars; + self._addText(selected, `${title}:`); + } }); return ""; } @@ -313,7 +333,7 @@ export default Ember.Component.extend({ term = term.toLowerCase(); if (term === "") { - return resolve(["slightly_smiling", "smile", "wink", "sunny", "blush"]); + return resolve(["slight_smile", "smile", "wink", "sunny", "blush"]); } if (Discourse.Emoji.translations[full]) { diff --git a/app/assets/javascripts/discourse/components/global-notice.js.es6 b/app/assets/javascripts/discourse/components/global-notice.js.es6 index 080427d80f..852f19ecd8 100644 --- a/app/assets/javascripts/discourse/components/global-notice.js.es6 +++ b/app/assets/javascripts/discourse/components/global-notice.js.es6 @@ -1,4 +1,7 @@ +import { on } from 'ember-addons/ember-computed-decorators'; import StringBuffer from 'discourse/mixins/string-buffer'; +import { iconHTML } from 'discourse/helpers/fa-icon'; +import LogsNotice from 'discourse/services/logs-notice'; export default Ember.Component.extend(StringBuffer, { rerenderTriggers: ['site.isReadOnly'], @@ -18,8 +21,33 @@ export default Ember.Component.extend(StringBuffer, { notices.push([this.siteSettings.global_notice, 'alert-global-notice']); } - if (notices.length > 0) { - buffer.push(_.map(notices, n => "
" + n[0] + "
").join("")); + if (!LogsNotice.currentProp('hidden')) { + notices.push([LogsNotice.currentProp('message'), 'alert-logs-notice', `
${iconHTML('times')}
`]); } + + if (notices.length > 0) { + buffer.push(_.map(notices, n => { + var html = `
${n[0]}`; + if (n[2]) html += n[2]; + html += '
'; + return html; + }).join("")); + } + }, + + @on('didInsertElement') + _setupLogsNotice() { + LogsNotice.current().addObserver('hidden', () => { + this.rerenderString(); + }); + + this.$().on('click.global-notice', '.alert-logs-notice .close', () => { + LogsNotice.currentProp('text', ''); + }); + }, + + @on('willDestroyElement') + _teardownLogsNotice() { + this.$().off('click.global-notice'); } }); diff --git a/app/assets/javascripts/discourse/components/hamburger-category.js.es6 b/app/assets/javascripts/discourse/components/hamburger-category.js.es6 deleted file mode 100644 index 63b08fd70e..0000000000 --- a/app/assets/javascripts/discourse/components/hamburger-category.js.es6 +++ /dev/null @@ -1,13 +0,0 @@ -import computed from 'ember-addons/ember-computed-decorators'; - -export default Ember.Component.extend({ - tagName: 'li', - classNames: ['category-link'], - - @computed('category.unreadTopics', 'category.newTopics') - unreadTotal(unreadTopics, newTopics) { - return parseInt(unreadTopics, 10) + parseInt(newTopics, 10); - }, - - showTopicCount: Ember.computed.not('currentUser') -}); diff --git a/app/assets/javascripts/discourse/components/hamburger-menu.js.es6 b/app/assets/javascripts/discourse/components/hamburger-menu.js.es6 index e10c01c84d..e00b175819 100644 --- a/app/assets/javascripts/discourse/components/hamburger-menu.js.es6 +++ b/app/assets/javascripts/discourse/components/hamburger-menu.js.es6 @@ -1,4 +1,6 @@ import computed from 'ember-addons/ember-computed-decorators'; +import mobile from 'discourse/lib/mobile'; + export default Ember.Component.extend({ classNames: ['hamburger-panel'], @@ -10,17 +12,17 @@ export default Ember.Component.extend({ @computed() showKeyboardShortcuts() { - return !Discourse.Mobile.mobileView && !this.capabilities.touch; + return !this.site.mobileView && !this.capabilities.touch; }, @computed() showMobileToggle() { - return Discourse.Mobile.mobileView || (this.siteSettings.enable_mobile_theme && this.capabilities.touch); + return this.site.mobileView || (this.siteSettings.enable_mobile_theme && this.capabilities.touch); }, @computed() mobileViewLinkTextKey() { - return Discourse.Mobile.mobileView ? "desktop_view" : "mobile_view"; + return this.site.mobileView ? "desktop_view" : "mobile_view"; }, @computed() @@ -68,7 +70,7 @@ export default Ember.Component.extend({ this.sendAction('showKeyboardAction'); }, toggleMobileView() { - Discourse.Mobile.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 index 7a3f52f455..c747984855 100644 --- a/app/assets/javascripts/discourse/components/header-dropdown.js.es6 +++ b/app/assets/javascripts/discourse/components/header-dropdown.js.es6 @@ -17,7 +17,7 @@ export default Ember.Component.extend({ if (this.siteSettings.login_required && !this.currentUser) { this.sendAction('loginAction'); } else { - if (Discourse.Mobile.mobileView && this.get('mobileAction')) { + if (this.site.mobileView && this.get('mobileAction')) { this.sendAction('mobileAction'); return; } diff --git a/app/assets/javascripts/discourse/components/home-logo.js.es6 b/app/assets/javascripts/discourse/components/home-logo.js.es6 index 1cd706d09e..c0846e268b 100644 --- a/app/assets/javascripts/discourse/components/home-logo.js.es6 +++ b/app/assets/javascripts/discourse/components/home-logo.js.es6 @@ -14,11 +14,11 @@ export default Ember.Component.extend({ }.property('targetUrl'), showSmallLogo: function() { - return !Discourse.Mobile.mobileView && this.get("minimized"); + return !this.site.mobileView && this.get("minimized"); }.property("minimized"), showMobileLogo: function() { - return Discourse.Mobile.mobileView && !Ember.isBlank(this.get('mobileBigLogoUrl')); + return this.site.mobileView && !Ember.isBlank(this.get('mobileBigLogoUrl')); }.property(), smallLogoUrl: setting('logo_small_url'), diff --git a/app/assets/javascripts/discourse/components/menu-panel.js.es6 b/app/assets/javascripts/discourse/components/menu-panel.js.es6 index 372df605b5..ca017a1171 100644 --- a/app/assets/javascripts/discourse/components/menu-panel.js.es6 +++ b/app/assets/javascripts/discourse/components/menu-panel.js.es6 @@ -120,17 +120,17 @@ export default Ember.Component.extend({ @computed() showKeyboardShortcuts() { - return !Discourse.Mobile.mobileView && !this.capabilities.touch; + return !this.site.mobileView && !this.capabilities.touch; }, @computed() showMobileToggle() { - return Discourse.Mobile.mobileView || (this.siteSettings.enable_mobile_theme && this.capabilities.touch); + return this.site.mobileView || (this.siteSettings.enable_mobile_theme && this.capabilities.touch); }, @computed() mobileViewLinkTextKey() { - return Discourse.Mobile.mobileView ? "desktop_view" : "mobile_view"; + return this.site.mobileView ? "desktop_view" : "mobile_view"; }, @computed() diff --git a/app/assets/javascripts/discourse/components/mount-widget.js.es6 b/app/assets/javascripts/discourse/components/mount-widget.js.es6 new file mode 100644 index 0000000000..8958cfd057 --- /dev/null +++ b/app/assets/javascripts/discourse/components/mount-widget.js.es6 @@ -0,0 +1,92 @@ +import { diff, patch } from 'virtual-dom'; +import { WidgetClickHook } from 'discourse/widgets/click-hook'; +import { renderedKey, queryRegistry } from 'discourse/widgets/widget'; + +const _cleanCallbacks = {}; +export function addWidgetCleanCallback(widgetName, fn) { + _cleanCallbacks[widgetName] = _cleanCallbacks[widgetName] || []; + _cleanCallbacks[widgetName].push(fn); +} + +export default Ember.Component.extend({ + _tree: null, + _rootNode: null, + _timeout: null, + _widgetClass: null, + _afterRender: null, + + init() { + this._super(); + const name = this.get('widget'); + + this._widgetClass = queryRegistry(name) || this.container.lookupFactory(`widget:${name}`); + this._connected = []; + }, + + didInsertElement() { + WidgetClickHook.setupDocumentCallback(); + + this._rootNode = document.createElement('div'); + this.element.appendChild(this._rootNode); + this._timeout = Ember.run.scheduleOnce('render', this, this.rerenderWidget); + }, + + willClearRender() { + const callbacks = _cleanCallbacks[this.get('widget')]; + if (callbacks) { + callbacks.forEach(cb => cb()); + } + + this._connected.forEach(v => v.destroy()); + this._connected.length = 0; + }, + + willDestroyElement() { + Ember.run.cancel(this._timeout); + }, + + queueRerender(callback) { + if (callback && !this._afterRender) { + this._afterRender = callback; + } + + Ember.run.scheduleOnce('render', this, this.rerenderWidget); + }, + + rerenderWidget() { + Ember.run.cancel(this._timeout); + if (this._rootNode) { + const opts = { model: this.get('model') }; + const newTree = new this._widgetClass(this.get('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._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._tree = newTree; + + if (this._afterRender) { + this._afterRender(); + this._afterRender = null; + } + + renderedKey('*'); + } + } + +}); diff --git a/app/assets/javascripts/discourse/components/notification-item.js.es6 b/app/assets/javascripts/discourse/components/notification-item.js.es6 index 844bf83edf..64411038df 100644 --- a/app/assets/javascripts/discourse/components/notification-item.js.es6 +++ b/app/assets/javascripts/discourse/components/notification-item.js.es6 @@ -1,3 +1,4 @@ +const LIKED_TYPE = 5; const INVITED_TYPE = 8; const GROUP_SUMMARY_TYPE = 16; @@ -80,7 +81,16 @@ export default Ember.Component.extend({ 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 { + } 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); diff --git a/app/assets/javascripts/discourse/components/post-gap.js.es6 b/app/assets/javascripts/discourse/components/post-gap.js.es6 deleted file mode 100644 index 159d047f07..0000000000 --- a/app/assets/javascripts/discourse/components/post-gap.js.es6 +++ /dev/null @@ -1,44 +0,0 @@ -export default Ember.Component.extend({ - classNameBindings: [':gap', ':jagged-border', 'gap::hidden'], - - initGaps: function(){ - this.set('loading', false); - const before = this.get('before') === 'true'; - const gaps = before ? this.get('postStream.gaps.before') : this.get('postStream.gaps.after'); - - if (gaps) { - this.set('gap', gaps[this.get('post.id')]); - } - }.on('init'), - - gapsChanged: function(){ - this.initGaps(); - this.rerender(); - }.observes('post.hasGap'), - - render(buffer) { - if (this.get('loading')) { - buffer.push(I18n.t('loading')); - } else { - const gapLength = this.get('gap.length'); - if (gapLength) { - buffer.push(I18n.t('post.gap', {count: gapLength})); - } - } - }, - - click() { - if (this.get('loading') || (!this.get('gap'))) { return false; } - this.set('loading', true); - this.rerender(); - - const postStream = this.get('postStream'); - const filler = this.get('before') === 'true' ? postStream.fillGapBefore : postStream.fillGapAfter; - - filler.call(postStream, this.get('post'), this.get('gap')).then(() => { - this.set('gap', null); - }); - - return false; - } -}); diff --git a/app/assets/javascripts/discourse/components/post-gutter.js.es6 b/app/assets/javascripts/discourse/components/post-gutter.js.es6 deleted file mode 100644 index 9889184d1f..0000000000 --- a/app/assets/javascripts/discourse/components/post-gutter.js.es6 +++ /dev/null @@ -1,85 +0,0 @@ -const MAX_SHOWN = 5; - -import StringBuffer from 'discourse/mixins/string-buffer'; -import { iconHTML } from 'discourse/helpers/fa-icon'; -import computed from 'ember-addons/ember-computed-decorators'; - -const { get, isEmpty, Component } = Ember; - -export default Component.extend(StringBuffer, { - classNameBindings: [':gutter'], - - rerenderTriggers: ['expanded'], - - // Roll up links to avoid duplicates - @computed('links') - collapsed(links) { - const seen = {}; - const result = []; - - if (!isEmpty(links)) { - links.forEach(function(l) { - const title = get(l, 'title'); - if (!seen[title]) { - result.pushObject(l); - seen[title] = true; - } - }); - } - return result; - }, - - renderString(buffer) { - const links = this.get('collapsed'); - const collapsed = !this.get('expanded'); - - if (!isEmpty(links)) { - let toRender = links; - if (collapsed) { - toRender = toRender.slice(0, MAX_SHOWN); - } - - buffer.push("'); - } - - if (this.get('canReplyAsNewTopic')) { - buffer.push(`${iconHTML('plus')}${I18n.t('post.reply_as_new_topic')}`); - } - }, - - click(e) { - const $target = $(e.target); - if ($target.hasClass('toggle-more')) { - this.toggleProperty('expanded'); - return false; - } else if ($target.closest('.reply-new').length) { - this.sendAction('newTopicAction', this.get('post')); - return false; - } - return true; - } -}); diff --git a/app/assets/javascripts/discourse/components/post-menu.js.es6 b/app/assets/javascripts/discourse/components/post-menu.js.es6 deleted file mode 100644 index ef63cd9d24..0000000000 --- a/app/assets/javascripts/discourse/components/post-menu.js.es6 +++ /dev/null @@ -1,440 +0,0 @@ -import StringBuffer from 'discourse/mixins/string-buffer'; -import { iconHTML } from 'discourse/helpers/fa-icon'; - -// Helper class for rendering a button -export const Button = function(action, label, icon, opts) { - this.action = action; - this.label = label; - - if (typeof icon === "object") { - this.opts = icon; - } else { - this.icon = icon; - } - this.opts = this.opts || opts || {}; -}; - -function animateHeart($elem, start, end, complete) { - if (Ember.testing) { return Ember.run(this, complete); } - - $elem.stop() - .css('textIndent', start) - .animate({ textIndent: end }, { - complete, - step(now) { - $(this).css('transform','scale('+now+')'); - }, - duration: 150 - }, 'linear'); -} - -Button.prototype.render = function(buffer) { - const opts = this.opts; - - const label = I18n.t(this.label, opts.labelOptions); - if (opts.prefixHTML) { - buffer.push(opts.prefixHTML); - } - buffer.push(""); -}; - -let hiddenButtons; - -const PostMenuComponent = Ember.Component.extend(StringBuffer, { - tagName: 'section', - classNames: ['post-menu-area', 'clearfix'], - - rerenderTriggers: [ - 'post.deleted_at', - 'post.likeAction.count', - 'post.likeAction.users.length', - 'post.reply_count', - 'post.showRepliesBelow', - 'post.can_delete', - 'post.bookmarked', - 'post.shareUrl', - 'post.topic.deleted_at', - 'post.replies.length', - 'post.wiki', - 'post.post_type', - 'collapsed'], - - _collapsedByDefault: function() { - this.set('collapsed', true); - }.on('init'), - - renderString(buffer) { - const post = this.get('post'); - - buffer.push(""); - }, - - // Delegate click actions - click(e) { - const $target = $(e.target); - const action = $target.data('action') || $target.parent().data('action'); - - if ($target.prop('disabled') || $target.parent().prop('disabled')) { return; } - - if (!action) return; - const handler = this["click" + action.classify()]; - if (!handler) return; - - handler.call(this, this.get('post')); - }, - - // Replies Button - renderReplies(post, buffer) { - if (!post.get('showRepliesBelow')) return; - - const replyCount = post.get('reply_count'); - buffer.push(""); - }, - - renderButtons(post, buffer) { - const self = this; - const allButtons = []; - let visibleButtons = []; - - if (typeof hiddenButtons === "undefined") { - if (!Em.isEmpty(this.siteSettings.post_menu_hidden_items)) { - hiddenButtons = this.siteSettings.post_menu_hidden_items.split('|'); - } else { - hiddenButtons = []; - } - } - - if (post.get("bookmarked")) { - hiddenButtons.removeObject("bookmark"); - } - - const yours = post.get('yours'); - this.siteSettings.post_menu.split("|").forEach(function(i) { - const creator = self["buttonFor" + i.classify()]; - if (creator) { - const button = creator.call(self, post); - if (button) { - allButtons.push(button); - if ((yours && button.opts.alwaysShowYours) || - (post.get('wiki') && button.opts.alwaysShowWiki) || - (hiddenButtons.indexOf(i) === -1)) { - visibleButtons.push(button); - } - } - } - }); - - // Only show ellipsis if there is more than one button hidden - // if there are no more buttons, we are not collapsed - const collapsed = this.get('collapsed'); - if (!collapsed || (allButtons.length <= visibleButtons.length + 1)) { - visibleButtons = allButtons; - if (collapsed) { this.set('collapsed', false); } - } else { - visibleButtons.splice(visibleButtons.length - 1, 0, this.buttonForShowMoreActions(post)); - } - - const callbacks = PostMenuComponent._registerButtonCallbacks; - if (callbacks) { - _.each(callbacks, function(callback) { - callback.apply(self, [visibleButtons]); - }); - } - - buffer.push('
'); - visibleButtons.forEach((b) => b.render(buffer)); - buffer.push("
"); - }, - - clickLikeCount() { - this.sendActionTarget('toggleWhoLiked'); - }, - - sendActionTarget(action, arg) { - const target = this.get(`${action}Target`); - return target ? target.send(this.get(action), arg) : this.sendAction(action, arg); - }, - - clickReplies() { - if (this.get('post.replies.length') > 0) { - this.set('post.replies', []); - } else { - this.get('post').loadReplies(); - } - }, - - // Delete button - buttonForDelete(post) { - let label, icon; - - if (post.get('post_number') === 1) { - // If it's the first post, the delete/undo actions are related to the topic - const topic = post.get('topic'); - if (topic.get('deleted_at')) { - if (!topic.get('details.can_recover')) { return; } - label = "topic.actions.recover"; - icon = "undo"; - } else { - if (!topic.get('details.can_delete')) { return; } - label = "topic.actions.delete"; - icon = "trash-o"; - } - - } else { - // The delete actions target the post iteself - if (post.get('deleted_at') || post.get('user_deleted')) { - if (!post.get('can_recover')) { return; } - label = "post.controls.undelete"; - icon = "undo"; - } else { - if (!post.get('can_delete')) { return; } - label = "post.controls.delete"; - icon = "trash-o"; - } - } - const action = (icon === 'trash-o') ? 'delete' : 'recover'; - let opts; - if (icon === "trash-o"){ - opts = {className: 'delete'}; - } - return new Button(action, label, icon, opts); - }, - - clickRecover(post) { - this.sendAction('recoverPost', post); - }, - - clickDelete(post) { - this.sendAction('deletePost', post); - }, - - // Like button - buttonForLike() { - const likeAction = this.get('post.likeAction'); - if (!likeAction) { return; } - - const className = likeAction.get('acted') ? 'has-like fade-out' : 'like'; - const opts = {className: className}; - - if (likeAction.get('canToggle')) { - const descKey = likeAction.get('acted') ? 'post.controls.undo_like' : 'post.controls.like'; - return new Button('like', descKey, 'heart', opts); - } else if (likeAction.get('acted')) { - opts.disabled = true; - return new Button('like', 'post.controls.has_liked', 'heart', opts); - } - }, - - buttonForLikeCount() { - const likeCount = this.get('post.likeAction.count') || 0; - if (likeCount > 0) { - const likedPost = !!this.get('post.likeAction.acted'); - - const label = likedPost - ? likeCount === 1 ? 'post.has_likes_title_only_you' : 'post.has_likes_title_you' - : 'post.has_likes_title'; - - return new Button('like-count', label, undefined, { - className: 'like-count highlight-action', - innerHTML: I18n.t("post.has_likes", { count: likeCount }), - labelOptions: {count: likedPost ? (likeCount-1) : likeCount} - }); - } - }, - - clickLike(post) { - const $heart = this.$('.fa-heart'), - $likeButton = this.$('button[data-action=like]'), - acted = post.get('likeAction.acted'), - self = this; - - if (acted) { - this.sendActionTarget('toggleLike'); - $likeButton.removeClass('has-like').addClass('like'); - } else { - const scale = [1.0, 1.5]; - animateHeart($heart, scale[0], scale[1], function() { - animateHeart($heart, scale[1], scale[0], function() { - self.sendActionTarget('toggleLike'); - $likeButton.removeClass('like').addClass('has-like'); - }); - }); - } - }, - - // Flag button - buttonForFlag(post) { - if (Em.isEmpty(post.get('flagsAvailable'))) return; - return new Button('flag', 'post.controls.flag', 'flag'); - }, - - clickFlag(post) { - this.sendAction('showFlags', post); - }, - - // Edit button - buttonForEdit(post) { - if (!post.get('can_edit')) return; - return new Button('edit', 'post.controls.edit', 'pencil', { - alwaysShowYours: true, - alwaysShowWiki: true - }); - }, - - clickEdit(post) { - this.sendAction('editPost', post); - }, - - // Share button - buttonForShare(post) { - const options = { - shareUrl: post.get('shareUrl'), - postNumber: post.get('post_number') - }; - return new Button('share', 'post.controls.share', 'link', options); - }, - - // Reply button - buttonForReply() { - if (!this.get('canCreatePost')) return; - const options = {className: 'create fade-out'}; - - if(!Discourse.Mobile.mobileView) { - options.textLabel = 'topic.reply.title'; - } - - return new Button('reply', 'post.controls.reply', 'reply', options); - }, - - clickReply(post) { - this.sendAction('replyToPost', post); - }, - - // Bookmark button - buttonForBookmark(post) { - if (!Discourse.User.current()) return; - - let iconClass = 'read-icon', - buttonClass = 'bookmark', - tooltip = 'bookmarks.not_bookmarked'; - - if (post.get('bookmarked')) { - iconClass += ' bookmarked'; - buttonClass += ' bookmarked'; - tooltip = 'bookmarks.created'; - } - - return new Button('bookmark', tooltip, {className: buttonClass, innerHTML: "
"}); - }, - - clickBookmark(post) { - this.sendAction('toggleBookmark', post); - }, - - // Wiki button - buttonForWiki(post) { - if (!post.get('can_wiki')) return; - - if (post.get('wiki')) { - return new Button('wiki', 'post.controls.unwiki', 'pencil-square-o', {className: 'wiki wikied'}); - } else { - return new Button('wiki', 'post.controls.wiki', 'pencil-square-o', {className: 'wiki'}); - } - }, - - clickWiki(post) { - this.sendAction('toggleWiki', post); - }, - - buttonForAdmin() { - if (!Discourse.User.currentProp('canManageTopic')) { return; } - return new Button('admin', 'post.controls.admin', 'wrench'); - }, - - renderAdminPopup(post, buffer) { - if (!Discourse.User.currentProp('canManageTopic')) { return; } - - const isModerator = post.get('post_type') === this.site.get('post_types.moderator_action'), - postTypeIcon = iconHTML('shield'), - postTypeText = isModerator ? I18n.t('post.controls.revert_to_regular') : I18n.t('post.controls.convert_to_moderator'), - rebakePostIcon = iconHTML('cog'), - rebakePostText = I18n.t('post.controls.rebake'), - unhidePostIcon = iconHTML('eye'), - unhidePostText = I18n.t('post.controls.unhide'), - changePostOwnerIcon = iconHTML('user'), - changePostOwnerText = I18n.t('post.controls.change_owner'); - - const html = '
' + - '

' + I18n.t('admin_title') + '

' + - '' + - '
'; - - buffer.push(html); - }, - - clickAdmin() { - const $postAdminMenu = this.$(".post-admin-menu"); - $postAdminMenu.show(); - $("html").on("mouseup.post-admin-menu", function() { - $postAdminMenu.hide(); - $("html").off("mouseup.post-admin-menu"); - }); - }, - - clickTogglePostType() { - this.sendAction("togglePostType", this.get("post")); - }, - - clickRebakePost() { - this.sendAction("rebakePost", this.get("post")); - }, - - clickUnhidePost() { - this.sendAction("unhidePost", this.get("post")); - }, - - clickChangePostOwner() { - this.sendAction("changePostOwner", this.get("post")); - }, - - buttonForShowMoreActions() { - return new Button('showMoreActions', 'show_more', 'ellipsis-h'); - }, - - clickShowMoreActions() { - this.set('collapsed', false); - } - -}); - -PostMenuComponent.reopenClass({ - registerButton(callback){ - this._registerButtonCallbacks = this._registerButtonCallbacks || []; - this._registerButtonCallbacks.push(callback); - } -}); - -export default PostMenuComponent; diff --git a/app/assets/javascripts/discourse/components/poster-name.js.es6 b/app/assets/javascripts/discourse/components/poster-name.js.es6 index 7f213f7c00..15ca540404 100644 --- a/app/assets/javascripts/discourse/components/poster-name.js.es6 +++ b/app/assets/javascripts/discourse/components/poster-name.js.es6 @@ -1,77 +1,2 @@ -import { setting } from 'discourse/lib/computed'; - -const PosterNameComponent = Em.Component.extend({ - classNames: ['names', 'trigger-user-card'], - displayNameOnPosts: setting('display_name_on_posts'), - - // sanitize name for comparison - sanitizeName(name){ - return name.toLowerCase().replace(/[\s_-]/g,''); - }, - - render(buffer) { - const post = this.get('post'); - - if (post) { - const username = post.get('username'), - primaryGroupName = post.get('primary_group_name'), - url = post.get('usernameUrl'); - - var linkClass = 'username', - name = post.get('name'); - - if (post.get('staff')) { linkClass += ' staff'; } - if (post.get('admin')) { linkClass += ' admin'; } - if (post.get('moderator')) { linkClass += ' moderator'; } - if (post.get('new_user')) { linkClass += ' new-user'; } - - if (!Em.isEmpty(primaryGroupName)) { - linkClass += ' ' + primaryGroupName; - } - // Main link - buffer.push("" + username + ""); - - // Add a glyph if we have one - const glyph = this.posterGlyph(post); - if (!Em.isEmpty(glyph)) { - buffer.push(glyph); - } - buffer.push(""); - - // Are we showing full names? - if (name && this.get('displayNameOnPosts') && (this.sanitizeName(name) !== this.sanitizeName(username))) { - name = Discourse.Utilities.escapeExpression(name); - buffer.push("" + name + ""); - } - - // User titles - let title = post.get('user_title'); - if (!Em.isEmpty(title)) { - - title = Discourse.Utilities.escapeExpression(title); - buffer.push(''); - if (Em.isEmpty(primaryGroupName)) { - buffer.push(title); - } else { - buffer.push("" + title + ""); - } - buffer.push(""); - } - - PosterNameComponent.trigger('renderedName', buffer, post); - } - }, - - // Overwrite this to give a user a custom font awesome glyph. - posterGlyph(post) { - if(post.get('moderator')) { - const desc = I18n.t('user.moderator_tooltip'); - return ''; - } - } -}); - -// Support for event triggering -PosterNameComponent.reopenClass(Em.Evented); - -export default PosterNameComponent; +const removed = new Discourse.RemovedObject('discourse/components/poster-name'); +export default removed; diff --git a/app/assets/javascripts/discourse/components/private-message-map.js.es6 b/app/assets/javascripts/discourse/components/private-message-map.js.es6 deleted file mode 100644 index 0d01910c72..0000000000 --- a/app/assets/javascripts/discourse/components/private-message-map.js.es6 +++ /dev/null @@ -1,27 +0,0 @@ -export default Ember.Component.extend({ - layoutName: 'components/private-message-map', - tagName: 'section', - classNames: ['information'], - details: Em.computed.alias('topic.details'), - - actions: { - removeAllowedUser: function(user) { - var self = this; - bootbox.dialog(I18n.t("private_message_info.remove_allowed_user", {name: user.get('username')}), [ - {label: I18n.t("no_value"), - 'class': 'btn-danger right'}, - {label: I18n.t("yes_value"), - 'class': 'btn-primary', - callback: function() { - self.get('topic.details').removeAllowedUser(user); - } - } - ]); - }, - - showPrivateInvite: function() { - this.sendAction('showPrivateInviteAction'); - } - } - -}); diff --git a/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6 b/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6 new file mode 100644 index 0000000000..e5303d3d84 --- /dev/null +++ b/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6 @@ -0,0 +1,201 @@ +import DiscourseURL from 'discourse/lib/url'; +import { keyDirty } from 'discourse/widgets/widget'; +import MountWidget from 'discourse/components/mount-widget'; +import { cloak, uncloak } from 'discourse/widgets/post-stream'; + +function findTopView($posts, viewportTop, min, max) { + if (max < min) { return min; } + + while(max>min){ + const mid = Math.floor((min + max) / 2); + const $post = $($posts[mid]); + const viewBottom = $post.position().top + $post.height(); + + if (viewBottom > viewportTop) { + max = mid-1; + } else { + min = mid+1; + } + } + + return min; +} + +export default MountWidget.extend({ + widget: 'post-stream', + _topVisible: null, + _bottomVisible: null, + + args: Ember.computed(function() { + return this.getProperties('posts', + 'canCreatePost', + 'multiSelect', + 'gaps', + 'selectedQuery', + 'selectedPostsCount', + 'searchService'); + }).volatile(), + + scrolled() { + if (this.isDestroyed || this.isDestroying) { return; } + + const $w = $(window); + const windowHeight = window.innerHeight ? window.innerHeight : $w.height(); + const slack = Math.round(windowHeight * 5); + const onscreen = []; + const nearby = []; + + let windowTop = $w.scrollTop(); + + const $posts = this.$('.onscreen-post, .cloaked-post'); + const viewportTop = windowTop - slack; + const topView = findTopView($posts, viewportTop, 0, $posts.length-1); + + let windowBottom = windowTop + windowHeight; + let viewportBottom = windowBottom + slack; + + const bodyHeight = $('body').height(); + if (windowBottom > bodyHeight) { windowBottom = bodyHeight; } + if (viewportBottom > bodyHeight) { viewportBottom = bodyHeight; } + + let bottomView = topView; + while (bottomView < $posts.length) { + const post = $posts[bottomView]; + const $post = $(post); + + if (!$post) { break; } + + const viewTop = $post.offset().top; + const viewBottom = viewTop + $post.height() + 100; + + if (viewTop > viewportBottom) { break; } + + if (viewBottom > windowTop && viewTop <= windowBottom) { + onscreen.push(bottomView); + } + nearby.push(bottomView); + + bottomView++; + } + + const posts = this.posts; + const refresh = cb => this.queueRerender(cb); + if (onscreen.length) { + const first = posts.objectAt(onscreen[0]); + if (this._topVisible !== first) { + this._topVisible = first; + const $body = $('body'); + const elem = $posts[onscreen[0]]; + const elemId = elem.id; + const $elem = $(elem); + const elemPos = $elem.position(); + const distToElement = elemPos ? $body.scrollTop() - elemPos.top : 0; + + const topRefresh = () => { + refresh(() => { + const $refreshedElem = $(`#${elemId}`); + + // Quickly going back might mean the element is destroyed + const position = $refreshedElem.position(); + if (position && position.top) { + $('html, body').scrollTop(position.top + distToElement); + } + }); + }; + this.sendAction('topVisibleChanged', { post: first, refresh: topRefresh }); + } + + const last = posts.objectAt(onscreen[onscreen.length-1]); + if (this._bottomVisible !== last) { + this._bottomVisible = last; + this.sendAction('bottomVisibleChanged', { post: last, refresh }); + } + } else { + this._topVisible = null; + this._bottomVisible = null; + } + + const onscreenPostNumbers = []; + const prev = this._previouslyNearby; + const newPrev = {}; + nearby.forEach(idx => { + const post = posts.objectAt(idx); + const postNumber = post.post_number; + delete prev[postNumber]; + + if (onscreen.indexOf(idx) !== -1) { + onscreenPostNumbers.push(postNumber); + } + newPrev[postNumber] = post; + uncloak(post, this); + }); + + Object.keys(prev).forEach(pn => cloak(prev[pn], this)); + + this._previouslyNearby = newPrev; + this.screenTrack.setOnscreen(onscreenPostNumbers); + }, + + _scrollTriggered() { + Ember.run.scheduleOnce('afterRender', this, this.scrolled); + }, + + didInsertElement() { + this._super(); + const debouncedScroll = () => Ember.run.debounce(this, this._scrollTriggered, 10); + + this._previouslyNearby = {}; + + this.appEvents.on('post-stream:refresh', debouncedScroll); + $(document).bind('touchmove.post-stream', debouncedScroll); + $(window).bind('scroll.post-stream', debouncedScroll); + this._scrollTriggered(); + + this.appEvents.on('post-stream:posted', staged => { + const disableJumpReply = this.currentUser.get('disable_jump_reply'); + + this.queueRerender(() => { + if (staged && !disableJumpReply) { + const postNumber = staged.get('post_number'); + DiscourseURL.jumpToPost(postNumber, { skipIfOnScreen: true }); + } + }); + }); + + this.$().on('mouseenter.post-stream', 'button.widget-button', e => { + $('button.widget-button').removeClass('d-hover'); + $(e.target).addClass('d-hover'); + }); + + this.$().on('mouseleave.post-stream', 'button.widget-button', () => { + $('button.widget-button').removeClass('d-hover'); + }); + + this.appEvents.on('post-stream:refresh', args => { + if (args) { + if (args.id) { + keyDirty(`post-${args.id}`); + + if (args.refreshLikes) { + keyDirty(`post-menu-${args.id}`, { onRefresh: 'refreshLikes' }); + } + } else if (args.force) { + keyDirty(`*`); + } + } + this.queueRerender(); + }); + }, + + willDestroyElement() { + this._super(); + $(document).unbind('touchmove.post-stream'); + $(window).unbind('scroll.post-stream'); + this.appEvents.off('post-stream:refresh'); + this.$().off('mouseenter.post-stream'); + this.$().off('mouseleave.post-stream'); + this.appEvents.off('post-stream:refresh'); + this.appEvents.off('post-stream:posted'); + } + +}); diff --git a/app/assets/javascripts/discourse/components/small-action.js.es6 b/app/assets/javascripts/discourse/components/small-action.js.es6 index 5674363489..b66024987e 100644 --- a/app/assets/javascripts/discourse/components/small-action.js.es6 +++ b/app/assets/javascripts/discourse/components/small-action.js.es6 @@ -1,33 +1,17 @@ import { autoUpdatingRelativeAge } from 'discourse/lib/formatter'; -import computed from 'ember-addons/ember-computed-decorators'; -const icons = { - 'closed.enabled': 'lock', - 'closed.disabled': 'unlock-alt', - 'autoclosed.enabled': 'lock', - 'autoclosed.disabled': 'unlock-alt', - 'archived.enabled': 'folder', - 'archived.disabled': 'folder-open', - 'pinned.enabled': 'thumb-tack', - 'pinned.disabled': 'thumb-tack unpinned', - 'pinned_globally.enabled': 'thumb-tack', - 'pinned_globally.disabled': 'thumb-tack unpinned', - 'visible.enabled': 'eye', - 'visible.disabled': 'eye-slash', - 'split_topic': 'sign-out', - 'invited_user': 'plus-circle', - 'removed_user': 'minus-circle' -}; +export function actionDescriptionHtml(actionCode, createdAt, username) { + const dt = new Date(createdAt); + const when = autoUpdatingRelativeAge(dt, { format: 'medium-with-ago' }); + const who = username ? `@${username}` : ""; + return I18n.t(`action_codes.${actionCode}`, { who, when }).htmlSafe(); +} export function actionDescription(actionCode, createdAt, username) { return function() { const ac = this.get(actionCode); if (ac) { - const dt = new Date(this.get(createdAt)); - const when = autoUpdatingRelativeAge(dt, { format: 'medium-with-ago' }); - const u = this.get(username); - const who = u ? `@${u}` : ""; - return I18n.t(`action_codes.${ac}`, { who, when }).htmlSafe(); + return actionDescriptionHtml(ac, this.get(createdAt), this.get(username)); } }.property(actionCode, createdAt); } @@ -38,11 +22,6 @@ export default Ember.Component.extend({ description: actionDescription('actionCode', 'post.created_at', 'post.action_code_who'), - @computed("actionCode") - icon(actionCode) { - return icons[actionCode] || 'exclamation'; - }, - actions: { edit() { this.sendAction('editPost', this.get('post')); diff --git a/app/assets/javascripts/discourse/components/time-gap.js.es6 b/app/assets/javascripts/discourse/components/time-gap.js.es6 deleted file mode 100644 index 9e410c4b73..0000000000 --- a/app/assets/javascripts/discourse/components/time-gap.js.es6 +++ /dev/null @@ -1,21 +0,0 @@ -import SmallActionComponent from 'discourse/components/small-action'; - -export default SmallActionComponent.extend({ - classNames: ['time-gap'], - classNameBindings: ['hideTimeGap::hidden'], - hideTimeGap: Em.computed.alias('postStream.hasNoFilters'), - icon: 'clock-o', - - description: function() { - const gapDays = this.get('daysAgo'); - if (gapDays < 30) { - return I18n.t('dates.later.x_days', {count: gapDays}); - } else if (gapDays < 365) { - const gapMonths = Math.floor(gapDays / 30); - return I18n.t('dates.later.x_months', {count: gapMonths}); - } else { - const gapYears = Math.floor(gapDays / 365); - return I18n.t('dates.later.x_years', {count: gapYears}); - } - }.property(), -}); diff --git a/app/assets/javascripts/discourse/components/toggle-summary.js.es6 b/app/assets/javascripts/discourse/components/toggle-summary.js.es6 deleted file mode 100644 index 45dad26601..0000000000 --- a/app/assets/javascripts/discourse/components/toggle-summary.js.es6 +++ /dev/null @@ -1,12 +0,0 @@ -export default Ember.Component.extend({ - layoutName: 'components/toggle-summary', - tagName: 'section', - classNames: ['information'], - postStream: Em.computed.alias('topic.postStream'), - - actions: { - toggleSummary() { - this.get('postStream').toggleSummary(); - } - } -}); diff --git a/app/assets/javascripts/discourse/components/topic-list.js.es6 b/app/assets/javascripts/discourse/components/topic-list.js.es6 index 2cc0747b0e..03a6a4a0a7 100644 --- a/app/assets/javascripts/discourse/components/topic-list.js.es6 +++ b/app/assets/javascripts/discourse/components/topic-list.js.es6 @@ -19,7 +19,7 @@ export default Ember.Component.extend({ }.property(), skipHeader: function() { - return Discourse.Mobile.mobileView; + return this.site.mobileView; }.property(), showLikes: function(){ diff --git a/app/assets/javascripts/discourse/components/topic-map.js.es6 b/app/assets/javascripts/discourse/components/topic-map.js.es6 deleted file mode 100644 index b09d1a2d8e..0000000000 --- a/app/assets/javascripts/discourse/components/topic-map.js.es6 +++ /dev/null @@ -1,46 +0,0 @@ -var LINKS_SHOWN = 5; - -export default Ember.Component.extend({ - mapCollapsed: true, - layoutName: 'components/topic-map', - details: Em.computed.alias('topic.details'), - allLinksShown: false, - - init: function() { - this._super(); - - // If the topic has a summary, expand the map by default - this.set('mapCollapsed', Discourse.Mobile.mobileView || (!this.get('topic.has_summary'))); - }, - - showPosterAvatar: Em.computed.gt('topic.posts_count', 2), - - toggleMapClass: function() { - return this.get('mapCollapsed') ? 'chevron-down' : 'chevron-up'; - }.property('mapCollapsed'), - - showAllLinksControls: function() { - if (this.get('allLinksShown')) return false; - if ((this.get('details.links.length') || 0) <= LINKS_SHOWN) return false; - return true; - }.property('allLinksShown', 'topic.details.links'), - - infoLinks: function() { - var allLinks = this.get('details.links'); - if (Em.isNone(allLinks)) return []; - - if (this.get('allLinksShown')) return allLinks; - return allLinks.slice(0, LINKS_SHOWN); - - }.property('details.links', 'allLinksShown'), - - actions: { - toggleMap: function() { - this.toggleProperty('mapCollapsed'); - }, - - showAllLinks: function() { - this.set('allLinksShown', true); - } - } -}); diff --git a/app/assets/javascripts/discourse/components/topic-participant.js.es6 b/app/assets/javascripts/discourse/components/topic-participant.js.es6 deleted file mode 100644 index e8e58ea34f..0000000000 --- a/app/assets/javascripts/discourse/components/topic-participant.js.es6 +++ /dev/null @@ -1,18 +0,0 @@ -export default Ember.Component.extend({ - - postStream: Em.computed.alias('participant.topic.postStream'), - showPostCount: Em.computed.gte('participant.post_count', 2), - - toggled: function() { - return this.get('postStream.userFilters').contains(this.get('participant.username')); - }.property('postStream.userFilters.[]'), - - actions: { - toggle() { - const postStream = this.get('postStream'); - if (postStream) { - postStream.toggleParticipant(this.get('participant.username')); - } - } - } -}); diff --git a/app/assets/javascripts/discourse/components/who-liked.js.es6 b/app/assets/javascripts/discourse/components/who-liked.js.es6 deleted file mode 100644 index 412dfecdeb..0000000000 --- a/app/assets/javascripts/discourse/components/who-liked.js.es6 +++ /dev/null @@ -1,26 +0,0 @@ -import StringBuffer from 'discourse/mixins/string-buffer'; - -export default Ember.Component.extend(StringBuffer, { - rerenderTriggers: ['users.length'], - - renderString(buffer) { - const users = this.get('users'); - if (users && users.get('length') > 0) { - buffer.push("
"); - let iconsHtml = ""; - users.forEach(function(u) { - iconsHtml += ""; - iconsHtml += Discourse.Utilities.avatarImg({ - size: 'small', - avatarTemplate: u.get('avatar_template'), - title: u.get('username') - }); - iconsHtml += ""; - }); - buffer.push(I18n.t('post.actions.people.like',{icons: iconsHtml})); - buffer.push("
"); - } else { - buffer.push(""); - } - } -}); diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6 index 88e6c532be..7333f6dd0a 100644 --- a/app/assets/javascripts/discourse/controllers/composer.js.es6 +++ b/app/assets/javascripts/discourse/controllers/composer.js.es6 @@ -57,7 +57,25 @@ export default Ember.Controller.extend({ lastValidatedAt: null, isUploading: false, topic: null, - showToolbar: false, + showToolbar: Em.computed({ + get(){ + const keyValueStore = this.container.lookup('key-value-store:main'); + const storedVal = keyValueStore.get("toolbar-enabled"); + if (this._toolbarEnabled === undefined && storedVal === undefined) { + // iPhone 6 is 375, anything narrower and toolbar should + // be default disabled. + // That said we should remember the state + this._toolbarEnabled = $(window).width() > 370; + } + return this._toolbarEnabled || storedVal === "true"; + }, + set(key, val){ + const keyValueStore = this.container.lookup('key-value-store:main'); + this._toolbarEnabled = val; + keyValueStore.set({key: "toolbar-enabled", value: val ? "true" : "false"}); + return val; + } + }), _initializeSimilar: function() { this.set('similarTopics', []); @@ -263,7 +281,6 @@ export default Ember.Controller.extend({ } var staged = false; - const disableJumpReply = Discourse.User.currentProp('disable_jump_reply'); // TODO: This should not happen in model const imageSizes = {}; @@ -281,6 +298,7 @@ export default Ember.Controller.extend({ self.send('postWasEnqueued', result.responseJson); self.destroyDraft(); self.close(); + self.appEvents.trigger('post-stream:refresh'); return result; } @@ -288,7 +306,15 @@ export default Ember.Controller.extend({ if (result.responseJson.action === "create_post" || self.get('replyAsNewTopicDraft')) { self.destroyDraft(); } + if (self.get('model.action') === 'edit') { + self.appEvents.trigger('post-stream:refresh', { id: parseInt(result.responseJson.id) }); + } else { + self.appEvents.trigger('post-stream:refresh'); + } + if (result.responseJson.action === "create_post") { + self.appEvents.trigger('post:highlight', result.payload.post_number); + } self.close(); const currentUser = Discourse.User.current(); @@ -298,14 +324,14 @@ export default Ember.Controller.extend({ currentUser.set('reply_count', currentUser.get('reply_count') + 1); } - // TODO disableJumpReply is super crude, it needs to provide some sort - // of notification to the end user + const disableJumpReply = Discourse.User.currentProp('disable_jump_reply'); if (!composer.get('replyingToTopic') || !disableJumpReply) { const post = result.target; if (post && !staged) { DiscourseURL.routeTo(post.get('url')); } } + }).catch(function(error) { composer.set('disableDrafts', false); self.appEvents.one('composer:opened', () => bootbox.alert(error)); @@ -316,18 +342,10 @@ export default Ember.Controller.extend({ staged = composer.get('stagedPost'); } - Em.run.schedule('afterRender', function() { - if (staged && !disableJumpReply) { - const postNumber = staged.get('post_number'); - DiscourseURL.jumpToPost(postNumber, { skipIfOnScreen: true }); - self.appEvents.trigger('post:highlight', postNumber); - } - }); + this.appEvents.trigger('post-stream:posted', staged); this.messageBus.pause(); - promise.finally(function(){ - self.messageBus.resume(); - }); + promise.finally(() => this.messageBus.resume()); return promise; }, @@ -587,14 +605,6 @@ export default Ember.Controller.extend({ $('.d-editor-input').autocomplete({ cancel: true }); }, - showOptions() { - var _ref; - return (_ref = this.get('controllers.modal')) ? _ref.show(Discourse.ArchetypeOptionsModalView.create({ - archetype: this.get('model.archetype'), - metaData: this.get('model.metaData') - })) : void 0; - }, - canEdit: function() { return this.get("model.action") === "edit" && Discourse.User.current().get("can_edit"); }.property("model.action"), diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6 index adbd78f6c5..8d07058990 100644 --- a/app/assets/javascripts/discourse/controllers/create-account.js.es6 +++ b/app/assets/javascripts/discourse/controllers/create-account.js.es6 @@ -16,6 +16,7 @@ export default Ember.Controller.extend(ModalFunctionality, { rejectedPasswords: Em.A([]), prefilledUsername: null, userFields: null, + isDeveloper: false, hasAuthOptions: Em.computed.notEmpty('authOptions'), canCreateLocal: setting('enable_local_logins'), @@ -37,6 +38,7 @@ export default Ember.Controller.extend(ModalFunctionality, { rejectedEmails: [], rejectedPasswords: [], prefilledUsername: null, + isDeveloper: false }); this._createUserFields(); }, @@ -70,8 +72,8 @@ export default Ember.Controller.extend(ModalFunctionality, { }.property('authOptions.auth_provider'), passwordInstructions: function() { - return I18n.t('user.password.instructions', {count: Discourse.SiteSettings.min_password_length}); - }.property(), + return this.get('isDeveloper') ? I18n.t('user.password.instructions', {count: Discourse.SiteSettings.min_admin_password_length}) : I18n.t('user.password.instructions', {count: Discourse.SiteSettings.min_password_length}); + }.property('isDeveloper'), nameInstructions: function() { return I18n.t(Discourse.SiteSettings.full_name_required ? 'user.name.instructions_required' : 'user.name.instructions'); @@ -228,41 +230,27 @@ export default Ember.Controller.extend(ModalFunctionality, { const _this = this; if (this.shouldCheckUsernameMatch()) { return Discourse.User.checkUsername(this.get('accountUsername'), this.get('accountEmail')).then(function(result) { - _this.set('globalNicknameExists', false); + _this.set('isDeveloper', false); if (result.available) { - if (result.global_match) { - _this.set('globalNicknameExists', true); - return _this.set('uniqueUsernameValidation', Discourse.InputValidation.create({ - ok: true, - reason: I18n.t('user.username.global_match') - })); - } else { - return _this.set('uniqueUsernameValidation', Discourse.InputValidation.create({ - ok: true, - reason: I18n.t('user.username.available') - })); + if (result.is_developer) { + _this.set('isDeveloper', true); } + return _this.set('uniqueUsernameValidation', Discourse.InputValidation.create({ + ok: true, + reason: I18n.t('user.username.available') + })); } else { if (result.suggestion) { - if (result.global_match !== void 0 && result.global_match === false) { - _this.set('globalNicknameExists', true); - return _this.set('uniqueUsernameValidation', Discourse.InputValidation.create({ - failed: true, - reason: I18n.t('user.username.global_mismatch', result) - })); - } else { - return _this.set('uniqueUsernameValidation', Discourse.InputValidation.create({ - failed: true, - reason: I18n.t('user.username.not_available', result) - })); - } + return _this.set('uniqueUsernameValidation', Discourse.InputValidation.create({ + failed: true, + reason: I18n.t('user.username.not_available', result) + })); } else if (result.errors) { return _this.set('uniqueUsernameValidation', Discourse.InputValidation.create({ failed: true, reason: result.errors.join(' ') })); } else { - _this.set('globalNicknameExists', true); return _this.set('uniqueUsernameValidation', Discourse.InputValidation.create({ failed: true, reason: I18n.t('user.username.enter_email') @@ -297,7 +285,8 @@ export default Ember.Controller.extend(ModalFunctionality, { } // If too short - if (password.length < Discourse.SiteSettings.min_password_length) { + const passwordLength = this.get('isDeveloper') ? Discourse.SiteSettings.min_admin_password_length : Discourse.SiteSettings.min_password_length; + if (password.length < passwordLength) { return Discourse.InputValidation.create({ failed: true, reason: I18n.t('user.password.too_short') @@ -330,7 +319,7 @@ export default Ember.Controller.extend(ModalFunctionality, { ok: true, reason: I18n.t('user.password.ok') }); - }.property('accountPassword', 'rejectedPasswords.@each', 'accountUsername', 'accountEmail'), + }.property('accountPassword', 'rejectedPasswords.@each', 'accountUsername', 'accountEmail', 'isDeveloper'), @on('init') fetchConfirmationValue() { @@ -360,6 +349,7 @@ export default Ember.Controller.extend(ModalFunctionality, { this.set('formSubmitted', true); return Discourse.User.createAccount(attrs).then(function(result) { + self.set('isDeveloper', false); if (result.success) { // Trigger the browser's password manager using the hidden static login form: const $hidden_login_form = $('#hidden-login-form'); @@ -369,6 +359,9 @@ export default Ember.Controller.extend(ModalFunctionality, { $hidden_login_form.submit(); } else { self.flash(result.message || I18n.t('create_account.failed'), 'error'); + if (result.is_developer) { + self.set('isDeveloper', true); + } if (result.errors && result.errors.email && result.errors.email.length > 0 && result.values) { self.get('rejectedEmails').pushObject(result.values.email); } diff --git a/app/assets/javascripts/discourse/controllers/flag.js.es6 b/app/assets/javascripts/discourse/controllers/flag.js.es6 index ea3bc834e2..c598bc682b 100644 --- a/app/assets/javascripts/discourse/controllers/flag.js.es6 +++ b/app/assets/javascripts/discourse/controllers/flag.js.es6 @@ -89,7 +89,6 @@ export default Ember.Controller.extend(ModalFunctionality, { }, createFlag(opts) { - const self = this; let postAction; // an instance of ActionSummary if (!this.get('flagTopic')) { @@ -103,13 +102,14 @@ export default Ember.Controller.extend(ModalFunctionality, { this.send('hideModal'); - postAction.act(this.get('model'), params).then(function() { - self.send('closeModal'); + postAction.act(this.get('model'), params).then(() => { + this.send('closeModal'); if (params.message) { - self.set('message', ''); + this.set('message', ''); } - }, function(errors) { - self.send('closeModal'); + this.appEvents.trigger('post-stream:refresh', { id: this.get('model.id') }); + }).catch(errors => { + this.send('closeModal'); if (errors && errors.responseText) { bootbox.alert($.parseJSON(errors.responseText).errors); } else { diff --git a/app/assets/javascripts/discourse/controllers/history.js.es6 b/app/assets/javascripts/discourse/controllers/history.js.es6 index 0a3d504344..f799700046 100644 --- a/app/assets/javascripts/discourse/controllers/history.js.es6 +++ b/app/assets/javascripts/discourse/controllers/history.js.es6 @@ -10,7 +10,7 @@ export default Ember.Controller.extend(ModalFunctionality, { revisionsTextKey: "post.revisions.controls.comparing_previous_to_current_out_of_total", _changeViewModeOnMobile: function() { - if (Discourse.Mobile.mobileView) { this.set("viewMode", "inline"); } + if (this.site.mobileView) { this.set("viewMode", "inline"); } }.on("init"), refresh(postId, postVersion) { diff --git a/app/assets/javascripts/discourse/controllers/navigation/category.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/category.js.es6 index 35b11cd304..c3bcae7a96 100644 --- a/app/assets/javascripts/discourse/controllers/navigation/category.js.es6 +++ b/app/assets/javascripts/discourse/controllers/navigation/category.js.es6 @@ -9,7 +9,6 @@ export default NavigationDefaultController.extend({ @computed("showingSubcategoryList", "category", "noSubcategories") navItems(showingSubcategoryList, category, noSubcategories) { - if (showingSubcategoryList) { return []; } return Discourse.NavItem.buildList(category, { noSubcategories }); } }); diff --git a/app/assets/javascripts/discourse/controllers/preferences.js.es6 b/app/assets/javascripts/discourse/controllers/preferences.js.es6 index 5231e4fa43..005ff085a8 100644 --- a/app/assets/javascripts/discourse/controllers/preferences.js.es6 +++ b/app/assets/javascripts/discourse/controllers/preferences.js.es6 @@ -68,10 +68,17 @@ export default Ember.Controller.extend(CanCheckEmails, { {name: I18n.t('user.email_previous_replies.never'), value: 2} ], - digestFrequencies: [{ name: I18n.t('user.email_digests.daily'), value: 1 }, - { name: I18n.t('user.email_digests.every_three_days'), value: 3 }, - { name: I18n.t('user.email_digests.weekly'), value: 7 }, - { name: I18n.t('user.email_digests.every_two_weeks'), value: 14 }], + digestFrequencies: [{ name: I18n.t('user.email_digests.every_30_minutes'), value: 30 }, + { name: I18n.t('user.email_digests.every_hour'), value: 60 }, + { name: I18n.t('user.email_digests.daily'), value: 1440 }, + { name: I18n.t('user.email_digests.every_three_days'), value: 4320 }, + { name: I18n.t('user.email_digests.weekly'), value: 10080 }, + { name: I18n.t('user.email_digests.every_two_weeks'), value: 20160 }], + + likeNotificationFrequencies: [{ name: I18n.t('user.like_notification_frequency.always'), value: 0 }, + { name: I18n.t('user.like_notification_frequency.first_time_and_daily'), value: 1 }, + { name: I18n.t('user.like_notification_frequency.first_time'), value: 2 }, + { name: I18n.t('user.like_notification_frequency.never'), value: 3 }], autoTrackDurations: [{ name: I18n.t('user.auto_track_options.never'), value: -1 }, { name: I18n.t('user.auto_track_options.immediately'), value: 0 }, diff --git a/app/assets/javascripts/discourse/controllers/quote-button.js.es6 b/app/assets/javascripts/discourse/controllers/quote-button.js.es6 index cfff408844..b946cef8ea 100644 --- a/app/assets/javascripts/discourse/controllers/quote-button.js.es6 +++ b/app/assets/javascripts/discourse/controllers/quote-button.js.es6 @@ -61,8 +61,10 @@ export default Ember.Controller.extend({ // containing a single invisible character markerElement.appendChild(document.createTextNode("\ufeff")); + const isMobileDevice = this.site.isMobileDevice; + // collapse the range at the beginning/end of the selection - range.collapse(!Discourse.Mobile.isMobileDevice); + range.collapse(!isMobileDevice); // and insert it at the start of our selection range range.insertNode(markerElement); @@ -83,7 +85,7 @@ export default Ember.Controller.extend({ let topOff = markerOffset.top; let leftOff = markerOffset.left; - if (Discourse.Mobile.isMobileDevice) { + if (isMobileDevice) { topOff = topOff + 20; leftOff = Math.min(leftOff + 10, $(window).width() - $quoteButton.outerWidth()); } else { @@ -136,7 +138,7 @@ export default Ember.Controller.extend({ const quotedText = Quote.build(post, buffer); composerOpts.quote = quotedText; if (composerController.get('content.viewOpen') || composerController.get('content.viewDraft')) { - this.appEvents.trigger('composer:insert-text', quotedText.trim()); + this.appEvents.trigger('composer:insert-text', quotedText); } else { composerController.open(composerOpts); } diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6 index 2fe9e6ee7b..a87f854e76 100644 --- a/app/assets/javascripts/discourse/controllers/topic.js.es6 +++ b/app/assets/javascripts/discourse/controllers/topic.js.es6 @@ -19,7 +19,6 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { loadedAllPosts: Em.computed.or('model.postStream.loadedAllPosts', 'model.postStream.loadingLastPost'), enteredAt: null, retrying: false, - firstPostExpanded: false, adminMenuVisible: false, showRecover: Em.computed.and('model.deleted', 'model.details.can_recover'), @@ -100,7 +99,64 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { DiscourseURL.routeTo(url); }, + selectedQuery: function() { + return post => this.postSelected(post); + }.property(), + actions: { + + fillGapBefore(args) { + return this.get('model.postStream').fillGapBefore(args.post, args.gap); + }, + + fillGapAfter(args) { + return this.get('model.postStream').fillGapAfter(args.post, args.gap); + }, + + // Called the the topmost visible post on the page changes. + topVisibleChanged(event) { + const { post, refresh } = event; + + if (!post) { return; } + + const postStream = this.get('model.postStream'); + const firstLoadedPost = postStream.get('posts.firstObject'); + + const currentPostNumber = post.get('post_number'); + this.set('model.currentPost', currentPostNumber); + this.send('postChangedRoute', currentPostNumber); + + if (post.get('post_number') === 1) { return; } + + if (firstLoadedPost && firstLoadedPost === post) { + postStream.prependMore().then(() => refresh()); + } + }, + + // Called the the bottommost visible post on the page changes. + bottomVisibleChanged(event) { + const { post, refresh } = event; + + const postStream = this.get('model.postStream'); + const lastLoadedPost = postStream.get('posts.lastObject'); + + this.set('controllers.topic-progress.progressPosition', postStream.progressIndexOfPost(post)); + + if (lastLoadedPost && lastLoadedPost === post && postStream.get('canAppendMore')) { + postStream.appendMore().then(() => refresh()); + // show loading stuff + refresh(); + } + }, + + toggleSummary() { + return this.get('model.postStream').toggleSummary(); + }, + + removeAllowedUser(user) { + return this.get('model.details').removeAllowedUser(user); + }, + showTopicAdminMenu() { this.set('adminMenuVisible', true); }, @@ -113,7 +169,6 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { this.deleteTopic(); }, - archiveMessage() { const topic = this.get('model'); topic.archiveMessage().then(()=>{ @@ -176,8 +231,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { // Deleting the first post deletes the topic if (post.get('post_number') === 1) { - this.deleteTopic(); - return; + return this.deleteTopic(); } else if (!post.can_delete) { // check if current user can delete post return false; @@ -210,7 +264,9 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { } ]); } else { - post.destroy(user).catch(function(error) { + return post.destroy(user).then(() => { + this.appEvents.trigger('post-stream:refresh'); + }).catch(error => { popupAjaxError(error); post.undoDeleteState(); }); @@ -245,14 +301,17 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { }, toggleBookmark(post) { - if (!Discourse.User.current()) { + if (!this.currentUser) { alert(I18n.t("bookmarks.not_bookmarked")); return; } if (post) { return post.toggleBookmark().catch(popupAjaxError); } else { - return this.get("model").toggleBookmark(); + return this.get("model").toggleBookmark().then(changedIds => { + if (!changedIds) { return; } + changedIds.forEach(id => this.appEvents.trigger('post-stream:refresh', { id })); + }); } }, @@ -261,18 +320,20 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { }, selectAll() { - const posts = this.get('model.postStream.posts'), - selectedPosts = this.get('selectedPosts'); + const posts = this.get('model.postStream.posts'); + const selectedPosts = this.get('selectedPosts'); if (posts) { selectedPosts.addObjects(posts); } this.set('allPostsSelected', true); + this.appEvents.trigger('post-stream:refresh', { force: true }); }, deselectAll() { this.get('selectedPosts').clear(); this.get('selectedReplies').clear(); this.set('allPostsSelected', false); + this.appEvents.trigger('post-stream:refresh', { force: true }); }, toggleParticipant(user) { @@ -293,6 +354,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { toggleMultiSelect() { this.toggleProperty('multiSelect'); + this.appEvents.trigger('post-stream:refresh', { force: true }); }, finishedEditingTopic() { @@ -324,27 +386,26 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { }, deleteSelected() { - const self = this; - bootbox.confirm(I18n.t("post.delete.confirm", { count: this.get('selectedPostsCount')}), function(result) { + bootbox.confirm(I18n.t("post.delete.confirm", { count: this.get('selectedPostsCount')}), result => { if (result) { // If all posts are selected, it's the same thing as deleting the topic - if (self.get('allPostsSelected')) { - return self.deleteTopic(); + if (this.get('allPostsSelected')) { + return this.deleteTopic(); } - const selectedPosts = self.get('selectedPosts'), - selectedReplies = self.get('selectedReplies'), - postStream = self.get('model.postStream'), - toRemove = []; + const selectedPosts = this.get('selectedPosts'); + const selectedReplies = this.get('selectedReplies'); + const postStream = this.get('model.postStream'); Discourse.Post.deleteMany(selectedPosts, selectedReplies); - postStream.get('posts').forEach(function (p) { - if (self.postSelected(p)) { toRemove.addObject(p); } + postStream.get('posts').forEach(p => { + if (this.postSelected(p)) { + p.set('deleted_at', new Date()); + } }); - postStream.removePosts(toRemove); - self.send('toggleMultiSelect'); + this.send('toggleMultiSelect'); } }); }, @@ -437,7 +498,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { composerController.open({ action: Composer.CREATE_TOPIC, draftKey: Composer.REPLY_AS_NEW_TOPIC_KEY, - categoryId: this.get('category.id') + categoryId: this.get('model.category.id') }).then(() => { return Em.isEmpty(quotedText) ? "" : quotedText; }).then(q => { @@ -447,18 +508,6 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { }); }, - expandFirstPost(post) { - const self = this; - this.set('loadingExpanded', true); - post.expand().then(function() { - self.set('firstPostExpanded', true); - }).catch(function(error) { - bootbox.alert($.parseJSON(error.responseText).errors); - }).finally(function() { - self.set('loadingExpanded', false); - }); - }, - retryLoading() { const self = this; self.set('retrying', true); @@ -470,22 +519,22 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { }, toggleWiki(post) { - post.updatePostField('wiki', !post.get('wiki')); + return post.updatePostField('wiki', !post.get('wiki')); }, togglePostType(post) { const regular = this.site.get('post_types.regular'); const moderator = this.site.get('post_types.moderator_action'); - post.updatePostField('post_type', post.get('post_type') === moderator ? regular : moderator); + return post.updatePostField('post_type', post.get('post_type') === moderator ? regular : moderator); }, rebakePost(post) { - post.rebake(); + return post.rebake(); }, unhidePost(post) { - post.unhide(); + return post.unhide(); }, changePostOwner(post) { @@ -498,11 +547,6 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { this.send('togglePinnedForUser'); }, - showExpandButton: function() { - const post = this.get('post'); - return post.get('post_number') === 1 && post.get('topic.expandable_first_post'); - }.property(), - canMergeTopic: function() { if (!this.get('model.details.can_move_posts')) return false; return this.get('selectedPostsCount') > 0; @@ -598,9 +642,10 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { // Unsubscribe before subscribing again this.unsubscribe(); - const self = this; - this.messageBus.subscribe("/topic/" + this.get('model.id'), function(data) { - const topic = self.get('model'); + const refresh = (args) => this.appEvents.trigger('post-stream:refresh', args); + + this.messageBus.subscribe("/topic/" + this.get('model.id'), data => { + const topic = this.get('model'); if (data.notification_level_change) { topic.set('details.notification_level', data.notification_level_change); @@ -608,26 +653,27 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { return; } - const postStream = self.get('model.postStream'); + const postStream = this.get('model.postStream'); switch (data.type) { - case "revised": case "acted": + postStream.triggerChangedPost(data.id, data.updated_at).then(() => refresh({ id: data.id, refreshLikes: true })); + break; + case "revised": case "rebaked": { - // TODO we could update less data for "acted" (only post actions) - postStream.triggerChangedPost(data.id, data.updated_at); + postStream.triggerChangedPost(data.id, data.updated_at).then(() => refresh({ id: data.id })); return; } case "deleted": { - postStream.triggerDeletedPost(data.id, data.post_number); + postStream.triggerDeletedPost(data.id, data.post_number).then(() => refresh({ id: data.id })); return; } case "recovered": { - postStream.triggerRecoveredPost(data.id, data.post_number); + postStream.triggerRecoveredPost(data.id, data.post_number).then(() => refresh({ id: data.id })); return; } case "created": { - postStream.triggerNewPostInStream(data.id); - if (self.get('currentUser.id') !== data.user_id) { + postStream.triggerNewPostInStream(data.id).then(() => refresh()); + if (this.get('currentUser.id') !== data.user_id) { Discourse.notifyBackgroundCountIncrement(); } return; @@ -673,23 +719,17 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { } }, - // If our current post is changed, notify the router - _currentPostChanged: function() { - const currentPost = this.get('model.currentPost'); - if (currentPost) { - this.send('postChangedRoute', currentPost); - } - }.observes('model.currentPost'), - readPosts(topicId, postNumbers) { - const topic = this.get("model"), - postStream = topic.get("postStream"); + const topic = this.get("model"); + const postStream = topic.get("postStream"); + + if (topic.get('id') === topicId) { - if (topic.get("id") === topicId) { // TODO identity map for postNumber - _.each(postStream.get('posts'), post => { - if (_.include(postNumbers, post.post_number) && !post.read) { - post.set("read", true); + postStream.get('posts').forEach(post => { + if (!post.read && postNumbers.indexOf(post.post_number) !== -1) { + post.set('read', true); + this.appEvents.trigger('post-stream:refresh', { id: post.id }); } }); @@ -709,59 +749,6 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { } }, - // Called the the topmost visible post on the page changes. - topVisibleChanged(post) { - if (!post) { return; } - - const postStream = this.get('model.postStream'); - const firstLoadedPost = postStream.get('posts.firstObject'); - - this.set('model.currentPost', post.get('post_number')); - - if (post.get('post_number') === 1) { return; } - - if (firstLoadedPost && firstLoadedPost === post) { - // Note: jQuery shouldn't be done in a controller, but how else can we - // trigger a scroll after a promise resolves in a controller? We need - // to do this to preserve upwards infinte scrolling. - const $body = $('body'); - const elemId = `#post_${post.get('post_number')}`; - const $elem = $(elemId).closest('.post-cloak'); - const elemPos = $elem.position(); - const distToElement = elemPos ? $body.scrollTop() - elemPos.top : 0; - - postStream.prependMore().then(function() { - Em.run.next(function () { - const $refreshedElem = $(elemId).closest('.post-cloak'); - - // Quickly going back might mean the element is destroyed - const position = $refreshedElem.position(); - if (position && position.top) { - $('html, body').scrollTop(position.top + distToElement); - } - }); - }); - } - }, - - /** - Called the the bottommost visible post on the page changes. - - @method bottomVisibleChanged - @params {Discourse.Post} post that is at the bottom - **/ - bottomVisibleChanged(post) { - if (!post) { return; } - - const postStream = this.get('model.postStream'); - const lastLoadedPost = postStream.get('posts.lastObject'); - - this.set('controllers.topic-progress.progressPosition', postStream.progressIndexOfPost(post)); - - if (lastLoadedPost && lastLoadedPost === post) { - postStream.appendMore(); - } - }, _showFooter: function() { const showFooter = this.get("model.postStream.loaded") && this.get("model.postStream.loadedAllPosts"); diff --git a/app/assets/javascripts/discourse/controllers/user-card.js.es6 b/app/assets/javascripts/discourse/controllers/user-card.js.es6 index c67125cdb2..a78407f225 100644 --- a/app/assets/javascripts/discourse/controllers/user-card.js.es6 +++ b/app/assets/javascripts/discourse/controllers/user-card.js.es6 @@ -45,7 +45,7 @@ export default Ember.Controller.extend({ } // Don't show on mobile - if (Discourse.Mobile.mobileView) { + if (this.site.mobileView) { const url = "/users/" + username; DiscourseURL.routeTo(url); return; 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 73c8ff293a..06a1be30db 100644 --- a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6 +++ b/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6 @@ -2,7 +2,6 @@ import computed from 'ember-addons/ember-computed-decorators'; import Topic from 'discourse/models/topic'; export default Ember.Controller.extend({ - needs: ["application", "user-topics-list", "user"], pmView: false, viewingSelf: Em.computed.alias('controllers.user.viewingSelf'), @@ -11,10 +10,6 @@ export default Ember.Controller.extend({ selected: Em.computed.alias('controllers.user-topics-list.selected'), bulkSelectEnabled: Em.computed.alias('controllers.user-topics-list.bulkSelectEnabled'), - mobileView: function() { - return Discourse.Mobile.mobileView; - }.property(), - showNewPM: function(){ return this.get('controllers.user.viewingSelf') && Discourse.User.currentProp('can_send_private_messages'); diff --git a/app/assets/javascripts/discourse/ember/resolver.js.es6 b/app/assets/javascripts/discourse/ember/resolver.js.es6 index c8c2a3eeea..d7124c0900 100644 --- a/app/assets/javascripts/discourse/ember/resolver.js.es6 +++ b/app/assets/javascripts/discourse/ember/resolver.js.es6 @@ -22,13 +22,11 @@ function loadingResolver(cb) { } function parseName(fullName) { - /*jshint validthis:true */ - const nameParts = fullName.split(":"), - type = nameParts[0], fullNameWithoutType = nameParts[1], - name = fullNameWithoutType, - namespace = get(this, 'namespace'), - root = namespace; + type = nameParts[0], fullNameWithoutType = nameParts[1], + name = fullNameWithoutType, + namespace = get(this, 'namespace'), + root = namespace; return { fullName: fullName, @@ -85,6 +83,10 @@ export default Ember.DefaultResolver.extend({ return module; }, + resolveWidget(parsedName) { + return this.customResolve(parsedName) || this._super(parsedName); + }, + resolveAdapter(parsedName) { return this.customResolve(parsedName) || this._super(parsedName); }, @@ -139,7 +141,7 @@ export default Ember.DefaultResolver.extend({ }, findMobileTemplate(parsedName) { - if (Discourse.Mobile.mobileView) { + if (this.mobileView) { var mobileParsedName = this.parseName(parsedName.fullName.replace("template:", "template:mobile/")); return this.findTemplate(mobileParsedName); } diff --git a/app/assets/javascripts/discourse/helpers/as-hash.js.es6 b/app/assets/javascripts/discourse/helpers/as-hash.js.es6 new file mode 100644 index 0000000000..c5c67a64e0 --- /dev/null +++ b/app/assets/javascripts/discourse/helpers/as-hash.js.es6 @@ -0,0 +1,8 @@ +// Note: Later versions of ember include `hash` +export default function hashHelper(params) { + const hash = {}; + Object.keys(params.hash).forEach(k => { + hash[k] = params.data.view.getStream(params.hash[k]).value(); + }); + return hash; +} diff --git a/app/assets/javascripts/discourse/helpers/fa-icon.js.es6 b/app/assets/javascripts/discourse/helpers/fa-icon.js.es6 index 456f876054..fa35b02d9b 100644 --- a/app/assets/javascripts/discourse/helpers/fa-icon.js.es6 +++ b/app/assets/javascripts/discourse/helpers/fa-icon.js.es6 @@ -1,3 +1,4 @@ +import { h } from 'virtual-dom'; import registerUnbound from 'discourse/helpers/register-unbound'; function iconClasses(icon, params) { @@ -7,7 +8,7 @@ function iconClasses(icon, params) { return classes; } -function iconHTML(icon, params) { +export function iconHTML(icon, params) { params = params || {}; var html = "" + domain + ""); - } - } - } -}); diff --git a/app/assets/javascripts/discourse/helpers/node.js.es6 b/app/assets/javascripts/discourse/helpers/node.js.es6 new file mode 100644 index 0000000000..474171ee59 --- /dev/null +++ b/app/assets/javascripts/discourse/helpers/node.js.es6 @@ -0,0 +1,31 @@ +import { h } from 'virtual-dom'; +import { relativeAge, longDate } from 'discourse/lib/formatter'; +import { number } from 'discourse/lib/formatter'; + +export function dateNode(dt) { + if (typeof dt === "string") { dt = new Date(dt); } + if (dt) { + const attributes = { + title: longDate(dt), + 'data-time': dt.getTime(), + 'data-format': 'tiny' + }; + + return h('span.relative-date', { attributes }, relativeAge(dt)); + } +} + +export function numberNode(num, opts) { + opts = opts || {}; + num = parseInt(num, 10); + if (isNaN(num)) { num = 0; } + + const numString = num.toString(); + const attributes = { }; + const formatted = number(num); + if (formatted !== numString) { + attributes.title = numString; + } + + return h('span.number', { className: opts.className, attributes }, formatted); +} diff --git a/app/assets/javascripts/discourse/initializers/enable-emoji.js.es6 b/app/assets/javascripts/discourse/initializers/enable-emoji.js.es6 index 1d62753988..d358a1e1d5 100644 --- a/app/assets/javascripts/discourse/initializers/enable-emoji.js.es6 +++ b/app/assets/javascripts/discourse/initializers/enable-emoji.js.es6 @@ -1,4 +1,4 @@ -import { onToolbarCreate } from 'discourse/components/d-editor'; +import { withPluginApi } from 'discourse/lib/plugin-api'; export default { name: 'enable-emoji', @@ -7,13 +7,15 @@ export default { const siteSettings = container.lookup('site-settings:main'); if (siteSettings.enable_emoji) { - onToolbarCreate(toolbar => { - toolbar.addButton({ - id: 'emoji', - group: 'extras', - icon: 'smile-o', - action: 'emoji', - title: 'composer.emoji' + withPluginApi('0.1', api => { + api.onToolbarCreate(toolbar => { + toolbar.addButton({ + id: 'emoji', + group: 'extras', + icon: 'smile-o', + action: 'emoji', + title: 'composer.emoji' + }); }); }); diff --git a/app/assets/javascripts/discourse/initializers/ensure-max-image-dimensions.js.es6 b/app/assets/javascripts/discourse/initializers/ensure-max-image-dimensions.js.es6 index 746abc38f4..99486215aa 100644 --- a/app/assets/javascripts/discourse/initializers/ensure-max-image-dimensions.js.es6 +++ b/app/assets/javascripts/discourse/initializers/ensure-max-image-dimensions.js.es6 @@ -1,7 +1,7 @@ export default { name: 'ensure-image-dimensions', after: 'mobile', - initialize: function() { + initialize(container) { if (!window) { return; } // This enforces maximum dimensions of images based on site settings @@ -11,7 +11,8 @@ export default { var width = Discourse.SiteSettings.max_image_width; var height = Discourse.SiteSettings.max_image_height; - if (Discourse.Mobile.mobileView) { + const site = container.lookup('site:main'); + if (site.mobileView) { width = $(window).width() - 20; } diff --git a/app/assets/javascripts/discourse/initializers/logs-notice.js.es6 b/app/assets/javascripts/discourse/initializers/logs-notice.js.es6 new file mode 100644 index 0000000000..424d84298d --- /dev/null +++ b/app/assets/javascripts/discourse/initializers/logs-notice.js.es6 @@ -0,0 +1,18 @@ +import LogsNotice from 'discourse/services/logs-notice'; +import Singleton from 'discourse/mixins/singleton'; + +export default { + name: "logs-notice", + after: "message-bus", + + initialize: function (container) { + const siteSettings = container.lookup('site-settings:main'); + const messageBus = container.lookup('message-bus:main'); + const keyValueStore = container.lookup('key-value-store:main'); + LogsNotice.reopenClass(Singleton, { + createCurrent() { + return this.create({ messageBus, keyValueStore, siteSettings}); + } + }); + } +}; diff --git a/app/assets/javascripts/discourse/initializers/mobile.js.es6 b/app/assets/javascripts/discourse/initializers/mobile.js.es6 index d39e080257..d4bffb3569 100644 --- a/app/assets/javascripts/discourse/initializers/mobile.js.es6 +++ b/app/assets/javascripts/discourse/initializers/mobile.js.es6 @@ -1,14 +1,19 @@ -/** - Initializes the `Discourse.Mobile` helper object. -**/ +import Mobile from 'discourse/lib/mobile'; + +// Initializes the `Mobile` helper object. export default { name: 'mobile', after: 'inject-objects', - initialize: function(container) { - Discourse.Mobile.init(); - var site = container.lookup('site:main'); - site.set('mobileView', Discourse.Mobile.mobileView); + initialize(container, app) { + Mobile.init(); + const site = container.lookup('site:main'); + + site.set('mobileView', Mobile.mobileView); + site.set('isMobileDevice', Mobile.isMobileDevice); + + // This is a bit weird but you can't seem to inject into the resolver? + app.registry.resolver.__resolver__.mobileView = Mobile.mobileView; } }; diff --git a/app/assets/javascripts/discourse/initializers/page-tracking.js.es6 b/app/assets/javascripts/discourse/initializers/page-tracking.js.es6 index 2511dd3eba..34fed0c977 100644 --- a/app/assets/javascripts/discourse/initializers/page-tracking.js.es6 +++ b/app/assets/javascripts/discourse/initializers/page-tracking.js.es6 @@ -1,5 +1,5 @@ import { cleanDOM } from 'discourse/routes/discourse'; -import PageTracker from 'discourse/lib/page-tracker'; +import { startPageTracking, onPageChange } from 'discourse/lib/page-tracker'; export default { name: "page-tracking", @@ -25,7 +25,6 @@ export default { }); }); - router.transientCache = function(key, data, count) { if (data === undefined) { return cache[key]; @@ -34,13 +33,12 @@ export default { } }; - const pageTracker = PageTracker.current(); - pageTracker.start(); + startPageTracking(router); // Out of the box, Discourse tries to track google analytics // if it is present if (typeof window._gaq !== 'undefined') { - pageTracker.on('change', function(url, title) { + onPageChange((url, title) => { window._gaq.push(["_set", "title", title]); window._gaq.push(['_trackPageview', url]); }); @@ -49,7 +47,7 @@ export default { // Also use Universal Analytics if it is present if (typeof window.ga !== 'undefined') { - pageTracker.on('change', function(url, title) { + onPageChange((url, title) => { window.ga('send', 'pageview', {page: url, title: title}); }); } diff --git a/app/assets/javascripts/discourse/initializers/post-decorations.js.es6 b/app/assets/javascripts/discourse/initializers/post-decorations.js.es6 index 5d82473b89..df6e8d8bc2 100644 --- a/app/assets/javascripts/discourse/initializers/post-decorations.js.es6 +++ b/app/assets/javascripts/discourse/initializers/post-decorations.js.es6 @@ -1,11 +1,13 @@ -import { decorateCooked } from 'discourse/lib/plugin-api'; -import HighlightSyntax from 'discourse/lib/highlight-syntax'; -import Lightbox from 'discourse/lib/lightbox'; +import highlightSyntax from 'discourse/lib/highlight-syntax'; +import lightbox from 'discourse/lib/lightbox'; +import { withPluginApi } from 'discourse/lib/plugin-api'; export default { name: "post-decorations", - initialize: function(container) { - decorateCooked(container, HighlightSyntax); - decorateCooked(container, Lightbox); + initialize() { + withPluginApi('0.1', api => { + api.decorateCooked(highlightSyntax); + api.decorateCooked(lightbox); + }); } }; diff --git a/app/assets/javascripts/discourse/initializers/signup-cta.js.es6 b/app/assets/javascripts/discourse/initializers/signup-cta.js.es6 index fad9e45634..4074d293f2 100644 --- a/app/assets/javascripts/discourse/initializers/signup-cta.js.es6 +++ b/app/assets/javascripts/discourse/initializers/signup-cta.js.es6 @@ -1,25 +1,23 @@ -import ScreenTrack from 'discourse/lib/screen-track'; import Session from 'discourse/models/session'; -const ANON_TOPIC_IDS = 2, - ANON_PROMPT_READ_TIME = 2 * 60 * 1000, - ONE_DAY = 24 * 60 * 60 * 1000, - PROMPT_HIDE_DURATION = ONE_DAY; +const ANON_TOPIC_IDS = 2; +const ANON_PROMPT_READ_TIME = 2 * 60 * 1000; +const ONE_DAY = 24 * 60 * 60 * 1000; +const PROMPT_HIDE_DURATION = ONE_DAY; export default { name: "signup-cta", initialize(container) { - const screenTrack = ScreenTrack.current(), - session = Session.current(), - siteSettings = container.lookup('site-settings:main'), - keyValueStore = container.lookup('key-value-store:main'), - user = container.lookup('current-user:main'); + const screenTrack = container.lookup('screen-track:main'); + const session = Session.current(); + const siteSettings = container.lookup('site-settings:main'); + const keyValueStore = container.lookup('key-value-store:main'); + const user = container.lookup('current-user:main'); - screenTrack.set('keyValueStore', keyValueStore); + screenTrack.keyValueStore = keyValueStore; // Preconditions - if (user) return; // must not be logged in if (keyValueStore.get('anon-cta-never')) return; // "never show again" if (!siteSettings.allow_new_registrations) return; @@ -63,7 +61,7 @@ export default { session.set('showSignupCta', true); } - screenTrack.set('anonFlushCallback', checkSignupCtaRequirements); + screenTrack.registerAnonCallback(checkSignupCtaRequirements); checkSignupCtaRequirements(); } 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 fd820d8202..63ef5104b4 100644 --- a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 +++ b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 @@ -96,7 +96,7 @@ export default { }); if (!Ember.testing) { - if (!Discourse.Mobile.mobileView) { + if (!site.mobileView) { bus.subscribe("/notification-alert/" + user.get('id'), function(data){ onNotification(data, user); }); diff --git a/app/assets/javascripts/discourse/lib/autocomplete.js.es6 b/app/assets/javascripts/discourse/lib/autocomplete.js.es6 index 5da0fb6b02..0d158734bd 100644 --- a/app/assets/javascripts/discourse/lib/autocomplete.js.es6 +++ b/app/assets/javascripts/discourse/lib/autocomplete.js.es6 @@ -3,7 +3,6 @@ @module $.fn.autocomplete **/ - export var CANCELLED_STATUS = "__CANCELLED"; const allowedLettersRegex = /[\s\t\[\{\(\/]/; @@ -45,7 +44,7 @@ export default function(options) { if (options === 'destroy') { Ember.run.cancel(inputTimeout); - $(this).off('keypress.autocomplete') + $(this).off('keyup.autocomplete') .off('keydown.autocomplete') .off('paste.autocomplete') .off('click.autocomplete'); @@ -59,7 +58,13 @@ export default function(options) { } if (this.length !== 1) { - alert("only supporting one matcher at the moment"); + if (window.console) { + window.console.log("WARNING: passed multiple elements to $.autocomplete, skipping."); + if (window.Error) { + window.console.log((new window.Error()).stack); + } + } + return this; } var disabled = options && options.disabled; @@ -70,6 +75,7 @@ export default function(options) { var completeEnd = null; var me = this; var div = null; + var prevTerm = null; // input is handled differently var isInput = this[0].tagName === "INPUT"; @@ -82,6 +88,7 @@ export default function(options) { div = null; completeStart = null; autocompleteOptions = null; + prevTerm = null; }; var addInputSelectedItem = function(item) { @@ -139,6 +146,10 @@ export default function(options) { text = text.substring(0, completeStart) + (options.key || "") + term + ' ' + text.substring(completeEnd + 1, text.length); me.val(text); Discourse.Utilities.setCaretPosition(me[0], completeStart + 1 + term.length); + + if (options && options.afterComplete) { + options.afterComplete(text); + } } } } @@ -226,7 +237,7 @@ export default function(options) { vOffset = div.height(); } - if (Discourse.Mobile.mobileView && !isInput) { + if (Discourse.Site.currentProp('mobileView') && !isInput) { div.css('width', 'auto'); if ((me.height() / 2) >= pos.top) { vOffset = -23; } @@ -242,7 +253,14 @@ export default function(options) { }); }; + const SKIP = "skip"; + const dataSource = (term, opts) => { + if (prevTerm === term) { + return SKIP; + } + + prevTerm = term; if (term.length !== 0 && term.trim().length === 0) { closeAutocomplete(); return null; @@ -251,9 +269,9 @@ export default function(options) { } }; - var updateAutoComplete = function(r) { + const updateAutoComplete = function(r) { - if (completeStart === null) return; + if (completeStart === null || r === SKIP) return; if (r && r.then && typeof(r.then) === "function") { if (div) { @@ -304,21 +322,21 @@ export default function(options) { } }; - $(this).on('keypress.autocomplete', function(e) { - var caretPosition, term; + $(this).on('keyup.autocomplete', function() { - // keep hunting backwards till you hit a the @ key - if (options.key && e.which === options.key.charCodeAt(0)) { - caretPosition = Discourse.Utilities.caretPosition(me[0]); - var prevChar = me.val().charAt(caretPosition - 1); - if (checkTriggerRule() && (!prevChar || allowedLettersRegex.test(prevChar))) { - completeStart = completeEnd = caretPosition; - updateAutoComplete(dataSource("", options)); + var caretPosition = Discourse.Utilities.caretPosition(me[0]); + + if (options.key && completeStart === null && caretPosition > 0) { + var key = me[0].value[caretPosition-1]; + if (key === options.key) { + var prevChar = me.val().charAt(caretPosition-2); + if (checkTriggerRule() && (!prevChar || allowedLettersRegex.test(prevChar))) { + completeStart = completeEnd = caretPosition-1; + updateAutoComplete(dataSource("", options)); + } } - } else if ((completeStart !== null) && (e.charCode !== 0)) { - caretPosition = Discourse.Utilities.caretPosition(me[0]); - term = me.val().substring(completeStart + (options.key ? 1 : 0), caretPosition); - term += String.fromCharCode(e.charCode); + } else if (completeStart !== null) { + var term = me.val().substring(completeStart + (options.key ? 1 : 0), caretPosition); updateAutoComplete(dataSource(term, options)); } }); @@ -331,7 +349,7 @@ export default function(options) { } if(options.allowAny){ - // saves us wiring up a change event as well, keypress is while its pressed + // saves us wiring up a change event as well Ember.run.cancel(inputTimeout); inputTimeout = Ember.run.later(function(){ diff --git a/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6 b/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6 index d20a1c0109..de1d6afc33 100644 --- a/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6 +++ b/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6 @@ -1,6 +1,6 @@ import DiscourseURL from 'discourse/lib/url'; -import PageTracker from 'discourse/lib/page-tracker'; import KeyValueStore from 'discourse/lib/key-value-store'; +import { onPageChange } from 'discourse/lib/page-tracker'; let primaryTab = false; let liveEnabled = false; @@ -84,7 +84,8 @@ function setupNotifications() { if (document) { document.addEventListener("scroll", resetIdle); } - PageTracker.on("change", resetIdle); + + onPageChange(resetIdle); } function resetIdle() { diff --git a/app/assets/javascripts/discourse/lib/discourse-location.js.es6 b/app/assets/javascripts/discourse/lib/discourse-location.js.es6 index a126bf783a..43b74ab1ef 100644 --- a/app/assets/javascripts/discourse/lib/discourse-location.js.es6 +++ b/app/assets/javascripts/discourse/lib/discourse-location.js.es6 @@ -1,5 +1,3 @@ -import CloakedCollectionView from 'discourse/views/cloaked-collection'; - /** @module Discourse */ @@ -33,7 +31,12 @@ const DiscourseLocation = Ember.Object.extend({ @method initState */ initState() { - set(this, 'history', get(this, 'history') || window.history); + const history = get(this, 'history') || window.history; + if (history && history.scrollRestoration) { + history.scrollRestoration = "manual"; + } + + set(this, 'history', history); let url = this.formatURL(this.getURL()); const loc = get(this, 'location'); @@ -221,36 +224,4 @@ const DiscourseLocation = Ember.Object.extend({ }); -/** - Since we're using pushState/replaceState let's add extra hooks to cloakedView to - eject itself when the popState occurs. This results in better back button - behavior. -**/ -CloakedCollectionView.reopen({ - _watchForPopState: function() { - const self = this, - cb = function() { - // Sam: This is a hack, but a very important one - // Due to the way we use replace state the back button works strangely - // - // If you visit a topic from the front page, scroll a bit around and then hit back - // you notice that first the page scrolls a bit (within the topic) and then it goes back - // this transition is jarring and adds uneeded rendering costs. - // - // To repro comment the hack out and wack a debugger statement here and in - // topic_route deactivate - $('.posts,#topic-title').hide(); - self.cleanUp(); - self.set('controller.model.postStream.loaded', false); - }; - this.set('_callback', cb); - popstateCallbacks.addObject(cb); - }.on('didInsertElement'), - - _disbandWatcher: function() { - popstateCallbacks.removeObject(this.get('_callback')); - this.set('_callback', null); - }.on('willDestroyElement') -}); - export default DiscourseLocation; diff --git a/app/assets/javascripts/discourse/lib/emoji/emoji-groups.js.es6 b/app/assets/javascripts/discourse/lib/emoji/emoji-groups.js.es6 index e678e4e24a..35838fad91 100644 --- a/app/assets/javascripts/discourse/lib/emoji/emoji-groups.js.es6 +++ b/app/assets/javascripts/discourse/lib/emoji/emoji-groups.js.es6 @@ -3,46 +3,1104 @@ // a few Emoji are actually missing from the Slack categories as well (?), and were added const groups = [ { - name: "people", - fullname: "People", - tabicon: "grinning", - icons: ["slightly_smiling", "grinning", "grin", "joy", "smiley", "smile", "sweat_smile", "laughing", "innocent", "smiling_imp", "imp", "wink", "blush", "relaxed", "yum", "relieved", "heart_eyes", "sunglasses", "smirk", "neutral_face", "expressionless", "unamused", "sweat", "pensive", "confused", "confounded", "kissing", "kissing_heart", "kissing_smiling_eyes", "kissing_closed_eyes", "stuck_out_tongue", "stuck_out_tongue_winking_eye", "stuck_out_tongue_closed_eyes", "disappointed", "worried", "angry", "rage", "cry", "persevere", "triumph", "disappointed_relieved", "frowning", "anguished", "fearful", "weary", "sleepy", "tired_face", "grimacing", "sob", "open_mouth", "hushed", "cold_sweat", "scream", "astonished", "flushed", "sleeping", "dizzy_face", "no_mouth", "mask", "smile_cat", "joy_cat", "smiley_cat", "heart_eyes_cat", "smirk_cat", "kissing_cat", "pouting_cat", "crying_cat_face", "scream_cat", "footprints", "bust_in_silhouette", "busts_in_silhouette", "baby", "boy", "girl", "man", "woman", "family", "couple", "two_men_holding_hands", "two_women_holding_hands", "dancers", "bride_with_veil", "person_with_blond_hair", "man_with_gua_pi_mao", "man_with_turban", "older_man", "older_woman", "cop", "construction_worker", "princess", "guardsman", "angel", "santa", "ghost", "japanese_ogre", "japanese_goblin", "hankey", "skull", "alien", "space_invader", "bow", "information_desk_person", "no_good", "ok_woman", "raising_hand", "person_with_pouting_face", "person_frowning", "massage", "haircut", "couple_with_heart", "couplekiss", "raised_hands", "clap", "hand", "ear", "eyes", "nose", "lips", "kiss", "tongue", "nail_care", "wave", "+1", "-1", "point_up", "point_up_2", "point_down", "point_left", "point_right", "ok_hand", "v", "facepunch", "fist", "raised_hand", "muscle", "open_hands", "pray"] + name:"people", + fullname:"People", + tabicon:"grinning", + icons:[ + "slight_smile", + "grinning", + "grin", + "joy", + "smiley", + "smile", + "sweat_smile", + "laughing", + "innocent", + "smiling_imp", + "imp", + "wink", + "blush", + "relaxed", + "yum", + "relieved", + "heart_eyes", + "sunglasses", + "smirk", + "neutral_face", + "expressionless", + "unamused", + "sweat", + "pensive", + "confused", + "confounded", + "kissing", + "kissing_heart", + "kissing_smiling_eyes", + "kissing_closed_eyes", + "stuck_out_tongue", + "stuck_out_tongue_winking_eye", + "stuck_out_tongue_closed_eyes", + "disappointed", + "worried", + "angry", + "rage", + "cry", + "persevere", + "triumph", + "disappointed_relieved", + "frowning", + "anguished", + "fearful", + "weary", + "sleepy", + "tired_face", + "grimacing", + "sob", + "open_mouth", + "hushed", + "cold_sweat", + "scream", + "astonished", + "flushed", + "sleeping", + "dizzy_face", + "no_mouth", + "mask", + "smile_cat", + "joy_cat", + "smiley_cat", + "heart_eyes_cat", + "smirk_cat", + "kissing_cat", + "pouting_cat", + "crying_cat_face", + "scream_cat", + "footprints", + "bust_in_silhouette", + "busts_in_silhouette", + "baby", + "boy", + "girl", + "man", + "woman", + "family", + "couple", + "two_men_holding_hands", + "two_women_holding_hands", + "dancers", + "bride_with_veil", + "person_with_blond_hair", + "man_with_gua_pi_mao", + "man_with_turban", + "older_man", + "older_woman", + "cop", + "construction_worker", + "princess", + "guardsman", + "angel", + "santa", + "ghost", + "japanese_ogre", + "japanese_goblin", + "hankey", + "skull", + "alien", + "space_invader", + "bow", + "information_desk_person", + "no_good", + "ok_woman", + "raising_hand", + "person_with_pouting_face", + "person_frowning", + "massage", + "haircut", + "couple_with_heart", + "couplekiss", + "raised_hands", + "clap", + "hand", + "ear", + "eyes", + "nose", + "lips", + "kiss", + "tongue", + "nail_care", + "wave", + "+1", + "-1", + "point_up", + "point_up_2", + "point_down", + "point_left", + "point_right", + "ok_hand", + "v", + "facepunch", + "fist", + "raised_hand", + "muscle", + "open_hands", + "pray", + "anger_right", + "eye", + "frowning2", + "hand_splayed", + "head_bandage", + "hugging", + "middle_finger", + "money_mouth", + "nerd", + "poop", + "punch", + "robot", + "rolling_eyes", + "skull_crossbones", + "slight_frown", + "speaking_head", + "spy", + "thinking", + "thumbsdown", + "thumbsup", + "upside_down", + "urn", + "vulcan", + "wind_blowing_face", + "writing_hand", + "zipper_mouth" + ] }, { - name: "nature", - fullname: "Nature", - tabicon: "evergreen_tree", - icons: ["seedling", "evergreen_tree", "deciduous_tree", "palm_tree", "cactus", "tulip", "cherry_blossom", "rose", "hibiscus", "sunflower", "blossom", "bouquet", "ear_of_rice", "herb", "four_leaf_clover", "maple_leaf", "fallen_leaf", "leaves", "mushroom", "chestnut", "rat", "mouse2", "mouse", "hamster", "ox", "water_buffalo", "cow2", "cow", "tiger2", "leopard", "tiger", "rabbit2", "rabbit", "cat2", "cat", "racehorse", "horse", "ram", "sheep", "goat", "rooster", "chicken", "baby_chick", "hatching_chick", "hatched_chick", "bird", "penguin", "elephant", "dromedary_camel", "camel", "boar", "pig2", "pig", "pig_nose", "dog2", "poodle", "dog", "wolf", "bear", "koala", "panda_face", "monkey_face", "see_no_evil", "hear_no_evil", "speak_no_evil", "monkey", "dragon", "dragon_face", "crocodile", "snake", "turtle", "frog", "whale2", "whale", "dolphin", "octopus", "fish", "tropical_fish", "blowfish", "shell", "snail", "bug", "ant", "bee", "beetle", "feet", "zap", "fire", "crescent_moon", "sunny", "partly_sunny", "cloud", "droplet", "sweat_drops", "umbrella", "dash", "snowflake", "star2", "star", "stars", "sunrise_over_mountains", "sunrise", "rainbow", "ocean", "volcano", "milky_way", "mount_fuji", "japan", "globe_with_meridians", "earth_africa", "earth_americas", "earth_asia", "new_moon", "waxing_crescent_moon", "first_quarter_moon", "moon", "full_moon", "waning_gibbous_moon", "last_quarter_moon", "waning_crescent_moon", "new_moon_with_face", "full_moon_with_face", "first_quarter_moon_with_face", "last_quarter_moon_with_face", "sun_with_face"] + name:"nature", + fullname:"Nature", + tabicon:"evergreen_tree", + icons:[ + "seedling", + "evergreen_tree", + "deciduous_tree", + "palm_tree", + "cactus", + "tulip", + "cherry_blossom", + "rose", + "hibiscus", + "sunflower", + "blossom", + "bouquet", + "ear_of_rice", + "herb", + "four_leaf_clover", + "maple_leaf", + "fallen_leaf", + "leaves", + "mushroom", + "chestnut", + "rat", + "mouse2", + "mouse", + "hamster", + "ox", + "water_buffalo", + "cow2", + "cow", + "tiger2", + "leopard", + "tiger", + "rabbit2", + "rabbit", + "cat2", + "cat", + "racehorse", + "horse", + "ram", + "sheep", + "goat", + "rooster", + "chicken", + "baby_chick", + "hatching_chick", + "hatched_chick", + "bird", + "penguin", + "elephant", + "dromedary_camel", + "camel", + "boar", + "pig2", + "pig", + "pig_nose", + "dog2", + "poodle", + "dog", + "wolf", + "bear", + "koala", + "panda_face", + "monkey_face", + "see_no_evil", + "hear_no_evil", + "speak_no_evil", + "monkey", + "dragon", + "dragon_face", + "crocodile", + "snake", + "turtle", + "frog", + "whale2", + "whale", + "dolphin", + "octopus", + "fish", + "tropical_fish", + "blowfish", + "shell", + "snail", + "bug", + "ant", + "bee", + "beetle", + "feet", + "zap", + "fire", + "crescent_moon", + "sunny", + "partly_sunny", + "cloud", + "droplet", + "sweat_drops", + "umbrella", + "dash", + "snowflake", + "star2", + "star", + "stars", + "sunrise_over_mountains", + "sunrise", + "rainbow", + "ocean", + "volcano", + "milky_way", + "mount_fuji", + "japan", + "globe_with_meridians", + "earth_africa", + "earth_americas", + "earth_asia", + "new_moon", + "waxing_crescent_moon", + "first_quarter_moon", + "moon", + "full_moon", + "waning_gibbous_moon", + "last_quarter_moon", + "waning_crescent_moon", + "new_moon_with_face", + "full_moon_with_face", + "first_quarter_moon_with_face", + "last_quarter_moon_with_face", + "sun_with_face", + "chipmunk", + "cloud_lightning", + "cloud_rain", + "cloud_snow", + "cloud_tornado", + "comet", + "crab", + "dove", + "fog", + "lion_face", + "scorpion", + "spider", + "spider_web", + "thunder_cloud_rain", + "turkey", + "unicorn", + "waxing_gibbous_moon", + "white_sun_cloud", + "white_sun_rain_cloud", + "white_sun_small_cloud" + ] }, { - name: "food", - fullname: "Food & Drink", - tabicon: "hamburger", - icons: ["tomato", "eggplant", "corn", "sweet_potato", "grapes", "melon", "watermelon", "tangerine", "lemon", "banana", "pineapple", "apple", "green_apple", "pear", "peach", "cherries", "strawberry", "hamburger", "pizza", "meat_on_bone", "poultry_leg", "rice_cracker", "rice_ball", "rice", "curry", "ramen", "spaghetti", "bread", "fries", "dango", "oden", "sushi", "fried_shrimp", "fish_cake", "icecream", "shaved_ice", "ice_cream", "doughnut", "cookie", "chocolate_bar", "candy", "lollipop", "custard", "honey_pot", "cake", "bento", "stew", "egg", "fork_and_knife", "tea", "coffee", "sake", "wine_glass", "cocktail", "tropical_drink", "beer", "beers", "baby_bottle"] + name:"food", + fullname:"Food & Drink", + tabicon:"hamburger", + icons:[ + "tomato", + "eggplant", + "corn", + "sweet_potato", + "grapes", + "melon", + "watermelon", + "tangerine", + "lemon", + "banana", + "pineapple", + "apple", + "green_apple", + "pear", + "peach", + "cherries", + "strawberry", + "hamburger", + "pizza", + "meat_on_bone", + "poultry_leg", + "rice_cracker", + "rice_ball", + "rice", + "curry", + "ramen", + "spaghetti", + "bread", + "fries", + "dango", + "oden", + "sushi", + "fried_shrimp", + "fish_cake", + "icecream", + "shaved_ice", + "ice_cream", + "doughnut", + "cookie", + "chocolate_bar", + "candy", + "lollipop", + "custard", + "honey_pot", + "cake", + "bento", + "stew", + "egg", + "fork_and_knife", + "tea", + "coffee", + "sake", + "wine_glass", + "cocktail", + "tropical_drink", + "beer", + "beers", + "baby_bottle", + "burrito", + "champagne", + "cheese", + "hot_pepper", + "hotdog", + "taco" + ] }, { - name: "celebration", - fullname: "Celebration", - tabicon: "gift", - icons: ["ribbon", "gift", "birthday", "jack_o_lantern", "christmas_tree", "tanabata_tree", "bamboo", "rice_scene", "fireworks", "sparkler", "tada", "confetti_ball", "balloon", "dizzy", "sparkles", "boom", "mortar_board", "crown", "dolls", "flags", "wind_chime", "crossed_flags", "izakaya_lantern", "ring", "heart", "broken_heart", "love_letter", "two_hearts", "revolving_hearts", "heartbeat", "heartpulse", "sparkling_heart", "cupid", "gift_heart", "heart_decoration", "purple_heart", "yellow_heart", "green_heart", "blue_heart"] + name:"celebration", + fullname:"Celebration", + tabicon:"gift", + icons:[ + "ribbon", + "gift", + "birthday", + "jack_o_lantern", + "christmas_tree", + "tanabata_tree", + "bamboo", + "rice_scene", + "fireworks", + "sparkler", + "tada", + "confetti_ball", + "balloon", + "dizzy", + "sparkles", + "boom", + "mortar_board", + "crown", + "dolls", + "flags", + "wind_chime", + "crossed_flags", + "izakaya_lantern", + "ring", + "heart", + "broken_heart", + "love_letter", + "two_hearts", + "revolving_hearts", + "heartbeat", + "heartpulse", + "sparkling_heart", + "cupid", + "gift_heart", + "heart_decoration", + "purple_heart", + "yellow_heart", + "green_heart", + "blue_heart", + "heart_exclamation" + ] }, { - name: "activity", - fullname: "Activities", - tabicon: "soccer", - icons: ["runner", "walking", "dancer", "rowboat", "swimmer", "surfer", "bath", "snowboarder", "ski", "snowman", "bicyclist", "mountain_bicyclist", "horse_racing", "tent", "fishing_pole_and_fish", "soccer", "basketball", "football", "baseball", "tennis", "rugby_football", "golf", "trophy", "running_shirt_with_sash", "checkered_flag", "musical_keyboard", "guitar", "violin", "saxophone", "trumpet", "musical_note", "notes", "musical_score", "headphones", "microphone", "performing_arts", "ticket", "tophat", "circus_tent", "clapper", "art", "dart", "8ball", "bowling", "slot_machine", "game_die", "video_game", "flower_playing_cards", "black_joker", "mahjong", "carousel_horse", "ferris_wheel", "roller_coaster"] + name:"activity", + fullname:"Activities", + tabicon:"soccer", + icons:[ + "runner", + "walking", + "dancer", + "rowboat", + "swimmer", + "surfer", + "bath", + "snowboarder", + "ski", + "snowman", + "bicyclist", + "mountain_bicyclist", + "horse_racing", + "tent", + "fishing_pole_and_fish", + "soccer", + "basketball", + "football", + "baseball", + "tennis", + "rugby_football", + "golf", + "trophy", + "running_shirt_with_sash", + "checkered_flag", + "musical_keyboard", + "guitar", + "violin", + "saxophone", + "trumpet", + "musical_note", + "notes", + "musical_score", + "headphones", + "microphone", + "performing_arts", + "ticket", + "tophat", + "circus_tent", + "clapper", + "art", + "dart", + "8ball", + "bowling", + "slot_machine", + "game_die", + "video_game", + "flower_playing_cards", + "black_joker", + "mahjong", + "carousel_horse", + "ferris_wheel", + "roller_coaster", + "badminton", + "ballot_box", + "basketball_player", + "bow_and_arrow", + "cricket", + "crossed_swords", + "field_hockey", + "golfer", + "hockey", + "ice_skate", + "paintbrush", + "skier", + "snowman2", + "stadium", + "volleyball" + ] }, { - name: "travel", - fullname: "Travel & Places", - tabicon: "airplane", - icons: ["train", "mountain_railway", "railway_car", "steam_locomotive", "monorail", "bullettrain_side", "bullettrain_front", "train2", "metro", "light_rail", "station", "tram", "bus", "oncoming_bus", "trolleybus", "minibus", "ambulance", "fire_engine", "police_car", "oncoming_police_car", "rotating_light", "taxi", "oncoming_taxi", "car", "oncoming_automobile", "blue_car", "truck", "articulated_lorry", "tractor", "bike", "busstop", "fuelpump", "construction", "vertical_traffic_light", "traffic_light", "rocket", "helicopter", "airplane", "seat", "anchor", "ship", "speedboat", "boat", "aerial_tramway", "mountain_cableway", "suspension_railway", "passport_control", "customs", "baggage_claim", "left_luggage", "yen", "euro", "pound", "dollar", "statue_of_liberty", "moyai", "foggy", "tokyo_tower", "fountain", "european_castle", "japanese_castle", "city_sunrise", "city_sunset", "night_with_stars", "bridge_at_night", "house", "house_with_garden", "office", "department_store", "factory", "post_office", "european_post_office", "hospital", "bank", "hotel", "love_hotel", "wedding", "church", "convenience_store", "school", "cn", "de", "es", "fr", "gb", "it", "jp", "kr", "ru", "us"] + name:"travel", + fullname:"Travel & Places", + tabicon:"airplane", + icons:[ + "train", + "mountain_railway", + "railway_car", + "steam_locomotive", + "monorail", + "bullettrain_side", + "bullettrain_front", + "train2", + "metro", + "light_rail", + "station", + "tram", + "bus", + "oncoming_bus", + "trolleybus", + "minibus", + "ambulance", + "fire_engine", + "police_car", + "oncoming_police_car", + "rotating_light", + "taxi", + "oncoming_taxi", + "car", + "oncoming_automobile", + "blue_car", + "truck", + "articulated_lorry", + "tractor", + "bike", + "busstop", + "fuelpump", + "construction", + "vertical_traffic_light", + "traffic_light", + "rocket", + "helicopter", + "airplane", + "seat", + "anchor", + "ship", + "speedboat", + "boat", + "aerial_tramway", + "mountain_cableway", + "suspension_railway", + "passport_control", + "customs", + "baggage_claim", + "left_luggage", + "yen", + "euro", + "pound", + "dollar", + "statue_of_liberty", + "moyai", + "foggy", + "tokyo_tower", + "fountain", + "european_castle", + "japanese_castle", + "city_sunrise", + "city_sunset", + "night_with_stars", + "bridge_at_night", + "house", + "house_with_garden", + "office", + "department_store", + "factory", + "post_office", + "european_post_office", + "hospital", + "bank", + "hotel", + "love_hotel", + "wedding", + "church", + "convenience_store", + "school", + "cn", + "de", + "es", + "fr", + "gb", + "it", + "jp", + "kr", + "ru", + "us", + "airplane_arriving", + "airplane_departure", + "airplane_small", + "beach", + "beach_umbrella", + "camping", + "city_dusk", + "cityscape", + "classical_building", + "construction_site", + "cruise_ship", + "desert", + "ferry", + "flag_black", + "flag_cn", + "flag_de", + "flag_es", + "flag_fr", + "flag_gb", + "flag_it", + "flag_jp", + "flag_kr", + "flag_ru", + "flag_us", + "flag_white", + "hole", + "homes", + "house_abandoned", + "island", + "kaaba", + "map", + "mosque", + "motorboat", + "motorcycle", + "motorway", + "mountain", + "mountain_snow", + "park", + "place_of_worship", + "race_car", + "railway_track", + "red_car", + "sailboat", + "shinto_shrine", + "sleeping_accommodation", + "synagogue" + ] }, { - name: "objects", - fullname: "Objects & Symbols", - tabicon: "eyeglasses", - icons: ["watch", "iphone", "calling", "computer", "alarm_clock", "hourglass_flowing_sand", "hourglass", "camera", "video_camera", "movie_camera", "tv", "radio", "pager", "telephone_receiver", "phone", "fax", "minidisc", "floppy_disk", "cd", "dvd", "vhs", "battery", "electric_plug", "bulb", "flashlight", "satellite", "credit_card", "money_with_wings", "moneybag", "gem", "closed_umbrella", "pouch", "purse", "handbag", "briefcase", "school_satchel", "lipstick", "eyeglasses", "womans_hat", "sandal", "high_heel", "boot", "mans_shoe", "athletic_shoe", "bikini", "dress", "kimono", "womans_clothes", "shirt", "necktie", "jeans", "door", "shower", "bathtub", "toilet", "barber", "syringe", "pill", "microscope", "telescope", "crystal_ball", "wrench", "hocho", "nut_and_bolt", "hammer", "bomb", "smoking", "gun", "bookmark", "newspaper", "key", "email", "envelope_with_arrow", "incoming_envelope", "e-mail", "inbox_tray", "outbox_tray", "package", "postal_horn", "postbox", "mailbox_closed", "mailbox", "mailbox_with_mail", "mailbox_with_no_mail", "page_facing_up", "page_with_curl", "bookmark_tabs", "chart_with_upwards_trend", "chart_with_downwards_trend", "bar_chart", "date", "calendar", "low_brightness", "high_brightness", "scroll", "clipboard", "book", "notebook", "notebook_with_decorative_cover", "ledger", "closed_book", "green_book", "blue_book", "orange_book", "books", "card_index", "link", "paperclip", "pushpin", "scissors", "triangular_ruler", "round_pushpin", "straight_ruler", "triangular_flag_on_post", "file_folder", "open_file_folder", "black_nib", "pencil2", "memo", "lock_with_ink_pen", "closed_lock_with_key", "lock", "unlock", "mega", "loudspeaker", "sound", "loud_sound", "speaker", "mute", "zzz", "bell", "no_bell", "thought_balloon", "speech_balloon", "children_crossing", "mag", "mag_right", "no_entry_sign", "no_entry", "name_badge", "no_pedestrians", "do_not_litter", "no_bicycles", "non-potable_water", "no_mobile_phones", "underage", "accept", "ideograph_advantage", "white_flower", "secret", "congratulations", "u5408", "u6e80", "u7981", "u6709", "u7121", "u7533", "u55b6", "u6708", "u5272", "u7a7a", "sa", "koko", "u6307", "chart", "sparkle", "eight_spoked_asterisk", "negative_squared_cross_mark", "white_check_mark", "eight_pointed_black_star", "vibration_mode", "mobile_phone_off", "vs", "a", "b", "ab", "cl", "o2", "sos", "id", "parking", "wc", "cool", "free", "new", "ng", "ok", "up", "atm", "aries", "taurus", "gemini", "cancer", "leo", "virgo", "libra", "scorpius", "sagittarius", "capricorn", "aquarius", "pisces", "restroom", "mens", "womens", "baby_symbol", "wheelchair", "potable_water", "no_smoking", "put_litter_in_its_place", "arrow_forward", "arrow_backward", "arrow_up_small", "arrow_down_small", "fast_forward", "rewind", "arrow_double_up", "arrow_double_down", "arrow_right", "arrow_left", "arrow_up", "arrow_down", "arrow_upper_right", "arrow_lower_right", "arrow_lower_left", "arrow_upper_left", "arrow_up_down", "left_right_arrow", "arrows_counterclockwise", "arrow_right_hook", "leftwards_arrow_with_hook", "arrow_heading_up", "arrow_heading_down", "twisted_rightwards_arrows", "repeat", "repeat_one", "zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "keycap_ten", "1234", "hash", "abc", "abcd", "capital_abcd", "information_source", "signal_strength", "cinema", "symbols", "heavy_plus_sign", "heavy_minus_sign", "wavy_dash", "heavy_division_sign", "heavy_multiplication_x", "heavy_check_mark", "arrows_clockwise", "tm", "copyright", "registered", "currency_exchange", "heavy_dollar_sign", "curly_loop", "loop", "part_alternation_mark", "exclamation", "bangbang", "question", "grey_exclamation", "grey_question", "interrobang", "x", "o", "100", "end", "back", "on", "top", "soon", "cyclone", "m", "ophiuchus", "six_pointed_star", "beginner", "trident", "warning", "hotsprings", "recycle", "anger", "diamond_shape_with_a_dot_inside", "spades", "clubs", "hearts", "diamonds", "ballot_box_with_check", "white_circle", "black_circle", "radio_button", "red_circle", "large_blue_circle", "small_red_triangle", "small_red_triangle_down", "small_orange_diamond", "small_blue_diamond", "large_orange_diamond", "large_blue_diamond", "black_small_square", "white_small_square", "black_large_square", "white_large_square", "black_medium_square", "white_medium_square", "black_medium_small_square", "white_medium_small_square", "black_square_button", "white_square_button", "clock1", "clock2", "clock3", "clock4", "clock5", "clock6", "clock7", "clock8", "clock9", "clock10", "clock11", "clock12", "clock130", "clock230", "clock330", "clock430", "clock530", "clock630", "clock730", "clock830", "clock930", "clock1030", "clock1130", "clock1230"] + name:"objects", + fullname:"Objects & Symbols", + tabicon:"eyeglasses", + icons:[ + "watch", + "iphone", + "calling", + "computer", + "alarm_clock", + "hourglass_flowing_sand", + "hourglass", + "camera", + "video_camera", + "movie_camera", + "tv", + "radio", + "pager", + "telephone_receiver", + "phone", + "fax", + "minidisc", + "floppy_disk", + "cd", + "dvd", + "vhs", + "battery", + "electric_plug", + "bulb", + "flashlight", + "satellite", + "credit_card", + "money_with_wings", + "moneybag", + "gem", + "closed_umbrella", + "pouch", + "purse", + "handbag", + "briefcase", + "school_satchel", + "lipstick", + "eyeglasses", + "womans_hat", + "sandal", + "high_heel", + "boot", + "mans_shoe", + "athletic_shoe", + "bikini", + "dress", + "kimono", + "womans_clothes", + "shirt", + "necktie", + "jeans", + "door", + "shower", + "bathtub", + "toilet", + "barber", + "syringe", + "pill", + "microscope", + "telescope", + "crystal_ball", + "wrench", + "hocho", + "nut_and_bolt", + "hammer", + "bomb", + "smoking", + "gun", + "bookmark", + "newspaper", + "key", + "email", + "envelope_with_arrow", + "incoming_envelope", + "e-mail", + "inbox_tray", + "outbox_tray", + "package", + "postal_horn", + "postbox", + "mailbox_closed", + "mailbox", + "mailbox_with_mail", + "mailbox_with_no_mail", + "page_facing_up", + "page_with_curl", + "bookmark_tabs", + "chart_with_upwards_trend", + "chart_with_downwards_trend", + "bar_chart", + "date", + "calendar", + "low_brightness", + "high_brightness", + "scroll", + "clipboard", + "book", + "notebook", + "notebook_with_decorative_cover", + "ledger", + "closed_book", + "green_book", + "blue_book", + "orange_book", + "books", + "card_index", + "link", + "paperclip", + "pushpin", + "scissors", + "triangular_ruler", + "round_pushpin", + "straight_ruler", + "triangular_flag_on_post", + "file_folder", + "open_file_folder", + "black_nib", + "pencil2", + "memo", + "lock_with_ink_pen", + "closed_lock_with_key", + "lock", + "unlock", + "mega", + "loudspeaker", + "sound", + "loud_sound", + "speaker", + "mute", + "zzz", + "bell", + "no_bell", + "thought_balloon", + "speech_balloon", + "children_crossing", + "mag", + "mag_right", + "no_entry_sign", + "no_entry", + "name_badge", + "no_pedestrians", + "do_not_litter", + "no_bicycles", + "non-potable_water", + "no_mobile_phones", + "underage", + "accept", + "ideograph_advantage", + "white_flower", + "secret", + "congratulations", + "u5408", + "u6e80", + "u7981", + "u6709", + "u7121", + "u7533", + "u55b6", + "u6708", + "u5272", + "u7a7a", + "sa", + "koko", + "u6307", + "chart", + "sparkle", + "eight_spoked_asterisk", + "negative_squared_cross_mark", + "white_check_mark", + "eight_pointed_black_star", + "vibration_mode", + "mobile_phone_off", + "vs", + "a", + "b", + "ab", + "cl", + "o2", + "sos", + "id", + "parking", + "wc", + "cool", + "free", + "new", + "ng", + "ok", + "up", + "atm", + "aries", + "taurus", + "gemini", + "cancer", + "leo", + "virgo", + "libra", + "scorpius", + "sagittarius", + "capricorn", + "aquarius", + "pisces", + "restroom", + "mens", + "womens", + "baby_symbol", + "wheelchair", + "potable_water", + "no_smoking", + "put_litter_in_its_place", + "arrow_forward", + "arrow_backward", + "arrow_up_small", + "arrow_down_small", + "fast_forward", + "rewind", + "arrow_double_up", + "arrow_double_down", + "arrow_right", + "arrow_left", + "arrow_up", + "arrow_down", + "arrow_upper_right", + "arrow_lower_right", + "arrow_lower_left", + "arrow_upper_left", + "arrow_up_down", + "left_right_arrow", + "arrows_counterclockwise", + "arrow_right_hook", + "leftwards_arrow_with_hook", + "arrow_heading_up", + "arrow_heading_down", + "twisted_rightwards_arrows", + "repeat", + "repeat_one", + "zero", + "one", + "two", + "three", + "four", + "five", + "six", + "seven", + "eight", + "nine", + "keycap_ten", + "1234", + "hash", + "abc", + "abcd", + "capital_abcd", + "information_source", + "signal_strength", + "cinema", + "symbols", + "heavy_plus_sign", + "heavy_minus_sign", + "wavy_dash", + "heavy_division_sign", + "heavy_multiplication_x", + "heavy_check_mark", + "arrows_clockwise", + "tm", + "copyright", + "registered", + "currency_exchange", + "heavy_dollar_sign", + "curly_loop", + "loop", + "part_alternation_mark", + "exclamation", + "bangbang", + "question", + "grey_exclamation", + "grey_question", + "interrobang", + "x", + "o", + "100", + "end", + "back", + "on", + "top", + "soon", + "cyclone", + "m", + "ophiuchus", + "six_pointed_star", + "beginner", + "trident", + "warning", + "hotsprings", + "recycle", + "anger", + "diamond_shape_with_a_dot_inside", + "spades", + "clubs", + "hearts", + "diamonds", + "ballot_box_with_check", + "white_circle", + "black_circle", + "radio_button", + "red_circle", + "large_blue_circle", + "small_red_triangle", + "small_red_triangle_down", + "small_orange_diamond", + "small_blue_diamond", + "large_orange_diamond", + "large_blue_diamond", + "black_small_square", + "white_small_square", + "black_large_square", + "white_large_square", + "black_medium_square", + "white_medium_square", + "black_medium_small_square", + "white_medium_small_square", + "black_square_button", + "white_square_button", + "clock1", + "clock2", + "clock3", + "clock4", + "clock5", + "clock6", + "clock7", + "clock8", + "clock9", + "clock10", + "clock11", + "clock12", + "clock130", + "clock230", + "clock330", + "clock430", + "clock530", + "clock630", + "clock730", + "clock830", + "clock930", + "clock1030", + "clock1130", + "clock1230", + "alembic", + "amphora", + "atom", + "biohazard", + "bed", + "bellhop", + "calendar_spiral", + "camera_with_flash", + "candle", + "card_box", + "chains", + "clock", + "coffin", + "compression", + "control_knobs", + "couch", + "crayon", + "cross", + "dagger", + "dark_sunglasses", + "desktop", + "dividers", + "envelope", + "file_cabinet", + "film_frames", + "fleur-de-lis", + "fork_knife_plate", + "frame_photo", + "gear", + "hammer_pick", + "helmet_with_cross", + "joystick", + "key2", + "keyboard", + "knife", + "label", + "level_slider", + "levitate", + "lifter", + "medal", + "menorah", + "metal", + "microphone2", + "military_medal", + "mouse_three_button", + "newspaper2", + "notepad_spiral", + "oil", + "om_symbol", + "orthodox_cross", + "paperclips", + "pause_button", + "peace", + "pen_ballpoint", + "pen_fountain", + "pencil", + "pick", + "ping_pong", + "play_pause", + "popcorn", + "prayer_beads", + "printer", + "projector", + "radioactive", + "record_button", + "reminder_ribbon", + "rosette", + "satellite_orbital", + "scales", + "shamrock", + "shield", + "shopping_bags", + "star_and_crescent", + "star_of_david", + "stop_button", + "stopwatch", + "telephone", + "ten", + "thermometer", + "thermometer_face", + "tickets", + "timer", + "tools", + "track_next", + "track_previous", + "trackball", + "umbrella2", + "wastebasket", + "wheel_of_dharma", + "yin_yang", + ] } ]; diff --git a/app/assets/javascripts/discourse/lib/emoji/emoji-toolbar.js.es6 b/app/assets/javascripts/discourse/lib/emoji/emoji-toolbar.js.es6 index 7df7dd75cf..47d77040dd 100644 --- a/app/assets/javascripts/discourse/lib/emoji/emoji-toolbar.js.es6 +++ b/app/assets/javascripts/discourse/lib/emoji/emoji-toolbar.js.es6 @@ -161,7 +161,7 @@ function showSelector(options) { options.appendTo.append('
'); $('.emoji-modal-wrapper').click(() => closeSelector()); - if (Discourse.Mobile.mobileView) PER_ROW = 9; + if (Discourse.Site.currentProp('mobileView')) { PER_ROW = 9; } const page = keyValueStore.getInt("emojiPage", 0); const offset = keyValueStore.getInt("emojiOffset", 0); diff --git a/app/assets/javascripts/discourse/lib/emoji/emoji.js.erb b/app/assets/javascripts/discourse/lib/emoji/emoji.js.erb index 67313d67fb..777983ea9b 100644 --- a/app/assets/javascripts/discourse/lib/emoji/emoji.js.erb +++ b/app/assets/javascripts/discourse/lib/emoji/emoji.js.erb @@ -1,7 +1,8 @@ // TODO @robin to move this whole thing to es6 Discourse.Emoji = {}; + // bump up this number to expire all emojis -Discourse.Emoji.ImageVersion = "1" +Discourse.Emoji.ImageVersion = "2" var emoji = <%= Emoji.standard.map(&:name).flatten.inspect %>; var aliases = <%= Emoji.aliases.inspect.gsub("=>", ":") %>; @@ -12,6 +13,15 @@ Discourse.Dialect.registerEmoji = function(code, url) { extendedEmoji[code] = url; }; +var _unicodeReplacements; +var _unicodeRegexp; +Discourse.Dialect.setUnicodeReplacements = function(replacements) { + _unicodeReplacements = replacements; + if (replacements) { + _unicodeRegexp = new RegExp(Object.keys(replacements).join("|"), "g"); + } +} + // This method is used by PrettyText to reset custom emojis in multisites Discourse.Dialect.resetEmojis = function() { extendedEmoji = {}; @@ -38,9 +48,11 @@ var emojiHash = {}; // add all default emojis emoji.forEach(function(code){ emojiHash[code] = true; }); // and their aliases + +var aliasHash = {}; for (var name in aliases) { aliases[name].forEach(function(alias) { - emojiHash[alias] = true; + aliasHash[alias] = name; }); } @@ -99,8 +111,8 @@ function imageFor(code) { // Also support default emotions var translations = { - ':)' : 'slightly_smiling', - ':-)' : 'slightly_smiling', + ':)' : 'slight_smile', + ':-)' : 'slight_smile', ':(' : 'frowning', ':-(' : 'frowning', ';)' : 'wink', @@ -151,6 +163,19 @@ Object.keys(translations).forEach(function (t) { } }); +Discourse.Dialect.addPreProcessor(function(text) { + if (_unicodeReplacements) { + _unicodeRegexp.lastIndex = 0; + + var m; + while ((m = _unicodeRegexp.exec(text)) !== null) { + text = text.replace(m[0], ":" + _unicodeReplacements[m[0]] + ":"); + } + } + + return text; +}); + function escapeRegExp(s) { return s.replace(/[-/\\^$*+?.()|[\]{}]/gi, '\\$&'); } @@ -198,27 +223,29 @@ Discourse.Emoji.search = function(term, options) { var maxResults = (options && options["maxResults"]) || -1; if (maxResults === 0) { return []; } - toSearch = toSearch || _.union(_.keys(emojiHash), _.keys(extendedEmoji)).sort(); + toSearch = toSearch || _.union(_.keys(emojiHash), _.keys(extendedEmoji), _.keys(aliasHash)).sort(); var i, results = []; - - var done = function() { + function addResult(term) { + var val = aliasHash[term] || term; + if (results.indexOf(val) === -1) { + results.push(val); + } return maxResults > 0 && results.length >= maxResults; } - for (i=0; i < toSearch.length; i++) { - if (toSearch[i].indexOf(term) === 0) { - results.push(toSearch[i]); - if(done()) { break; } + var item; + for (i=0; i 0) { - results.push(toSearch[i]); - if(done()) { break; } - } + for (i=0; i scrollTop) { + if (top >= scrollTop) { return false; } index += 1; @@ -312,12 +316,7 @@ export default { } if ($article.is('.topic-post')) { - let tabLoc = $article.find('a.tabLoc'); - if (tabLoc.length === 0) { - tabLoc = $(''); - $article.prepend(tabLoc); - } - tabLoc.focus(); + $('a.tabLoc', $article).focus(); } this._scrollList($article, direction); diff --git a/app/assets/javascripts/discourse/lib/mobile.js b/app/assets/javascripts/discourse/lib/mobile.js.es6 similarity index 78% rename from app/assets/javascripts/discourse/lib/mobile.js rename to app/assets/javascripts/discourse/lib/mobile.js.es6 index 552e3f6873..561a05458a 100644 --- a/app/assets/javascripts/discourse/lib/mobile.js +++ b/app/assets/javascripts/discourse/lib/mobile.js.es6 @@ -1,10 +1,10 @@ // An object that is responsible for logic related to mobile devices. -Discourse.Mobile = { +const Mobile = { isMobileDevice: false, mobileView: false, - init: function() { - var $html = $('html'); + init() { + const $html = $('html'); this.isMobileDevice = $html.hasClass('mobile-device'); this.mobileView = $html.hasClass('mobile-view'); @@ -42,3 +42,13 @@ Discourse.Mobile = { window.location.assign(window.location.pathname + '?mobile_view=' + (mobile ? '1' : '0')); } }; + +// Backwards compatibiltity, deprecated +Object.defineProperty(Discourse, 'Mobile', { + get: function() { + Ember.warn("DEPRECATION: `Discourse.Mobile` is deprecated, use `this.site.mobileView` instead"); + return Mobile; + } +}); + +export default Mobile; diff --git a/app/assets/javascripts/discourse/lib/page-tracker.js.es6 b/app/assets/javascripts/discourse/lib/page-tracker.js.es6 index 351c78211e..7e63b5c731 100644 --- a/app/assets/javascripts/discourse/lib/page-tracker.js.es6 +++ b/app/assets/javascripts/discourse/lib/page-tracker.js.es6 @@ -1,37 +1,34 @@ -import Singleton from 'discourse/mixins/singleton'; +const PageTracker = Ember.Object.extend(Ember.Evented); +let _pageTracker = PageTracker.create(); -/** - Called whenever the "page" changes. This allows us to set up analytics - and other tracking. +let _started = false; +export function startPageTracking(router) { + if (_started) { return; } - To get notified when the page changes, you can install a hook like so: + router.on('didTransition', function() { + this.send('refreshTitle'); + const url = Discourse.getURL(this.get('url')); - ```javascript - PageTracker.current().on('change', function(url, title) { - console.log('the page changed to: ' + url + ' and title ' + title); + // Refreshing the title is debounced, so we need to trigger this in the + // next runloop to have the correct title. + Em.run.next(() => { + _pageTracker.trigger('change', url, Discourse.get('_docTitle')); }); - ``` -**/ -const PageTracker = Ember.Object.extend(Ember.Evented, { - start: function() { - if (this.get('started')) { return; } + }); + _started = true; +} - var router = Discourse.__container__.lookup('router:main'), - self = this; +export function onPageChange(fn) { + _pageTracker.on('change', fn); +} - router.on('didTransition', function() { - this.send('refreshTitle'); - var url = Discourse.getURL(this.get('url')); - - // Refreshing the title is debounced, so we need to trigger this in the - // next runloop to have the correct title. - Em.run.next(function() { - self.trigger('change', url, Discourse.get('_docTitle')); - }); - }); - this.set('started', true); +// backwards compatibility +const BackwardsCompat = { + current() { + console.warn(`Using PageTracker.current() is deprecated. Your plugin should use the PluginAPI`); + return _pageTracker; } -}); -PageTracker.reopenClass(Singleton); +}; -export default PageTracker; +Discourse.PageTracker = BackwardsCompat; +export default BackwardsCompat; diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6 index 5a700db5f2..947fae6f73 100644 --- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 +++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6 @@ -1,4 +1,302 @@ +import { iconNode } from 'discourse/helpers/fa-icon'; +import { addDecorator } from 'discourse/widgets/post-cooked'; import ComposerEditor from 'discourse/components/composer-editor'; +import { addButton } from 'discourse/widgets/post-menu'; +import { includeAttributes } from 'discourse/lib/transform-post'; +import { addToolbarCallback } from 'discourse/components/d-editor'; +import { addWidgetCleanCallback } from 'discourse/components/mount-widget'; +import { decorateWidget, changeSetting } from 'discourse/widgets/widget'; +import { onPageChange } from 'discourse/lib/page-tracker'; +import { preventCloak } from 'discourse/widgets/post-stream'; + +class PluginApi { + constructor(version, container) { + this.version = version; + this.container = container; + this._currentUser = container.lookup('current-user:main'); + } + + /** + * Use this function to retrieve the currently logged in user within your plugin. + * If the user is not logged in, it will be `null`. + **/ + getCurrentUser() { + return this._currentUser; + } + + /** + * Used for decorating the `cooked` content of a post after it is rendered using + * jQuery. + * + * `callback` will be called when it is time to decorate with a jQuery selector. + * + * Use `options.onlyStream` if you only want to decorate posts within a topic, + * and not in other places like the user stream. + * + * For example, to add a yellow background to all posts you could do this: + * + * ``` + * api.decorateCooked($elem => $elem.css({ backgroundColor: 'yellow' })); + * ``` + **/ + decorateCooked(callback, opts) { + opts = opts || {}; + + addDecorator(callback); + + if (!opts.onlyStream) { + decorate(ComposerEditor, 'previewRefreshed', callback); + decorate(this.container.lookupFactory('view:user-stream'), 'didInsertElement', callback); + } + } + + /** + * addPosterIcon(callback) + * + * This function can be used to add an icon with a link that will be displayed + * beside a poster's name. The `callback` is called with the post's user custom + * fields and post attrions. An icon will be rendered if the callback returns + * an object with the appropriate attributes. + * + * The returned object can have the following attributes: + * + * icon the font awesome icon to render + * emoji an emoji icon to render + * className (optional) a css class to apply to the icon + * url (optional) where to link the icon + * title (optional) the tooltip title for the icon on hover + * + * ``` + * api.addPosterIcon((cfs, attrs) => { + * if (cfs.customer) { + * return { icon: 'user', className: 'customer', title: 'customer' }; + * } + * }); + * ``` + **/ + addPosterIcon(cb) { + decorateWidget('poster-name:after', dec => { + const attrs = dec.attrs; + + const result = cb(attrs.userCustomFields || {}, attrs); + if (result) { + let iconBody; + + if (result.icon) { + iconBody = iconNode(result.icon); + } else if (result.emoji) { + iconBody = result.emoji.split('|').map(emoji => { + const src = Discourse.Emoji.urlFor(emoji); + return dec.h('img', { className: 'emoji', attributes: { src } }); + }); + } + + if (result.text) { + iconBody = [iconBody, result.text]; + } + + if (result.url) { + iconBody = dec.h('a', { attributes: { href: result.url } }, iconBody); + } + + + return dec.h('span', + { className: result.className, attributes: { title: result.title } }, + iconBody); + } + }); + } + + /** + * The main interface for extending widgets with additional HTML. + * + * The `name` you pass it should be the name of the widget and a type + * for the decorator. All widgets support `before` and `after` types. + * + * Example: + * + * ``` + * api.decorateWidget('post:after', () => { + * return "I am displayed after every post!"; + * }); + * ``` + * + * Your decorator will be called with an instance of a `DecoratorHelper` + * object, which provides methods you can use to build more interesting + * formatting. + * + * ``` + * api.decorateWidget('post:after', helper => { + * return helper.h('p.fancy', `I'm an HTML paragraph on post with id ${helper.attrs.id}`); + * }); + * + * (View the source for `DecoratorHelper` for more helper methods you + * can use in your plugin decorators.) + * + **/ + decorateWidget(name, fn) { + decorateWidget(name, fn); + } + + /** + * Adds a new action to a widget that already exists. You can use this to + * add additional functionality from your plugin. + * + * Example: + * + * ``` + * api.attachWidgetAction('post', 'annoyMe', () => { + * alert('ANNOYED!'); + * }); + * ``` + **/ + attachWidgetAction(widget, actionName, fn) { + const widgetClass = this.container.lookupFactory(`widget:${widget}`); + widgetClass.prototype[actionName] = fn; + } + + /** + * Add more attributes to the Post's `attrs` object passed through to widgets. + * You'll need to do this if you've added attributes to the serializer for a + * Post and want to use them when you're rendering. + * + * Example: + * + * ``` + * // attrs.poster_age and attrs.poster_height will be present + * api.includePostAttributes('poster_age', 'poster_height'); + * ``` + * + **/ + includePostAttributes(...attributes) { + includeAttributes(...attributes); + } + + /** + * Add a new button below a post with your plugin. + * + * The `callback` function will be called whenever the post menu is rendered, + * and if you return an object with the button details it will be rendered. + * + * Example: + * + * ``` + * api.addPostMenuButton('coffee', () => { + * return { + * action: 'drinkCoffee', + * icon: 'coffee', + * className: 'hot-coffee', + * title: 'coffee.title', + * position: 'first' // can be `first`, `last` or `second-last-hidden` + * }; + * }); + **/ + addPostMenuButton(name, callback) { + addButton(name, callback); + } + + /** + * A hook that is called when the editor toolbar is created. You can + * use this to add custom editor buttons. + * + * Example: + * + * ``` + * api.onToolbarCreate(toolbar => { + * toolbar.addButton({ + * id: 'pop-text', + * group: 'extras', + * icon: 'bolt', + * action: 'makeItPop', + * title: 'pop_format.title' + * }); + * }); + **/ + onToolbarCreate(callback) { + addToolbarCallback(callback); + } + + /** + * A hook that is called when the post stream is removed from the DOM. + * This advanced hook should be used if you end up wiring up any + * events that need to be torn down when the user leaves the topic + * page. + **/ + cleanupStream(fn) { + addWidgetCleanCallback('post-stream', fn); + } + + /** + Called whenever the "page" changes. This allows us to set up analytics + and other tracking. + + To get notified when the page changes, you can install a hook like so: + + ```javascript + api.onPageChange((url, title) => { + console.log('the page changed to: ' + url + ' and title ' + title); + }); + ``` + **/ + onPageChange(fn) { + onPageChange(fn); + } + + /** + * Changes a setting associated with a widget. For example, if + * you wanted small avatars in the post stream: + * + * ```javascript + * api.changeWidgetSetting('post-avatar', 'size', 'small'); + * ``` + * + **/ + changeWidgetSetting(widgetName, settingName, newValue) { + changeSetting(widgetName, settingName, newValue); + } + + /** + * Prevents an element in the post stream from being cloaked. + * This is useful if you are using a plugin such as youtube + * and don't want the video removed once it has begun + * playing. + * + * ```javascript + * api.preventCloak(1234); + * ``` + **/ + preventCloak(postId) { + preventCloak(postId); + } +} + +let _pluginv01; +function getPluginApi(version) { + if (version === "0.1") { + if (!_pluginv01) { + _pluginv01 = new PluginApi(version, Discourse.__container__); + } + return _pluginv01; + } else { + console.warn(`Plugin API v${version} is not supported`); + } +} + +/** + * withPluginApi(version, apiCode, noApi) + * + * 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 + * be called with the `PluginApi` object. +*/ +export function withPluginApi(version, apiCodeCallback, opts) { + opts = opts || {}; + + const api = getPluginApi(version); + if (api) { + return apiCodeCallback(api); + } +} let _decorateId = 0; function decorate(klass, evt, cb) { @@ -7,38 +305,6 @@ function decorate(klass, evt, cb) { klass.reopen(mixin); } -export function decorateCooked(container, cb) { - const postView = container.lookupFactory('view:post'); - decorate(postView, 'postViewInserted', cb); - decorate(postView, 'postViewUpdated', cb); - decorate(ComposerEditor, 'previewRefreshed', cb); - decorate(container.lookupFactory('view:embedded-post'), 'didInsertElement', cb); - decorate(container.lookupFactory('view:user-stream'), 'didInsertElement', cb); -} - -// This is backported so plugins in the new format will not raise errors -// -// To upgrade your plugin for backwards compatibility, you can add code in this -// form: -// -// function newApiCode(api) { -// // api.xyz(); -// } -// -// function oldCode() { -// // your pre-PluginAPI code goes here. You will be able to delete this -// // code once the `PluginAPI` has been rolled out to all versions of -// // Discourse you want to support. -// } -// -// // `newApiCode` will use API version 0.1, if no API support then -// // `oldCode` will be called -// withPluginApi('0.1', newApiCode, { noApi: oldCode }); -// -export function withPluginApi(version, apiCodeCallback, opts) { - console.warn(`Plugin API v${version} is not supported`); - - if (opts && opts.noApi) { - return opts.noApi(); - } +export function decorateCooked() { + console.warn('`decorateCooked` has been removed. Use `getPluginApi(version).decorateCooked` instead'); } diff --git a/app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6 b/app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6 index db7f1238a7..a57f46c9eb 100644 --- a/app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6 +++ b/app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6 @@ -1,6 +1,8 @@ -import { Placeholder } from 'discourse/views/cloaked'; import { default as computed } from 'ember-addons/ember-computed-decorators'; +export function Placeholder(viewName) { + this.viewName = viewName; +} export default Ember.Object.extend(Ember.Array, { posts: null, @@ -34,6 +36,11 @@ export default Ember.Object.extend(Ember.Array, { this._changeArray(cb, this.get('posts.length') - 1, 1, 0); }, + refreshAll(cb) { + const length = this.get('posts.length'); + this._changeArray(cb, 0, length, length); + }, + appending(postIds) { this._changeArray(() => { const appendingIds = this._appendingIds; diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 index 93e584f239..3506b06d6b 100644 --- a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 +++ b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 @@ -37,8 +37,6 @@ function positioningWorkaround($fixedElement) { if (evt) { evt.target.removeEventListener('blur', blurred); } - - $('body').removeData('disable-cloaked-view'); }; var blurred = _.debounce(blurredNow, 250); @@ -63,7 +61,6 @@ function positioningWorkaround($fixedElement) { // take care of body - $('body').data('disable-cloaked-view',true); $('#main-outlet').hide(); $('header').hide(); diff --git a/app/assets/javascripts/discourse/lib/screen-track.js.es6 b/app/assets/javascripts/discourse/lib/screen-track.js.es6 index 2bc9373870..60704ac4bb 100644 --- a/app/assets/javascripts/discourse/lib/screen-track.js.es6 +++ b/app/assets/javascripts/discourse/lib/screen-track.js.es6 @@ -1,22 +1,21 @@ // We use this class to track how long posts in a topic are on the screen. +const PAUSE_UNLESS_SCROLLED = 1000 * 60 * 3; +const MAX_TRACKING_TIME = 1000 * 60 * 6; +const ANON_MAX_TOPIC_IDS = 5; -import Singleton from 'discourse/mixins/singleton'; +const getTime = () => new Date().getTime(); -const PAUSE_UNLESS_SCROLLED = 1000 * 60 * 3, - MAX_TRACKING_TIME = 1000 * 60 * 6, - ANON_MAX_TOPIC_IDS = 5; - -const ScreenTrack = Ember.Object.extend({ - - init() { +export default class { + constructor(topicTrackingState, siteSettings, session, currentUser) { + this.topicTrackingState = topicTrackingState; + this.siteSettings = siteSettings; + this.session = session; + this.currentUser = currentUser; this.reset(); - - // TODO: Move `ScreenTrack` to injection and remove this - this.set('topicTrackingState', Discourse.__container__.lookup('topic-tracking-state:main')); - }, + } start(topicId, topicController) { - const currentTopicId = this.get('topicId'); + const currentTopicId = this._topicId; if (currentTopicId && (currentTopicId !== topicId)) { this.tick(); this.flush(); @@ -25,90 +24,81 @@ const ScreenTrack = Ember.Object.extend({ this.reset(); // Create an interval timer if we don't have one. - if (!this.get('interval')) { - const self = this; - this.set('interval', setInterval(function () { - self.tick(); - }, 1000)); - - $(window).on('scroll.screentrack', function(){self.scrolled();}); + if (!this._interval) { + this._interval = setInterval(() => this.tick(), 1000); + $(window).on('scroll.screentrack', () => this.scrolled()); } - this.set('topicId', topicId); - this.set('topicController', topicController); - }, + this._topicId = topicId; + this._topicController = topicController; + } stop() { - if(!this.get('topicId')) { - // already stopped no need to "extra stop" - return; - } + // already stopped no need to "extra stop" + if(!this._topicId) { return; } + $(window).off('scroll.screentrack'); this.tick(); this.flush(); this.reset(); - this.set('topicId', null); - this.set('topicController', null); - if (this.get('interval')) { - clearInterval(this.get('interval')); - this.set('interval', null); + + this._topicId = null; + this._topicController = null; + + if (this._interval) { + clearInterval(this._interval); + this._interval = null; } - }, + } - track(elementId, postNumber) { - this.get('timings')["#" + elementId] = { - time: 0, - postNumber: postNumber - }; - }, - - stopTracking(elementId) { - delete this.get('timings')['#' + elementId]; - }, + setOnscreen(onscreen) { + this._onscreen = onscreen; + } // Reset our timers reset() { - this.setProperties({ - lastTick: new Date().getTime(), - lastScrolled: new Date().getTime(), - lastFlush: 0, - cancelled: false, - timings: {}, - totalTimings: {}, - topicTime: 0 - }); - }, + const now = getTime(); + this._lastTick = now; + this._lastScrolled = now; + this._lastFlush = 0; + this._timings = {}; + this._totalTimings = {}; + this._topicTime = 0; + this._onscreen = []; + } scrolled() { - this.set('lastScrolled', new Date().getTime()); - }, + this._lastScrolled = getTime(); + } + + registerAnonCallback(cb) { + this._anonCallback = cb; + } flush() { - if (this.get('cancelled')) { return; } + const newTimings = {}; + const totalTimings = this._totalTimings; - const newTimings = {}, - totalTimings = this.get('totalTimings'), - self = this; + const timings = this._timings; + Object.keys(this._timings).forEach(postNumber => { + const time = timings[postNumber]; + totalTimings[postNumber] = totalTimings[postNumber] || 0; - _.each(this.get('timings'), function(timing) { - if (!totalTimings[timing.postNumber]) - totalTimings[timing.postNumber] = 0; - - if (timing.time > 0 && totalTimings[timing.postNumber] < MAX_TRACKING_TIME) { - totalTimings[timing.postNumber] += timing.time; - newTimings[timing.postNumber] = timing.time; + if (time > 0 && totalTimings[postNumber] < MAX_TRACKING_TIME) { + totalTimings[postNumber] += time; + newTimings[postNumber] = time; } - timing.time = 0; + timings[postNumber] = 0; }); - const topicId = parseInt(this.get('topicId'), 10); + const topicId = parseInt(this._topicId, 10); let highestSeen = 0; - _.each(newTimings, function(time,postNumber) { + Object.keys(newTimings).forEach(postNumber => { highestSeen = Math.max(highestSeen, parseInt(postNumber, 10)); }); - const highestSeenByTopic = Discourse.Session.currentProp('highestSeenByTopic'); + const highestSeenByTopic = this.session.get('highestSeenByTopic'); if ((highestSeenByTopic[topicId] || 0) < highestSeen) { highestSeenByTopic[topicId] = highestSeen; } @@ -116,11 +106,11 @@ const ScreenTrack = Ember.Object.extend({ this.topicTrackingState.updateSeen(topicId, highestSeen); if (!$.isEmptyObject(newTimings)) { - if (Discourse.User.current()) { + if (this.currentUser) { Discourse.ajax('/topics/timings', { data: { timings: newTimings, - topic_time: this.get('topicTime'), + topic_time: this._topicTime, topic_id: topicId }, cache: false, @@ -128,22 +118,20 @@ const ScreenTrack = Ember.Object.extend({ headers: { 'X-SILENCE-LOGGER': 'true' } - }).then(function() { - const controller = self.get('topicController'); + }).then(() => { + const controller = this._topicController; if (controller) { - const postNumbers = Object.keys(newTimings).map(function(v) { - return parseInt(v, 10); - }); + const postNumbers = Object.keys(newTimings).map(v => parseInt(v, 10)); controller.readPosts(topicId, postNumbers); } }); - } else if (this.get('anonFlushCallback')) { + } else if (this._anonCallback) { // Anonymous viewer - save to localStorage - const storage = this.get('keyValueStore'); + const storage = this.keyValueStore; // Save total time const existingTime = storage.getInt('anon-topic-time'); - storage.setItem('anon-topic-time', existingTime + this.get('topicTime')); + storage.setItem('anon-topic-time', existingTime + this._topicTime); // Save unique topic IDs up to a max let topicIds = storage.get('anon-topic-ids'); @@ -158,64 +146,47 @@ const ScreenTrack = Ember.Object.extend({ } // Inform the observer - this.get('anonFlushCallback')(); + this._anonCallback(); // No need to call controller.readPosts() } - this.set('topicTime', 0); + this._topicTime = 0; } - this.set('lastFlush', 0); - }, + + this._lastFlush = 0; + } tick() { + const now = new Date().getTime(); // If the user hasn't scrolled the browser in a long time, stop tracking time read - const sinceScrolled = new Date().getTime() - this.get('lastScrolled'); + const sinceScrolled = now - this._lastScrolled; if (sinceScrolled > PAUSE_UNLESS_SCROLLED) { return; } - const diff = new Date().getTime() - this.get('lastTick'); - this.set('lastFlush', this.get('lastFlush') + diff); - this.set('lastTick', new Date().getTime()); + const diff = now - this._lastTick; + this._lastFlush += diff; + this._lastTick = now; - const totalTimings = this.get('totalTimings'), timings = this.get('timings'); - const nextFlush = Discourse.SiteSettings.flush_timings_secs * 1000; + const totalTimings = this._totalTimings; + const timings = this._timings; + const nextFlush = this.siteSettings.flush_timings_secs * 1000; - // rush new post numbers - const rush = _.any(_.filter(timings, function(t){return t.time>0;}), function(t){ - return !totalTimings[t.postNumber]; + const rush = Object.keys(timings).some(postNumber => { + return timings[postNumber] > 0 && !totalTimings[postNumber]; }); - if (this.get('lastFlush') > nextFlush || rush) { + if (this._lastFlush > nextFlush || rush) { this.flush(); } // Don't track timings if we're not in focus if (!Discourse.get("hasFocus")) return; - this.set('topicTime', this.get('topicTime') + diff); - const docViewTop = $(window).scrollTop() + $('header').height(), - docViewBottom = docViewTop + $(window).height(); + this._topicTime += diff; - // TODO: Eyeline has a smarter more accurate function here. It's bad to do jQuery - // in a model like component, so we should refactor this out later. - _.each(this.get('timings'),function(timing,id) { - const $element = $(id); - if ($element.length === 1) { - const elemTop = $element.offset().top, - elemBottom = elemTop + $element.height(); - - // If part of the element is on the screen, increase the counter - if (((docViewTop <= elemTop && elemTop <= docViewBottom)) || ((docViewTop <= elemBottom && elemBottom <= docViewBottom))) { - timing.time = timing.time + diff; - } - } - }); + this._onscreen.forEach(postNumber => timings[postNumber] = (timings[postNumber] || 0) + diff); } -}); - - -ScreenTrack.reopenClass(Singleton); -export default ScreenTrack; +} diff --git a/app/assets/javascripts/discourse/lib/transform-post.js.es6 b/app/assets/javascripts/discourse/lib/transform-post.js.es6 new file mode 100644 index 0000000000..b3379004ed --- /dev/null +++ b/app/assets/javascripts/discourse/lib/transform-post.js.es6 @@ -0,0 +1,201 @@ +function actionDescription(action, acted, count) { + if (acted) { + if (count <= 1) { + return I18n.t(`post.actions.by_you.${action}`); + } else { + return I18n.t(`post.actions.by_you_and_others.${action}`, { count: count - 1 }); + } + } else { + return I18n.t(`post.actions.by_others.${action}`, { count }); + } +} + +const _additionalAttributes = []; + +export function includeAttributes(...attributes) { + attributes.forEach(a => _additionalAttributes.push(a)); +} + +export function transformBasicPost(post) { + // Note: it can be dangerous to not use `get` in Ember code, but this is significantly + // faster and has tests to confirm it works. We only call `get` when the property is a CP + return { + id: post.id, + hidden: post.hidden, + deleted: post.get('deleted'), + deleted_at: post.deleted_at, + user_deleted: post.user_deleted, + isDeleted: post.deleted_at || post.user_deleted, + deletedByAvatarTemplate: null, + deletedByUsername: null, + primary_group_name: post.primary_group_name, + wiki: post.wiki, + firstPost: post.post_number === 1, + post_number: post.post_number, + cooked: post.cooked, + via_email: post.via_email, + user_id: post.user_id, + usernameUrl: Discourse.getURL(`/users/${post.username}`), + username: post.username, + avatar_template: post.avatar_template, + bookmarked: post.bookmarked, + yours: post.yours, + shareUrl: post.get('shareUrl'), + staff: post.staff, + admin: post.admin, + moderator: post.moderator, + new_user: post.trust_level === 0, + name: post.name, + user_title: post.user_title, + created_at: post.created_at, + updated_at: post.updated_at, + canDelete: post.can_delete, + canRecover: post.can_recover, + canEdit: post.can_edit, + canFlag: !Ember.isEmpty(post.get('flagsAvailable')), + version: post.version, + canRecoverTopic: false, + canDeletedTopic: false, + canViewEditHistory: post.can_view_edit_history, + canWiki: post.can_wiki, + showLike: false, + liked: false, + canToggleLike: false, + likeCount: false, + actionsSummary: null, + read: post.read, + replyToUsername: null, + replyToAvatarTemplate: null, + reply_to_post_number: post.reply_to_post_number, + cooked_hidden: !!post.cooked_hidden, + expandablePost: false, + replyCount: post.reply_count, + }; + +} + + +export default function transformPost(currentUser, site, post, prevPost, nextPost) { + // Note: it can be dangerous to not use `get` in Ember code, but this is significantly + // faster and has tests to confirm it works. We only call `get` when the property is a CP + const postType = post.post_type; + const postTypes = site.post_types; + const topic = post.topic; + const details = topic.get('details'); + + const postAtts = transformBasicPost(post); + + postAtts.topicId = topic.id; + postAtts.topicOwner = details.created_by.id === post.user_id; + postAtts.post_type = postType; + postAtts.via_email = post.via_email; + postAtts.isModeratorAction = postType === postTypes.moderator_action; + postAtts.isWhisper = postType === postTypes.whisper; + postAtts.isSmallAction = postType === postTypes.small_action; + postAtts.canBookmark = !!currentUser; + postAtts.canManage = currentUser && currentUser.get('canManageTopic'); + postAtts.canViewRawEmail = currentUser && (currentUser.id === post.user_id || currentUser.staff); + postAtts.canReplyAsNewTopic = details.can_reply_as_new_topic; + postAtts.isWarning = topic.is_warning; + postAtts.links = post.get('internalLinks'); + postAtts.replyDirectlyBelow = nextPost && nextPost.reply_to_post_number === post.post_number; + postAtts.replyDirectlyAbove = prevPost && post.reply_to_post_number === prevPost.post_number; + postAtts.linkCounts = post.link_counts; + postAtts.actionCode = post.action_code; + postAtts.actionCodeWho = post.action_code_who; + postAtts.userCustomFields = post.user_custom_fields; + postAtts.topicUrl = topic.get('url'); + + const showPMMap = topic.archetype === 'private_message' && post.post_number === 1; + if (showPMMap) { + postAtts.showPMMap = true; + postAtts.allowedGroups = details.allowed_groups; + postAtts.allowedUsers = details.allowed_users; + postAtts.canRemoveAllowedUsers = details.can_remove_allowed_users; + postAtts.canInvite = details.can_invite_to; + } + + const showTopicMap = showPMMap || (post.post_number === 1 && topic.archetype === 'regular' && topic.posts_count > 1); + if (showTopicMap) { + postAtts.showTopicMap = true; + postAtts.topicCreatedAt = topic.created_at; + postAtts.createdByUsername = details.created_by.username; + postAtts.createdByAvatarTemplate = details.created_by.avatar_template; + + postAtts.lastPostUrl = topic.get('lastPostUrl'); + postAtts.lastPostUsername = details.last_poster.username; + postAtts.lastPostAvatarTemplate = details.last_poster.avatar_template; + postAtts.lastPostAt = topic.last_posted_at; + + postAtts.topicReplyCount = topic.get('replyCount'); + postAtts.topicViews = topic.views; + postAtts.topicViewsHeat = topic.get('viewsHeat'); + + postAtts.participantCount = topic.participant_count; + postAtts.topicLikeCount = topic.like_count; + postAtts.topicLinks = details.links; + if (postAtts.topicLinks) { + postAtts.topicLinkLength = details.links.length; + } + postAtts.topicPostsCount = topic.posts_count; + + postAtts.participants = details.participants; + + const postStream = topic.get('postStream'); + postAtts.userFilters = postStream.userFilters; + postAtts.topicSummaryEnabled = postStream.summary; + postAtts.topicWordCount = topic.word_count; + postAtts.hasTopicSummary = topic.has_summary; + } + + if (postAtts.isDeleted) { + postAtts.deletedByAvatarTemplate = post.get('postDeletedBy.avatar_template'); + postAtts.deletedByUsername = post.get('postDeletedBy.username'); + } + + const replyToUser = post.get('reply_to_user'); + if (replyToUser) { + postAtts.replyToUsername = replyToUser.username; + postAtts.replyToAvatarTemplate = replyToUser.avatar_template; + } + + if (post.actions_summary) { + postAtts.actionsSummary = post.actions_summary.filter(a => { + return a.actionType.name_key !== 'like' && a.count > 0; + }).map(a => { + const acted = a.acted; + const action = a.actionType.name_key; + const count = a.count; + + return { id: a.id, + postId: post.id, + action, + acted, + count, + canUndo: a.can_undo, + canDeferFlags: a.can_defer_flags, + description: actionDescription(action, acted, count) }; + }); + } + + const likeAction = post.likeAction; + if (likeAction) { + postAtts.liked = likeAction.acted; + postAtts.canToggleLike = likeAction.get('canToggle'); + postAtts.showLike = postAtts.liked || postAtts.canToggleLike; + postAtts.likeCount = likeAction.count; + } + + if (postAtts.post_number === 1) { + postAtts.canRecoverTopic = topic.deleted_at && details.can_recover; + postAtts.canDeleteTopic = !topic.deleted_at && details.can_delete; + postAtts.expandablePost = topic.expandable_first_post; + } else { + postAtts.canRecover = postAtts.isDeleted && postAtts.canRecover; + postAtts.canDelete = !postAtts.isDeleted && postAtts.canDelete; + } + + _additionalAttributes.forEach(a => postAtts[a] = post[a]); + + return postAtts; +} diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6 index c35cffba30..b5572ef0a7 100644 --- a/app/assets/javascripts/discourse/lib/url.js.es6 +++ b/app/assets/javascripts/discourse/lib/url.js.es6 @@ -14,10 +14,9 @@ const DiscourseURL = Ember.Object.createWithMixins({ /** Jumps to a particular post in the stream **/ - jumpToPost: function(postNumber, opts) { - const holderId = `.post-cloak[data-post-number=${postNumber}]`; - const offset = function() { - + jumpToPost(postNumber, opts) { + const holderId = `#post_${postNumber}`; + const offset = () => { const $header = $('header'); const $title = $('#topic-title'); const windowHeight = $(window).height() - $title.height(); @@ -26,8 +25,7 @@ const DiscourseURL = Ember.Object.createWithMixins({ return $header.outerHeight(true) + ((expectedOffset < 0) ? 0 : expectedOffset); }; - - Em.run.schedule('afterRender', function() { + Em.run.schedule('afterRender', () => { if (postNumber === 1) { $(window).scrollTop(0); return; @@ -37,21 +35,18 @@ const DiscourseURL = Ember.Object.createWithMixins({ const holder = $(holderId); if (holder.length > 0 && opts && opts.skipIfOnScreen){ - // if we are on screen skip const elementTop = lockon.elementTop(), - scrollTop = $(window).scrollTop(), - windowHeight = $(window).height()-offset(), - height = holder.height(); + scrollTop = $(window).scrollTop(), + windowHeight = $(window).height()-offset(), + height = holder.height(); - if (elementTop > scrollTop && - (elementTop + height) < (scrollTop + windowHeight)) { + if (elementTop > scrollTop && (elementTop + height) < (scrollTop + windowHeight)) { return; } } lockon.lock(); - }); }, @@ -81,7 +76,7 @@ const DiscourseURL = Ember.Object.createWithMixins({ }, // Scroll to the same page, different anchor - scrollToId: function(id) { + scrollToId(id) { if (Em.isEmpty(id)) { return; } _jumpScheduled = true; diff --git a/app/assets/javascripts/discourse/models/action-summary.js.es6 b/app/assets/javascripts/discourse/models/action-summary.js.es6 index a8f75cd537..a39d78fb50 100644 --- a/app/assets/javascripts/discourse/models/action-summary.js.es6 +++ b/app/assets/javascripts/discourse/models/action-summary.js.es6 @@ -3,20 +3,6 @@ import { popupAjaxError } from 'discourse/lib/ajax-error'; export default RestModel.extend({ - // Description for the action - description: function() { - const action = this.get('actionType.name_key'); - if (this.get('acted')) { - if (this.get('count') <= 1) { - return I18n.t('post.actions.by_you.' + action); - } else { - return I18n.t('post.actions.by_you_and_others.' + action, { count: this.get('count') - 1 }); - } - } else { - return I18n.t('post.actions.by_others.' + action, { count: this.get('count') }); - } - }.property('count', 'acted', 'actionType'), - canToggle: function() { return this.get('can_undo') || this.get('can_act'); }.property('can_undo', 'can_act'), @@ -31,7 +17,14 @@ export default RestModel.extend({ }); }, - toggle: function(post) { + togglePromise(post) { + if (!this.get('acted')) { + return this.act(post).then(() => true); + } + return this.undo(post).then(() => false); + }, + + toggle(post) { if (!this.get('acted')) { this.act(post); return true; @@ -42,7 +35,7 @@ export default RestModel.extend({ }, // Perform this action - act: function(post, opts) { + act(post, opts) { if (!opts) opts = {}; @@ -83,37 +76,20 @@ export default RestModel.extend({ }, // Undo this action - undo: function(post) { + undo(post) { this.removeAction(post); // Remove our post action return Discourse.ajax("/post_actions/" + post.get('id'), { type: 'DELETE', - data: { - post_action_type_id: this.get('id') - } - }).then(function(result) { - return post.updateActionsSummary(result); - }); + data: { post_action_type_id: this.get('id') } + }).then(result => post.updateActionsSummary(result)); }, - deferFlags: function(post) { - const self = this; + deferFlags(post) { return Discourse.ajax("/post_actions/defer_flags", { type: "POST", - data: { - post_action_type_id: this.get("id"), - id: post.get('id') - } - }).then(function () { - self.set("count", 0); - }); - }, - - loadUsers(post) { - return this.store.find('post-action-user', { - id: post.get('id'), - post_action_type_id: this.get('id') - }); + data: { post_action_type_id: this.get("id"), id: post.get('id') } + }).then(() => this.set('count', 0)); } }); diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6 index cc094dc084..9107fe62f1 100644 --- a/app/assets/javascripts/discourse/models/composer.js.es6 +++ b/app/assets/javascripts/discourse/models/composer.js.es6 @@ -154,7 +154,7 @@ const Composer = RestModel.extend({ usernameLink }); - if (!Discourse.Mobile.mobileView) { + if (!this.site.mobileView) { const replyUsername = post.get('reply_to_user.username'); const replyAvatarTemplate = post.get('reply_to_user.avatar_template'); if (replyUsername && replyAvatarTemplate && this.get('action') === EDIT) { diff --git a/app/assets/javascripts/discourse/models/login_method.js b/app/assets/javascripts/discourse/models/login_method.js index 9411cfee9e..dff01f0317 100644 --- a/app/assets/javascripts/discourse/models/login_method.js +++ b/app/assets/javascripts/discourse/models/login_method.js @@ -37,6 +37,7 @@ Discourse.LoginMethod.reopenClass({ "cas", "twitter", "yahoo", + "instagram", "github" ].forEach(function(name){ if (Discourse.SiteSettings["enable_" + name + "_logins"]) { diff --git a/app/assets/javascripts/discourse/models/nav-item.js.es6 b/app/assets/javascripts/discourse/models/nav-item.js.es6 index 1d614c0d1d..7eb1616485 100644 --- a/app/assets/javascripts/discourse/models/nav-item.js.es6 +++ b/app/assets/javascripts/discourse/models/nav-item.js.es6 @@ -7,7 +7,7 @@ const NavItem = Discourse.Model.extend({ name = this.get('name'), count = this.get('count') || 0; - if (name === 'latest' && !Discourse.Mobile.mobileView) { + if (name === 'latest' && !Discourse.Site.currentProp('mobileView')) { count = 0; } diff --git a/app/assets/javascripts/discourse/models/post-stream.js.es6 b/app/assets/javascripts/discourse/models/post-stream.js.es6 index 02511e01f0..f9118bf4a0 100644 --- a/app/assets/javascripts/discourse/models/post-stream.js.es6 +++ b/app/assets/javascripts/discourse/models/post-stream.js.es6 @@ -4,21 +4,6 @@ import PostsWithPlaceholders from 'discourse/lib/posts-with-placeholders'; import { default as computed } from 'ember-addons/ember-computed-decorators'; import { loadTopicView } from 'discourse/models/topic'; -function calcDayDiff(p1, p2) { - if (!p1) { return; } - - const date = p1.get('created_at'); - if (date && p2) { - const lastDate = p2.get('created_at'); - if (lastDate) { - const delta = new Date(date).getTime() - new Date(lastDate).getTime(); - const days = Math.round(delta / (1000 * 60 * 60 * 24)); - - p1.set('daysSincePrevious', days); - } - } -} - export default RestModel.extend({ _identityMap: null, posts: null, @@ -295,6 +280,7 @@ export default RestModel.extend({ if (idx !== -1) { stream.pushObjects(gap); return this.appendMore().then(() => { + delete this.get('gaps.after')[postId]; this.get('stream').enumerableContentDidChange(); }); } @@ -377,7 +363,6 @@ export default RestModel.extend({ // Commit the post we staged. Call this after a save succeeds. commitPost(post) { - if (this.get('topic.id') === post.get('topic_id')) { if (this.get('loadedAllPosts')) { this.appendPost(post); @@ -414,7 +399,6 @@ export default RestModel.extend({ const stored = this.storePost(post); if (stored) { const posts = this.get('posts'); - calcDayDiff(posts.get('firstObject'), stored); posts.unshiftObject(stored); } @@ -426,7 +410,6 @@ export default RestModel.extend({ if (stored) { const posts = this.get('posts'); - calcDayDiff(stored, this.get('lastAppended')); if (!posts.contains(stored)) { if (!this.get('loadingBelow')) { this.get('postsWithPlaceholders').appendPost(() => posts.pushObject(stored)); @@ -445,12 +428,15 @@ export default RestModel.extend({ removePosts(posts) { if (Ember.isEmpty(posts)) { return; } - const postIds = posts.map(p => p.get('id')); - const identityMap = this._identityMap; + this.get('postsWithPlaceholders').refreshAll(() => { + const allPosts = this.get('posts'); + const postIds = posts.map(p => p.get('id')); + const identityMap = this._identityMap; - this.get('stream').removeObjects(postIds); - this.get('posts').removeObjects(posts); - postIds.forEach(id => delete identityMap[id]); + this.get('stream').removeObjects(postIds); + allPosts.removeObjects(posts); + postIds.forEach(id => delete identityMap[id]); + }); }, // Returns a post from the identity map if it's been inserted. @@ -471,10 +457,12 @@ export default RestModel.extend({ have no filters. **/ triggerNewPostInStream(postId) { - if (!postId) { return; } + const resolved = Ember.RSVP.Promise.resolve(); + + if (!postId) { return resolved; } // We only trigger if there are no filters active - if (!this.get('hasNoFilters')) { return; } + if (!this.get('hasNoFilters')) { return resolved; } const loadedAllPosts = this.get('loadedAllPosts'); @@ -482,25 +470,27 @@ export default RestModel.extend({ this.get('stream').addObject(postId); if (loadedAllPosts) { this.set('loadingLastPost', true); - this.findPostsByIds([postId]).then(posts => { + return this.findPostsByIds([postId]).then(posts => { posts.forEach(p => this.appendPost(p)); }).finally(() => { this.set('loadingLastPost', false); }); } } + + return resolved; }, triggerRecoveredPost(postId) { const existing = this._identityMap[postId]; if (existing) { - this.triggerChangedPost(postId, new Date()); + return this.triggerChangedPost(postId, new Date()); } else { // need to insert into stream const url = "/posts/" + postId; const store = this.store; - Discourse.ajax(url).then(p => { + return Discourse.ajax(url).then(p => { const post = store.createRecord('post', p); const stream = this.get("stream"); const posts = this.get("posts"); @@ -541,34 +531,26 @@ export default RestModel.extend({ const url = "/posts/" + postId; const store = this.store; - Discourse.ajax(url).then(p => { + return Discourse.ajax(url).then(p => { this.storePost(store.createRecord('post', p)); }).catch(() => { this.removePosts([existing]); }); } + return Ember.RSVP.Promise.resolve(); }, triggerChangedPost(postId, updatedAt) { - if (!postId) { return; } + const resolved = Ember.RSVP.Promise.resolve(); + if (!postId) { return resolved; } const existing = this._identityMap[postId]; if (existing && existing.updated_at !== updatedAt) { const url = "/posts/" + postId; const store = this.store; - Discourse.ajax(url).then(p => this.storePost(store.createRecord('post', p))); + return Discourse.ajax(url).then(p => this.storePost(store.createRecord('post', p))); } - }, - - // Returns the "thread" of posts in the history of a post. - findReplyHistory(post) { - const url = `/posts/${post.get('id')}/reply-history.json?max_replies=${Discourse.SiteSettings.max_reply_history}`; - const store = this.store; - return Discourse.ajax(url).then(result => { - return result.map(p => this.storePost(store.createRecord('post', p))); - }).then(replyHistory => { - post.set('replyHistory', replyHistory); - }); + return resolved; }, /** diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6 index ff638cef69..8565cfc7d1 100644 --- a/app/assets/javascripts/discourse/models/post.js.es6 +++ b/app/assets/javascripts/discourse/models/post.js.es6 @@ -7,10 +7,6 @@ import computed from 'ember-addons/ember-computed-decorators'; const Post = RestModel.extend({ - init() { - this.set('replyHistory', []); - }, - @computed() siteSettings() { // TODO: Remove this once one instantiate all `Discourse.Post` models via the store. @@ -35,11 +31,6 @@ const Post = RestModel.extend({ deletedViaTopic: Em.computed.and('firstPost', 'topic.deleted_at'), deleted: Em.computed.or('deleted_at', 'deletedViaTopic'), notDeleted: Em.computed.not('deleted'), - userDeleted: Em.computed.empty('user_id'), - - hasTimeGap: function() { - return (this.get('daysSincePrevious') || 0) > Discourse.SiteSettings.show_time_gap_days; - }.property('daysSincePrevious'), showName: function() { const name = this.get('name'); @@ -68,25 +59,13 @@ const Post = RestModel.extend({ usernameUrl: url('username', '/users/%@'), - showUserReplyTab: function() { - return this.get('reply_to_user') && ( - !Discourse.SiteSettings.suppress_reply_directly_above || - this.get('reply_to_post_number') < (this.get('post_number') - 1) - ); - }.property('reply_to_user', 'reply_to_post_number', 'post_number'), - topicOwner: propertyEqual('topic.details.created_by.id', 'user_id'), - hasHistory: Em.computed.gt('version', 1), - - canViewRawEmail: function() { - return this.get("user_id") === Discourse.User.currentProp("id") || Discourse.User.currentProp('staff'); - }.property("user_id"), updatePostField(field, value) { const data = {}; data[field] = value; - Discourse.ajax(`/posts/${this.get('id')}/${field}`, { type: 'PUT', data }).then(() => { + return Discourse.ajax(`/posts/${this.get('id')}/${field}`, { type: 'PUT', data }).then(() => { this.set(field, value); this.incrementProperty("version"); }).catch(popupAjaxError); @@ -97,9 +76,6 @@ const Post = RestModel.extend({ return this.get('link_counts').filterProperty('internal').filterProperty('title'); }.property('link_counts.@each.internal'), - // Edits are the version - 1, so version 2 = 1 edit - editCount: function() { return this.get('version') - 1; }.property('version'), - flagsAvailable: function() { const post = this; return Discourse.Site.currentProp('flagTypes').filter(function(item) { @@ -107,17 +83,6 @@ const Post = RestModel.extend({ }); }.property('actions_summary.@each.can_act'), - actionsWithoutLikes: function() { - if (!!Ember.isEmpty(this.get('actions_summary'))) return null; - - return this.get('actions_summary').filter(function(i) { - if (i.get('count') === 0) return false; - if (i.get('actionType.name_key') === 'like') { return false; } - if (i.get('users') && i.get('users').length > 0) return true; - return !i.get('hidden'); - }); - }.property('actions_summary.@each.users', 'actions_summary.@each.count'), - afterUpdate(res) { if (res.category) { Discourse.Site.current().updateCategory(res.category); @@ -246,10 +211,6 @@ const Post = RestModel.extend({ let value = otherPost[key], oldValue = self[key]; - if (key === "replyHistory") { - return; - } - if (!value) { value = null; } if (!oldValue) { oldValue = null; } @@ -267,56 +228,9 @@ const Post = RestModel.extend({ }); }, - // Load replies to this post - loadReplies() { - if(this.get('loadingReplies')){ - return; - } - - this.set('loadingReplies', true); - this.set('replies', []); - - const self = this; - return Discourse.ajax("/posts/" + (this.get('id')) + "/replies") - .then(function(loaded) { - const replies = self.get('replies'); - _.each(loaded,function(reply) { - const post = Discourse.Post.create(reply); - post.set('topic', self.get('topic')); - replies.pushObject(post); - }); - }) - ['finally'](function(){ - self.set('loadingReplies', false); - }); - }, - - // Whether to show replies directly below - showRepliesBelow: function() { - const replyCount = this.get('reply_count'); - - // We don't show replies if there aren't any - if (replyCount === 0) return false; - - // Always show replies if the setting `suppress_reply_directly_below` is false. - if (!Discourse.SiteSettings.suppress_reply_directly_below) return true; - - // Always show replies if there's more than one - if (replyCount > 1) return true; - - // If we have *exactly* one reply, we have to consider if it's directly below us - const topic = this.get('topic'); - return !topic.isReplyDirectlyBelow(this); - - }.property('reply_count'), - expandHidden() { - const self = this; - return Discourse.ajax("/posts/" + this.get('id') + "/cooked.json").then(function (result) { - self.setProperties({ - cooked: result.cooked, - cooked_hidden: false - }); + return Discourse.ajax("/posts/" + this.get('id') + "/cooked.json").then(result => { + this.setProperties({ cooked: result.cooked, cooked_hidden: false }); }); }, diff --git a/app/assets/javascripts/discourse/models/store.js.es6 b/app/assets/javascripts/discourse/models/store.js.es6 index 9c66da96dd..af365c7bad 100644 --- a/app/assets/javascripts/discourse/models/store.js.es6 +++ b/app/assets/javascripts/discourse/models/store.js.es6 @@ -37,7 +37,9 @@ function findAndRemoveMap(type, id) { flushMap(); export default Ember.Object.extend({ - _plurals: {}, + _plurals: {'post-reply': 'post-replies', + 'post-reply-history': 'post_reply_histories'}, + pluralize(thing) { return this._plurals[thing] || thing + "s"; }, diff --git a/app/assets/javascripts/discourse/models/topic-details.js.es6 b/app/assets/javascripts/discourse/models/topic-details.js.es6 index c40213a72e..a92174bc97 100644 --- a/app/assets/javascripts/discourse/models/topic-details.js.es6 +++ b/app/assets/javascripts/discourse/models/topic-details.js.es6 @@ -34,12 +34,6 @@ const TopicDetails = RestModel.extend({ this.set('loaded', true); }, - fewParticipants: function() { - if (!!Ember.isEmpty(this.get('participants'))) return null; - return this.get('participants').slice(0, 3); - }.property('participants'), - - notificationReasonText: function() { var level = this.get('notification_level'); if(typeof level !== 'number'){ @@ -68,13 +62,13 @@ const TopicDetails = RestModel.extend({ }, removeAllowedUser(user) { - var users = this.get('allowed_users'), - username = user.get('username'); + const users = this.get('allowed_users'); + const username = user.get('username'); - Discourse.ajax("/t/" + this.get('topic.id') + "/remove-allowed-user", { + return Discourse.ajax("/t/" + this.get('topic.id') + "/remove-allowed-user", { type: 'PUT', data: { username: username } - }).then(function() { + }).then(() => { users.removeObject(users.findProperty('username', username)); }); } diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6 index 24d0638a53..e6cd21304d 100644 --- a/app/assets/javascripts/discourse/models/topic.js.es6 +++ b/app/assets/javascripts/discourse/models/topic.js.es6 @@ -224,34 +224,37 @@ const Topic = RestModel.extend({ .then(function () { self.set('archetype', 'regular'); }); }, - estimatedReadingTime: function() { - const wordCount = this.get('word_count'); - if (!wordCount) return; - - return Math.floor(wordCount / Discourse.SiteSettings.read_time_word_count); - }.property('word_count'), - toggleBookmark() { - if (this.get("bookmarking")) { return; } + if (this.get('bookmarking')) { return Ember.RSVP.Promise.resolve(); } this.set("bookmarking", true); - const self = this, - stream = this.get('postStream'), - posts = Em.get(stream, 'posts'), - firstPost = posts && posts[0] && posts[0].get('post_number') === 1 && posts[0], - bookmark = !this.get('bookmarked'), - path = bookmark ? '/bookmark' : '/remove_bookmarks'; + const stream = this.get('postStream'); + const posts = Em.get(stream, 'posts'); + const firstPost = posts && posts[0] && posts[0].get('post_number') === 1 && posts[0]; + const bookmark = !this.get('bookmarked'); + const path = bookmark ? '/bookmark' : '/remove_bookmarks'; - const toggleBookmarkOnServer = function() { - return Discourse.ajax('/t/' + self.get('id') + path, { - type: 'PUT', - }).then(function() { - self.toggleProperty('bookmarked'); - if (bookmark && firstPost) { firstPost.set('bookmarked', true); } - if (!bookmark && posts) { - posts.forEach((post) => post.get('bookmarked') && post.set('bookmarked', false)); + const toggleBookmarkOnServer = () => { + return Discourse.ajax(`/t/${this.get('id')}${path}`, { type: 'PUT' }).then(() => { + this.toggleProperty('bookmarked'); + if (bookmark && firstPost) { + firstPost.set('bookmarked', true); + return [firstPost.id]; } - }).catch(function(error) { + if (!bookmark && posts) { + + const updated = []; + posts.forEach(post => { + if (post.get('bookmarked')) { + post.set('bookmarked', false); + updated.push(post.get('id')); + } + }); + return updated; + } + + return []; + }).catch(error => { let showGenericError = true; if (error && error.responseText) { try { @@ -265,28 +268,26 @@ const Topic = RestModel.extend({ } throw error; - }).finally(function() { - self.set("bookmarking", false); - }); + }).finally(() => this.set('bookmarking', false)); }; - let unbookmarkedPosts = []; + const unbookmarkedPosts = []; if (!bookmark && posts) { - posts.forEach((post) => post.get('bookmarked') && unbookmarkedPosts.push(post)); + posts.forEach(post => post.get('bookmarked') && unbookmarkedPosts.push(post)); } - if (unbookmarkedPosts.length > 1) { - return bootbox.confirm( - I18n.t("bookmarks.confirm_clear"), - I18n.t("no_value"), - I18n.t("yes_value"), - function (confirmed) { - if (confirmed) { return toggleBookmarkOnServer(); } - } - ); - } else { - return toggleBookmarkOnServer(); - } + return new Ember.RSVP.Promise(resolve => { + if (unbookmarkedPosts.length > 1) { + bootbox.confirm( + I18n.t("bookmarks.confirm_clear"), + I18n.t("no_value"), + I18n.t("yes_value"), + confirmed => confirmed ? toggleBookmarkOnServer().then(resolve) : resolve() + ); + } else { + toggleBookmarkOnServer().then(resolve); + } + }); }, createInvite(emailOrUsername, groupNames) { @@ -390,25 +391,6 @@ const Topic = RestModel.extend({ }); }, - // Is the reply to a post directly below it? - isReplyDirectlyBelow(post) { - const posts = this.get('postStream.posts'); - const postNumber = post.get('post_number'); - if (!posts) return; - - const postBelow = posts[posts.indexOf(post) + 1]; - - // If the post directly below's reply_to_post_number is our post number or we are quoted, - // it's considered directly below. - // - // TODO: we don't carry information about quoting, this leaves this code fairly fragile - // instead we should start shipping quote meta data with posts, but this will add at least - // 1 query to the topics page - // - return postBelow && (postBelow.get('reply_to_post_number') === postNumber || - postBelow.get('cooked').indexOf('data-post="'+ postNumber + '"') >= 0 - ); - }, hasExcerpt: Em.computed.notEmpty('excerpt'), diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6 index 9eeb9f87b3..5ae7433316 100644 --- a/app/assets/javascripts/discourse/models/user.js.es6 +++ b/app/assets/javascripts/discourse/models/user.js.es6 @@ -158,15 +158,17 @@ const User = RestModel.extend({ 'external_links_in_new_tab', 'email_digests', 'email_direct', + 'email_in_reply_to', 'email_private_messages', 'email_previous_replies', 'dynamic_favicon', 'enable_quoting', 'disable_jump_reply', 'automatically_unpin_topics', - 'digest_after_days', + 'digest_after_minutes', 'new_topic_duration_minutes', - 'auto_track_topics_after_msecs' + 'auto_track_topics_after_msecs', + 'like_notification_frequency' ].forEach(s => { data[s] = this.get(`user_option.${s}`); }); diff --git a/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6 b/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6 index 7d66de697d..96c4cea329 100644 --- a/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6 +++ b/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6 @@ -6,6 +6,7 @@ import DiscourseURL from 'discourse/lib/url'; import DiscourseLocation from 'discourse/lib/discourse-location'; import SearchService from 'discourse/services/search'; import { startTracking, default as TopicTrackingState } from 'discourse/models/topic-tracking-state'; +import ScreenTrack from 'discourse/lib/screen-track'; function inject() { const app = arguments[0], @@ -38,23 +39,29 @@ export default { const currentUser = Discourse.User.current(); app.register('current-user:main', currentUser, { instantiate: false }); - const tracking = TopicTrackingState.create({ messageBus, currentUser }); - app.register('topic-tracking-state:main', tracking, { instantiate: false }); + const topicTrackingState = TopicTrackingState.create({ messageBus, currentUser }); + app.register('topic-tracking-state:main', topicTrackingState, { instantiate: false }); injectAll(app, 'topicTrackingState'); const site = Discourse.Site.current(); app.register('site:main', site, { instantiate: false }); injectAll(app, 'site'); - app.register('site-settings:main', Discourse.SiteSettings, { instantiate: false }); + const siteSettings = Discourse.SiteSettings; + app.register('site-settings:main', siteSettings, { instantiate: false }); injectAll(app, 'siteSettings'); app.register('search-service:main', SearchService); injectAll(app, 'searchService'); - app.register('session:main', Session.current(), { instantiate: false }); + const session = Session.current(); + app.register('session:main', session, { instantiate: false }); injectAll(app, 'session'); + const screenTrack = new ScreenTrack(topicTrackingState, siteSettings, session, currentUser); + app.register('screen-track:main', screenTrack, { instantiate: false }); + inject(app, 'screenTrack', 'component', 'route'); + inject(app, 'currentUser', 'component', 'route', 'controller'); app.register('location:discourse-location', DiscourseLocation); @@ -63,6 +70,6 @@ export default { app.register('key-value-store:main', keyValueStore, { instantiate: false }); injectAll(app, 'keyValueStore'); - startTracking(tracking); + startTracking(topicTrackingState); } }; diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6 index 0ace34b5bb..b057bcba8c 100644 --- a/app/assets/javascripts/discourse/routes/application.js.es6 +++ b/app/assets/javascripts/discourse/routes/application.js.es6 @@ -4,10 +4,10 @@ import showModal from 'discourse/lib/show-modal'; import OpenComposer from "discourse/mixins/open-composer"; import Category from 'discourse/models/category'; -function unlessReadOnly(method) { +function unlessReadOnly(method, message) { return function() { if (this.site.get("isReadOnly")) { - bootbox.alert(I18n.t("read_only_mode.login_disabled")); + bootbox.alert(message); } else { this[method](); } @@ -17,13 +17,15 @@ function unlessReadOnly(method) { const ApplicationRoute = Discourse.Route.extend(OpenComposer, { siteTitle: setting('title'), + _handleLogout() { + if (this.currentUser) { + this.currentUser.destroySession().then(() => logout(this.siteSettings, this.keyValueStore)); + } + }, + actions: { - logout() { - if (this.currentUser) { - this.currentUser.destroySession().then(() => logout(this.siteSettings, this.keyValueStore)); - } - }, + logout: unlessReadOnly('_handleLogout', I18n.t("read_only_mode.logout_disabled")), _collectTitleTokens(tokens) { tokens.push(this.get('siteTitle')); @@ -37,12 +39,6 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, { return this._super(); }, - // This is here as a bugfix for when an Ember Cloaked view triggers - // a scroll after a controller has been torn down. The real fix - // should be to fix ember cloaking to not do that, but this catches - // it safely just in case. - postChangedRoute: Ember.K, - showTopicEntrance(data) { this.controllerFor('topic-entrance').send('show', data); }, @@ -89,9 +85,9 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, { return true; }, - showLogin: unlessReadOnly('handleShowLogin'), + showLogin: unlessReadOnly('handleShowLogin', I18n.t("read_only_mode.login_disabled")), - showCreateAccount: unlessReadOnly('handleShowCreateAccount'), + showCreateAccount: unlessReadOnly('handleShowCreateAccount', I18n.t("read_only_mode.login_disabled")), showForgotPassword() { showModal('forgotPassword', { title: 'forgot_password.title' }); 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 890f0729f8..990a882157 100644 --- a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 +++ b/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 @@ -1,4 +1,3 @@ -import ScreenTrack from 'discourse/lib/screen-track'; import { queryParams } from 'discourse/controllers/discovery-sortable'; // A helper to build a topic route for a filter @@ -69,7 +68,7 @@ export default function(filter, extras) { model(data, transition) { // attempt to stop early cause we need this to be called before .sync - ScreenTrack.current().stop(); + this.screenTrack.stop(); const findOpts = filterQueryParams(data), findExtras = { cached: this.isPoppedState(transition) }; diff --git a/app/assets/javascripts/discourse/routes/discourse.js.es6 b/app/assets/javascripts/discourse/routes/discourse.js.es6 index 94633e1bc3..5576fb422c 100644 --- a/app/assets/javascripts/discourse/routes/discourse.js.es6 +++ b/app/assets/javascripts/discourse/routes/discourse.js.es6 @@ -75,8 +75,10 @@ const DiscourseRoute = Ember.Route.extend({ }); export function cleanDOM() { - // Close mini profiler - $('.profiler-results .profiler-result').remove(); + + if (window.MiniProfiler) { + window.MiniProfiler.pageTransition(); + } // Close some elements that may be open $('header ul.icons li').removeClass('active'); diff --git a/app/assets/javascripts/discourse/routes/new-message.js.es6 b/app/assets/javascripts/discourse/routes/new-message.js.es6 index c5d3ab849b..05767d3422 100644 --- a/app/assets/javascripts/discourse/routes/new-message.js.es6 +++ b/app/assets/javascripts/discourse/routes/new-message.js.es6 @@ -1,20 +1,38 @@ +import Group from 'discourse/models/group'; + export default Discourse.Route.extend({ beforeModel: function(transition) { const self = this; if (Discourse.User.current()) { // User is logged in self.replaceWith('discovery.latest').then(function(e) { - Discourse.User.findByUsername(transition.queryParams.username).then((user) => { - if (user.can_send_private_message_to_user) { - Ember.run.next(function() { - e.send('createNewMessageViaParams', user.username, transition.queryParams.title, transition.queryParams.body); - }); - } else { - bootbox.alert(I18n.t("composer.cant_send_pm", {username: user.username})); - } - }).catch(() => { - bootbox.alert(I18n.t("generic_error")); - }); + if (transition.queryParams.username) { + // send a message to user + Discourse.User.findByUsername(transition.queryParams.username).then((user) => { + if (user.can_send_private_message_to_user) { + Ember.run.next(function() { + e.send('createNewMessageViaParams', user.username, transition.queryParams.title, transition.queryParams.body); + }); + } else { + bootbox.alert(I18n.t("composer.cant_send_pm", {username: user.username})); + } + }).catch(() => { + bootbox.alert(I18n.t("generic_error")); + }); + } else { + // send a message to group + Group.find(transition.queryParams.groupname).then((group) => { + if (!group.automatic && group.mentionable) { + Ember.run.next(function() { + e.send('createNewMessageViaParams', group.name, transition.queryParams.title, transition.queryParams.body); + }); + } else { + bootbox.alert(I18n.t("composer.cant_send_pm", {username: group.name})); + } + }).catch(() => { + bootbox.alert(I18n.t("generic_error")); + }); + } }); } else { // User is not logged in diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6 index a4a6fa58cc..6e17a41b5b 100644 --- a/app/assets/javascripts/discourse/routes/topic.js.es6 +++ b/app/assets/javascripts/discourse/routes/topic.js.es6 @@ -1,4 +1,3 @@ -import ScreenTrack from 'discourse/lib/screen-track'; import DiscourseURL from 'discourse/lib/url'; let isTransitioning = false, @@ -186,7 +185,7 @@ const TopicRoute = Discourse.Route.extend({ topicController.set('multiSelect', false); topicController.unsubscribe(); this.controllerFor('composer').set('topic', null); - ScreenTrack.current().stop(); + this.screenTrack.stop(); const headerController = this.controllerFor('header'); if (headerController) { @@ -215,8 +214,9 @@ const TopicRoute = Discourse.Route.extend({ controller.subscribe(); this.controllerFor('topic-progress').set('model', model); + // We reset screen tracking every time a topic is entered - ScreenTrack.current().start(model.get('id'), controller); + this.screenTrack.start(model.get('id'), controller); } }); diff --git a/app/assets/javascripts/discourse/routes/user-index.js.es6 b/app/assets/javascripts/discourse/routes/user-index.js.es6 index 24a536237e..1653ef0bc8 100644 --- a/app/assets/javascripts/discourse/routes/user-index.js.es6 +++ b/app/assets/javascripts/discourse/routes/user-index.js.es6 @@ -4,7 +4,7 @@ export default Discourse.Route.extend({ // HACK: Something with the way the user card intercepts clicks seems to break how the // transition into a user's activity works. This makes the back button work on mobile // where there is no user card as well as desktop where there is. - if (Discourse.Mobile.mobileView) { + if (this.site.mobileView) { this.replaceWith('userActivity'); } else { this.transitionTo('userActivity'); diff --git a/app/assets/javascripts/discourse/services/logs-notice.js.es6 b/app/assets/javascripts/discourse/services/logs-notice.js.es6 new file mode 100644 index 0000000000..8948de3a16 --- /dev/null +++ b/app/assets/javascripts/discourse/services/logs-notice.js.es6 @@ -0,0 +1,69 @@ +import { on, observes } from 'ember-addons/ember-computed-decorators'; +import computed from 'ember-addons/ember-computed-decorators'; + +const LOGS_NOTICE_KEY = "logs-notice-text"; + +const LogsNotice = Ember.Object.extend({ + text: "", + + @on('init') + _setup() { + if (!this.get('isActivated')) return; + + const text = this.keyValueStore.getItem(LOGS_NOTICE_KEY); + if (text) this.set('text', text); + + this.messageBus.subscribe("/logs_error_rate_exceeded", data => { + const duration = data.duration; + var siteSettingLimit = 0; + + if (duration === 'minute') { + siteSettingLimit = this.siteSettings.alert_admins_if_errors_per_minute; + } else if (duration === 'hour') { + siteSettingLimit = this.siteSettings.alert_admins_if_errors_per_hour; + } + + this.set('text', + I18n.t('logs_error_rate_exceeded_notice', { + timestamp: moment().format("YYYY-MM-DD H:mm:ss"), + siteSettingLimit: siteSettingLimit, + rate: data.rate, + duration: duration, + url: Discourse.getURL('/logs') + }) + ); + }); + }, + + @computed('text') + isEmpty(text) { + return Ember.isEmpty(text); + }, + + @computed('text') + message(text) { + return new Handlebars.SafeString(text); + }, + + @computed('currentUser') + isAdmin(currentUser) { + return currentUser && currentUser.admin; + }, + + @computed('isEmpty', 'isAdmin') + hidden(isEmpty, isAdmin) { + return !isAdmin || isEmpty; + }, + + @observes('text') + _updateKeyValueStore() { + this.keyValueStore.setItem(LOGS_NOTICE_KEY, this.get('text')); + }, + + @computed('siteSettings.alert_admins_if_errors_per_hour', 'siteSettings.alert_admins_if_errors_per_minute') + isActivated(errorsPerHour, errorsPerMinute) { + return errorsPerHour > 0 || errorsPerMinute > 0; + } +}); + +export default LogsNotice; diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/templates/badges/show.hbs index 7cfada2430..e41eb32ef1 100644 --- a/app/assets/javascripts/discourse/templates/badges/show.hbs +++ b/app/assets/javascripts/discourse/templates/badges/show.hbs @@ -29,7 +29,7 @@ {{#link-to 'user' user}} {{avatar user imageSize="extra_large"}}
- {{poster-name post=user}} +
{{user.username}}
{{/link-to}}
diff --git a/app/assets/javascripts/discourse/templates/components/hamburger-category.hbs b/app/assets/javascripts/discourse/templates/components/hamburger-category.hbs deleted file mode 100644 index 9204b3d42d..0000000000 --- a/app/assets/javascripts/discourse/templates/components/hamburger-category.hbs +++ /dev/null @@ -1,9 +0,0 @@ -{{category-link category allowUncategorized="true"}} - -{{#if unreadTotal}} - {{unreadTotal}} -{{/if}} - -{{#if showTopicCount}} - {{category.topic_count}} -{{/if}} diff --git a/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs b/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs index 6c3640a6c7..f0bc9397ab 100644 --- a/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs +++ b/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs @@ -74,19 +74,7 @@ {{plugin-outlet "site-map-links-last"}} {{/menu-links}} - {{#if categories}} -
    -
  • - {{d-link class="heading" - route="discovery.categories" - class="categories-link" - label="filters.categories.title"}} -
    • - {{#each categories as |c|}} - {{hamburger-category category=c}} - {{/each}} -
- {{/if}} + {{mount-widget widget='hamburger-categories' args=(as-hash categories=categories)}}
{{#menu-links omitRule="true"}} diff --git a/app/assets/javascripts/discourse/templates/components/private-message-map.hbs b/app/assets/javascripts/discourse/templates/components/private-message-map.hbs deleted file mode 100644 index eb2d2dd5f2..0000000000 --- a/app/assets/javascripts/discourse/templates/components/private-message-map.hbs +++ /dev/null @@ -1,24 +0,0 @@ -

{{fa-icon 'envelope'}} {{i18n 'private_message_info.title'}}

-
- {{#each details.allowed_groups as |ag|}} -
- {{fa-icon 'users'}} {{#link-to "group.index" ag.name}}{{unbound ag.name}}{{/link-to}} -
- {{/each}} - {{#each details.allowed_users as |au|}} -
- {{#user-link user=au}} - {{avatar au imageSize="small"}} - {{unbound au.username}} - {{/user-link}} - {{#if details.can_remove_allowed_users}} - {{fa-icon "times"}} - {{/if}} -
- {{/each}} -
-{{#if details.can_invite_to}} -
- -
-{{/if}} diff --git a/app/assets/javascripts/discourse/templates/components/small-action.hbs b/app/assets/javascripts/discourse/templates/components/small-action.hbs index 091f0e07df..821ed4ff91 100644 --- a/app/assets/javascripts/discourse/templates/components/small-action.hbs +++ b/app/assets/javascripts/discourse/templates/components/small-action.hbs @@ -1,4 +1,3 @@ -
{{fa-icon icon}}
{{#if post}} {{#if post.can_delete}} @@ -11,8 +10,4 @@ {{avatar post imageSize="small"}} {{/if}} -

{{description}}

- {{#if post.cooked}} -
{{{post.cooked}}}
- {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/toggle-summary.hbs b/app/assets/javascripts/discourse/templates/components/toggle-summary.hbs deleted file mode 100644 index 671b85d945..0000000000 --- a/app/assets/javascripts/discourse/templates/components/toggle-summary.hbs +++ /dev/null @@ -1,12 +0,0 @@ -{{#if postStream.summary}} -

{{{i18n 'summary.enabled_description'}}}

- -{{else}} - {{#if topic.estimatedReadingTime}} -

{{{i18n 'summary.description_time' replyCount=topic.replyCount readingTime=topic.estimatedReadingTime}}}

- {{else}} -

{{{i18n 'summary.description' replyCount=topic.replyCount}}}

- {{/if}} - - -{{/if}} diff --git a/app/assets/javascripts/discourse/templates/components/topic-participant.hbs b/app/assets/javascripts/discourse/templates/components/topic-participant.hbs deleted file mode 100644 index 0389b002ff..0000000000 --- a/app/assets/javascripts/discourse/templates/components/topic-participant.hbs +++ /dev/null @@ -1,6 +0,0 @@ - - {{#if showPostCount}} - {{unbound participant.post_count}} - {{/if}} - {{avatar participant imageSize="medium"}} - diff --git a/app/assets/javascripts/discourse/templates/components/user-menu.hbs b/app/assets/javascripts/discourse/templates/components/user-menu.hbs index 10ca6e7be6..6f014d80d2 100644 --- a/app/assets/javascripts/discourse/templates/components/user-menu.hbs +++ b/app/assets/javascripts/discourse/templates/components/user-menu.hbs @@ -23,8 +23,8 @@
{{#conditional-loading-spinner condition=loadingNotifications containerClass="spinner-container"}} -
{{#if notifications}} +
    {{#each notifications as |n|}} {{notification-item notification=n}} diff --git a/app/assets/javascripts/discourse/templates/discovery.hbs b/app/assets/javascripts/discourse/templates/discovery.hbs index 1e4548bbe2..069be994ba 100644 --- a/app/assets/javascripts/discourse/templates/discovery.hbs +++ b/app/assets/javascripts/discourse/templates/discovery.hbs @@ -27,3 +27,5 @@
+ +{{plugin-outlet "discovery-below"}} diff --git a/app/assets/javascripts/discourse/templates/embedded-post.hbs b/app/assets/javascripts/discourse/templates/embedded-post.hbs deleted file mode 100644 index 03bfc30a26..0000000000 --- a/app/assets/javascripts/discourse/templates/embedded-post.hbs +++ /dev/null @@ -1,16 +0,0 @@ -
-
- {{raw "post/poster-avatar" post=this classNames="main-avatar"}} -
-
-
- {{poster-name post=this}} - {{#if view.parentView.previousPost}}{{/if}} - {{#unless view.parentView.previousPost}}{{/unless}} -
{{age-with-tooltip created_at}}
 -
-
- {{{unbound cooked}}} -
-
-
diff --git a/app/assets/javascripts/discourse/templates/modal/archetype_options.hbs b/app/assets/javascripts/discourse/templates/modal/archetype_options.hbs deleted file mode 100644 index d8c949d9b0..0000000000 --- a/app/assets/javascripts/discourse/templates/modal/archetype_options.hbs +++ /dev/null @@ -1,8 +0,0 @@ -
-
- {{view "archetype-options" archetype=view.archetype}} -
-
-
- -
diff --git a/app/assets/javascripts/discourse/templates/modal/flag.hbs b/app/assets/javascripts/discourse/templates/modal/flag.hbs index 290c321a91..51709ea2dd 100644 --- a/app/assets/javascripts/discourse/templates/modal/flag.hbs +++ b/app/assets/javascripts/discourse/templates/modal/flag.hbs @@ -45,5 +45,4 @@ {{#if canDeleteSpammer}} {{/if}} - {{{i18n 'flagging.private_reminder'}}} diff --git a/app/assets/javascripts/discourse/templates/navigation/category.hbs b/app/assets/javascripts/discourse/templates/navigation/category.hbs index 428abe827b..85174bbbfd 100644 --- a/app/assets/javascripts/discourse/templates/navigation/category.hbs +++ b/app/assets/javascripts/discourse/templates/navigation/category.hbs @@ -3,7 +3,6 @@ noSubcategories=noSubcategories hideSubcategories=showingSubcategoryList}} - {{navigation-bar navItems=navItems filterMode=filterMode}} {{#if currentUser}} diff --git a/app/assets/javascripts/discourse/templates/post-placeholder.hbs b/app/assets/javascripts/discourse/templates/post-placeholder.hbs deleted file mode 100644 index 936863f191..0000000000 --- a/app/assets/javascripts/discourse/templates/post-placeholder.hbs +++ /dev/null @@ -1,13 +0,0 @@ -
-
-
-
-
- -
-
-
-
-
-
-
diff --git a/app/assets/javascripts/discourse/templates/post-small-action.hbs b/app/assets/javascripts/discourse/templates/post-small-action.hbs deleted file mode 100644 index 42c11c5246..0000000000 --- a/app/assets/javascripts/discourse/templates/post-small-action.hbs +++ /dev/null @@ -1,9 +0,0 @@ -{{post-gap post=this postStream=controller.model.postStream before="true"}} - -{{small-action actionCode=action_code - post=this - daysAgo=view.daysAgo - editPost="editPost" - deletePost="deletePost"}} - -{{post-gap post=this postStream=controller.model.postStream before="false"}} diff --git a/app/assets/javascripts/discourse/templates/post.hbs b/app/assets/javascripts/discourse/templates/post.hbs deleted file mode 100644 index 1606d6d6f8..0000000000 --- a/app/assets/javascripts/discourse/templates/post.hbs +++ /dev/null @@ -1,141 +0,0 @@ -{{post-gap post=this postStream=controller.model.postStream before="true"}} - -{{#if hasTimeGap}} - {{time-gap daysAgo=daysSincePrevious postStream=controller.model.postStream}} -{{/if}} - -
- {{view 'reply-history' content=replyHistory}} -
- -
-
- -
- {{#if userDeleted}} - - {{else}} - {{raw "post/poster-avatar" post=this classNames="main-avatar"}} - {{/if}} -
- {{plugin-outlet "poster-avatar-bottom"}} -
- -
-
- {{poster-name post=this}} - {{plugin-outlet "poster-name-right"}} -
- {{age-with-tooltip created_at}} -
- {{#if hasHistory}} -
- {{#if can_view_edit_history}} - - {{editCount}} - {{fa-icon "pencil"}} - - {{else}} - - {{editCount}} - {{fa-icon "pencil"}} - - {{/if}} -
- {{/if}} - {{#if wiki}} -
{{fa-icon "pencil-square-o"}}
- {{/if}} - {{#if via_email}} - {{#if canViewRawEmail}} -
{{fa-icon "envelope-o"}}
- {{else}} -
{{fa-icon "envelope-o"}}
- {{/if}} - {{/if}} - - {{#if view.whisper}} -
{{fa-icon "eye-slash"}}
- {{/if}} - - {{#if showUserReplyTab}} - - {{#if loadingReplyHistory}} - {{i18n 'loading'}} - {{else}} - {{fa-icon "mail-forward"}} - {{avatar reply_to_user imageSize="tiny"}} - {{reply_to_user.username}} - {{/if}} - - {{/if}} -
{{fa-icon "circle"}}
-
- -
- - -
- - -
-
- {{{cooked}}} - {{plugin-outlet "post-after-cooked"}} - {{#if firstPost}} - {{plugin-outlet "topic-after-cooked"}} - {{/if}} -
- {{#if cooked_hidden}} - {{i18n 'post.show_hidden'}} - {{/if}} - {{#if view.showExpandButton}} - {{#if controller.loadingExpanded}} - - {{else}} - - {{/if}} - {{/if}} - - {{post-menu post=this - canCreatePost=controller.model.details.can_create_post - replyToPost="replyToPost" - recoverPost="recoverPost" - deletePost="deletePost" - toggleLike="toggleLike" - toggleLikeTarget=view - showFlags="showFlags" - editPost="editPost" - toggleBookmark="toggleBookmark" - toggleWiki="toggleWiki" - togglePostType="togglePostType" - rebakePost="rebakePost" - unhidePost="unhidePost" - changePostOwner="changePostOwner" - toggleWhoLiked="toggleWhoLiked" - toggleWhoLikedTarget=view}} -
- - {{who-liked users=view.likedUsers}} - {{#if replies}} -
- {{#each reply in replies}} - {{view 'embedded-post' content=reply}} - {{/each}} -
- {{/if}} - - {{actions-summary post=this}} - {{view 'topic-map-container' post=this topic=controller.model}} -
- - {{post-gutter post=this - links=internalLinks - canReplyAsNewTopic=topic.details.can_reply_as_new_topic - newTopicAction="replyAsNewTopic"}} -
- -
- -{{post-gap post=this postStream=controller.model.postStream before="false"}} -{{plugin-outlet "post-bottom"}} diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs index 4bb3b7ebd7..e74b36dad0 100644 --- a/app/assets/javascripts/discourse/templates/topic.hbs +++ b/app/assets/javascripts/discourse/templates/topic.hbs @@ -69,15 +69,39 @@ {{conditional-loading-spinner condition=model.postStream.loadingAbove}} {{#unless model.postStream.loadingFilter}} - {{cloaked-collection itemViewClass="post" - defaultHeight="200" - content=postsToRender - slackRatio="15" - loadingHTML="" - preservesContext="true" - uncloakDefault="true" - offsetFixedTop="header" - offsetFixedBottom="#reply-control"}} + {{scrolling-post-stream + posts=postsToRender + canCreatePost=model.details.can_create_post + multiSelect=multiSelect + selectedPostsCount=selectedPostsCount + selectedQuery=selectedQuery + gaps=model.postStream.gaps + showFlags="showFlags" + editPost="editPost" + showHistory="showHistory" + showRawEmail="showRawEmail" + deletePost="deletePost" + recoverPost="recoverPost" + expandHidden="expandHidden" + newTopicAction="replyAsNewTopic" + expandFirstPost="expandFirstPost" + toggleBookmark="toggleBookmark" + togglePostType="togglePostType" + rebakePost="rebakePost" + changePostOwner="changePostOwner" + unhidePost="unhidePost" + replyToPost="replyToPost" + toggleWiki="toggleWiki" + toggleParticipant="toggleParticipant" + toggleSummary="toggleSummary" + removeAllowedUser="removeAllowedUser" + showInvite="showInvite" + topVisibleChanged="topVisibleChanged" + bottomVisibleChanged="bottomVisibleChanged" + selectPost="toggledSelectedPost" + selectReplies="toggledSelectedPostReplies" + fillGapBefore="fillGapBefore" + fillGapAfter="fillGapAfter"}} {{/unless}}
diff --git a/app/assets/javascripts/discourse/templates/user/activity.hbs b/app/assets/javascripts/discourse/templates/user/activity.hbs index 4eb0971cc1..3b07cd95ae 100644 --- a/app/assets/javascripts/discourse/templates/user/activity.hbs +++ b/app/assets/javascripts/discourse/templates/user/activity.hbs @@ -23,6 +23,7 @@ {{/link-to}} {{/if}} + {{plugin-outlet "user-activity-bottom"}} {{/mobile-nav}} {{#if viewingSelf}} diff --git a/app/assets/javascripts/discourse/templates/user/messages.hbs b/app/assets/javascripts/discourse/templates/user/messages.hbs index afc7d0f427..9f4c6b62f8 100644 --- a/app/assets/javascripts/discourse/templates/user/messages.hbs +++ b/app/assets/javascripts/discourse/templates/user/messages.hbs @@ -1,8 +1,8 @@
- {{#unless mobileView}} - {{#if showNewPM}} - {{d-button class="btn-primary new-private-message" action="composePrivateMessage" icon="envelope" label="user.new_private_message"}} - {{/if}} + {{#unless site.mobileView}} + {{#if showNewPM}} + {{d-button class="btn-primary new-private-message" action="composePrivateMessage" icon="envelope" label="user.new_private_message"}} + {{/if}} {{/unless}} {{#mobile-nav class='messages-nav' desktopClass='nav-stacked action-list' currentPath=currentPath}} @@ -47,10 +47,10 @@ - {{#if mobileView}} - {{#if showNewPM}} - {{d-button class="btn-primary new-private-message" action="composePrivateMessage" icon="envelope" label="user.new_private_message"}} - {{/if}} + {{#if site.mobileView}} + {{#if showNewPM}} + {{d-button class="btn-primary new-private-message" action="composePrivateMessage" icon="envelope" label="user.new_private_message"}} + {{/if}} {{/if}} {{#if canArchive}} diff --git a/app/assets/javascripts/discourse/templates/user/preferences.hbs b/app/assets/javascripts/discourse/templates/user/preferences.hbs index 6e8c026a4d..b2fd4443d7 100644 --- a/app/assets/javascripts/discourse/templates/user/preferences.hbs +++ b/app/assets/javascripts/discourse/templates/user/preferences.hbs @@ -172,7 +172,7 @@ {{preference-checkbox labelKey="user.email_digests.title" checked=model.user_option.email_digests}} {{#if model.user_option.email_digests}}
- {{combo-box valueAttribute="value" content=digestFrequencies value=model.user_option.digest_after_days}} + {{combo-box valueAttribute="value" content=digestFrequencies value=model.user_option.digest_after_minutes}}
{{/if}} {{/if}} @@ -180,11 +180,12 @@ {{combo-box valueAttribute="value" content=previousRepliesOptions value=model.user_option.email_previous_replies}} + {{preference-checkbox labelKey="user.email_in_reply_to" checked=model.user_option.email_in_reply_to}} {{preference-checkbox labelKey="user.email_private_messages" checked=model.user_option.email_private_messages}} {{preference-checkbox labelKey="user.email_direct" checked=model.user_option.email_direct}} {{preference-checkbox labelKey="user.mailing_list_mode" checked=model.user_option.mailing_list_mode}} {{preference-checkbox labelKey="user.email_always" checked=model.user_option.email_always}} - + {{#unless model.user_option.email_always}}
{{#if siteSettings.email_time_window_mins}} {{i18n 'user.email.frequency' count=siteSettings.email_time_window_mins}} @@ -192,6 +193,7 @@ {{i18n 'user.email.frequency_immediately'}} {{/if}}
+ {{/unless}} @@ -216,6 +218,11 @@ {{combo-box valueAttribute="value" content=autoTrackDurations value=model.user_option.auto_track_topics_after_msecs}} +
+ + {{combo-box valueAttribute="value" content=likeNotificationFrequencies value=model.user_option.like_notification_frequency}} +
+ {{preference-checkbox labelKey="user.external_links_in_new_tab" checked=model.user_option.external_links_in_new_tab}} {{preference-checkbox labelKey="user.enable_quoting" checked=model.user_option.enable_quoting}} {{preference-checkbox labelKey="user.dynamic_favicon" checked=model.user_option.dynamic_favicon}} diff --git a/app/assets/javascripts/discourse/views/archetype-options.js.es6 b/app/assets/javascripts/discourse/views/archetype-options.js.es6 deleted file mode 100644 index 8cf0c4bd34..0000000000 --- a/app/assets/javascripts/discourse/views/archetype-options.js.es6 +++ /dev/null @@ -1,20 +0,0 @@ -import DiscourseContainerView from 'discourse/views/container'; - -export default DiscourseContainerView.extend({ - metaDataBinding: 'parentView.metaData', - - init: function() { - this._super(); - var metaData = this.get('metaData'); - var archetypeOptionsView = this; - return this.get('archetype.options').forEach(function(a) { - if (a.option_type === 1) { - archetypeOptionsView.attachViewWithArgs({ - content: a, - checked: metaData.get(a.key) === 'true' - }, Discourse.OptionBooleanView); - } - - }); - } -}); diff --git a/app/assets/javascripts/discourse/views/cloaked-collection.js.es6 b/app/assets/javascripts/discourse/views/cloaked-collection.js.es6 deleted file mode 100644 index 4bf5f9f2f8..0000000000 --- a/app/assets/javascripts/discourse/views/cloaked-collection.js.es6 +++ /dev/null @@ -1,300 +0,0 @@ -/*eslint no-bitwise:0 */ -const CloakedCollectionView = Ember.CollectionView.extend({ - cloakView: Ember.computed.alias('itemViewClass'), - topVisible: null, - bottomVisible: null, - offsetFixedTopElement: null, - offsetFixedBottomElement: null, - loadingHTML: 'Loading...', - scrollDebounce: 10, - - init() { - const cloakView = this.get('cloakView'), - idProperty = this.get('idProperty'), - uncloakDefault = !!this.get('uncloakDefault'); - - // Set the slack ratio differently to allow for more or less slack in preloading - const slackRatio = parseFloat(this.get('slackRatio')); - if (!slackRatio) { this.set('slackRatio', 1.0); } - - const CloakedView = this.container.lookupFactory('view:cloaked'); - this.set('itemViewClass', CloakedView.extend({ - classNames: [cloakView + '-cloak'], - cloaks: cloakView, - preservesContext: this.get('preservesContext') === 'true', - cloaksController: this.get('itemController'), - defaultHeight: this.get('defaultHeight'), - - init() { - this._super(); - if (idProperty) { - this.set('elementId', cloakView + '-cloak-' + this.get('content.' + idProperty)); - } - if (uncloakDefault) { - this.uncloak(); - } else { - this.cloak(); - } - } - })); - - this._super(); - Ember.run.next(this, 'scrolled'); - }, - - /** - If the topmost visible view changed, we will notify the controller if it has an appropriate hook. - - @method _topVisibleChanged - @observes topVisible - **/ - _topVisibleChanged: function() { - const controller = this.get('controller'); - if (controller.topVisibleChanged) { controller.topVisibleChanged(this.get('topVisible')); } - }.observes('topVisible'), - - /** - If the bottommost visible view changed, we will notify the controller if it has an appropriate hook. - - @method _bottomVisible - @observes bottomVisible - **/ - _bottomVisible: function() { - const controller = this.get('controller'); - if (controller.bottomVisibleChanged) { controller.bottomVisibleChanged(this.get('bottomVisible')); } - }.observes('bottomVisible'), - - /** - Binary search for finding the topmost view on screen. - - @method findTopView - @param {Array} childViews the childViews to search through - @param {Number} windowTop The top of the viewport to search against - @param {Number} min The minimum index to search through of the child views - @param {Number} max The max index to search through of the child views - @returns {Number} the index into childViews of the topmost view - **/ - findTopView(childViews, viewportTop, min, max) { - if (max < min) { return min; } - - const wrapperTop = this.get('wrapperTop')>>0; - - while(max>min){ - const mid = Math.floor((min + max) / 2), - // in case of not full-window scrolling - $view = childViews[mid].$(), - - // .position is quite expensive, shortcut here to get a slightly rougher - // but much faster value - parentOffsetTop = $view.offsetParent().offset().top, - offsetTop = $view.offset().top, - viewBottom = (offsetTop - parentOffsetTop) + wrapperTop + $view.height(); - - if (viewBottom > viewportTop) { - max = mid-1; - } else { - min = mid+1; - } - } - - return min; - }, - - - /** - Determine what views are onscreen and cloak/uncloak them as necessary. - - @method scrolled - **/ - scrolled() { - if (!this.get('scrollingEnabled')) { return; } - - const childViews = this.get('childViews'); - if ((!childViews) || (childViews.length === 0)) { return; } - - const self = this, - toUncloak = [], - onscreen = [], - onscreenCloaks = [], - $w = $(window), - windowHeight = this.get('wrapperHeight') || ( window.innerHeight ? window.innerHeight : $w.height() ), - slack = Math.round(windowHeight * this.get('slackRatio')), - offsetFixedTopElement = this.get('offsetFixedTopElement'), - offsetFixedBottomElement = this.get('offsetFixedBottomElement'), - bodyHeight = this.get('wrapperHeight') ? this.$().height() : $('body').height(); - - let windowTop = this.get('wrapperTop') || $w.scrollTop(); - - const viewportTop = windowTop - slack, - topView = this.findTopView(childViews, viewportTop, 0, childViews.length-1); - - let windowBottom = windowTop + windowHeight; - let viewportBottom = windowBottom + slack; - - if (windowBottom > bodyHeight) { windowBottom = bodyHeight; } - if (viewportBottom > bodyHeight) { viewportBottom = bodyHeight; } - - if (offsetFixedTopElement) { - windowTop += (offsetFixedTopElement.outerHeight(true) || 0); - } - - if (offsetFixedBottomElement) { - windowBottom -= (offsetFixedBottomElement.outerHeight(true) || 0); - } - - // Find the bottom view and what's onscreen - let bottomView = topView; - let bottomVisible = null; - while (bottomView < childViews.length) { - const view = childViews[bottomView]; - const $view = view.$(); - - if (!$view) { break; } - - // in case of not full-window scrolling - const scrollOffset = this.get('wrapperTop') || 0; - const viewTop = $view.offset().top + scrollOffset; - const viewBottom = viewTop + $view.height(); - - if (viewTop > viewportBottom) { break; } - toUncloak.push(view); - - if (viewBottom > windowTop && viewTop <= windowBottom) { - const content = view.get('content'); - onscreen.push(content); - - if (!view.get('isPlaceholder')) { - bottomVisible = content; - } - onscreenCloaks.push(view); - } - - bottomView++; - } - if (bottomView >= childViews.length) { bottomView = childViews.length - 1; } - - // If our controller has a `sawObjects` method, pass the on screen objects to it. - const controller = this.get('controller'); - if (onscreen.length) { - this.setProperties({topVisible: onscreen[0], bottomVisible }); - if (controller && controller.sawObjects) { - Em.run.schedule('afterRender', function() { - controller.sawObjects(onscreen); - }); - } - } else { - this.setProperties({topVisible: null, bottomVisible: null}); - } - - const toCloak = childViews.slice(0, topView).concat(childViews.slice(bottomView+1)); - - this._uncloak = toUncloak; - if(this._nextUncloak){ - Em.run.cancel(this._nextUncloak); - this._nextUncloak = null; - } - - Em.run.schedule('afterRender', this, function() { - onscreenCloaks.forEach(function (v) { - if(v && v.uncloak) { - v.uncloak(); - } - }); - toCloak.forEach(function (v) { v.cloak(); }); - if (self._nextUncloak) { Em.run.cancel(self._nextUncloak); } - self._nextUncloak = Em.run.later(self, self.uncloakQueue,50); - }); - - for (let j=bottomView; j0){ - const view = this._uncloak.shift(); - if(view && view.uncloak && !view._containedView){ - Em.run.schedule('afterRender', view, view.uncloak); - processed++; - } - } - if(this._uncloak.length === 0){ - this._uncloak = null; - } else { - Em.run.schedule('afterRender', self, function(){ - if(self._nextUncloak){ - Em.run.cancel(self._nextUncloak); - } - self._nextUncloak = Em.run.next(self, function(){ - if(self._nextUncloak){ - Em.run.cancel(self._nextUncloak); - } - self._nextUncloak = Em.run.later(self,self.uncloakQueue,delay); - }); - }); - } - } - }, - - scrollTriggered() { - if ($('body').data('disable-cloaked-view')) { - return; - } - Em.run.scheduleOnce('afterRender', this, 'scrolled'); - }, - - _startEvents: function() { - if (this.get('offsetFixed')) { - Em.warn("Cloaked-collection's `offsetFixed` is deprecated. Use `offsetFixedTop` instead."); - } - - const self = this, - offsetFixedTop = this.get('offsetFixedTop') || this.get('offsetFixed'), - offsetFixedBottom = this.get('offsetFixedBottom'), - scrollDebounce = this.get('scrollDebounce'), - onScrollMethod = function() { - Ember.run.debounce(self, 'scrollTriggered', scrollDebounce); - }; - - if (offsetFixedTop) { - this.set('offsetFixedTopElement', $(offsetFixedTop)); - } - - if (offsetFixedBottom) { - this.set('offsetFixedBottomElement', $(offsetFixedBottom)); - } - - $(document).bind('touchmove.ember-cloak', onScrollMethod); - $(window).bind('scroll.ember-cloak', onScrollMethod); - this.addObserver('wrapperTop', self, onScrollMethod); - this.addObserver('wrapperHeight', self, onScrollMethod); - this.addObserver('content.@each', self, onScrollMethod); - this.scrollTriggered(); - - this.set('scrollingEnabled', true); - }.on('didInsertElement'), - - cleanUp() { - $(document).unbind('touchmove.ember-cloak'); - $(window).unbind('scroll.ember-cloak'); - this.set('scrollingEnabled', false); - }, - - _endEvents: function() { - this.cleanUp(); - }.on('willDestroyElement') -}); - -Ember.Handlebars.helper('cloaked-collection', Ember.testing ? Ember.CollectionView : CloakedCollectionView); -export default CloakedCollectionView; diff --git a/app/assets/javascripts/discourse/views/cloaked.js.es6 b/app/assets/javascripts/discourse/views/cloaked.js.es6 deleted file mode 100644 index ae96413c76..0000000000 --- a/app/assets/javascripts/discourse/views/cloaked.js.es6 +++ /dev/null @@ -1,143 +0,0 @@ -export function Placeholder(viewName) { - this.viewName = viewName; -} - -export default Ember.View.extend({ - attributeBindings: ['style'], - _containedView: null, - _scheduled: null, - isPlaceholder: null, - - init() { - this._super(); - this._scheduled = false; - this._childViews = []; - }, - - setContainedView(cv) { - if (this._childViews[0]) { - this._childViews[0].destroy(); - this._childViews[0] = cv; - } - - this.set('isPlaceholder', cv && (cv.get('content') instanceof Placeholder)); - - if (cv) { - cv.set('_parentView', this); - cv.set('templateData', this.get('templateData')); - this._childViews[0] = cv; - } else { - this._childViews.clear(); - } - - if (this._scheduled) return; - this._scheduled = true; - this.set('_containedView', cv); - Ember.run.schedule('render', this, this.updateChildView); - }, - - render(buffer) { - const element = buffer.element(); - const dom = buffer.dom; - - this._childViewsMorph = dom.appendMorph(element); - }, - - updateChildView() { - this._scheduled = false; - if (!this._elementCreated || this.isDestroying || this.isDestroyed) { return; } - - const childView = this._containedView; - if (childView && !childView._elementCreated) { - this._renderer.renderTree(childView, this, 0); - } - }, - - /** - Triggers the set up for rendering a view that is cloaked. - - @method uncloak - */ - uncloak() { - const state = this._state || this.state; - if (state !== 'inDOM' && state !== 'preRender') { return; } - - if (!this._containedView) { - const model = this.get('content'); - const container = this.get('container'); - - let controller; - - // Wire up the itemController if necessary - const controllerName = this.get('cloaksController'); - if (controllerName) { - const controllerFullName = 'controller:' + controllerName; - let factory = container.lookupFactory(controllerFullName); - - // let ember generate controller if needed - if (!factory) { - factory = Ember.generateControllerFactory(container, controllerName, model); - - // inform developer about typo - Ember.Logger.warn('ember-cloaking: can\'t lookup controller by name "' + controllerFullName + '".'); - Ember.Logger.warn('ember-cloaking: using ' + factory.toString() + '.'); - } - - const parentController = this.get('controller'); - controller = factory.create({ model, parentController, target: parentController }); - } - - const createArgs = {}; - const target = controller || model; - - if (this.get('preservesContext')) { - createArgs.content = target; - } else { - createArgs.context = target; - } - if (controller) { createArgs.controller = controller; } - this.setProperties({ style: ''.htmlSafe(), loading: false }); - - const cloaks = target && (target instanceof Placeholder) ? target.viewName : this.get('cloaks'); - this.setContainedView(this.createChildView(cloaks, createArgs)); - } - }, - - /** - Removes the view from the DOM and tears down all observers. - - @method cloak - */ - cloak() { - const self = this; - - if (this._containedView && (this._state || this.state) === 'inDOM') { - const style = `height: ${this.$().height()}px;`.htmlSafe(); - this.set('style', style); - this.$().prop('style', style); - - - // We need to remove the container after the height of the element has taken - // effect. - Ember.run.schedule('afterRender', function() { - self.setContainedView(null); - }); - } - }, - - _setHeights: function(){ - if (!this._containedView) { - // setting default height - // but do not touch if height already defined - if(!this.$().height()){ - let defaultHeight = 100; - if(this.get('defaultHeight')) { - defaultHeight = this.get('defaultHeight'); - } - - this.$().css('height', defaultHeight); - } - } - }.on('didInsertElement') -}); - diff --git a/app/assets/javascripts/discourse/views/embedded-post.js.es6 b/app/assets/javascripts/discourse/views/embedded-post.js.es6 deleted file mode 100644 index e6d85a85c2..0000000000 --- a/app/assets/javascripts/discourse/views/embedded-post.js.es6 +++ /dev/null @@ -1,17 +0,0 @@ -import ScreenTrack from 'discourse/lib/screen-track'; - -export default Discourse.GroupedView.extend({ - templateName: 'embedded-post', - classNames: ['reply'], - attributeBindings: ['data-post-id'], - 'data-post-id': Em.computed.alias('content.id'), - - _startTracking: function() { - const post = this.get('content'); - ScreenTrack.current().track(this.get('elementId'), post.get('post_number')); - }.on('didInsertElement'), - - _stopTracking: function() { - ScreenTrack.current().stopTracking(this.get('elementId')); - }.on('willDestroyElement') -}); diff --git a/app/assets/javascripts/discourse/views/grouped.js.es6 b/app/assets/javascripts/discourse/views/grouped.js.es6 deleted file mode 100644 index 988c166127..0000000000 --- a/app/assets/javascripts/discourse/views/grouped.js.es6 +++ /dev/null @@ -1,10 +0,0 @@ -export default Ember.View.extend({ - _groupInit: function() { - this.set('context', this.get('content')); - - const templateData = this.get('templateData'); - if (templateData) { - this.set('templateData.insideGroup', true); - } - }.on('init') -}); diff --git a/app/assets/javascripts/discourse/views/modal-body.js.es6 b/app/assets/javascripts/discourse/views/modal-body.js.es6 index f164c8dbbe..05998dac40 100644 --- a/app/assets/javascripts/discourse/views/modal-body.js.es6 +++ b/app/assets/javascripts/discourse/views/modal-body.js.es6 @@ -9,7 +9,7 @@ export default Ember.View.extend({ $('#discourse-modal').modal('show'); // Focus on first element - if (!Discourse.Mobile.mobileView && this.get('focusInput')) { + if (!this.site.mobileView && this.get('focusInput')) { Em.run.schedule('afterRender', () => this.$('input:first').focus()); } diff --git a/app/assets/javascripts/discourse/views/option-boolean.js.es6 b/app/assets/javascripts/discourse/views/option-boolean.js.es6 deleted file mode 100644 index 813677edcd..0000000000 --- a/app/assets/javascripts/discourse/views/option-boolean.js.es6 +++ /dev/null @@ -1,11 +0,0 @@ -export default Discourse.GroupedView.extend({ - classNames: ['archetype-option'], - composerControllerBinding: 'Discourse.router.composerController', - templateName: "modal/option_boolean", - - _checkedChanged: function() { - var metaData = this.get('parentView.metaData'); - metaData.set(this.get('content.key'), this.get('checked') ? 'true' : 'false'); - this.get('controller.controllers.composer').saveDraft(); - }.observes('checked') -}); diff --git a/app/assets/javascripts/discourse/views/post-placeholder.js.es6 b/app/assets/javascripts/discourse/views/post-placeholder.js.es6 deleted file mode 100644 index d73c6ce754..0000000000 --- a/app/assets/javascripts/discourse/views/post-placeholder.js.es6 +++ /dev/null @@ -1 +0,0 @@ -export default Ember.View.extend({ templateName: 'post-placeholder' }); diff --git a/app/assets/javascripts/discourse/views/post.js.es6 b/app/assets/javascripts/discourse/views/post.js.es6 deleted file mode 100644 index 8dd08a5b61..0000000000 --- a/app/assets/javascripts/discourse/views/post.js.es6 +++ /dev/null @@ -1,383 +0,0 @@ -import ScreenTrack from 'discourse/lib/screen-track'; -import { number } from 'discourse/lib/formatter'; -import DiscourseURL from 'discourse/lib/url'; -import { default as computed, on } from 'ember-addons/ember-computed-decorators'; -import { fmt } from 'discourse/lib/computed'; -import { isValidLink } from 'discourse/lib/click-track'; - -const DAY = 60 * 50 * 1000; - -const PostView = Discourse.GroupedView.extend(Ember.Evented, { - classNames: ['topic-post', 'clearfix'], - classNameBindings: ['needsModeratorClass:moderator:regular', - 'selected', - 'post.hidden:post-hidden', - 'post.deleted:deleted', - 'post.topicOwner:topic-owner', - 'groupNameClass', - 'post.wiki:wiki', - 'whisper'], - - post: Ember.computed.alias('content'), - postElementId: fmt('post.post_number', 'post_%@'), - likedUsers: null, - - @on('init') - initLikedUsers() { - this.set('likedUsers', []); - }, - - @computed('post.post_type') - whisper(postType) { - return postType === this.site.get('post_types.whisper'); - }, - - templateName: function() { - return (this.get('post.post_type') === this.site.get('post_types.small_action')) ? 'post-small-action' : 'post'; - }.property('post.post_type'), - - historyHeat: function() { - const updatedAt = this.get('post.updated_at'); - if (!updatedAt) { return; } - - // Show heat on age - const rightNow = new Date().getTime(), - updatedAtDate = new Date(updatedAt).getTime(); - - if (updatedAtDate > (rightNow - DAY * Discourse.SiteSettings.history_hours_low)) return 'heatmap-high'; - if (updatedAtDate > (rightNow - DAY * Discourse.SiteSettings.history_hours_medium)) return 'heatmap-med'; - if (updatedAtDate > (rightNow - DAY * Discourse.SiteSettings.history_hours_high)) return 'heatmap-low'; - }.property('post.updated_at'), - - needsModeratorClass: function() { - return (this.get('post.post_type') === this.site.get('post_types.moderator_action')) || - (this.get('post.topic.is_warning') && this.get('post.firstPost')); - }.property('post.post_type'), - - groupNameClass: function() { - const primaryGroupName = this.get('post.primary_group_name'); - if (primaryGroupName) { - return "group-" + primaryGroupName; - } - }.property('post.primary_group_name'), - - showExpandButton: function() { - if (this.get('controller.firstPostExpanded')) { return false; } - - const post = this.get('post'); - return post.get('post_number') === 1 && post.get('topic.expandable_first_post'); - }.property('post.post_number', 'controller.firstPostExpanded'), - - // If the cooked content changed, add the quote controls - cookedChanged: function() { - Em.run.scheduleOnce('afterRender', this, '_cookedWasChanged'); - }.observes('post.cooked'), - - _cookedWasChanged() { - this.trigger('postViewUpdated', this.$()); - this._insertQuoteControls(); - }, - - mouseUp(e) { - if (this.get('controller.multiSelect') && (e.metaKey || e.ctrlKey)) { - this.get('controller').toggledSelectedPost(this.get('post')); - } - }, - - selected: function() { - return this.get('controller').postSelected(this.get('post')); - }.property('controller.selectedPostsCount'), - - canSelectReplies: function() { - if (this.get('post.reply_count') === 0) { return false; } - return !this.get('selected'); - }.property('post.reply_count', 'selected'), - - selectPostText: function() { - return this.get('selected') ? I18n.t('topic.multi_select.selected', { count: this.get('controller.selectedPostsCount') }) : I18n.t('topic.multi_select.select'); - }.property('selected', 'controller.selectedPostsCount'), - - repliesShown: Em.computed.gt('post.replies.length', 0), - - _updateQuoteElements($aside, desc) { - let navLink = ""; - const quoteTitle = I18n.t("post.follow_quote"), - postNumber = $aside.data('post'); - - if (postNumber) { - - // If we have a topic reference - let topicId, topic; - if (topicId = $aside.data('topic')) { - topic = this.get('controller.content'); - - // If it's the same topic as ours, build the URL from the topic object - if (topic && topic.get('id') === topicId) { - navLink = ``; - } else { - // Made up slug should be replaced with canonical URL - navLink = ``; - } - - } else if (topic = this.get('controller.content')) { - // assume the same topic - navLink = ``; - } - } - // Only add the expand/contract control if it's not a full post - let expandContract = ""; - if (!$aside.data('full')) { - expandContract = ``; - $('.title', $aside).css('cursor', 'pointer'); - } - $('.quote-controls', $aside).html(expandContract + navLink); - }, - - _toggleQuote($aside) { - if (this.get('expanding')) { return; } - - this.set('expanding', true); - - $aside.data('expanded', !$aside.data('expanded')); - - const finished = () => this.set('expanding', false); - - if ($aside.data('expanded')) { - this._updateQuoteElements($aside, 'chevron-up'); - // Show expanded quote - const $blockQuote = $('blockquote', $aside); - $aside.data('original-contents', $blockQuote.html()); - - const originalText = $blockQuote.text().trim(); - $blockQuote.html(I18n.t("loading")); - let topicId = this.get('post.topic_id'); - if ($aside.data('topic')) { - topicId = $aside.data('topic'); - } - - const postId = parseInt($aside.data('post'), 10); - topicId = parseInt(topicId, 10); - - Discourse.ajax(`/posts/by_number/${topicId}/${postId}`).then(result => { - const div = $("
"); - div.html(result.cooked); - div.highlight(originalText, {caseSensitive: true, element: 'span', className: 'highlighted'}); - $blockQuote.showHtml(div, 'fast', finished); - }); - } else { - // Hide expanded quote - this._updateQuoteElements($aside, 'chevron-down'); - $('blockquote', $aside).showHtml($aside.data('original-contents'), 'fast', finished); - } - return false; - }, - - // Show how many times links have been clicked on - _showLinkCounts() { - const self = this, - link_counts = this.get('post.link_counts'); - - if (!link_counts) { return; } - - link_counts.forEach(function(lc) { - if (!lc.clicks || lc.clicks < 1) { return; } - - self.$(".cooked a[href]").each(function() { - const $link = $(this), - href = $link.attr('href'); - - let valid = href === lc.url; - - // this might be an attachment - if (lc.internal && /^\/uploads\//.test(lc.url)) { - valid = href.indexOf(lc.url) >= 0; - } - - if (valid) { - // don't display badge counts on category badge & oneboxes (unless when explicitely stated) - if (isValidLink($link)) { - $link.append("" + number(lc.clicks) + ""); - } - } - }); - }); - }, - - actions: { - toggleLike() { - const currentUser = this.get('controller.currentUser'); - const post = this.get('post'); - const likeAction = post.get('likeAction'); - if (likeAction && likeAction.get('canToggle')) { - const users = this.get('likedUsers'); - const store = this.get('controller.store'); - const action = store.createRecord('post-action-user', - currentUser.getProperties('id', 'username', 'avatar_template') - ); - - if (likeAction.toggle(post) && users.get('length')) { - users.addObject(action); - } else { - users.removeObject(action); - } - } - }, - - toggleWhoLiked() { - const post = this.get('post'); - const likeAction = post.get('likeAction'); - if (likeAction) { - const users = this.get('likedUsers'); - if (users.get('length')) { - users.clear(); - } else { - likeAction.loadUsers(post).then(newUsers => this.set('likedUsers', newUsers)); - } - } - }, - - // Toggle the replies this post is a reply to - toggleReplyHistory(post) { - const replyHistory = post.get('replyHistory'), - topicController = this.get('controller'), - origScrollTop = $(window).scrollTop(), - replyPostNumber = this.get('post.reply_to_post_number'), - postNumber = this.get('post.post_number'), - self = this; - - if (Discourse.Mobile.mobileView) { - DiscourseURL.routeTo(this.get('post.topic').urlForPostNumber(replyPostNumber)); - return; - } - - const stream = topicController.get('model.postStream'); - const offsetFromTop = this.$().position().top - $(window).scrollTop(); - - if(Discourse.SiteSettings.experimental_reply_expansion) { - if(postNumber - replyPostNumber > 1) { - stream.collapsePosts(replyPostNumber + 1, postNumber - 1); - } - - Em.run.next(function() { - PostView.highlight(replyPostNumber); - $(window).scrollTop(self.$().position().top - offsetFromTop); - }); - return; - } - - if (replyHistory.length > 0) { - const origHeight = this.$('.embedded-posts.top').height(); - - replyHistory.clear(); - Em.run.next(function() { - $(window).scrollTop(origScrollTop - origHeight); - }); - } else { - post.set('loadingReplyHistory', true); - - stream.findReplyHistory(post).then(function () { - post.set('loadingReplyHistory', false); - - Em.run.next(function() { - $(window).scrollTop(origScrollTop + self.$('.embedded-posts.top').height()); - }); - }); - } - } - }, - - // Add the quote controls to a post - _insertQuoteControls() { - const self = this, - $quotes = this.$('aside.quote'); - - // Safety check - in some cases with cloackedView this seems to be `undefined`. - if (Em.isEmpty($quotes)) { return; } - - $quotes.each(function(i, e) { - const $aside = $(e); - if ($aside.data('post')) { - self._updateQuoteElements($aside, 'chevron-down'); - const $title = $('.title', $aside); - - // Unless it's a full quote, allow click to expand - if (!($aside.data('full') || $title.data('has-quote-controls'))) { - $title.on('click', function(e2) { - if ($(e2.target).is('a')) return true; - self._toggleQuote($aside); - }); - $title.data('has-quote-controls', true); - } - } - }); - }, - - _destroyedPostView: function() { - ScreenTrack.current().stopTracking(this.get('elementId')); - }.on('willDestroyElement'), - - _postViewInserted: function() { - const $post = this.$(), - postNumber = this.get('post').get('post_number'); - - this._showLinkCounts(); - - ScreenTrack.current().track($post.prop('id'), postNumber); - - this.trigger('postViewInserted', $post); - - // Find all the quotes - Em.run.scheduleOnce('afterRender', this, '_insertQuoteControls'); - - $post.closest('.post-cloak').attr('data-post-number', postNumber); - this._applySearchHighlight(); - }.on('didInsertElement'), - - _fixImageSizes: function(){ - var maxWidth; - this.$('img:not(.avatar)').each(function(idx,img){ - - // deferring work only for posts with images - // we got to use screen here, cause nothing is rendered yet. - // long term we may want to allow for weird margins that are enforced, instead of hardcoding at 70/20 - maxWidth = maxWidth || $(window).width() - (Discourse.Mobile.mobileView ? 20 : 70); - if (Discourse.SiteSettings.max_image_width < maxWidth) { - maxWidth = Discourse.SiteSettings.max_image_width; - } - - var aspect = img.height / img.width; - if (img.width > maxWidth) { - img.width = maxWidth; - img.height = parseInt(maxWidth * aspect,10); - } - - // very unlikely but lets fix this too - if (img.height > Discourse.SiteSettings.max_image_height) { - img.height = Discourse.SiteSettings.max_image_height; - img.width = parseInt(maxWidth / aspect,10); - } - - }); - }.on('willInsertElement'), - - _applySearchHighlight: function() { - const highlight = this.get('searchService.highlightTerm'); - const cooked = this.$('.cooked'); - - if (!cooked) { return; } - - if (highlight && highlight.length > 2) { - if (this._highlighted) { - cooked.unhighlight(); - } - cooked.highlight(highlight.split(/\s+/)); - this._highlighted = true; - - } else if (this._highlighted) { - cooked.unhighlight(); - this._highlighted = false; - } - }.observes('searchService.highlightTerm', 'cooked') -}); - -export default PostView; diff --git a/app/assets/javascripts/discourse/views/quote-button.js.es6 b/app/assets/javascripts/discourse/views/quote-button.js.es6 index da9ba9040c..681523377b 100644 --- a/app/assets/javascripts/discourse/views/quote-button.js.es6 +++ b/app/assets/javascripts/discourse/views/quote-button.js.es6 @@ -1,3 +1,11 @@ +// we don't want to deselect when we click on buttons that use it +function ignoreElements(e) { + const $target = $(e.target); + return $target.hasClass('quote-button') || + $target.closest('.create').length || + $target.closest('.reply-new').length; +} + export default Ember.View.extend({ classNames: ['quote-button'], classNameBindings: ['visible'], @@ -45,11 +53,7 @@ export default Ember.View.extend({ .on("mousedown.quote-button", function(e) { view.set('isMouseDown', true); - const $target = $(e.target); - // we don't want to deselect when we click on buttons that use it - if ($target.hasClass('quote-button') || - $target.closest('.create').length || - $target.closest('.reply-new').length) return; + if (ignoreElements(e)) { return; } // deselects only when the user left click // (allows anyone to `extend` their selection using shift+click) @@ -58,6 +62,8 @@ export default Ember.View.extend({ !e.shiftKey) controller.deselectText(); }) .on('mouseup.quote-button', function(e) { + if (ignoreElements(e)) { return; } + view.selectText(e.target, controller); view.set('isMouseDown', false); }) diff --git a/app/assets/javascripts/discourse/views/reply-history.js.es6 b/app/assets/javascripts/discourse/views/reply-history.js.es6 deleted file mode 100644 index e1f2cb45bc..0000000000 --- a/app/assets/javascripts/discourse/views/reply-history.js.es6 +++ /dev/null @@ -1,7 +0,0 @@ -export default Em.CollectionView.extend({ - tagName: 'section', - classNameBindings: [':embedded-posts', ':top', ':topic-body', ':offset2', 'hidden'], - itemViewClass: 'embedded-post', - hidden: Em.computed.equal('content.length', 0), - previousPost: true -}); diff --git a/app/assets/javascripts/discourse/views/share.js.es6 b/app/assets/javascripts/discourse/views/share.js.es6 index 6c1d0f1848..c15f26d835 100644 --- a/app/assets/javascripts/discourse/views/share.js.es6 +++ b/app/assets/javascripts/discourse/views/share.js.es6 @@ -82,7 +82,7 @@ export default Ember.View.extend({ $shareLink.css({top: "" + y + "px"}); - if (!Discourse.Mobile.mobileView) { + if (!self.site.mobileView) { $shareLink.css({left: "" + x + "px"}); } diff --git a/app/assets/javascripts/discourse/views/topic-footer-main-buttons.js.es6 b/app/assets/javascripts/discourse/views/topic-footer-main-buttons.js.es6 index bc63cd182a..ab3992ec6d 100644 --- a/app/assets/javascripts/discourse/views/topic-footer-main-buttons.js.es6 +++ b/app/assets/javascripts/discourse/views/topic-footer-main-buttons.js.es6 @@ -6,7 +6,7 @@ export default ContainerView.extend({ @on('init') createButtons() { - const mobileView = Discourse.Mobile.mobileView; + const mobileView = this.site.mobileView; if (!mobileView && this.currentUser.get('staff')) { const viewArgs = {action: 'showTopicAdminMenu', title: 'topic_admin_menu', icon: 'wrench', position: 'absolute'}; diff --git a/app/assets/javascripts/discourse/views/topic-map-container.js.es6 b/app/assets/javascripts/discourse/views/topic-map-container.js.es6 deleted file mode 100644 index 5bd42eb367..0000000000 --- a/app/assets/javascripts/discourse/views/topic-map-container.js.es6 +++ /dev/null @@ -1,46 +0,0 @@ -import ContainerView from 'discourse/views/container'; -import { default as computed, observes, on } from 'ember-addons/ember-computed-decorators'; - -export default ContainerView.extend({ - classNameBindings: ['hidden', ':topic-map'], - - @observes('topic.posts_count') - _postsChanged() { - Ember.run.once(this, 'rerender'); - }, - - @computed - hidden() { - if (!this.get('post.firstPost')) return true; - - const topic = this.get('topic'); - if (topic.get('archetype') === 'private_message') return false; - if (topic.get('archetype') !== 'regular') return true; - return topic.get('posts_count') < 2; - }, - - @on('init') - startAppending() { - if (this.get('hidden')) return; - - this.attachViewWithArgs({ topic: this.get('topic') }, 'topic-map'); - this.trigger('appendMapInformation', this); - }, - - appendMapInformation(view) { - const topic = this.get('topic'); - - if (topic.get('has_summary')) { - view.attachViewWithArgs({ topic, filterBinding: 'controller.filter' }, 'toggle-summary'); - } - - const currentUser = this.get('controller.currentUser'); - if (currentUser && currentUser.get('staff') && topic.get('has_deleted')) { - view.attachViewWithArgs({ topic, filterBinding: 'controller.filter' }, 'topic-deleted'); - } - - if (this.get('topic.isPrivateMessage')) { - view.attachViewWithArgs({ topic, showPrivateInviteAction: 'showInvite' }, 'private-message-map'); - } - } -}); diff --git a/app/assets/javascripts/discourse/views/topic-progress.js.es6 b/app/assets/javascripts/discourse/views/topic-progress.js.es6 index 56e3c0ca71..7454c99d2d 100644 --- a/app/assets/javascripts/discourse/views/topic-progress.js.es6 +++ b/app/assets/javascripts/discourse/views/topic-progress.js.es6 @@ -76,7 +76,7 @@ export default Ember.View.extend({ _focusWhenOpened: function() { // Don't focus on mobile or touch - if (Discourse.Mobile.mobileView || this.capabilities.isIOS) { + if (this.site.mobileView || this.capabilities.isIOS) { return; } diff --git a/app/assets/javascripts/discourse/views/topic.js.es6 b/app/assets/javascripts/discourse/views/topic.js.es6 index 93b3adb129..96cdf5826d 100644 --- a/app/assets/javascripts/discourse/views/topic.js.es6 +++ b/app/assets/javascripts/discourse/views/topic.js.es6 @@ -185,7 +185,7 @@ function highlight(postNumber) { }); } -listenForViewEvent(TopicView, 'post:highlight', function(postNumber) { +listenForViewEvent(TopicView, 'post:highlight', postNumber => { Ember.run.scheduleOnce('afterRender', null, highlight, postNumber); }); diff --git a/app/assets/javascripts/discourse/widgets/actions-summary.js.es6 b/app/assets/javascripts/discourse/widgets/actions-summary.js.es6 new file mode 100644 index 0000000000..b776b9a5eb --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/actions-summary.js.es6 @@ -0,0 +1,136 @@ +import { createWidget } from 'discourse/widgets/widget'; +import { avatarFor } from 'discourse/widgets/post'; +import { iconNode } from 'discourse/helpers/fa-icon'; +import { h } from 'virtual-dom'; +import { dateNode } from 'discourse/helpers/node'; + +export function avatarAtts(user) { + return { template: user.avatar_template, + username: user.username, + post_url: user.post_url, + url: Discourse.getURL('/users/') + user.username_lower }; +} + +createWidget('small-user-list', { + tagName: 'div.clearfix', + + buildClasses(atts) { + return atts.listClassName; + }, + + html(atts) { + let users = atts.users; + if (users) { + const currentUser = this.currentUser; + if (atts.addSelf && !users.some(u => u.username === currentUser.username)) { + users = users.concat(avatarAtts(currentUser)); + } + + let description = I18n.t(atts.description, { icons: '' }); + + // oddly post_url is on the user + let postUrl; + const icons = users.map(u => { + postUrl = postUrl || u.post_url; + return avatarFor.call(this, 'small', u); + }); + + if (postUrl) { + description = h('a', { attributes: { href: Discourse.getURL(postUrl) } }, description); + } + return [icons, description, '.']; + } + } +}); + +createWidget('action-link', { + tagName: 'span.action-link', + + buildClasses(attrs) { + return attrs.className; + }, + + html(attrs) { + return h('a', [attrs.text, '. ']); + }, + + click() { + this.sendWidgetAction(this.attrs.action); + } +}); + +createWidget('actions-summary-item', { + tagName: 'div.post-action', + + defaultState() { + return { users: [] }; + }, + + html(attrs, state) { + const users = state.users; + + const result = []; + const action = attrs.action; + + if (users.length === 0) { + result.push(this.attach('action-link', { action: 'whoActed', text: attrs.description })); + } else { + result.push(this.attach('small-user-list', { users, description: `post.actions.people.${action}` })); + } + + if (attrs.canUndo) { + result.push(this.attach('action-link', { action: 'undo', className: 'undo', text: I18n.t(`post.actions.undo.${action}`)})); + } + + if (attrs.canDeferFlags) { + const flagsDesc = I18n.t(`post.actions.defer_flags`, { count: attrs.count }); + result.push(this.attach('action-link', { action: 'deferFlags', className: 'defer-flags', text: flagsDesc })); + } + + return result; + }, + + whoActed() { + const attrs = this.attrs; + const state = this.state; + return this.store.find('post-action-user', { id: attrs.postId, post_action_type_id: attrs.id }).then(users => { + state.users = users.map(avatarAtts); + }); + }, + + undo() { + this.sendWidgetAction('undoPostAction', this.attrs.id); + }, + + deferFlags() { + this.sendWidgetAction('deferPostActionFlags', this.attrs.id); + } +}); + +export default createWidget('actions-summary', { + tagName: 'section.post-actions', + + html(attrs) { + const actionsSummary = attrs.actionsSummary || []; + const body = []; + actionsSummary.forEach(as => { + body.push(this.attach('actions-summary-item', as)); + body.push(h('div.clearfix')); + }); + + if (attrs.deleted_at) { + body.push(h('div.post-action', [ + iconNode('trash-o'), + ' ', + avatarFor.call(this, 'small', { + template: attrs.deletedByAvatarTemplate, + username: attrs.deletedByUsername + }), + ' ', + dateNode(attrs.deleted_at) + ])); + } + + return body; + } +}); diff --git a/app/assets/javascripts/discourse/widgets/button.js.es6 b/app/assets/javascripts/discourse/widgets/button.js.es6 new file mode 100644 index 0000000000..5b4f6e1194 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/button.js.es6 @@ -0,0 +1,48 @@ +import { createWidget } from 'discourse/widgets/widget'; +import { iconNode } from 'discourse/helpers/fa-icon'; + +export default createWidget('button', { + tagName: 'button.widget-button', + + buildClasses() { + if (this.attrs.className) { return this.attrs.className; } + }, + + buildAttributes() { + const attrs = this.attrs; + + let title; + if (attrs.title) { + title = I18n.t(attrs.title, attrs.titleOptions); + } + + const attributes = { "aria-label": title, title }; + if (attrs.disabled) { attributes.disabled = "true"; } + + if (attrs.data) { + Object.keys(attrs.data).forEach(k => attributes[`data-${k}`] = attrs.data[k]); + } + + return attributes; + }, + + html(attrs) { + const contents = []; + + const left = !attrs.iconRight; + if (attrs.icon && left) { contents.push(iconNode(attrs.icon)); } + if (attrs.label) { contents.push(I18n.t(attrs.label, attrs.labelOptions)); } + if (attrs.contents) { contents.push(attrs.contents); } + if (attrs.icon && !left) { contents.push(iconNode(attrs.icon)); } + + return contents; + }, + + click() { + const attrs = this.attrs; + if (attrs.disabled) { return; } + + $(`button.widget-button`).removeClass('d-hover').blur(); + return this.sendWidgetAction(attrs.action); + } +}); diff --git a/app/assets/javascripts/discourse/widgets/category-link.js.es6 b/app/assets/javascripts/discourse/widgets/category-link.js.es6 new file mode 100644 index 0000000000..509f531f8a --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/category-link.js.es6 @@ -0,0 +1,10 @@ +import RawHtml from 'discourse/widgets/raw-html'; +import { categoryBadgeHTML } from 'discourse/helpers/category-link'; + +// Right now it's RawHTML. Eventually it should emit nodes +export default class CategoryLink extends RawHtml { + constructor(attrs) { + attrs.html = categoryBadgeHTML(attrs.category, attrs); + super(attrs); + } +}; diff --git a/app/assets/javascripts/discourse/widgets/click-hook.js.es6 b/app/assets/javascripts/discourse/widgets/click-hook.js.es6 new file mode 100644 index 0000000000..4324095b73 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/click-hook.js.es6 @@ -0,0 +1,63 @@ +/*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) { + return widget.rerenderResult(() => widget.click(e)); + } + 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) { + return widget.clickOutside(e); + } + }); + }); + + + _watchingDocument = true; +}; diff --git a/app/assets/javascripts/discourse/widgets/connector.js.es6 b/app/assets/javascripts/discourse/widgets/connector.js.es6 new file mode 100644 index 0000000000..c132666a41 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/connector.js.es6 @@ -0,0 +1,39 @@ +export default class Connector { + + constructor(widget, opts) { + this.widget = widget; + this.opts = opts; + } + + init() { + const $elem = $(`
`); + const elem = $elem[0]; + + const { opts, widget } = this; + Ember.run.next(() => { + + const mounted = widget._findView(); + + let context; + if (opts.context === 'model') { + const model = widget.findAncestorModel(); + context = model; + } + + const view = Ember.View.create({ + container: widget.container, + templateName: opts.templateName, + context + }); + mounted._connected.push(view); + + view.renderer.replaceIn(view, $elem[0]); + }); + + return elem; + } + + update() { } +} + +Connector.prototype.type = 'Widget'; diff --git a/app/assets/javascripts/discourse/widgets/decorator-helper.js.es6 b/app/assets/javascripts/discourse/widgets/decorator-helper.js.es6 new file mode 100644 index 0000000000..6ea4eb7d2b --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/decorator-helper.js.es6 @@ -0,0 +1,94 @@ +import Connector from 'discourse/widgets/connector'; +import { h } from 'virtual-dom'; +import PostCooked from 'discourse/widgets/post-cooked'; +import RawHtml from 'discourse/widgets/raw-html'; + +class DecoratorHelper { + constructor(widget, attrs, state) { + this.widget = widget; + this.attrs = attrs; + this.state = state; + } + + /** + * The `h` helper allows you to build up a virtual dom easily. + * + * Example: + * + * ``` + * // renders `

paragraph

` + * return helper.h('div.some-class', helper.h('p', 'paragraph')); + * ``` + **/ + // h() is attached via `prototype` below + + /** + * Returns the model associated with this widget. When decorating + * posts this will normally be the post. + * + * Example: + * + * ``` + * const post = helper.getModel(); + * console.log(post.get('id')); + * ``` + **/ + getModel() { + return this.widget.findAncestorModel(); + } + + /** + * If your decorator must produce raw HTML, you can use this helper + * to display it. It is preferred to use the `h` helper and create + * the HTML yourself whenever possible. + * + * Example: + * + * ``` + * return helper.rawHtml(`

I will be displayedCook me

`); + * ``` + **/ + cooked(cookedText) { + return new PostCooked({ cookedText }); + } + + /** + * You can use this bridge to mount an Ember View inside the virtual + * DOM post stream. Note that this is a bit bizarre, as our core app + * is rendered in Ember, then we switch to a virtual dom, and this + * allows part of that virtual dom to use Ember again! + * + * It really only exists as backwards compatibility for some old + * plugins that would be difficult to update otherwise. There are + * performance reasons not to use this, so be careful and avoid + * using it whenever possible. + * + * Example: + * + * ``` + * helper.connect({ templateName: 'my-handlebars-template' }); + * ``` + **/ + connect(details) { + return new Connector(this.widget, details); + } + +} +DecoratorHelper.prototype.h = h; + +export default DecoratorHelper; diff --git a/app/assets/javascripts/discourse/widgets/embedded-post.js.es6 b/app/assets/javascripts/discourse/widgets/embedded-post.js.es6 new file mode 100644 index 0000000000..767044ccb9 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/embedded-post.js.es6 @@ -0,0 +1,42 @@ +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'; +import DiscourseURL from 'discourse/lib/url'; + +createWidget('post-link-arrow', { + html(attrs) { + if (attrs.above) { + return h('a.post-info.arrow', { + attributes: { title: I18n.t('topic.jump_reply_up') } + }, iconNode('arrow-up')); + } else { + return h('a.post-info.arrow', { + attributes: { title: I18n.t('topic.jump_reply_down') } + }, iconNode('arrow-down')); + } + }, + + click() { + DiscourseURL.routeTo(this.attrs.shareUrl); + } +}); + +export default createWidget('embedded-post', { + buildKey: attrs => `embedded-post-${attrs.id}`, + + html(attrs, state) { + return [ + h('div.row', [ + this.attach('post-avatar', attrs), + h('div.topic-body', [ + h('div.topic-meta-data', [ + this.attach('poster-name', attrs), + this.attach('post-link-arrow', { above: state.above, shareUrl: attrs.shareUrl }) + ]), + new RawHtml({html: `
${attrs.cooked}
`}) + ]) + ]) + ]; + } +}); diff --git a/app/assets/javascripts/discourse/widgets/event-handler.js.es6 b/app/assets/javascripts/discourse/widgets/event-handler.js.es6 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/assets/javascripts/discourse/widgets/hamburger-categories.js.es6 b/app/assets/javascripts/discourse/widgets/hamburger-categories.js.es6 new file mode 100644 index 0000000000..cb86752c36 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/hamburger-categories.js.es6 @@ -0,0 +1,36 @@ +import { createWidget } from 'discourse/widgets/widget'; +import { h } from 'virtual-dom'; + +createWidget('hamburger-category', { + tagName: 'li.category-link', + + html(c) { + const results = [ this.attach('category_link', { category: c, allowUncategorized: true }) ]; + + const unreadTotal = parseInt(c.get('unreadTopics'), 10) + parseInt(c.get('newTopics'), 10); + if (unreadTotal) { + results.push(h('a.badge.badge-notification', { attributes: { href: c.get('url') } }, unreadTotal.toString())); + } + + if (!this.currentUser) { + results.push(h('b.topics-count', c.get('topic_count').toString())); + } + + return results; + } +}); + +export default createWidget('hamburger-categories', { + tagName: 'ul.category-links.clearfix', + + html(attrs) { + const href = Discourse.getURL('/categories'); + const result = [h('li.heading', + h('a.d-link.categories-link', { attributes: { href } }, I18n.t('filters.categories.title')) + )]; + + const categories = attrs.categories; + if (categories.length === 0) { return; } + return result.concat(categories.map(c => this.attach('hamburger-category', c))); + } +}); diff --git a/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6 new file mode 100644 index 0000000000..37e4c642a7 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6 @@ -0,0 +1,67 @@ +import { iconNode } from 'discourse/helpers/fa-icon'; +import { createWidget } from 'discourse/widgets/widget'; +import { h } from 'virtual-dom'; + +createWidget('post-admin-menu-button', { + tagName: 'li.btn', + buildClasses(attrs) { + return attrs.className; + }, + html(attrs) { + return [iconNode(attrs.icon), I18n.t(attrs.label)]; + }, + click() { + this.sendWidgetAction('closeAdminMenu'); + return this.sendWidgetAction(this.attrs.action); + } +}); + +export default createWidget('post-admin-menu', { + tagName: 'div.post-admin-menu.popup-menu', + + html(attrs) { + const contents = []; + contents.push(h('h3', I18n.t('admin_title'))); + + + if (!attrs.isWhisper && this.currentUser.staff) { + const buttonAtts = { action: 'togglePostType', icon: 'shield', className: 'toggle-post-type' }; + + if (attrs.isModeratorAction) { + buttonAtts.label = 'post.controls.revert_to_regular'; + } else { + buttonAtts.label = 'post.controls.convert_to_moderator'; + } + contents.push(this.attach('post-admin-menu-button', buttonAtts)); + } + + contents.push(this.attach('post-admin-menu-button', { + icon: 'cog', label: 'post.controls.rebake', action: 'rebakePost', className: 'rebuild-html' + })); + + if (attrs.hidden) { + contents.push(this.attach('post-admin-menu-button', { + icon: 'eye', + label: 'post.controls.unhide', + action: 'unhidePost', + className: 'unhide-post' + })); + } + + if (this.currentUser.admin) { + contents.push(this.attach('post-admin-menu-button', { + icon: 'user', + label: 'post.controls.change_owner', + action: 'changePostOwner', + className: 'change-owner' + })); + } + + return contents; + }, + + clickOutside() { + this.sendWidgetAction('closeAdminMenu'); + } +}); + diff --git a/app/assets/javascripts/discourse/widgets/post-cooked.js.es6 b/app/assets/javascripts/discourse/widgets/post-cooked.js.es6 new file mode 100644 index 0000000000..f98a90eb1d --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/post-cooked.js.es6 @@ -0,0 +1,208 @@ +import { isValidLink } from 'discourse/lib/click-track'; +import { number } from 'discourse/lib/formatter'; + +const _decorators = []; + +// Don't call this directly: use `plugin-api/decorateCooked` +export function addDecorator(cb) { + _decorators.push(cb); +} + +export default class PostCooked { + + constructor(attrs, getModel) { + this.attrs = attrs; + this.expanding = false; + this._highlighted = false; + this.getModel = getModel; + } + + update(prev) { + if (prev.attrs.cooked !== this.attrs.cooked) { + return this.init(); + } + } + + init() { + const $html = $(`
${this.attrs.cooked}
`); + this._insertQuoteControls($html); + this._showLinkCounts($html); + this._fixImageSizes($html); + this._applySearchHighlight($html); + + _decorators.forEach(cb => cb($html, this.getModel)); + return $html[0]; + } + + _applySearchHighlight($html) { + const highlight = this.attrs.highlightTerm; + + if (highlight && highlight.length > 2) { + if (this._highlighted) { + $html.unhighlight(); + } + $html.highlight(highlight.split(/\s+/)); + this._highlighted = true; + + } else if (this._highlighted) { + $html.unhighlight(); + this._highlighted = false; + } + } + + _fixImageSizes($html) { + const maxImageWidth = Discourse.SiteSettings.max_image_width; + const maxImageHeight = Discourse.SiteSettings.max_image_height; + + let maxWindowWidth; + $html.find('img:not(.avatar)').each((idx,img) => { + // deferring work only for posts with images + // we got to use screen here, cause nothing is rendered yet. + // long term we may want to allow for weird margins that are enforced, instead of hardcoding at 70/20 + maxWindowWidth = maxWindowWidth || $(window).width() - (this.attrs.mobileView ? 20 : 70); + if (maxImageWidth < maxWindowWidth) { + maxWindowWidth = maxImageWidth; + } + + const aspect = img.height / img.width; + if (img.width > maxWindowWidth) { + img.width = maxWindowWidth; + img.height = parseInt(maxWindowWidth * aspect,10); + } + + // very unlikely but lets fix this too + if (img.height > maxImageHeight) { + img.height = maxImageHeight; + img.width = parseInt(maxWindowWidth / aspect,10); + } + }); + } + + _showLinkCounts($html) { + const linkCounts = this.attrs.linkCounts; + if (!linkCounts) { return; } + + linkCounts.forEach(lc => { + if (!lc.clicks || lc.clicks < 1) { return; } + + $html.find('a[href]').each((i, e) => { + const $link = $(e); + const href = $link.attr('href'); + + let valid = href === lc.url; + + // this might be an attachment + if (lc.internal && /^\/uploads\//.test(lc.url)) { + valid = href.indexOf(lc.url) >= 0; + } + + // don't display badge counts on category badge & oneboxes (unless when explicitely stated) + if (valid && isValidLink($link)) { + const title = I18n.t("topic_map.clicks", {count: lc.clicks}); + $link.append(`${number(lc.clicks)}`); + } + }); + }); + } + + _toggleQuote($aside) { + if (this.expanding) { return; } + + this.expanding = true; + + $aside.data('expanded', !$aside.data('expanded')); + + const finished = () => this.expanding = false; + + if ($aside.data('expanded')) { + this._updateQuoteElements($aside, 'chevron-up'); + // Show expanded quote + const $blockQuote = $('blockquote', $aside); + $aside.data('original-contents', $blockQuote.html()); + + const originalText = $blockQuote.text().trim(); + $blockQuote.html(I18n.t("loading")); + let topicId = this.attrs.topicId; + if ($aside.data('topic')) { + topicId = $aside.data('topic'); + } + + const postId = parseInt($aside.data('post'), 10); + topicId = parseInt(topicId, 10); + + Discourse.ajax(`/posts/by_number/${topicId}/${postId}`).then(result => { + const div = $("
"); + div.html(result.cooked); + div.highlight(originalText, {caseSensitive: true, element: 'span', className: 'highlighted'}); + $blockQuote.showHtml(div, 'fast', finished); + }); + } else { + // Hide expanded quote + this._updateQuoteElements($aside, 'chevron-down'); + $('blockquote', $aside).showHtml($aside.data('original-contents'), 'fast', finished); + } + return false; + } + + _urlForPostNumber(postNumber) { + return (postNumber > 0) ? `${this.attrs.topicUrl}/${postNumber}` : this.attrs.topicUrl; + } + + _updateQuoteElements($aside, desc) { + let navLink = ""; + const quoteTitle = I18n.t("post.follow_quote"); + const postNumber = $aside.data('post'); + + if (postNumber) { + + // If we have a topic reference + const asideTopicId = parseInt($aside.data('topic')); + + if (asideTopicId) { + // If it's the same topic as ours, build the URL from the topic object + if (this.attrs.topicId === asideTopicId) { + navLink = ``; + } else { + // Made up slug should be replaced with canonical URL + const asideLink = Discourse.getURL("/t/via-quote/") + asideTopicId + "/" + postNumber; + navLink = ``; + } + + } else { + // assume the same topic + navLink = ``; + } + } + // Only add the expand/contract control if it's not a full post + let expandContract = ""; + if (!$aside.data('full')) { + expandContract = ``; + $('.title', $aside).css('cursor', 'pointer'); + } + $('.quote-controls', $aside).html(expandContract + navLink); + } + + _insertQuoteControls($html) { + const $quotes = $html.find('aside.quote'); + if ($quotes.length === 0) { return; } + + $quotes.each((i, e) => { + const $aside = $(e); + if ($aside.data('post')) { + this._updateQuoteElements($aside, 'chevron-down'); + const $title = $('.title', $aside); + + // Unless it's a full quote, allow click to expand + if (!($aside.data('full') || $title.data('has-quote-controls'))) { + $title.on('click', e2 => { + if ($(e2.target).is('a')) return true; + this._toggleQuote($aside); + }); + $title.data('has-quote-controls', true); + } + } + }); + } +} + +PostCooked.prototype.type = 'Widget'; diff --git a/app/assets/javascripts/discourse/widgets/post-edits-indicator.js.es6 b/app/assets/javascripts/discourse/widgets/post-edits-indicator.js.es6 new file mode 100644 index 0000000000..5ae62a3f1c --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/post-edits-indicator.js.es6 @@ -0,0 +1,41 @@ +import { createWidget } from 'discourse/widgets/widget'; +import { iconNode } from 'discourse/helpers/fa-icon'; +import { longDate } from 'discourse/lib/formatter'; +import { h } from 'virtual-dom'; + +const FIFTY_HOURS = 60 * 50 * 1000; + +export default createWidget('post-edits-indicator', { + tagName: 'div.post-info.edits', + + historyHeat(updatedAt) { + if (!updatedAt) { return; } + + // Show heat on age + const rightNow = new Date().getTime(); + const updatedAtTime = updatedAt.getTime(); + + const siteSettings = this.siteSettings; + if (updatedAtTime > (rightNow - FIFTY_HOURS * siteSettings.history_hours_low)) return 'heatmap-high'; + if (updatedAtTime > (rightNow - FIFTY_HOURS * siteSettings.history_hours_medium)) return 'heatmap-med'; + if (updatedAtTime > (rightNow - FIFTY_HOURS * siteSettings.history_hours_high)) return 'heatmap-low'; + }, + + html(attrs) { + const contents = [attrs.version - 1, ' ', iconNode('pencil')]; + const updatedAt = new Date(attrs.updated_at); + + const title = `${I18n.t('post.last_edited_on')} ${longDate(updatedAt)}`; + return h('a', { + className: this.historyHeat(updatedAt), + attributes: { title } + }, contents); + }, + + click() { + if (this.attrs.canViewEditHistory) { + this.sendWidgetAction('showHistory'); + } + } +}); + diff --git a/app/assets/javascripts/discourse/widgets/post-gap.js.es6 b/app/assets/javascripts/discourse/widgets/post-gap.js.es6 new file mode 100644 index 0000000000..68e0be1ad3 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/post-gap.js.es6 @@ -0,0 +1,24 @@ +import { createWidget } from 'discourse/widgets/widget'; + +export default createWidget('post-gap', { + tagName: 'div.gap.jagged-border', + buildKey: (attrs) => `post-gap-${attrs.pos}-${attrs.postId}`, + + defaultState() { + return { loading: false }; + }, + + html(attrs, state) { + return state.loading ? I18n.t('loading') : I18n.t('post.gap', {count: attrs.gap.length}); + }, + + click() { + const { attrs, state } = this; + + if (state.loading) { return; } + state.loading = true; + + const args = { gap: attrs.gap, post: this.model }; + return this.sendWidgetAction(attrs.pos === 'before' ? 'fillGapBefore' : 'fillGapAfter', args); + } +}); diff --git a/app/assets/javascripts/discourse/widgets/post-gutter.js.es6 b/app/assets/javascripts/discourse/widgets/post-gutter.js.es6 new file mode 100644 index 0000000000..177d103213 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/post-gutter.js.es6 @@ -0,0 +1,70 @@ +import { iconNode } from 'discourse/helpers/fa-icon'; +import { createWidget } from 'discourse/widgets/widget'; +import { h } from 'virtual-dom'; +import RawHtml from 'discourse/widgets/raw-html'; + +const MAX_GUTTER_LINKS = 5; + +export default createWidget('post-gutter', { + tagName: 'div.gutter', + + defaultState() { + return { collapsed: true }; + }, + + html(attrs, state) { + const links = this.attrs.links || []; + + const result = []; + let toShow = links.length; + if (state.collapsed && toShow > MAX_GUTTER_LINKS) { toShow = MAX_GUTTER_LINKS; } + + const seenTitles = {}; + + + let i = 0; + while (i < links.length && result.length < toShow) { + const l = links[i++]; + + let title = l.title; + if (title && !seenTitles[title]) { + seenTitles[title] = true; + const linkBody = [new RawHtml({ html: `${Discourse.Emoji.unescape(title)}` })]; + if (l.clicks) { + linkBody.push(h('span.badge.badge-notification.clicks', l.clicks.toString())); + } + + const className = l.reflection ? 'inbound' : 'outbound'; + const link = h('a.track-link', { className, attributes: { href: l.url } }, linkBody); + result.push(h('li', link)); + } + } + + if (state.collapsed) { + const remaining = links.length - MAX_GUTTER_LINKS; + if (remaining > 0) { + result.push(h('li', h('a.toggle-more', I18n.t('post.more_links', {count: remaining})))); + } + } + + if (attrs.canReplyAsNewTopic) { + result.push(h('a.reply-new', [iconNode('plus'), I18n.t('post.reply_as_new_topic')])); + } + + return h('ul.post-links', result); + }, + + click(e) { + const $target = $(e.target); + if ($target.hasClass('toggle-more')) { + this.sendWidgetAction('showAll'); + } else if ($target.closest('.reply-new').length) { + this.sendWidgetAction('newTopicAction'); + } + return true; + }, + + showAll() { + this.state.collapsed = false; + } +}); diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-menu.js.es6 new file mode 100644 index 0000000000..aff7d61fa2 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/post-menu.js.es6 @@ -0,0 +1,365 @@ +import { createWidget } from 'discourse/widgets/widget'; +import { avatarAtts } from 'discourse/widgets/actions-summary'; +import { h } from 'virtual-dom'; + +const LIKE_ACTION = 2; + +function animateHeart($elem, start, end, complete) { + if (Ember.testing) { return Ember.run(this, complete); } + + $elem.stop() + .css('textIndent', start) + .animate({ textIndent: end }, { + complete, + step(now) { + $(this).css('transform','scale('+now+')'); + }, + duration: 150 + }, 'linear'); +} + +const _builders = {}; +const _extraButtons = {}; + +export function addButton(name, builder) { + _extraButtons[name] = builder; +} + +function registerButton(name, builder) { + _builders[name] = builder; +} + +registerButton('like', attrs => { + if (!attrs.showLike) { return; } + const className = attrs.liked ? 'toggle-like has-like fade-out' : 'toggle-like like'; + + const button = { + action: 'like', + icon: 'heart', + className + }; + + if (attrs.canToggleLike) { + button.title = attrs.liked ? 'post.controls.undo_like' : 'post.controls.like'; + } else if (attrs.liked) { + button.title = 'post.controls.has_liked'; + button.disabled = true; + } + return button; +}); + +registerButton('like-count', attrs => { + const count = attrs.likeCount; + + if (count > 0) { + const title = attrs.liked + ? count === 1 ? 'post.has_likes_title_only_you' : 'post.has_likes_title_you' + : 'post.has_likes_title'; + + return { action: 'toggleWhoLiked', + title, + className: 'like-count highlight-action', + contents: I18n.t("post.has_likes", { count }), + titleOptions: {count: attrs.liked ? (count-1) : count } + }; + } +}); + +registerButton('flag', attrs => { + if (attrs.canFlag) { + return { action: 'showFlags', + title: 'post.controls.flag', + icon: 'flag', + className: 'create-flag' }; + } +}); + +registerButton('edit', attrs => { + if (attrs.canEdit) { + return { + action: 'editPost', + className: 'edit', + title: 'post.controls.edit', + icon: 'pencil', + alwaysShowYours: true, + alwaysShowWiki: true + }; + } +}); + +registerButton('replies', (attrs, state, siteSettings) => { + const replyCount = attrs.replyCount; + + if (!replyCount) { return; } + + // Omit replies if the setting `suppress_reply_directly_below` is enabled + if (replyCount === 1 && + attrs.replyDirectlyBelow && + siteSettings.suppress_reply_directly_below) { + return; + } + + return { + action: 'toggleRepliesBelow', + className: 'show-replies', + icon: state.repliesShown ? 'chevron-up' : 'chevron-down', + titleOptions: { count: replyCount }, + title: 'post.has_replies', + labelOptions: { count: replyCount }, + label: 'post.has_replies', + iconRight: true + }; +}); + + +registerButton('share', attrs => { + return { + action: 'share', + title: 'post.controls.share', + icon: 'link', + data: { + 'share-url': attrs.shareUrl, + 'post-number': attrs.post_number + } + }; +}); + +registerButton('reply', attrs => { + const args = { + action: 'replyToPost', + title: 'post.controls.reply', + icon: 'reply', + className: 'reply create fade-out' + }; + + if (!attrs.canCreatePost) { return; } + + if (!attrs.mobileView) { + args.label = 'topic.reply.title'; + } + + return args; +}); + +registerButton('bookmark', attrs => { + if (!attrs.canBookmark) { return; } + + let iconClass = 'read-icon'; + let buttonClass = 'bookmark'; + let tooltip = 'bookmarks.not_bookmarked'; + + if (attrs.bookmarked) { + iconClass += ' bookmarked'; + buttonClass += ' bookmarked'; + tooltip = 'bookmarks.created'; + } + + return { action: 'toggleBookmark', + title: tooltip, + className: buttonClass, + contents: h('div', { className: iconClass }) }; +}); + +registerButton('admin', attrs => { + if (!attrs.canManage) { return; } + return { action: 'openAdminMenu', + title: 'post.controls.admin', + className: 'show-post-admin-menu', + icon: 'wrench' }; +}); + +registerButton('delete', attrs => { + if (attrs.canRecoverTopic) { + return { action: 'recoverPost', title: 'topic.actions.recover', icon: 'undo', className: 'recover' }; + } else if (attrs.canDeleteTopic) { + return { action: 'deletePost', title: 'topic.actions.delete', icon: 'trash-o', className: 'delete' }; + } else if (attrs.canRecover) { + return { action: 'recoverPost', title: 'post.controls.undelete', icon: 'undo', className: 'recover' }; + } else if (attrs.canDelete) { + return { action: 'deletePost', title: 'post.controls.delete', icon: 'trash-o', className: 'delete' }; + } +}); + +registerButton('wiki', attrs => { + if (!attrs.canWiki) { return; } + + if (attrs.wiki) { + return { action: 'toggleWiki', + title: 'post.controls.unwiki', + icon: 'pencil-square-o', + className: 'wiki wikied' }; + } else { + return { action: 'toggleWiki', + title: 'post.controls.wiki', + icon: 'pencil-square-o', + className: 'wiki' }; + } +}); + +export default createWidget('post-menu', { + tagName: 'section.post-menu-area.clearfix', + + defaultState() { + return { collapsed: true, likedUsers: [], adminVisible: false }; + }, + + buildKey: attrs => `post-menu-${attrs.id}`, + + attachButton(name, attrs) { + const builder = _builders[name]; + if (builder) { + const buttonAtts = builder(attrs, this.state, this.siteSettings); + if (buttonAtts) { + return this.attach('button', buttonAtts); + } + } + }, + + html(attrs, state) { + const { siteSettings } = this; + + const hiddenSetting = (siteSettings.post_menu_hidden_items || ''); + const hiddenButtons = hiddenSetting.split('|').filter(s => { + return !attrs.bookmarked || s !== 'bookmark'; + }); + + const allButtons = []; + let visibleButtons = []; + siteSettings.post_menu.split('|').forEach(i => { + const button = this.attachButton(i, attrs); + if (button) { + allButtons.push(button); + if ((attrs.yours && button.attrs.alwaysShowYours) || + (attrs.wiki && button.attrs.alwaysShowWiki) || + (hiddenButtons.indexOf(i) === -1)) { + visibleButtons.push(button); + } + } + }); + + // Only show ellipsis if there is more than one button hidden + // if there are no more buttons, we are not collapsed + if (!state.collapsed || (allButtons.length <= visibleButtons.length + 1)) { + visibleButtons = allButtons; + if (state.collapsed) { state.collapsed = false; } + } else { + const showMore = this.attach('button', { + action: 'showMoreActions', + title: 'show_more', + className: 'show-more-actions', + icon: 'ellipsis-h' }); + visibleButtons.splice(visibleButtons.length - 1, 0, showMore); + } + + Object.keys(_extraButtons).forEach(k => { + const builder = _extraButtons[k]; + if (builder) { + const buttonAtts = builder(attrs, this.state, this.siteSettings); + if (buttonAtts) { + const { position, beforeButton } = buttonAtts; + delete buttonAtts.position; + + let button = this.attach('button', buttonAtts); + + if (beforeButton) { + button = h('span', [beforeButton(h), button]); + } + + if (button) { + switch(position) { + case 'first': + visibleButtons.unshift(button); + break; + case 'second-last-hidden': + if (!state.collapsed) { + visibleButtons.splice(visibleButtons.length-2, 0, button); + } + break; + default: + visibleButtons.push(button); + break; + } + } + } + } + }); + + const postControls = []; + + const repliesButton = this.attachButton('replies', attrs); + if (repliesButton) { + postControls.push(repliesButton); + } + + postControls.push(h('div.actions', visibleButtons)); + if (state.adminVisible) { + postControls.push(this.attach('post-admin-menu', attrs)); + } + + const contents = [ h('nav.post-controls.clearfix', postControls) ]; + if (state.likedUsers.length) { + contents.push(this.attach('small-user-list', { + users: state.likedUsers, + addSelf: attrs.liked, + listClassName: 'who-liked', + description: 'post.actions.people.like' + })); + } + + return contents; + }, + + openAdminMenu() { + this.state.adminVisible = true; + }, + + closeAdminMenu() { + this.state.adminVisible = false; + }, + + showMoreActions() { + this.state.collapsed = false; + }, + + like() { + const attrs = this.attrs; + if (attrs.liked) { + return this.sendWidgetAction('toggleLike'); + } + + const $heart = $(`[data-post-id=${attrs.id}] .fa-heart`); + $heart.closest('button').addClass('has-like'); + + const scale = [1.0, 1.5]; + return new Ember.RSVP.Promise(resolve => { + animateHeart($heart, scale[0], scale[1], () => { + animateHeart($heart, scale[1], scale[0], () => { + this.sendWidgetAction('toggleLike').then(() => resolve()); + }); + }); + }); + }, + + refreshLikes() { + if (this.state.likedUsers.length) { + return this.getWhoLiked(); + } + }, + + getWhoLiked() { + const { attrs, state } = this; + + return this.store.find('post-action-user', { id: attrs.id, post_action_type_id: LIKE_ACTION }).then(users => { + state.likedUsers = users.map(avatarAtts); + }); + }, + + toggleWhoLiked() { + const state = this.state; + if (state.likedUsers.length) { + state.likedUsers = []; + } else { + return this.getWhoLiked(); + } + }, +}); diff --git a/app/assets/javascripts/discourse/widgets/post-placeholder.js.es6 b/app/assets/javascripts/discourse/widgets/post-placeholder.js.es6 new file mode 100644 index 0000000000..f12fb26f34 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/post-placeholder.js.es6 @@ -0,0 +1,17 @@ +import { createWidget } from 'discourse/widgets/widget'; +import { h } from 'virtual-dom'; + +export default createWidget('post-placeholder', { + tagName: 'article.placeholder', + + html() { + return h('div.row', [ + h('div.topic-avatar', h('div.placeholder-avatar')), + h('div.topic-body', [ + h('div.placeholder-text'), + h('div.placeholder-text'), + h('div.placeholder-text') + ]) + ]); + } +}); diff --git a/app/assets/javascripts/discourse/widgets/post-small-action.js.es6 b/app/assets/javascripts/discourse/widgets/post-small-action.js.es6 new file mode 100644 index 0000000000..4940b6446a --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/post-small-action.js.es6 @@ -0,0 +1,75 @@ +import { createWidget } from 'discourse/widgets/widget'; +import RawHtml from 'discourse/widgets/raw-html'; +import { iconNode } from 'discourse/helpers/fa-icon'; +import { h } from 'virtual-dom'; +import { actionDescriptionHtml } from 'discourse/components/small-action'; +import { avatarFor } from 'discourse/widgets/post'; + +const icons = { + 'closed.enabled': 'lock', + 'closed.disabled': 'unlock-alt', + 'autoclosed.enabled': 'lock', + 'autoclosed.disabled': 'unlock-alt', + 'archived.enabled': 'folder', + 'archived.disabled': 'folder-open', + 'pinned.enabled': 'thumb-tack', + 'pinned.disabled': 'thumb-tack unpinned', + 'pinned_globally.enabled': 'thumb-tack', + 'pinned_globally.disabled': 'thumb-tack unpinned', + 'visible.enabled': 'eye', + 'visible.disabled': 'eye-slash', + 'split_topic': 'sign-out', + 'invited_user': 'plus-circle', + 'removed_user': 'minus-circle' +}; + +export default createWidget('post-small-action', { + buildKey: attrs => `post-small-act-${attrs.id}`, + tagName: 'div.small-action.onscreen-post.clearfix', + + buildId(attrs) { + return `post_${attrs.post_number}`; + }, + + buildClasses(attrs) { + if (attrs.deleted) { return 'deleted'; } + }, + + html(attrs) { + const contents = []; + + if (attrs.canDelete) { + contents.push(this.attach('button', { + icon: 'times', + action: 'deletePost', + title: 'post.controls.delete' + })); + } + + if (attrs.canEdit) { + contents.push(this.attach('button', { + icon: 'pencil', + action: 'editPost', + title: 'post.controls.edit' + })); + } + + contents.push(avatarFor.call(this, 'small', { + template: attrs.avatar_template, + username: attrs.avatar, + url: attrs.usernameUrl + })); + + const description = actionDescriptionHtml(attrs.actionCode, attrs.created_at, attrs.actionCodeWho); + contents.push(new RawHtml({ html: `

${description}

` })); + + if (attrs.cooked) { + contents.push(new RawHtml({ html: `
${attrs.cooked}
` })); + } + + return [ + h('div.topic-avatar', iconNode(icons[attrs.actionCode] || 'exclamation')), + h('div.small-action-desc', contents) + ]; + } +}); diff --git a/app/assets/javascripts/discourse/widgets/post-stream.js.es6 b/app/assets/javascripts/discourse/widgets/post-stream.js.es6 new file mode 100644 index 0000000000..704b671f24 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/post-stream.js.es6 @@ -0,0 +1,113 @@ +import { createWidget } from 'discourse/widgets/widget'; +import transformPost from 'discourse/lib/transform-post'; +import { Placeholder } from 'discourse/lib/posts-with-placeholders'; +import { addWidgetCleanCallback } from 'discourse/components/mount-widget'; + +const CLOAKING_ENABLED = !window.inTestEnv; +const DAY = 1000 * 60 * 60 * 24; + +const _dontCloak = {}; +let _cloaked = {}; + +export function preventCloak(postId) { + _dontCloak[postId] = true; +} + +export function cloak(post, component) { + if (!CLOAKING_ENABLED || _cloaked[post.id] || _dontCloak[post.id]) { return; } + + const $post = $(`#post_${post.post_number}`); + _cloaked[post.id] = $post.outerHeight(); + Ember.run.debounce(component, 'queueRerender', 1000); +} + +export function uncloak(post, component) { + if (!CLOAKING_ENABLED || !_cloaked[post.id]) { return; } + _cloaked[post.id] = null; + component.queueRerender(); +} + +addWidgetCleanCallback('post-stream', () => _cloaked = {}); + +export default createWidget('post-stream', { + tagName: 'div.post-stream', + + html(attrs) { + const posts = attrs.posts || []; + const postArray = posts.toArray(); + + const result = []; + + const before = attrs.gaps && attrs.gaps.before ? attrs.gaps.before : {}; + const after = attrs.gaps && attrs.gaps.after ? attrs.gaps.after : {}; + + let prevPost; + let prevDate; + + const mobileView = this.site.mobileView; + for (let i=0; i this.siteSettings.show_time_gap_days) { + result.push(this.attach('time-gap', { daysSince })); + } + } + prevDate = curTime; + + const height = _cloaked[post.id]; + if (height) { + transformed.cloaked = true; + transformed.height = height; + } + + if (transformed.isSmallAction) { + result.push(this.attach('post-small-action', transformed, { model: post })); + } else { + result.push(this.attach('post', transformed, { model: post })); + } + + // Post gap - after + const afterGap = after[post.id]; + if (afterGap) { + result.push(this.attach('post-gap', { pos: 'after', postId: post.id, gap: afterGap }, { model: post })); + } + + prevPost = post; + } + return result; + } +}); diff --git a/app/assets/javascripts/discourse/widgets/post.js.es6 b/app/assets/javascripts/discourse/widgets/post.js.es6 new file mode 100644 index 0000000000..be6ed28ad1 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/post.js.es6 @@ -0,0 +1,432 @@ +import PostCooked from 'discourse/widgets/post-cooked'; +import { createWidget, applyDecorators } from 'discourse/widgets/widget'; +import { iconNode } from 'discourse/helpers/fa-icon'; +import { transformBasicPost } from 'discourse/lib/transform-post'; +import { h } from 'virtual-dom'; +import DiscourseURL from 'discourse/lib/url'; +import { dateNode } from 'discourse/helpers/node'; + +export function avatarImg(wanted, attrs) { + const size = Discourse.Utilities.translateSize(wanted); + const url = Discourse.Utilities.avatarUrl(attrs.template, size); + + // We won't render an invalid url + if (!url || url.length === 0) { return; } + const title = attrs.username; + + const properties = { + attributes: { alt: '', width: size, height: size, src: Discourse.getURLWithCDN(url), title }, + className: 'avatar' + }; + + return h('img', properties); +} + +export function avatarFor(wanted, attrs) { + return h('a', { + className: `trigger-user-card ${attrs.className || ''}`, + attributes: { href: attrs.url, 'data-user-card': attrs.username } + }, avatarImg(wanted, attrs)); +} + +createWidget('select-post', { + tagName: 'div.select-posts', + + html(attrs) { + const buttons = []; + + if (attrs.replyCount > 0 && !attrs.selected) { + buttons.push(this.attach('button', { label: 'topic.multi_select.select_replies', action: 'selectReplies' })); + } + + const selectPostKey = attrs.selected ? 'topic.multi_select.selected' : 'topic.multi_select.select'; + buttons.push(this.attach('button', { className: 'select-post', + label: selectPostKey, + labelOptions: { count: attrs.selectedPostsCount }, + action: 'selectPost' })); + return buttons; + } +}); + +createWidget('reply-to-tab', { + tagName: 'a.reply-to-tab', + + defaultState() { + return { loading: false }; + }, + + html(attrs, state) { + if (state.loading) { return I18n.t('loading'); } + + return [iconNode('mail-forward'), + ' ', + avatarImg.call(this,'small',{ + template: attrs.replyToAvatarTemplate, + username: attrs.replyToUsername + }), + ' ', + h('span', attrs.replyToUsername)]; + }, + + click() { + this.state.loading = true; + this.sendWidgetAction('toggleReplyAbove').then(() => this.state.loading = false); + } +}); + +createWidget('post-avatar', { + tagName: 'div.topic-avatar', + + settings: { + size: 'large' + }, + + html(attrs) { + let body; + if (!attrs.user_id) { + body = h('i', { className: 'fa fa-trash-o deleted-user-avatar' }); + } else { + body = avatarFor.call(this, this.settings.size, { + template: attrs.avatar_template, + username: attrs.username, + url: attrs.usernameUrl, + className: 'main-avatar' + }); + } + + return [body, h('div.poster-avatar-extra')]; + } +}); + + +createWidget('wiki-edit-button', { + tagName: 'div.post-info.wiki', + title: 'post.wiki.about', + + html() { + return iconNode('pencil-square-o'); + }, + + click() { + this.sendWidgetAction('editPost'); + } +}); + +createWidget('post-email-indicator', { + tagName: 'div.post-info.via-email', + title: 'post.via_email', + + buildClasses(attrs) { + return attrs.canViewRawEmail ? 'raw-email' : null; + }, + + html() { + return iconNode('envelope-o'); + }, + + click() { + if (this.attrs.canViewRawEmail) { + this.sendWidgetAction('showRawEmail'); + } + } +}); + +function showReplyTab(attrs, siteSettings) { + return attrs.replyToUsername && + (!attrs.replyDirectlyAbove || !siteSettings.suppress_reply_directly_above); +} + +createWidget('post-meta-data', { + tagName: 'div.topic-meta-data', + html(attrs) { + const result = [this.attach('poster-name', attrs)]; + + if (attrs.isWhisper) { + result.push(h('div.post-info.whisper', { + attributes: { title: I18n.t('post.whisper') }, + }, iconNode('eye-slash'))); + } + + const createdAt = new Date(attrs.created_at); + if (createdAt) { + result.push(h('div.post-info', + h('a.post-date', { + attributes: { + href: attrs.shareUrl, + 'data-share-url': attrs.shareUrl, + 'data-post-number': attrs.post_number + } + }, dateNode(createdAt)) + )); + } + + if (attrs.via_email) { + result.push(this.attach('post-email-indicator', attrs)); + } + + if (attrs.version > 1) { + result.push(this.attach('post-edits-indicator', attrs)); + } + + if (attrs.wiki) { + result.push(this.attach('wiki-edit-button', attrs)); + } + + if (attrs.multiSelect) { + result.push(this.attach('select-post', attrs)); + } + + if (showReplyTab(attrs, this.siteSettings)) { + result.push(this.attach('reply-to-tab', attrs)); + } + + result.push(h('div.read-state', { + className: attrs.read ? 'read' : null, + attributes: { + title: I18n.t('post.unread') + } + }, iconNode('circle'))); + + return result; + } +}); + +createWidget('expand-hidden', { + tagName: 'a.expand-hidden', + + html() { + return I18n.t('post.show_hidden'); + }, + + click() { + this.sendWidgetAction('expandHidden'); + } +}); + +createWidget('expand-post-button', { + tagName: 'button.btn.expand-post', + buildKey: attrs => `expand-post-button-${attrs.id}`, + + defaultState() { + return { loadingExpanded: false }; + }, + + html(attrs, state) { + if (state.loadingExpanded) { + return I18n.t('loading'); + } else { + return [I18n.t('post.show_full'), "..."]; + } + }, + + click() { + this.state.loadingExpanded = true; + this.sendWidgetAction('expandFirstPost'); + } +}); + +class DecoratorHelper { + constructor(widget) { + this.container = widget.container; + this._widget = widget; + } + + getModel() { + return this._widget.findAncestorModel(); + } +} + +createWidget('post-contents', { + buildKey: attrs => `post-contents-${attrs.id}`, + + defaultState() { + return { expandedFirstPost: false, repliesBelow: [] }; + }, + + buildClasses(attrs) { + const classes = ['regular']; + if (!this.state.repliesShown) { + classes.push('contents'); + } + if (showReplyTab(attrs, this.siteSettings)) { + classes.push('avoid-tab'); + } + return classes; + }, + + html(attrs, state) { + let result = [new PostCooked(attrs, new DecoratorHelper(this))]; + result = result.concat(applyDecorators(this, 'after-cooked', attrs, state)); + + if (attrs.cooked_hidden) { + result.push(this.attach('expand-hidden', attrs)); + } + + if (!state.expandedFirstPost && attrs.expandablePost) { + result.push(this.attach('expand-post-button', attrs)); + } + + const extraState = { state: { repliesShown: !!state.repliesBelow.length } }; + result.push(this.attach('post-menu', attrs, extraState)); + + const repliesBelow = state.repliesBelow; + if (repliesBelow.length) { + result.push(h('section.embedded-posts.bottom', repliesBelow.map(p => this.attach('embedded-post', p)))); + } + + return result; + }, + + toggleRepliesBelow() { + if (this.state.repliesBelow.length) { + this.state.repliesBelow = []; + return; + } + + const post = this.findAncestorModel(); + const topicUrl = post ? post.get('topic.url') : null; + return this.store.find('post-reply', { postId: this.attrs.id }).then(posts => { + this.state.repliesBelow = posts.map(p => { + p.shareUrl = `${topicUrl}/${p.post_number}`; + return transformBasicPost(p); + }); + }); + }, + + expandFirstPost() { + const post = this.findAncestorModel(); + return post.expand().then(() => this.state.expandedFirstPost = true); + } +}); + +createWidget('post-body', { + tagName: 'div.topic-body', + + html(attrs) { + const postContents = this.attach('post-contents', attrs); + const result = [this.attach('post-meta-data', attrs), postContents]; + + result.push(this.attach('actions-summary', attrs)); + if (attrs.showTopicMap) { + result.push(this.attach('topic-map', attrs)); + } + + return result; + } +}); + +createWidget('post-article', { + tagName: 'article.boxed.onscreen-post', + buildKey: attrs => `post-article-${attrs.id}`, + + defaultState() { + return { repliesAbove: [] }; + }, + + buildId(attrs) { + return `post_${attrs.post_number}`; + }, + + buildClasses(attrs) { + if (attrs.via_email) { return 'via-email'; } + }, + + buildAttributes(attrs) { + return { 'data-post-id': attrs.id, 'data-user-id': attrs.user_id }; + }, + + html(attrs, state) { + const rows = [h('a.tabLoc', { attributes: { href: ''} })]; + if (state.repliesAbove.length) { + const replies = state.repliesAbove.map(p => this.attach('embedded-post', p, { state: { above: true } })); + rows.push(h('div.row', h('section.embedded-posts.top.topic-body.offset2', replies))); + } + + rows.push(h('div.row', [this.attach('post-avatar', attrs), + this.attach('post-body', attrs), + this.attach('post-gutter', attrs)])); + return rows; + }, + + toggleReplyAbove() { + const replyPostNumber = this.attrs.reply_to_post_number; + + // jump directly on mobile + if (this.attrs.mobileView) { + DiscourseURL.jumpToPost(replyPostNumber); + return Ember.RSVP.Promise.resolve(); + } + + if (this.state.repliesAbove.length) { + this.state.repliesAbove = []; + return Ember.RSVP.Promise.resolve(); + } else { + const post = this.findAncestorModel(); + const topicUrl = post ? post.get('topic.url') : null; + return this.store.find('post-reply-history', { postId: this.attrs.id }).then(posts => { + this.state.repliesAbove = posts.map((p) => { + p.shareUrl = `${topicUrl}/${p.post_number}`; + return transformBasicPost(p); + }); + }); + } + }, + +}); + +export default createWidget('post', { + buildKey: attrs => `post-${attrs.id}`, + shadowTree: true, + + buildAttributes(attrs) { + return attrs.cloaked ? { style: `height: ${attrs.height}px` } : undefined; + }, + + buildId(attrs) { + return attrs.cloaked ? `post_${attrs.post_number}` : undefined; + }, + + buildClasses(attrs) { + if (attrs.cloaked) { return 'cloaked-post'; } + const classNames = ['topic-post', 'clearfix']; + + if (attrs.selected) { classNames.push('selected'); } + if (attrs.topicOwner) { classNames.push('topic-owner'); } + if (attrs.hidden) { classNames.push('post-hidden'); } + if (attrs.deleted) { classNames.push('deleted'); } + if (attrs.primary_group_name) { classNames.push(`group-${attrs.primary_group_name}`); } + if (attrs.wiki) { classNames.push(`wiki`); } + if (attrs.isWhisper) { classNames.push('whisper'); } + if (attrs.isModeratorAction || (attrs.isWarning && attrs.firstPost)) { + classNames.push('moderator'); + } else { + classNames.push('regular'); + } + return classNames; + }, + + html(attrs) { + if (attrs.cloaked) { return ''; } + + return this.attach('post-article', attrs); + }, + + toggleLike() { + const post = this.model; + const likeAction = post.get('likeAction'); + + if (likeAction && likeAction.get('canToggle')) { + return likeAction.togglePromise(post); + } + }, + + undoPostAction(typeId) { + const post = this.model; + return post.get('actions_summary').findProperty('id', typeId).undo(post); + }, + + deferPostActionFlags(typeId) { + const post = this.model; + return post.get('actions_summary').findProperty('id', typeId).deferFlags(post); + } +}); diff --git a/app/assets/javascripts/discourse/widgets/poster-name.js.es6 b/app/assets/javascripts/discourse/widgets/poster-name.js.es6 new file mode 100644 index 0000000000..c9b2a45ab5 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/poster-name.js.es6 @@ -0,0 +1,70 @@ +import { iconNode } from 'discourse/helpers/fa-icon'; +import { createWidget } from 'discourse/widgets/widget'; +import { h } from 'virtual-dom'; + +function sanitizeName(name){ + return name.toLowerCase().replace(/[\s_-]/g,''); +} + +export default createWidget('poster-name', { + tagName: 'div.names.trigger-user-card', + + // TODO: Allow extensibility + posterGlyph(attrs) { + if (attrs.moderator) { + return iconNode('shield', { title: I18n.t('user.moderator_tooltip') }); + } + }, + + userLink(attrs, text) { + return h('a', { attributes: { + href: attrs.usernameUrl, + 'data-auto-route': true, + 'data-user-card': attrs.username + } }, text); + }, + + html(attrs) { + const username = attrs.username; + const classNames = ['username']; + + if (attrs.staff) { classNames.push('staff'); } + if (attrs.admin) { classNames.push('admin'); } + if (attrs.moderator) { classNames.push('moderator'); } + if (attrs.new_user) { classNames.push('new-user'); } + + const primaryGroupName = attrs.primary_group_name; + if (primaryGroupName && primaryGroupName.length) { + classNames.push(primaryGroupName); + } + const nameContents = [ this.userLink(attrs, attrs.username) ]; + const glyph = this.posterGlyph(attrs); + if (glyph) { nameContents.push(glyph); } + + const contents = [h('span', { className: classNames.join(' ') }, nameContents)]; + const name = attrs.name; + if (name && this.siteSettings.display_name_on_posts && sanitizeName(name) !== sanitizeName(username)) { + contents.push(h('span.full-name', this.userLink(attrs, name))); + } + const title = attrs.user_title; + if (title && title.length) { + let titleContents = title; + if (primaryGroupName) { + const href = Discourse.getURL(`/groups/${primaryGroupName}`); + titleContents = h('a.user-group', { attributes: { href } }, title); + } + contents.push(h('span.user-title', titleContents)); + } + + // const cfs = attrs.userCustomFields; + // if (cfs) { + // _callbacks.forEach(cb => { + // const result = cb(cfs, attrs); + // if (result) { + // + // } + // }); + // } + return contents; + } +}); diff --git a/app/assets/javascripts/discourse/widgets/private-message-map.js.es6 b/app/assets/javascripts/discourse/widgets/private-message-map.js.es6 new file mode 100644 index 0000000000..9fe250d5c6 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/private-message-map.js.es6 @@ -0,0 +1,76 @@ +import { iconNode } from 'discourse/helpers/fa-icon'; +import { createWidget } from 'discourse/widgets/widget'; +import { h } from 'virtual-dom'; +import { avatarFor } from 'discourse/widgets/post'; + +createWidget('pm-map-user-group', { + tagName: 'div.user.group', + + html(attrs) { + const link = h('a', { attributes: { href: Discourse.getURL(`/groups/${attrs.name}`) } }, attrs.name); + return [iconNode('users'), ' ', link]; + } +}); + +createWidget('pm-remove-link', { + tagName: 'a.remove-invited', + + html() { + return iconNode('times'); + }, + + click() { + bootbox.confirm(I18n.t("private_message_info.remove_allowed_user", {name: this.attrs.username}), + () => this.sendWidgetAction('removeAllowedUser', this.attrs) + ); + } +}); + +createWidget('pm-map-user', { + tagName: 'div.user', + + html(attrs) { + const user = attrs.user; + const avatar = avatarFor('small', { template: user.avatar_template, username: user.username }); + const link = h('a', { attributes: { href: user.get('path') } }, [ avatar, ' ', user.username ]); + + const result = [link]; + if (attrs.canRemoveAllowedUsers) { + result.push(' '); + result.push(this.attach('pm-remove-link', user)); + } + + return result; + } +}); + +export default createWidget('private-message-map', { + tagName: 'section.information.private-message-map', + + html(attrs) { + const participants = []; + + if (attrs.allowedGroups.length) { + participants.push(attrs.allowedGroups.map(ag => this.attach('pm-map-user-group', ag))); + } + + if (attrs.allowedUsers.length) { + participants.push(attrs.allowedUsers.map(ag => { + return this.attach('pm-map-user', { user: ag, canRemoveAllowedUsers: attrs.canRemoveAllowedUsers }); + })); + } + + const result = [ h('h3', [iconNode('envelope'), ' ', I18n.t('private_message_info.title')]), + h('div.participants.clearfix', participants) ]; + + if (attrs.canInvite) { + result.push(h('div.controls', this.attach('button', { + action: 'showInvite', + label: 'private_message_info.invite', + className: 'btn' + }))); + } + + return result; + } +}); diff --git a/app/assets/javascripts/discourse/widgets/raw-html.js.es6 b/app/assets/javascripts/discourse/widgets/raw-html.js.es6 new file mode 100644 index 0000000000..a1eddd74b1 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/raw-html.js.es6 @@ -0,0 +1,18 @@ +export default class RawHtml { + constructor(attrs) { + this.html = attrs.html; + } + + init() { + return $(this.html)[0]; + } + + update(prev) { + if (prev.html === this.html) { return; } + return this.init(); + } + + destroy() { } +} + +RawHtml.prototype.type = 'Widget'; diff --git a/app/assets/javascripts/discourse/widgets/time-gap.js.es6 b/app/assets/javascripts/discourse/widgets/time-gap.js.es6 new file mode 100644 index 0000000000..721a048032 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/time-gap.js.es6 @@ -0,0 +1,26 @@ +import { createWidget } from 'discourse/widgets/widget'; +import { h } from 'virtual-dom'; +import { iconNode } from 'discourse/helpers/fa-icon'; + +function description(attrs) { + const daysSince = attrs.daysSince; + + if (daysSince < 30) { + return I18n.t('dates.later.x_days', {count: daysSince}); + } else if (daysSince < 365) { + const gapMonths = Math.floor(daysSince / 30); + return I18n.t('dates.later.x_months', {count: gapMonths}); + } else { + const gapYears = Math.floor(daysSince / 365); + return I18n.t('dates.later.x_years', {count: gapYears}); + } +} + +export default createWidget('time-gap', { + tagName: 'div.time-gap.small-action.clearfix', + + html(attrs) { + return [h('div.topic-avatar', iconNode('clock-o')), + h('div.small-action-desc', description(attrs))]; + } +}); diff --git a/app/assets/javascripts/discourse/widgets/toggle-topic-summary.js.es6 b/app/assets/javascripts/discourse/widgets/toggle-topic-summary.js.es6 new file mode 100644 index 0000000000..9816f35b41 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/toggle-topic-summary.js.es6 @@ -0,0 +1,33 @@ +import RawHtml from 'discourse/widgets/raw-html'; +import { createWidget } from 'discourse/widgets/widget'; + +createWidget('toggle-summary-description', { + description(attrs) { + if (attrs.topicSummaryEnabled) { + return I18n.t('summary.enabled_description'); + } + + if (attrs.topicWordCount) { + const readingTime = Math.floor(attrs.topicWordCount / this.siteSettings.read_time_word_count); + return I18n.t('summary.description_time', { replyCount: attrs.topicReplyCount, readingTime }); + } + return I18n.t('summary.description', { replyCount: attrs.topicReplyCount }); + }, + + html(attrs) { + // vdom makes putting html in the i18n difficult + return new RawHtml({ html: `

${this.description(attrs)}

` }); + } +}); + +export default createWidget('toggle-topic-summary', { + tagName: 'section.information.toggle-summary', + html(attrs) { + return [ this.attach('toggle-summary-description', attrs), + this.attach('button', { + className: 'btn btn-primary', + label: attrs.topicSummaryEnabled ? 'summary.disable' : 'summary.enable', + action: 'toggleSummary' + }) ]; + } +}); diff --git a/app/assets/javascripts/discourse/widgets/topic-map.js.es6 b/app/assets/javascripts/discourse/widgets/topic-map.js.es6 new file mode 100644 index 0000000000..00d6f7e93e --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/topic-map.js.es6 @@ -0,0 +1,219 @@ +import { createWidget } from 'discourse/widgets/widget'; +import { h } from 'virtual-dom'; +import { avatarImg, avatarFor } from 'discourse/widgets/post'; +import { dateNode, numberNode } from 'discourse/helpers/node'; + +const LINKS_SHOWN = 5; + +function renderParticipants(userFilters, participants) { + if (!participants) { return; } + + userFilters = userFilters || []; + return participants.map(p => { + return this.attach('topic-participant', p, { state: { toggled: userFilters.contains(p.username) } }); + }); +} + +createWidget('topic-map-show-links', { + tagName: 'div.link-summary', + html(attrs) { + return h('a', I18n.t('topic_map.links_shown', { totalLinks: attrs.totalLinks })); + }, + + click() { + this.sendWidgetAction('showAllLinks'); + } +}); + +createWidget('topic-participant', { + html(attrs, state) { + const linkContents = [avatarImg('medium', { username: attrs.username, template: attrs.avatar_template })]; + + if (attrs.post_count > 2) { + linkContents.push(h('span.post-count', attrs.post_count.toString())); + } + + return h('a.poster', { className: state.toggled ? 'toggled' : null, attributes: { title: attrs.username } }, + linkContents + ); + }, + + click() { + this.sendWidgetAction('toggleParticipant', this.attrs); + } +}); + +createWidget('topic-map-summary', { + tagName: 'section.map', + + buildClasses(attrs, state) { + if (state.collapsed) { return 'map-collapsed'; } + }, + + html(attrs, state) { + const contents = []; + contents.push(h('li', + [ + h('h4', I18n.t('created_lowercase')), + avatarFor('tiny', { username: attrs.createdByUsername, template: attrs.createdByAvatarTemplate }), + dateNode(attrs.topicCreatedAt) + ] + )); + contents.push(h('li', + h('a', { attributes: { href: attrs.lastPostUrl } }, [ + h('h4', I18n.t('last_reply_lowercase')), + avatarFor('tiny', { username: attrs.lastPostUsername, template: attrs.lastPostAvatarTemplate }), + dateNode(attrs.lastPostAt) + ]) + )); + contents.push(h('li', [ + numberNode(attrs.topicReplyCount), + h('h4', I18n.t('replies_lowercase', { count: attrs.topicReplyCount })) + ])); + contents.push(h('li.secondary', [ + numberNode(attrs.topicViews, { className: attrs.topicViewsHeat }), + h('h4', I18n.t('views_lowercase', { count: attrs.topicViews })) + ])); + contents.push(h('li.secondary', [ + numberNode(attrs.participantCount), + h('h4', I18n.t('users_lowercase', { count: attrs.participantCount })) + ])); + + if (attrs.topicLikeCount) { + contents.push(h('li.secondary', [ + numberNode(attrs.likeCount), + h('h4', I18n.t('likes_lowercase', { count: attrs.likeCount })) + ])); + } + + if (attrs.topicLinkLength > 0) { + contents.push(h('li.secondary', [ + numberNode(attrs.topicLinkLength), + h('h4', I18n.t('links_lowercase', { count: attrs.topicLinkLength })) + ])); + } + + if (state.collapsed && attrs.topicPostsCount > 2 && attrs.participants.length > 0) { + const participants = renderParticipants.call(this, attrs.userFilters, attrs.participants.slice(0, 3)); + contents.push(h('li.avatars', participants)); + } + + return h('ul.clearfix', contents); + } +}); + +createWidget('topic-map-link', { + tagName: 'a.topic-link.track-link', + + buildClasses(attrs) { + if (attrs.attachment) { return 'attachment'; } + }, + + buildAttributes(attrs) { + return { href: attrs.url, + target: "_blank", + 'data-user-id': attrs.user_id, + 'data-ignore-post-id': 'true', + title: attrs.url }; + }, + + html(attrs) { + if (attrs.title) { return attrs.title; } + return attrs.url; + } +}); + +createWidget('topic-map-expanded', { + tagName: 'section.topic-map-expanded', + + defaultState() { + return { allLinksShown: false }; + }, + + html(attrs, state) { + const avatars = h('section.avatars.clearfix', [ + h('h3', I18n.t('topic_map.participants_title')), + renderParticipants.call(this, attrs.userFilters, attrs.participants) + ]); + + const result = [avatars]; + if (attrs.topicLinks) { + + const toShow = state.allLinksShown ? attrs.topicLinks : attrs.topicLinks.slice(0, LINKS_SHOWN); + const links = toShow.map(l => { + + let host = ''; + if (l.title && l.title.length) { + const domain = l.domain; + if (domain && domain.length) { + const s = domain.split('.'); + host = h('span.domain', s[s.length-2] + "." + s[s.length-1]); + } + } + + return h('tr', [ + h('td', + h('span.badge.badge-notification.clicks', { + attributes: { title: I18n.t('topic_map.clicks', { count: l.clicks }) } + }, l.clicks.toString()) + ), + h('td', [this.attach('topic-map-link', l), ' ', host]) + ]); + }); + + const showAllLinksContent = [ + h('h3', I18n.t('topic_map.links_title')), + h('table.topic-links', links) + ]; + + if (!state.allLinksShown && links.length < attrs.topicLinks.length) { + showAllLinksContent.push(this.attach('topic-map-show-links', { totalLinks: attrs.topicLinks.length })); + } + + const section = h('section.links', showAllLinksContent); + result.push(section); + } + return result; + }, + + showAllLinks() { + this.state.allLinksShown = true; + } +}); + +export default createWidget('topic-map', { + tagName: 'div.topic-map', + buildKey: attrs => `topic-map-${attrs.id}`, + + defaultState() { + return { collapsed: true }; + }, + + html(attrs, state) { + const nav = h('nav.buttons', this.attach('button', { + title: 'topic.toggle_information', + icon: state.collapsed ? 'chevron-down' : 'chevron-up', + action: 'toggleMap', + className: 'btn', + })); + + const contents = [nav, this.attach('topic-map-summary', attrs, { state })]; + + if (!state.collapsed) { + contents.push(this.attach('topic-map-expanded', attrs)); + } + + if (attrs.hasTopicSummary) { + contents.push(this.attach('toggle-topic-summary', attrs)); + } + + if (attrs.showPMMap) { + contents.push(this.attach('private-message-map', attrs)); + } + return contents; + }, + + toggleMap() { + this.state.collapsed = !this.state.collapsed; + } +}); diff --git a/app/assets/javascripts/discourse/widgets/widget.js.es6 b/app/assets/javascripts/discourse/widgets/widget.js.es6 new file mode 100644 index 0000000000..47f56cdfe6 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/widget.js.es6 @@ -0,0 +1,285 @@ +import { WidgetClickHook, WidgetClickOutsideHook } from 'discourse/widgets/click-hook'; +import { h } from 'virtual-dom'; +import DecoratorHelper from 'discourse/widgets/decorator-helper'; + +function emptyContent() { } + +const _registry = {}; +let _dirty = {}; + +export function keyDirty(key, options) { + _dirty[key] = options || {}; +} + +export function renderedKey(key) { + delete _dirty[key]; +} + +export function queryRegistry(name) { + return _registry[name]; +} + +const _decorators = {}; + +export function decorateWidget(widgetName, cb) { + _decorators[widgetName] = _decorators[widgetName] || []; + _decorators[widgetName].push(cb); +} + +export function applyDecorators(widget, type, attrs, state) { + const decorators = _decorators[`${widget.name}:${type}`] || []; + + if (decorators.length) { + const helper = new DecoratorHelper(widget, attrs, state); + return decorators.map(d => d(helper)); + } + + return []; +} + +const _customSettings = {}; +export function changeSetting(widgetName, settingName, newValue) { + _customSettings[widgetName] = _customSettings[widgetName] || {}; + _customSettings[widgetName][settingName] = newValue; +} + +function drawWidget(builder, attrs, state) { + const properties = {}; + + if (this.buildClasses) { + let classes = this.buildClasses(attrs, state) || []; + if (!Array.isArray(classes)) { classes = [classes]; } + + const customClasses = applyDecorators(this, 'classNames', attrs, state); + if (customClasses && customClasses.length) { + classes = classes.concat(customClasses); + } + + if (classes.length) { + properties.className = classes.join(' '); + } + } + if (this.buildId) { + properties.id = this.buildId(attrs); + } + + if (this.buildAttributes) { + properties.attributes = this.buildAttributes(attrs); + } + if (this.clickOutside) { + properties['widget-click-outside'] = new WidgetClickOutsideHook(this); + } + if (this.click) { + properties['widget-click'] = new WidgetClickHook(this); + } + + const attributes = properties['attributes'] || {}; + properties.attributes = attributes; + if (this.title) { + attributes.title = I18n.t(this.title); + } + + let contents = this.html(attrs, state); + if (this.name) { + const beforeContents = applyDecorators(this, 'before', attrs, state) || []; + const afterContents = applyDecorators(this, 'after', attrs, state) || []; + contents = beforeContents.concat(contents).concat(afterContents); + } + + return h(this.tagName || 'div', properties, contents); +} + +export function createWidget(name, opts) { + const result = class CustomWidget extends Widget {}; + + if (name) { + _registry[name] = result; + } + + opts.name = name; + opts.html = opts.html || emptyContent; + opts.draw = drawWidget; + + Object.keys(opts).forEach(k => result.prototype[k] = opts[k]); + return result; +} + +export default class Widget { + constructor(attrs, container, opts) { + opts = opts || {}; + this.attrs = attrs || {}; + this.mergeState = opts.state; + this.container = container; + this.model = opts.model; + + this.key = this.buildKey ? this.buildKey(attrs) : null; + + this.site = container.lookup('site:main'); + this.siteSettings = container.lookup('site-settings:main'); + this.currentUser = container.lookup('current-user:main'); + this.store = container.lookup('store:main'); + this.appEvents = container.lookup('app-events:main'); + + if (this.name) { + const custom = _customSettings[this.name]; + if (custom) { + Object.keys(custom).forEach(k => this.settings[k] = custom[k]); + } + } + } + + defaultState() { + return {}; + } + + destroy() { + console.log('destroy called'); + } + + render(prev) { + if (prev && prev.state) { + this.state = prev.state; + } else { + this.state = this.defaultState(); + } + + // Sometimes we pass state down from the parent + if (this.mergeState) { + this.state = _.merge(this.state, this.mergeState); + } + + if (prev) { + const dirtyOpts = _dirty[prev.key] || {}; + if (prev.shadowTree) { + this.shadowTree = true; + if (!dirtyOpts && !_dirty['*']) { + return prev.vnode; + } + } + renderedKey(prev.key); + + const refreshAction = dirtyOpts.onRefresh; + if (refreshAction) { + this.sendWidgetAction(refreshAction); + } + } + + return this.draw(h, this.attrs, this.state); + } + + _findAncestorWithProperty(property) { + let widget = this; + while (widget) { + const value = widget[property]; + if (value) { + return widget; + } + widget = widget.parentWidget; + } + } + + _findView() { + const widget = this._findAncestorWithProperty('_emberView'); + if (widget) { + return widget._emberView; + } + } + + attach(widgetName, attrs, opts) { + let WidgetClass = _registry[widgetName]; + + if (!WidgetClass) { + if (!this.container) { + console.error("couldn't find container"); + return; + } + WidgetClass = this.container.lookupFactory(`widget:${widgetName}`); + } + + if (WidgetClass) { + const result = new WidgetClass(attrs, this.container, opts); + result.parentWidget = this; + return result; + } else { + throw `Couldn't find ${widgetName} factory`; + } + } + + scheduleRerender() { + let widget = this; + while (widget) { + if (widget.shadowTree) { + keyDirty(widget.key); + } + + const emberView = widget._emberView; + if (emberView) { + return emberView.queueRerender(); + } + widget = widget.parentWidget; + } + } + + _sendComponentAction(name, param) { + const view = this._findAncestorWithProperty('_emberView'); + + let promise; + if (view) { + // Peek into ember internals to allow us to return promises from actions + const ev = view._emberView; + const target = ev.get('targetObject'); + + const actionName = ev.get(name); + if (!actionName) { + Ember.warn(`${name} not found`); + return; + } + + if (target) { + // TODO: Use ember closure actions + const actions = target._actions || target.actionHooks; + const method = actions[actionName]; + if (method) { + promise = method.call(target, param); + if (!promise || !promise.then) { + promise = Ember.RSVP.resolve(promise); + } + } else { + return ev.sendAction(name, param); + } + } + } + + return this.rerenderResult(() => promise); + } + + findAncestorModel() { + const modelWidget = this._findAncestorWithProperty('model'); + if (modelWidget) { + return modelWidget.model; + } + } + + rerenderResult(fn) { + this.scheduleRerender(); + const result = fn(); + // re-render after any promises complete, too! + if (result && result.then) { + return result.then(() => this.scheduleRerender()); + } + return result; + } + + sendWidgetAction(name, param) { + return this.rerenderResult(() => { + const widget = this._findAncestorWithProperty(name); + if (widget) { + return widget[name](param); + } + + return this._sendComponentAction(name, param || this.findAncestorModel()); + }); + } +} + +Widget.prototype.type = 'Thunk'; diff --git a/app/assets/javascripts/env.js b/app/assets/javascripts/env.js index e3035e2623..5537a6c10b 100644 --- a/app/assets/javascripts/env.js +++ b/app/assets/javascripts/env.js @@ -2,3 +2,7 @@ window.ENV = { }; window.Discourse = {}; Discourse.SiteSettings = {}; + +window.EmberENV = window.EmberENV || {}; +window.EmberENV['FORCE_JQUERY'] = true; + diff --git a/app/assets/javascripts/locales/vi.js.erb b/app/assets/javascripts/locales/vi.js.erb new file mode 100644 index 0000000000..d08cb397f5 --- /dev/null +++ b/app/assets/javascripts/locales/vi.js.erb @@ -0,0 +1,3 @@ +//= depend_on 'client.vi.yml' +//= require locales/i18n +<%= JsLocaleHelper.output_locale(:vi) %> diff --git a/app/assets/javascripts/main_include.js b/app/assets/javascripts/main_include.js index 15c4cb0747..0c11c43989 100644 --- a/app/assets/javascripts/main_include.js +++ b/app/assets/javascripts/main_include.js @@ -57,11 +57,9 @@ //= require ./discourse/models/user-badge //= require ./discourse/controllers/discovery-sortable //= require ./discourse/controllers/navigation/default -//= require ./discourse/views/grouped //= require ./discourse/views/container //= require ./discourse/views/modal-body //= require ./discourse/views/flag -//= require ./discourse/views/cloaked //= require ./discourse/components/combo-box //= require ./discourse/components/edit-category-panel //= require ./discourse/views/button @@ -109,3 +107,4 @@ //= require_tree ./discourse/pre-initializers //= require_tree ./discourse/initializers //= require_tree ./discourse/services +//= require_tree ./discourse/widgets diff --git a/app/assets/javascripts/vendor.js b/app/assets/javascripts/vendor.js index 29ee2c5328..5d6d3e6d2e 100644 --- a/app/assets/javascripts/vendor.js +++ b/app/assets/javascripts/vendor.js @@ -38,4 +38,7 @@ //= require break_string //= require buffered-proxy //= require jquery.autoellipsis-1.0.10.min.js +//= require virtual-dom +//= require virtual-dom-amd +//= require highlight.js //= require_tree ./discourse/ember diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss index 15e1ff697b..7be08fb75e 100644 --- a/app/assets/stylesheets/common/admin/admin_base.scss +++ b/app/assets/stylesheets/common/admin/admin_base.scss @@ -1850,6 +1850,12 @@ table#user-badges { margin: 0; } +// Mobile specific style for Admin IP Lookup box +.mobile-view .admin-contents .ip-lookup .location-box { + width: 300px; + left: 20px; +} + .cboxcontainer { display: inline-block; padding: 8px; diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss index 5b3ecebf49..2c4529ce83 100644 --- a/app/assets/stylesheets/common/base/topic-post.scss +++ b/app/assets/stylesheets/common/base/topic-post.scss @@ -340,6 +340,9 @@ table.md-table { } .whisper { + .post-info.whisper { + margin-left: 0.5em; + } .topic-body { .cooked { font-style: italic; diff --git a/app/assets/stylesheets/common/components/banner.css.scss b/app/assets/stylesheets/common/components/banner.css.scss index 3c800e9b19..7faca616cb 100644 --- a/app/assets/stylesheets/common/components/banner.css.scss +++ b/app/assets/stylesheets/common/components/banner.css.scss @@ -16,9 +16,10 @@ } .close { - font-size: 1.786em !important; - margin-top: -10px !important; - color: darken($tertiary, 45%); + font-size: 1.786em; + margin-top: -5px; + color: scale-color($tertiary, $lightness: 70%); + padding-left: 5px; } .meta { diff --git a/app/assets/stylesheets/common/components/buttons.css.scss b/app/assets/stylesheets/common/components/buttons.css.scss index bf42ff0f08..a0b606291e 100644 --- a/app/assets/stylesheets/common/components/buttons.css.scss +++ b/app/assets/stylesheets/common/components/buttons.css.scss @@ -129,6 +129,12 @@ content: $fa-var-google; } } + &.instagram { + background: $instagram; + &:before { + content: $fa-var-instagram; + } + } &.facebook { background: $facebook; &:before { diff --git a/app/assets/stylesheets/common/foundation/variables.scss b/app/assets/stylesheets/common/foundation/variables.scss index b09dbc2893..b06099e3b5 100644 --- a/app/assets/stylesheets/common/foundation/variables.scss +++ b/app/assets/stylesheets/common/foundation/variables.scss @@ -13,6 +13,7 @@ $large-width: 1110px !default; // -------------------------------------------------- $google: #5b76f7 !default; +$instagram: #125688 !default; $facebook: #3b5998 !default; $cas: #70BA61 !default; $twitter: #00bced !default; diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss index 77e4ea12e7..82a1ee16f4 100644 --- a/app/assets/stylesheets/desktop/modal.scss +++ b/app/assets/stylesheets/desktop/modal.scss @@ -46,12 +46,6 @@ margin-left: -1px; } -.modal-footer span.hint { - color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%)); - float: right; - line-height: 30px; -} - .modal-header { border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); h3 { diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 8717c698c5..f148d4817f 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -19,7 +19,7 @@ h1 .topic-statuses .topic-status i { max-height: 40px; } -.post-cloak { +.topic-body { padding: 0; &:first-of-type { @@ -34,16 +34,6 @@ h1 .topic-statuses .topic-status i { color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); } - .gutter { - .reply-new { - .discourse-no-touch & { - opacity:0; - transition: opacity 0.7s ease-in-out; - } - .discourse-touch & {opacity: 1;} - } - } - .actions .fade-out { .discourse-no-touch & { opacity: 0.7; @@ -55,14 +45,25 @@ h1 .topic-statuses .topic-status i { &:hover .actions .fade-out, .selected .actions .fade-out { opacity: 1; } +} - &:hover .gutter, .selected .gutter { - .reply-new, - .track-link { - opacity:1; +.topic-post { + .gutter { + .reply-new { + .discourse-no-touch & { + opacity:0; + transition: opacity 0.7s ease-in-out; } + .discourse-touch & {opacity: 1;} + } } + &:hover .gutter, .selected .gutter { + .reply-new, + .track-link { + opacity:1; + } + } } section.post-menu-area { @@ -138,65 +139,64 @@ nav.post-controls { background: transparent; border: none; margin-left: 3px; - transition: all linear 0.15s; - &:hover { - background: dark-light-diff($primary, $secondary, 90%, -60%); - color: $primary; - } + &.d-hover { + background: dark-light-diff($primary, $secondary, 90%, -60%); + color: $primary; + } - &:active { - box-shadow: inset 0 1px 3px rgba(0,0,0, .4); - } + &:active { + box-shadow: inset 0 1px 3px rgba(0,0,0, .4); + } - &.hidden { - display: none; - } - &.admin { - position: relative; - } + &.hidden { + display: none; + } + &.admin { + position: relative; + } - &.delete:hover { - background: $danger; - color: $secondary; - } + &.delete.d-hover { + background: $danger; + color: $secondary; + } - &.like:hover { - color: $love; - background: dark-light-diff($love, $secondary, 85%, -60%) - } + &.like.d-hover { + color: $love; + background: dark-light-diff($love, $secondary, 85%, -60%) + } - &.has-like {color: $love;} - &.has-like[disabled]:hover { - background: transparent; - } - &.has-like[disabled]:active { - box-shadow: none; - } + &.has-like {color: $love;} + &.has-like[disabled]:hover { + background: transparent; + } + &.has-like[disabled]:active { + box-shadow: none; + } - &.wikied { - color: green; - } + &.wikied { + color: green; + } - &.bookmark {padding: 8px 11px; } + &.bookmark {padding: 8px 11px; } - .read-icon { - &:before { - font-family: "FontAwesome"; - content: "\f02e"; - } - &.unseen { - &:before { - content: "\f097"; - } - } - &.bookmarked { - &:before { - color: $tertiary; - } - } + .read-icon { + &:before { + font-family: "FontAwesome"; + content: "\f02e"; + } + &.unseen { + &:before { + content: "\f097"; } } + &.bookmarked { + &:before { + color: $tertiary; + } + } + } + } .post-admin-menu { background-color: $secondary; @@ -208,7 +208,6 @@ nav.post-controls { bottom: -2px; right: 15px; z-index: 1000; - display: none; h3 { margin-top: 0; @@ -589,11 +588,15 @@ a.mention, a.mention-group { } .deleted { - .topic-body, .small-action { + .topic-body { background-color: dark-light-diff(rgba($danger,.7), $secondary, 50%, -60%); } } +.small-action.deleted { + background-color: dark-light-diff(rgba($danger,.7), $secondary, 50%, -60%); +} + #share-link { width: 365px; margin-left: -4px; @@ -895,12 +898,10 @@ $topic-avatar-width: 45px; .select-posts { position: absolute; - left: 100%; + right: 0; z-index: 490; - top: 8px; - width: 200px; + top: 3em; height: 100px; - background-color: $secondary; button { margin-left: 8px; @@ -972,7 +973,7 @@ span.highlighted { .read-state { color: scale-color($tertiary, $lightness: 50%); position: absolute; - right: -2px; + right: 0px; top: 13px; font-size: 0.571em; } @@ -1004,9 +1005,9 @@ and (max-width : 870px) { width: 45px; } - .post-cloak .reply-to-tab { + .topic-post .reply-to-tab { right: 15%; - } + } .topic-body { box-sizing: border-box; diff --git a/app/assets/stylesheets/mobile/discourse.scss b/app/assets/stylesheets/mobile/discourse.scss index d8b34c96ab..7840a341c9 100644 --- a/app/assets/stylesheets/mobile/discourse.scss +++ b/app/assets/stylesheets/mobile/discourse.scss @@ -160,3 +160,27 @@ h2#site-text-logo } } } + +/* page not found styles */ +h1.page-not-found { + line-height: 24px; + margin: 5px 0 -5px 0; +} + +.page-not-found-topics a.badge-wrapper { + margin-left: 8px; +} + +h2.popular-topics-title { + margin-bottom: 6px; + font-size: 1.2em; +} + +h2.recent-topics-title { + margin-bottom: 6px; + font-size: 1.2em; +} + +.page-not-found-search h2 { + font-size: 1.2em; +} diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss index 6431e56b99..bc1689b97c 100644 --- a/app/assets/stylesheets/mobile/modal.scss +++ b/app/assets/stylesheets/mobile/modal.scss @@ -48,8 +48,6 @@ margin-left: -1px; } -.modal-footer span.hint { display: none; } - .modal-header { // we need tighter spacing on mobile for header // this clearfix under the modal title h3 pushes it way down diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss index 496f1ef92a..ac5adc6de8 100644 --- a/app/assets/stylesheets/mobile/topic-post.scss +++ b/app/assets/stylesheets/mobile/topic-post.scss @@ -2,23 +2,28 @@ /* may not need this */ } -.time-gap { - border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); +.small-action { + border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); color: lighten($primary, 50%); padding-bottom: 3px; - margin-bottom: 10px; text-transform: uppercase; font-weight: bold; - .topic-avatar { - margin: 0 5px 0 10px; - } } -.topic-post { +.small-action .topic-avatar { + margin-top: 5px; +} + +.topic-post article { border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); padding: 6px 0; } +.post-stream { + padding-bottom: 30px; +} + + span.badge-posts { margin-right: 5px; } @@ -523,24 +528,6 @@ span.highlighted { } } -.small-action .small-action-desc { - p { - padding-top: 0; - } - .custom-message { - margin-left: -40px; - } -} - -.small-action .topic-avatar { - padding: 0; - margin: 0; -} - -.small-action.time-gap .topic-avatar { - margin-top: -5px; -} - .gap.jagged-border { margin-left: -10px; margin-right: -10px; diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss index 2b421b8ae2..fa3d7d4598 100644 --- a/app/assets/stylesheets/mobile/topic.scss +++ b/app/assets/stylesheets/mobile/topic.scss @@ -162,7 +162,7 @@ position: absolute; } -.post-cloak:last-of-type {padding-bottom: 40px;} +.topic-post:last-of-type {padding-bottom: 40px;} .heatmap-high {color: scale-color($danger, $lightness: -25%) !important;} .heatmap-med {color: $danger !important;} diff --git a/app/controllers/admin/backups_controller.rb b/app/controllers/admin/backups_controller.rb index 9ebe489fa7..22e57fcc9a 100644 --- a/app/controllers/admin/backups_controller.rb +++ b/app/controllers/admin/backups_controller.rb @@ -32,6 +32,7 @@ class Admin::BackupsController < Admin::AdminController rescue BackupRestore::OperationRunningError render json: failed_json.merge(message: I18n.t("backup.operation_already_running")) else + StaffActionLogger.new(current_user).log_backup_operation render json: success_json end @@ -133,7 +134,7 @@ class Admin::BackupsController < Admin::AdminController # when all chunks are uploaded if uploaded_file_size + current_chunk_size >= total_size # merge all the chunks in a background thread - Jobs.enqueue(:backup_chunks_merger, filename: filename, identifier: identifier, chunks: chunk_number) + Jobs.enqueue_in(5.seconds, :backup_chunks_merger, filename: filename, identifier: identifier, chunks: chunk_number) end render nothing: true diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index b36e02ccd8..8a09c8fbee 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -94,7 +94,9 @@ class ApplicationController < ActionController::Base end end - rescue_from Discourse::NotFound do + class PluginDisabled < StandardError; end + + rescue_from Discourse::NotFound, PluginDisabled do rescue_discourse_actions(:not_found, 404) end @@ -120,8 +122,6 @@ class ApplicationController < ActionController::Base end end - class PluginDisabled < StandardError; end - # If a controller requires a plugin, it will raise an exception if that plugin is # disabled. This allows plugins to be disabled programatically. def self.requires_plugin(plugin_name) @@ -164,7 +164,15 @@ class ApplicationController < ActionController::Base end def set_locale - I18n.locale = current_user.try(:effective_locale) || SiteSetting.default_locale + if !current_user + if SiteSetting.allow_user_locale + I18n.locale = locale_from_header + else + I18n.locale = SiteSetting.default_locale + end + else + I18n.locale = current_user.effective_locale + end I18n.ensure_all_loaded! end @@ -309,6 +317,20 @@ class ApplicationController < ActionController::Base private + def locale_from_header + begin + # Rails I18n uses underscores between the locale and the region; the request + # headers use hyphens. + require 'http_accept_language' unless defined? HttpAcceptLanguage + available_locales = I18n.available_locales.map { |locale| locale.to_s.gsub(/_/, '-') } + parser = HttpAcceptLanguage::Parser.new(request.env["HTTP_ACCEPT_LANGUAGE"]) + parser.language_region_compatible_from(available_locales).gsub(/-/, '_') + rescue + # If Accept-Language headers are not set. + I18n.default_locale + end + end + def preload_anonymous_data store_preloaded("site", Site.json_for(guardian)) store_preloaded("siteSettings", SiteSetting.client_settings_json) @@ -454,7 +476,7 @@ class ApplicationController < ActionController::Base def build_not_found_page(status=404, layout=false) category_topic_ids = Category.pluck(:topic_id).compact @container_class = "wrap not-found-container" - @top_viewed = Topic.where.not(id: category_topic_ids).top_viewed(10) + @top_viewed = TopicQuery.new(nil, {except_topic_ids: category_topic_ids}).list_top_for("monthly").topics.first(10) @recent = Topic.where.not(id: category_topic_ids).recent(10) @slug = params[:slug].class == String ? params[:slug] : '' @slug = (params[:id].class == String ? params[:id] : '') if @slug.blank? diff --git a/app/controllers/embed_controller.rb b/app/controllers/embed_controller.rb index 58b6cbda3e..bc1fbaea86 100644 --- a/app/controllers/embed_controller.rb +++ b/app/controllers/embed_controller.rb @@ -8,6 +8,7 @@ class EmbedController < ApplicationController def comments embed_url = params[:embed_url] + embed_username = params[:discourse_username] topic_id = nil if embed_url.present? @@ -35,7 +36,7 @@ class EmbedController < ApplicationController end elsif embed_url.present? - Jobs.enqueue(:retrieve_topic, user_id: current_user.try(:id), embed_url: embed_url) + Jobs.enqueue(:retrieve_topic, user_id: current_user.try(:id), embed_url: embed_url, author_username: embed_username) render 'loading' end diff --git a/app/controllers/export_csv_controller.rb b/app/controllers/export_csv_controller.rb index cbb6399acb..5545f872d4 100644 --- a/app/controllers/export_csv_controller.rb +++ b/app/controllers/export_csv_controller.rb @@ -30,7 +30,7 @@ class ExportCsvController < ApplicationController @_export_params ||= begin params.require(:entity) params.require(:entity_type) - params.permit(:entity, :entity_type, args: [:name, :start_date, :end_date, :category_id, :group_id]) + params.permit(:entity, :entity_type, args: [:name, :start_date, :end_date, :category_id, :group_id, :trust_level]) end end end diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb index 1a7f87b7aa..923e822ce0 100644 --- a/app/controllers/invites_controller.rb +++ b/app/controllers/invites_controller.rb @@ -6,6 +6,7 @@ class InvitesController < ApplicationController before_filter :ensure_logged_in, only: [:destroy, :create, :create_invite_link, :resend_invite, :check_csv_chunk, :upload_csv_chunk] before_filter :ensure_new_registrations_allowed, only: [:show, :redeem_disposable_invite] + before_filter :ensure_not_logged_in, only: [:show, :redeem_disposable_invite] def show invite = Invite.find_by(invite_key: params[:id]) @@ -195,4 +196,12 @@ class InvitesController < ApplicationController false end end + + def ensure_not_logged_in + if current_user + flash[:error] = I18n.t("login.already_logged_in", current_user: current_user.username) + render layout: 'no_ember' + false + end + end end diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb index a5aa226c05..0d96f5dbee 100644 --- a/app/controllers/list_controller.rb +++ b/app/controllers/list_controller.rb @@ -129,6 +129,18 @@ class ListController < ApplicationController render 'list', formats: [:rss] end + def top_feed + discourse_expires_in 1.minute + + @title = "#{SiteSetting.title} - #{I18n.t("rss_description.top")}" + @link = "#{Discourse.base_url}/top" + @atom_link = "#{Discourse.base_url}/top.rss" + @description = I18n.t("rss_description.top") + @topic_list = TopicQuery.new(nil).list_top_for("monthly") + + render 'list', formats: [:rss] + end + def category_feed guardian.ensure_can_see!(@category) discourse_expires_in 1.minute @@ -175,6 +187,7 @@ class ListController < ApplicationController list.for_period = period list.more_topics_url = construct_url_with(:next, top_options) list.prev_topics_url = construct_url_with(:prev, top_options) + @rss = "top" if use_crawler_layout? @title = I18n.t("js.filters.top.#{period}.title") diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb index a34b31b704..1b755a2d93 100644 --- a/app/controllers/session_controller.rb +++ b/app/controllers/session_controller.rb @@ -117,7 +117,14 @@ class SessionController < ApplicationController SingleSignOn::ACCESSORS.each do |a| details[a] = sso.send(a) end - Rails.logger.error "Failed to create or lookup user: #{e}\n\n#{details.map{|k,v| "#{k}: #{v}"}.join("\n")}" + + message = "Failed to create or lookup user: #{e}." + message << "\n\n" << "-" * 100 << "\n\n" + message << details.map { |k,v| "#{k}: #{v}" }.join("\n") + message << "\n\n" << "-" * 100 << "\n\n" + message << e.backtrace.join("\n") + + Rails.logger.error(message) render text: I18n.t("sso.unknown_error"), status: 500 end diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb index fc2bbe09f4..14564a38d2 100644 --- a/app/controllers/static_controller.rb +++ b/app/controllers/static_controller.rb @@ -101,7 +101,7 @@ class StaticController < ApplicationController data = DistributedMemoizer.memoize('favicon' + SiteSetting.favicon_url, 60*30) do begin - file = FileHelper.download(SiteSetting.favicon_url, 50.kilobytes, "favicon.png") + file = FileHelper.download(SiteSetting.favicon_url, 50.kilobytes, "favicon.png", true) data = file.read file.unlink data diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb index d30f1008ca..fb6465bb36 100644 --- a/app/controllers/topics_controller.rb +++ b/app/controllers/topics_controller.rb @@ -49,6 +49,10 @@ class TopicsController < ApplicationController # existing installs. return wordpress if params[:best].present? + # work around people somehow sending in arrays, + # arrays are not supported + params[:page] = params[:page].to_i rescue 1 + opts = params.slice(:username_filters, :filter, :page, :post_number, :show_deleted) username_filters = opts[:username_filters] @@ -65,7 +69,7 @@ class TopicsController < ApplicationController raise Discourse::NotFound end - page = params[:page].to_i + page = params[:page] if (page < 0) || ((page - 1) * @topic_view.chunk_size > @topic_view.topic.highest_post_number) raise Discourse::NotFound end @@ -529,7 +533,7 @@ class TopicsController < ApplicationController url << "/#{post_number}" if post_number.to_i > 0 url << ".json" if request.format.json? - page = params[:page].to_i + page = params[:page] url << "?page=#{page}" if page != 0 redirect_to url, status: 301 diff --git a/app/controllers/user_badges_controller.rb b/app/controllers/user_badges_controller.rb index 5f1499f916..c84e5ebe3d 100644 --- a/app/controllers/user_badges_controller.rb +++ b/app/controllers/user_badges_controller.rb @@ -11,7 +11,7 @@ class UserBadgesController < ApplicationController if params[:username] user_id = User.where(username_lower: params[:username].downcase).pluck(:id).first user_badges = user_badges.where(user_id: user_id) if user_id - grant_count = user_badges.count + grant_count = badge.user_badges.where(user_id: user_id).count end if offset = params[:offset] diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb index a7fc7aaf49..dd1a3cef80 100644 --- a/app/controllers/users/omniauth_callbacks_controller.rb +++ b/app/controllers/users/omniauth_callbacks_controller.rb @@ -10,7 +10,8 @@ class Users::OmniauthCallbacksController < ApplicationController Auth::GoogleOAuth2Authenticator.new, Auth::OpenIdAuthenticator.new("yahoo", "https://me.yahoo.com", trusted: true), Auth::GithubAuthenticator.new, - Auth::TwitterAuthenticator.new + Auth::TwitterAuthenticator.new, + Auth::InstagramAuthenticator.new ] skip_before_filter :redirect_to_login_if_required @@ -18,7 +19,7 @@ class Users::OmniauthCallbacksController < ApplicationController layout false def self.types - @types ||= Enum.new(:facebook, :twitter, :google, :yahoo, :github, :persona, :cas) + @types ||= Enum.new(:facebook, :instagram, :twitter, :google, :yahoo, :github, :persona, :cas) end # need to be able to call this diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 3a9f77942f..0bd0378134 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -343,7 +343,8 @@ class UsersController < ApplicationController errors: user.errors.full_messages.join("\n") ), errors: user.errors.to_hash, - values: user.attributes.slice('name', 'username', 'email') + values: user.attributes.slice('name', 'username', 'email'), + is_developer: UsernameCheckerService.new.is_developer?(user.email) } end rescue ActiveRecord::StatementInvalid @@ -714,7 +715,12 @@ class UsersController < ApplicationController def user_params params.permit(:name, :email, :password, :username, :active) - .merge(ip_address: request.remote_ip, registration_ip_address: request.remote_ip) + .merge(ip_address: request.remote_ip, registration_ip_address: request.remote_ip, + locale: user_locale) + end + + def user_locale + I18n.locale end def fail_with(key) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index d8b9634dcc..4cc6834c5c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -60,7 +60,7 @@ module ApplicationHelper end def rtl_class - RTL.new(current_user).css_class + rtl? ? 'rtl' : '' end def escape_unicode(javascript) @@ -111,7 +111,7 @@ module ApplicationHelper end def rtl? - ["ar", "fa_IR", "he"].include?(user_locale) + ["ar", "fa_IR", "he"].include? I18n.locale.to_s end def user_locale diff --git a/app/jobs/regular/export_csv_file.rb b/app/jobs/regular/export_csv_file.rb index 1f955f574e..ddb6d6b929 100644 --- a/app/jobs/regular/export_csv_file.rb +++ b/app/jobs/regular/export_csv_file.rb @@ -53,10 +53,14 @@ module Jobs def user_list_export user_array = [] user_field_ids = UserField.pluck(:id) + condition = {} + if @extra && @extra[:trust_level] && trust_level = TrustLevel.levels[@extra[:trust_level].to_sym] + condition = {trust_level: trust_level} + end if SiteSetting.enable_sso # SSO enabled - User.includes(:user_stat, :single_sign_on_record, :groups).find_each do |user| + User.where(condition).includes(:user_stat, :single_sign_on_record, :groups).find_each do |user| user_info_string = get_base_user_string(user) user_info_string = add_single_sign_on(user, user_info_string) user_info_string = add_custom_fields(user, user_info_string, user_field_ids) @@ -66,7 +70,7 @@ module Jobs end else # SSO disabled - User.includes(:user_stat, :groups).find_each do |user| + User.where(condition).includes(:user_stat, :groups).find_each do |user| user_info_string = get_base_user_string(user) user_info_string = add_custom_fields(user, user_info_string, user_field_ids) user_info_string = add_group_names(user, user_info_string) diff --git a/app/jobs/regular/user_email.rb b/app/jobs/regular/user_email.rb index ff38409c1b..9ef71e0867 100644 --- a/app/jobs/regular/user_email.rb +++ b/app/jobs/regular/user_email.rb @@ -50,7 +50,7 @@ module Jobs NOTIFICATIONS_SENT_BY_MAILING_LIST ||= Set.new %w{posted replied mentioned group_mentioned quoted} - def message_for_email(user, post, type, notification, + def message_for_email(user, post, type, notification, notification_type=nil, notification_data_hash=nil, email_token=nil, to_address=nil) @@ -86,7 +86,7 @@ module Jobs end if user.user_option.mailing_list_mode? && - !post.topic.private_message? && + (!post.try(:topic).try(:private_message?)) && NOTIFICATIONS_SENT_BY_MAILING_LIST.include?(email_args[:notification_type]) # no need to log a reason when the mail was already sent via the mailing list job return [nil, nil] diff --git a/app/jobs/scheduled/clean_up_email_logs.rb b/app/jobs/scheduled/clean_up_email_logs.rb index 413aca9d20..30305c4d9a 100644 --- a/app/jobs/scheduled/clean_up_email_logs.rb +++ b/app/jobs/scheduled/clean_up_email_logs.rb @@ -10,7 +10,7 @@ module Jobs EmailLog.where(reply_key: nil) .where("created_at < ?", threshold) - .destroy_all + .delete_all end end diff --git a/app/jobs/scheduled/enqueue_digest_emails.rb b/app/jobs/scheduled/enqueue_digest_emails.rb index 9c10f69573..2ee87d6799 100644 --- a/app/jobs/scheduled/enqueue_digest_emails.rb +++ b/app/jobs/scheduled/enqueue_digest_emails.rb @@ -2,7 +2,7 @@ module Jobs # A daily job that will enqueue digest emails to be sent to users class EnqueueDigestEmails < Jobs::Scheduled - every 6.hours + every 30.minutes def execute(args) unless SiteSetting.disable_digest_emails? @@ -13,14 +13,14 @@ module Jobs end def target_user_ids - # Users who want to receive emails and haven't been emailed in the last day + # Users who want to receive digest email within their chosen digest email frequency query = User.real .where(active: true, staged: false) .joins(:user_option) .not_suspended .where(user_options: {email_digests: true}) - .where("COALESCE(last_emailed_at, '2010-01-01') <= CURRENT_TIMESTAMP - ('1 DAY'::INTERVAL * user_options.digest_after_days)") - .where("COALESCE(last_seen_at, '2010-01-01') <= CURRENT_TIMESTAMP - ('1 DAY'::INTERVAL * user_options.digest_after_days)") + .where("COALESCE(last_emailed_at, '2010-01-01') <= CURRENT_TIMESTAMP - ('1 MINUTE'::INTERVAL * user_options.digest_after_minutes)") + .where("COALESCE(last_seen_at, '2010-01-01') <= CURRENT_TIMESTAMP - ('1 MINUTE'::INTERVAL * user_options.digest_after_minutes)") .where("COALESCE(last_seen_at, '2010-01-01') >= CURRENT_TIMESTAMP - ('1 DAY'::INTERVAL * #{SiteSetting.delete_digest_email_after_days})") # If the site requires approval, make sure the user is approved diff --git a/app/jobs/scheduled/poll_feed.rb b/app/jobs/scheduled/poll_feed.rb index 8c93910def..d5ab5b6bc1 100644 --- a/app/jobs/scheduled/poll_feed.rb +++ b/app/jobs/scheduled/poll_feed.rb @@ -86,11 +86,7 @@ module Jobs end def content - if @article_rss_item.content - @article_rss_item.content.scrub - else - @article_rss_item.description.scrub - end + @article_rss_item.content.try(:scrub) || @article_rss_item.description.try(:scrub) end def title diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb index 542744d398..d63dd23b92 100644 --- a/app/mailers/user_notifications.rb +++ b/app/mailers/user_notifications.rb @@ -11,37 +11,43 @@ class UserNotifications < ActionMailer::Base def signup(user, opts={}) build_email(user.email, template: "user_notifications.signup", + locale: user_locale(user), email_token: opts[:email_token]) end def signup_after_approval(user, opts={}) build_email(user.email, template: 'user_notifications.signup_after_approval', + locale: user_locale(user), email_token: opts[:email_token], - new_user_tips: I18n.t('system_messages.usage_tips.text_body_template', base_url: Discourse.base_url)) + new_user_tips: I18n.t('system_messages.usage_tips.text_body_template', base_url: Discourse.base_url, locale: locale)) end def authorize_email(user, opts={}) build_email(user.email, template: "user_notifications.authorize_email", + locale: user_locale(user), email_token: opts[:email_token]) end def forgot_password(user, opts={}) build_email(user.email, template: user.has_password? ? "user_notifications.forgot_password" : "user_notifications.set_password", + locale: user_locale(user), email_token: opts[:email_token]) end def admin_login(user, opts={}) build_email(user.email, template: "user_notifications.admin_login", + locale: user_locale(user), email_token: opts[:email_token]) end def account_created(user, opts={}) build_email(user.email, template: "user_notifications.account_created", + locale: user_locale(user), email_token: opts[:email_token]) end @@ -181,6 +187,10 @@ class UserNotifications < ActionMailer::Base protected + def user_locale(user) + (user.locale.present? && I18n.available_locales.include?(user.locale.to_sym)) ? user.locale : nil + end + def email_post_markdown(post) result = "[email-indent]\n" result << "#{post.raw}\n\n" @@ -193,9 +203,9 @@ class UserNotifications < ActionMailer::Base include UserNotificationsHelper end - def self.get_context_posts(post, topic_user) - user_option = topic_user.try(:user).try(:user_option) - if user_option && (user_option.email_previous_replies == UserOption.previous_replies_type[:never]) + def self.get_context_posts(post, topic_user, user) + + if user.user_option.email_previous_replies == UserOption.previous_replies_type[:never] return [] end @@ -210,7 +220,7 @@ class UserNotifications < ActionMailer::Base .order('created_at desc') .limit(SiteSetting.email_posts_context) - if topic_user && topic_user.last_emailed_post_number && user_option.try(:email_previous_replies) == UserOption.previous_replies_type[:unless_emailed] + if topic_user && topic_user.last_emailed_post_number && user.user_option.email_previous_replies == UserOption.previous_replies_type[:unless_emailed] context_posts = context_posts.where("post_number > ?", topic_user.last_emailed_post_number) end @@ -236,25 +246,20 @@ class UserNotifications < ActionMailer::Base user_name = name unless name.blank? end - title = notification_data[:topic_title] allow_reply_by_email = opts[:allow_reply_by_email] unless user.suspended? - use_site_subject = opts[:use_site_subject] - add_re_to_subject = opts[:add_re_to_subject] - show_category_in_subject = opts[:show_category_in_subject] - use_template_html = opts[:use_template_html] original_username = notification_data[:original_username] || notification_data[:display_username] send_notification_email( - title: title, + title: notification_data[:topic_title], post: post, username: original_username, from_alias: user_name, allow_reply_by_email: allow_reply_by_email, - use_site_subject: use_site_subject, - add_re_to_subject: add_re_to_subject, - show_category_in_subject: show_category_in_subject, + use_site_subject: opts[:use_site_subject], + add_re_to_subject: opts[:add_re_to_subject], + show_category_in_subject: opts[:show_category_in_subject], notification_type: notification_type, - use_template_html: use_template_html, + use_template_html: opts[:use_template_html], user: user ) end @@ -269,6 +274,7 @@ class UserNotifications < ActionMailer::Base from_alias = opts[:from_alias] notification_type = opts[:notification_type] user = opts[:user] + locale = user_locale(user) # category name category = Topic.find_by(id: post.topic_id).category @@ -285,7 +291,7 @@ class UserNotifications < ActionMailer::Base context = "" tu = TopicUser.get(post.topic_id, user) - context_posts = self.class.get_context_posts(post, tu) + context_posts = self.class.get_context_posts(post, tu, user) # make .present? cheaper context_posts = context_posts.to_a @@ -301,11 +307,13 @@ class UserNotifications < ActionMailer::Base if opts[:use_template_html] topic_excerpt = post.excerpt.gsub("\n", " ") if post.is_first_post? && post.excerpt else + in_reply_to_post = post.reply_to_post if user.user_option.email_in_reply_to html = UserNotificationRenderer.new(Rails.configuration.paths["app/views"]).render( template: 'email/notification', format: :html, locals: { context_posts: context_posts, post: post, + in_reply_to_post: in_reply_to_post, classes: RTL.new(user).css_class } ) @@ -330,6 +338,7 @@ class UserNotifications < ActionMailer::Base add_unsubscribe_via_email_link: user.user_option.mailing_list_mode, unsubscribe_url: post.topic.unsubscribe_url, allow_reply_by_email: allow_reply_by_email, + only_reply_by_email: allow_reply_by_email && user.staged, use_site_subject: use_site_subject, add_re_to_subject: add_re_to_subject, show_category_in_subject: show_category_in_subject, @@ -339,7 +348,8 @@ class UserNotifications < ActionMailer::Base html_override: html, site_description: SiteSetting.site_description, site_title: SiteSetting.title, - style: :notification + style: :notification, + locale: locale } # If we have a display name, change the from address diff --git a/app/models/backup.rb b/app/models/backup.rb index 40e5b1f71b..dfa5381219 100644 --- a/app/models/backup.rb +++ b/app/models/backup.rb @@ -34,7 +34,7 @@ class Backup end def after_remove_hook - remove_from_s3 if SiteSetting.enable_s3_backups? + remove_from_s3 if SiteSetting.enable_s3_backups? && !SiteSetting.s3_disable_cleanup? end def s3_bucket diff --git a/app/models/badge.rb b/app/models/badge.rb index 4fc46f0abf..912f920731 100644 --- a/app/models/badge.rb +++ b/app/models/badge.rb @@ -368,7 +368,7 @@ end # Table name: badges # # id :integer not null, primary key -# name :string(255) not null +# name :string not null # description :text # badge_type_id :integer not null # grant_count :integer default(0), not null @@ -376,7 +376,7 @@ end # updated_at :datetime not null # allow_title :boolean default(FALSE), not null # multiple_grant :boolean default(FALSE), not null -# icon :string(255) default("fa-certificate") +# icon :string default("fa-certificate") # listable :boolean default(TRUE) # target_posts :boolean default(FALSE) # query :text @@ -391,5 +391,6 @@ end # # Indexes # -# index_badges_on_name (name) UNIQUE +# index_badges_on_badge_type_id (badge_type_id) +# index_badges_on_name (name) UNIQUE # diff --git a/app/models/badge_grouping.rb b/app/models/badge_grouping.rb index f1201e7214..4fdcef66e3 100644 --- a/app/models/badge_grouping.rb +++ b/app/models/badge_grouping.rb @@ -22,7 +22,7 @@ end # Table name: badge_groupings # # id :integer not null, primary key -# name :string(255) not null +# name :string not null # description :text # position :integer not null # created_at :datetime not null diff --git a/app/models/badge_type.rb b/app/models/badge_type.rb index 2d179a36e8..11d4a4b655 100644 --- a/app/models/badge_type.rb +++ b/app/models/badge_type.rb @@ -13,7 +13,7 @@ end # Table name: badge_types # # id :integer not null, primary key -# name :string(255) not null +# name :string not null # created_at :datetime not null # updated_at :datetime not null # diff --git a/app/models/category.rb b/app/models/category.rb index 2eab836c0c..f23dfa06eb 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -33,6 +33,8 @@ class Category < ActiveRecord::Base length: { in: 1..50 } validate :parent_category_validator + validate :email_in_validator + validate :ensure_slug before_save :apply_permissions before_save :downcase_email @@ -308,7 +310,16 @@ SQL end def downcase_email - self.email_in = email_in.downcase if self.email_in + self.email_in = (email_in || "").strip.downcase.presence + end + + def email_in_validator + return if self.email_in.blank? + email_in.split("|").each do |email| + unless Email.is_valid?(email) + self.errors.add(:base, I18n.t('category.errors.invalid_email_in', email_in: email)) + end + end end def downcase_name @@ -380,7 +391,7 @@ SQL end def self.find_by_email(email) - self.find_by(email_in: Email.downcase(email)) + self.where("email_in LIKE ?", "%#{Email.downcase(email)}%").first end def has_children? @@ -452,7 +463,7 @@ end # topics_year :integer default(0) # topics_month :integer default(0) # topics_week :integer default(0) -# slug :string(255) not null +# slug :string not null # description :text # text_color :string(6) default("FFFFFF"), not null # read_restricted :boolean default(FALSE), not null @@ -465,17 +476,18 @@ end # posts_year :integer default(0) # posts_month :integer default(0) # posts_week :integer default(0) -# email_in :string(255) +# email_in :string # email_in_allow_strangers :boolean default(FALSE) # topics_day :integer default(0) # posts_day :integer default(0) -# logo_url :string(255) -# background_url :string(255) +# logo_url :string +# background_url :string # allow_badges :boolean default(TRUE), not null # name_lower :string(50) not null # auto_close_based_on_last_post :boolean default(FALSE) # topic_template :text # suppress_from_homepage :boolean default(FALSE) +# contains_messages :boolean # # Indexes # diff --git a/app/models/color_scheme.rb b/app/models/color_scheme.rb index 7e43107940..0c1867f45e 100644 --- a/app/models/color_scheme.rb +++ b/app/models/color_scheme.rb @@ -126,7 +126,7 @@ end # Table name: color_schemes # # id :integer not null, primary key -# name :string(255) not null +# name :string not null # enabled :boolean default(FALSE), not null # versioned_id :integer # version :integer default(1), not null diff --git a/app/models/color_scheme_color.rb b/app/models/color_scheme_color.rb index 39a7b51eec..51e0c4ae8d 100644 --- a/app/models/color_scheme_color.rb +++ b/app/models/color_scheme_color.rb @@ -9,8 +9,8 @@ end # Table name: color_scheme_colors # # id :integer not null, primary key -# name :string(255) not null -# hex :string(255) not null +# name :string not null +# hex :string not null # color_scheme_id :integer not null # created_at :datetime not null # updated_at :datetime not null diff --git a/app/models/concerns/has_custom_fields.rb b/app/models/concerns/has_custom_fields.rb index 1e1f3869a1..f1c3ec2863 100644 --- a/app/models/concerns/has_custom_fields.rb +++ b/app/models/concerns/has_custom_fields.rb @@ -107,7 +107,6 @@ module HasCustomFields end end - end def reload(options = nil) diff --git a/app/models/digest_email_site_setting.rb b/app/models/digest_email_site_setting.rb index 5276fe3b3e..e9a817ad4c 100644 --- a/app/models/digest_email_site_setting.rb +++ b/app/models/digest_email_site_setting.rb @@ -10,10 +10,12 @@ class DigestEmailSiteSetting < EnumSiteSetting def self.values @values ||= [ { name: 'never', value: 0 }, - { name: 'daily', value: 1 }, - { name: 'every_three_days', value: 3 }, - { name: 'weekly', value: 7 }, - { name: 'every_two_weeks', value: 14 } + { name: 'every_30_minutes', value: 30 }, + { name: 'every_hour', value: 60 }, + { name: 'daily', value: 1440 }, + { name: 'every_three_days', value: 4320 }, + { name: 'weekly', value: 10080 }, + { name: 'every_two_weeks', value: 20160 } ] end diff --git a/app/models/directory_item.rb b/app/models/directory_item.rb index 680b35c082..9582b42986 100644 --- a/app/models/directory_item.rb +++ b/app/models/directory_item.rb @@ -40,19 +40,39 @@ class DirectoryItem < ActiveRecord::Base end ActiveRecord::Base.transaction do - exec_sql "DELETE FROM directory_items WHERE period_type = :period_type", period_type: period_types[period_type] - exec_sql "INSERT INTO directory_items - (period_type, user_id, likes_received, likes_given, topics_entered, days_visited, posts_read, topic_count, post_count) - SELECT + exec_sql "DELETE FROM directory_items + USING directory_items di + LEFT JOIN users u ON u.id = user_id + WHERE di.id = directory_items.id AND + u.id IS NULL AND + di.period_type = :period_type", period_type: period_types[period_type] + + + exec_sql "INSERT INTO directory_items(period_type, user_id, likes_received, likes_given, topics_entered, days_visited, posts_read, topic_count, post_count) + SELECT :period_type, u.id, - SUM(CASE WHEN ua.action_type = :was_liked_type THEN 1 ELSE 0 END), - SUM(CASE WHEN ua.action_type = :like_type THEN 1 ELSE 0 END), - COALESCE((SELECT COUNT(topic_id) FROM topic_views AS v WHERE v.user_id = u.id AND v.viewed_at >= :since), 0), - COALESCE((SELECT COUNT(id) FROM user_visits AS uv WHERE uv.user_id = u.id AND uv.visited_at >= :since), 0), - COALESCE((SELECT SUM(posts_read) FROM user_visits AS uv2 WHERE uv2.user_id = u.id AND uv2.visited_at >= :since), 0), - SUM(CASE WHEN ua.action_type = :new_topic_type THEN 1 ELSE 0 END), - SUM(CASE WHEN ua.action_type = :reply_type THEN 1 ELSE 0 END) + 0, + 0, + 0, + 0, + 0, + 0, + 0 + FROM users u + LEFT JOIN directory_items di ON di.user_id = u.id AND di.period_type = :period_type + WHERE di.id IS NULL AND u.id > 0 + ", period_type: period_types[period_type] + + exec_sql "WITH x AS (SELECT + u.id user_id, + SUM(CASE WHEN ua.action_type = :was_liked_type THEN 1 ELSE 0 END) likes_received, + SUM(CASE WHEN ua.action_type = :like_type THEN 1 ELSE 0 END) likes_given, + COALESCE((SELECT COUNT(topic_id) FROM topic_views AS v WHERE v.user_id = u.id AND v.viewed_at >= :since), 0) topics_entered, + COALESCE((SELECT COUNT(id) FROM user_visits AS uv WHERE uv.user_id = u.id AND uv.visited_at >= :since), 0) days_visited, + COALESCE((SELECT SUM(posts_read) FROM user_visits AS uv2 WHERE uv2.user_id = u.id AND uv2.visited_at >= :since), 0) posts_read, + SUM(CASE WHEN ua.action_type = :new_topic_type THEN 1 ELSE 0 END) topic_count, + SUM(CASE WHEN ua.action_type = :reply_type THEN 1 ELSE 0 END) post_count FROM users AS u LEFT OUTER JOIN user_actions AS ua ON ua.user_id = u.id LEFT OUTER JOIN topics AS t ON ua.target_topic_id = t.id AND t.archetype = 'regular' @@ -67,7 +87,28 @@ class DirectoryItem < ActiveRecord::Base AND (NOT (COALESCE(p.hidden, false))) AND COALESCE(p.post_type, :regular_post_type) = :regular_post_type AND u.id > 0 - GROUP BY u.id", + GROUP BY u.id) + UPDATE directory_items di SET + likes_received = x.likes_received, + likes_given = x.likes_given, + topics_entered = x.likes_given, + days_visited = x.days_visited, + posts_read = x.posts_read, + topic_count = x.topic_count, + post_count = x.post_count + FROM x + WHERE + x.user_id = di.user_id AND + di.period_type = :period_type AND ( + di.likes_received <> x.likes_received OR + di.likes_given <> x.likes_given OR + di.topics_entered <> x.likes_given OR + di.days_visited <> x.days_visited OR + di.posts_read <> x.posts_read OR + di.topic_count <> x.topic_count OR + di.post_count <> x.post_count ) + + ", period_type: period_types[period_type], since: since, like_type: UserAction::LIKE, @@ -76,6 +117,7 @@ class DirectoryItem < ActiveRecord::Base reply_type: UserAction::REPLY, regular_post_type: Post.types[:regular] + if period_type == :all exec_sql < 1 } - .each { |emoji| aliases[emoji["aliases"][0]] = emoji["aliases"][1..-1] } + @aliases ||= db['aliases'] - aliases + # Fix how `slightly_smiling` was mislabeled + @aliases['slight_smile'] ||= [] + @aliases['slight_smile'] << 'slightly_smiling' + + @aliases end def self.load_custom @@ -121,22 +124,27 @@ class Emoji def self.unicode_replacements return @unicode_replacements if @unicode_replacements - @unicode_replacements = Hash[db.map {|e| [e['emoji'], e['aliases'][0]] }] + + @unicode_replacements = {} + db['emojis'].each do |e| + hex = e['code'].hex + # Don't replace digits or letters + if hex > 128 + @unicode_replacements[[hex].pack('U')] = e['name'] + end + end + @unicode_replacements["\u{2639}"] = 'frowning' - @unicode_replacements["\u{263A}"] = 'slightly_smiling' - @unicode_replacements["\u{263B}"] = 'slightly_smiling' + @unicode_replacements["\u{263A}"] = 'slight_smile' + @unicode_replacements["\u{263B}"] = 'slight_smile' @unicode_replacements["\u{2661}"] = 'heart' @unicode_replacements["\u{2665}"] = 'heart' @unicode_replacements end - def self.unicode_regexp - @unicode_regexp ||= Regexp.union(unicode_replacements.keys) - end - - def self.sub_unicode!(text) - text.gsub!(unicode_regexp) {|m| ":#{unicode_replacements[m]}:"} + def self.unicode_replacements_json + @unicode_replacements_json ||= unicode_replacements.to_json end end diff --git a/app/models/facebook_user_info.rb b/app/models/facebook_user_info.rb index 8ef00720e4..9695859801 100644 --- a/app/models/facebook_user_info.rb +++ b/app/models/facebook_user_info.rb @@ -9,13 +9,13 @@ end # id :integer not null, primary key # user_id :integer not null # facebook_user_id :integer not null -# username :string(255) -# first_name :string(255) -# last_name :string(255) -# email :string(255) -# gender :string(255) -# name :string(255) -# link :string(255) +# username :string +# first_name :string +# last_name :string +# email :string +# gender :string +# name :string +# link :string # created_at :datetime not null # updated_at :datetime not null # diff --git a/app/models/github_user_info.rb b/app/models/github_user_info.rb index c79a3b0e91..8e776f33ab 100644 --- a/app/models/github_user_info.rb +++ b/app/models/github_user_info.rb @@ -8,7 +8,7 @@ end # # id :integer not null, primary key # user_id :integer not null -# screen_name :string(255) not null +# screen_name :string not null # github_user_id :integer not null # created_at :datetime not null # updated_at :datetime not null diff --git a/app/models/google_user_info.rb b/app/models/google_user_info.rb index 26f3dda50d..343fe9945f 100644 --- a/app/models/google_user_info.rb +++ b/app/models/google_user_info.rb @@ -8,15 +8,15 @@ end # # id :integer not null, primary key # user_id :integer not null -# google_user_id :string(255) not null -# first_name :string(255) -# last_name :string(255) -# email :string(255) -# gender :string(255) -# name :string(255) -# link :string(255) -# profile_link :string(255) -# picture :string(255) +# google_user_id :string not null +# first_name :string +# last_name :string +# email :string +# gender :string +# name :string +# link :string +# profile_link :string +# picture :string # created_at :datetime not null # updated_at :datetime not null # diff --git a/app/models/group.rb b/app/models/group.rb index 148b1e9e8d..527955fbd6 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -81,8 +81,10 @@ class Group < ActiveRecord::Base def incoming_email_validator return if self.automatic || self.incoming_email.blank? - unless Email.is_valid?(incoming_email) - self.errors.add(:base, I18n.t('groups.errors.invalid_incoming_email', incoming_email: incoming_email)) + incoming_email.split("|").each do |email| + unless Email.is_valid?(email) + self.errors.add(:base, I18n.t('groups.errors.invalid_incoming_email', incoming_email: email)) + end end end @@ -332,7 +334,7 @@ class Group < ActiveRecord::Base end def self.find_by_email(email) - self.find_by(incoming_email: Email.downcase(email)) + self.where("incoming_email LIKE ?", "%#{Email.downcase(email)}%").first end def bulk_add(user_ids) @@ -360,6 +362,10 @@ class Group < ActiveRecord::Base true end + def mentionable?(user, group_id) + Group.mentionable(user).where(id: group_id).exists? + end + protected def name_format_validator @@ -455,7 +461,7 @@ end # Table name: groups # # id :integer not null, primary key -# name :string(255) not null +# name :string not null # created_at :datetime not null # updated_at :datetime not null # automatic :boolean default(FALSE), not null @@ -465,7 +471,7 @@ end # automatic_membership_email_domains :text # automatic_membership_retroactive :boolean default(FALSE) # primary_group :boolean default(FALSE), not null -# title :string(255) +# title :string # grant_trust_level :integer # incoming_email :string # has_messages :boolean default(FALSE), not null diff --git a/app/models/incoming_links_report.rb b/app/models/incoming_links_report.rb index 57531025e1..388ea57cc9 100644 --- a/app/models/incoming_links_report.rb +++ b/app/models/incoming_links_report.rb @@ -35,9 +35,10 @@ class IncomingLinksReport num_clicks = link_count_per_user num_topics = topic_count_per_user + user_id_lookup = User.where(username: num_clicks.keys).select(:id, :username).inject({}) {|sum,v| sum[v.username] = v.id; sum;} report.data = [] num_clicks.each_key do |username| - report.data << {username: username, num_clicks: num_clicks[username], num_topics: num_topics[username]} + report.data << {username: username, user_id: user_id_lookup[username], num_clicks: num_clicks[username], num_topics: num_topics[username]} end report.data = report.data.sort_by {|x| x[:num_clicks]}.reverse[0,10] end diff --git a/app/models/instagram_user_info.rb b/app/models/instagram_user_info.rb new file mode 100644 index 0000000000..c16a432934 --- /dev/null +++ b/app/models/instagram_user_info.rb @@ -0,0 +1,5 @@ +class InstagramUserInfo < ActiveRecord::Base + + belongs_to :user + +end diff --git a/app/models/invite.rb b/app/models/invite.rb index a2fdc3403d..d6e0f02fb2 100644 --- a/app/models/invite.rb +++ b/app/models/invite.rb @@ -252,7 +252,7 @@ end # # id :integer not null, primary key # invite_key :string(32) not null -# email :string(255) +# email :string # invited_by_id :integer not null # user_id :integer # redeemed_at :datetime diff --git a/app/models/like_notification_frequency_site_setting.rb b/app/models/like_notification_frequency_site_setting.rb new file mode 100644 index 0000000000..33f009af57 --- /dev/null +++ b/app/models/like_notification_frequency_site_setting.rb @@ -0,0 +1,23 @@ +require_dependency 'enum_site_setting' + +class LikeNotificationFrequencySiteSetting < EnumSiteSetting + + def self.valid_value?(val) + val.to_i.to_s == val.to_s && + values.any? { |v| v[:value] == val.to_i } + end + + def self.values + @values ||= [ + { name: 'user.like_notification_frequency.always', value: 0 }, + { name: 'user.like_notification_frequency.first_time_and_daily', value: 1 }, + { name: 'user.like_notification_frequency.first_time', value: 2 }, + { name: 'user.like_notification_frequency.never', value: 3 }, + ] + end + + def self.translate_names? + true + end + +end diff --git a/app/models/notification.rb b/app/models/notification.rb index d21875c8b2..072f787166 100644 --- a/app/models/notification.rb +++ b/app/models/notification.rb @@ -98,8 +98,8 @@ class Notification < ActiveRecord::Base # Be wary of calling this frequently. O(n) JSON parsing can suck. def data_hash @data_hash ||= begin - return nil if data.blank? + parsed = JSON.parse(data) return nil if parsed.blank? @@ -122,12 +122,19 @@ class Notification < ActiveRecord::Base end def self.recent_report(user, count = nil) + return unless user && user.user_option + count ||= 10 notifications = user.notifications .visible .recent(count) .includes(:topic) - .to_a + + if user.user_option.like_notification_frequency == UserOption.like_notification_frequency_type[:never] + notifications = notifications.where('notification_type <> ?', Notification.types[:liked]) + end + + notifications = notifications.to_a if notifications.present? @@ -203,5 +210,6 @@ end # idx_notifications_speedup_unread_count (user_id,notification_type) # index_notifications_on_post_action_id (post_action_id) # index_notifications_on_user_id_and_created_at (user_id,created_at) +# index_notifications_on_user_id_and_id (user_id,id) UNIQUE # index_notifications_on_user_id_and_topic_id_and_post_number (user_id,topic_id,post_number) # diff --git a/app/models/oauth2_user_info.rb b/app/models/oauth2_user_info.rb index 7ce0cace41..5b27d0cf71 100644 --- a/app/models/oauth2_user_info.rb +++ b/app/models/oauth2_user_info.rb @@ -9,10 +9,10 @@ end # # id :integer not null, primary key # user_id :integer not null -# uid :string(255) not null -# provider :string(255) not null -# email :string(255) -# name :string(255) +# uid :string not null +# provider :string not null +# email :string +# name :string # created_at :datetime not null # updated_at :datetime not null # diff --git a/app/models/optimized_image.rb b/app/models/optimized_image.rb index 482585e8ea..f316a8d2df 100644 --- a/app/models/optimized_image.rb +++ b/app/models/optimized_image.rb @@ -236,7 +236,7 @@ end # width :integer not null # height :integer not null # upload_id :integer not null -# url :string(255) not null +# url :string not null # # Indexes # diff --git a/app/models/plugin_store_row.rb b/app/models/plugin_store_row.rb index db1d9d3fda..d9bb1c05db 100644 --- a/app/models/plugin_store_row.rb +++ b/app/models/plugin_store_row.rb @@ -6,9 +6,9 @@ end # Table name: plugin_store_rows # # id :integer not null, primary key -# plugin_name :string(255) not null -# key :string(255) not null -# type_name :string(255) not null +# plugin_name :string not null +# key :string not null +# type_name :string not null # value :text # # Indexes diff --git a/app/models/post.rb b/app/models/post.rb index 3f93899ff8..dfed7e86f1 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -653,7 +653,7 @@ end # notify_user_count :integer default(0), not null # like_score :integer default(0), not null # deleted_by_id :integer -# edit_reason :string(255) +# edit_reason :string # word_count :integer # version :integer default(1), not null # cook_method :integer default(1), not null @@ -666,7 +666,7 @@ end # via_email :boolean default(FALSE), not null # raw_email :text # public_version :integer default(1), not null -# action_code :string(255) +# action_code :string # # Indexes # diff --git a/app/models/post_action.rb b/app/models/post_action.rb index 943dbc8ebd..31f221cc9f 100644 --- a/app/models/post_action.rb +++ b/app/models/post_action.rb @@ -147,10 +147,10 @@ SQL # so callback is called action.save action.add_moderator_post_if_needed(moderator, :agreed, delete_post) - @trigger_spam = true if action.post_action_type_id == PostActionType.types[:spam] + trigger_spam = true if action.post_action_type_id == PostActionType.types[:spam] end - DiscourseEvent.trigger(:confirmed_spam_post, post) if @trigger_spam + DiscourseEvent.trigger(:confirmed_spam_post, post) if trigger_spam update_flagged_posts_count end @@ -241,7 +241,14 @@ SQL PostCreator.new(user, opts).create.try(:id) end + def self.limit_action!(user,post,post_action_type_id) + RateLimiter.new(user, "post_action-#{post.id}_#{post_action_type_id}", 4, 1.minute).performed! + end + def self.act(user, post, post_action_type_id, opts = {}) + + limit_action!(user,post,post_action_type_id) + related_post_id = create_message_for_post_action(user, post, post_action_type_id, opts) staff_took_action = opts[:take_action] || false @@ -272,6 +279,7 @@ SQL post_action.recover! action_attrs.each { |attr, val| post_action.send("#{attr}=", val) } post_action.save + PostAlertObserver.after_create_post_action(post_action) else post_action = create(where_attrs.merge(action_attrs)) if post_action && post_action.errors.count == 0 @@ -295,6 +303,9 @@ SQL end def self.remove_act(user, post, post_action_type_id) + + limit_action!(user,post,post_action_type_id) + finder = PostAction.where(post_id: post.id, user_id: user.id, post_action_type_id: post_action_type_id) finder = finder.with_deleted.includes(:post) if user.try(:staff?) if action = finder.first @@ -480,7 +491,7 @@ SQL elsif PostActionType.auto_action_flag_types.include?(post_action_type) && SiteSetting.flags_required_to_hide_post > 0 - old_flags, new_flags = PostAction.flag_counts_for(post.id) + _old_flags, new_flags = PostAction.flag_counts_for(post.id) if new_flags >= SiteSetting.flags_required_to_hide_post hide_post!(post, post_action_type, guess_hide_reason(post)) diff --git a/app/models/post_alert_observer.rb b/app/models/post_alert_observer.rb index ce2b366526..f1913ab776 100644 --- a/app/models/post_alert_observer.rb +++ b/app/models/post_alert_observer.rb @@ -1,10 +1,14 @@ class PostAlertObserver < ActiveRecord::Observer observe :post_action, :post_revision - def alerter + def self.alerter @alerter ||= PostAlerter.new end + def alerter + self.class.alerter + end + # Dispatch to an after_save_#{class_name} method def after_save(model) method_name = callback_for('after_save', model) @@ -17,13 +21,60 @@ class PostAlertObserver < ActiveRecord::Observer send(method_name, model) if respond_to?(method_name) end + def refresh_like_notification(post, read) + return unless post && post.user_id + + usernames = post.post_actions.where(post_action_type_id: PostActionType.types[:like]) + .joins(:user) + .order('post_actions.created_at desc') + .where('post_actions.created_at > ?', 1.day.ago) + .pluck(:username) + + if usernames.length > 0 + data = { + topic_title: post.topic.title, + username: usernames[0], + display_username: usernames[0], + username2: usernames[1], + count: usernames.length + } + Notification.create( + notification_type: Notification.types[:liked], + topic_id: post.topic_id, + post_number: post.post_number, + user_id: post.user_id, + read: read, + data: data.to_json + ) + end + end + def after_save_post_action(post_action) # We only care about deleting post actions for now return if post_action.deleted_at.blank? - Notification.where(post_action_id: post_action.id).each(&:destroy) + + if post_action.post_action_type_id == PostActionType.types[:like] && post_action.post + + read = true + + Notification.where( + topic_id: post_action.post.topic_id, + user_id: post_action.post.user_id, + post_number: post_action.post.post_number, + notification_type: Notification.types[:liked] + ).each do |notification| + read = false unless notification.read + notification.destroy + end + + refresh_like_notification(post_action.post, read) + else + # not using destroy_all cause we want stuff to trigger + Notification.where(post_action_id: post_action.id).each(&:destroy) + end end - def after_create_post_action(post_action) + def self.after_create_post_action(post_action) # We only notify on likes for now return unless post_action.is_like? @@ -40,6 +91,10 @@ class PostAlertObserver < ActiveRecord::Observer ) end + def after_create_post_action(post_action) + self.class.after_create_post_action(post_action) + end + def after_create_post_revision(post_revision) post = post_revision.post diff --git a/app/models/post_analyzer.rb b/app/models/post_analyzer.rb index cf20921cca..42328bf724 100644 --- a/app/models/post_analyzer.rb +++ b/app/models/post_analyzer.rb @@ -52,11 +52,17 @@ class PostAnalyzer cooked_stripped.css("code").remove cooked_stripped.css(".onebox").remove - @raw_mentions = cooked_stripped.to_html - .scan(PrettyText.mention_matcher) - .flatten - .map(&:downcase) - .uniq + raw_mentions = cooked_stripped.css('.mention, .mention-group').map do |e| + if name = e.inner_text + name = name[1..-1] + name.downcase! if name + name + end + end + + raw_mentions.compact! + raw_mentions.uniq! + @raw_mention = raw_mentions end # from rack ... compat with ruby 2.2 diff --git a/app/models/post_detail.rb b/app/models/post_detail.rb index 8f88851673..c43219749c 100644 --- a/app/models/post_detail.rb +++ b/app/models/post_detail.rb @@ -11,8 +11,8 @@ end # # id :integer not null, primary key # post_id :integer -# key :string(255) -# value :string(255) +# key :string +# value :string # extra :text # created_at :datetime not null # updated_at :datetime not null diff --git a/app/models/post_search_data.rb b/app/models/post_search_data.rb index 1611df2718..f9ee72b885 100644 --- a/app/models/post_search_data.rb +++ b/app/models/post_search_data.rb @@ -11,7 +11,7 @@ end # post_id :integer not null, primary key # search_data :tsvector # raw_data :text -# locale :string(255) +# locale :string # # Indexes # diff --git a/app/models/queued_post.rb b/app/models/queued_post.rb index fa1f411208..66e75e9601 100644 --- a/app/models/queued_post.rb +++ b/app/models/queued_post.rb @@ -114,7 +114,7 @@ end # Table name: queued_posts # # id :integer not null, primary key -# queue :string(255) not null +# queue :string not null # state :integer not null # user_id :integer not null # raw :text not null diff --git a/app/models/screened_email.rb b/app/models/screened_email.rb index 4cbe165741..ee8b005728 100644 --- a/app/models/screened_email.rb +++ b/app/models/screened_email.rb @@ -67,7 +67,7 @@ end # Table name: screened_emails # # id :integer not null, primary key -# email :string(255) not null +# email :string not null # action_type :integer not null # match_count :integer default(0), not null # last_match_at :datetime diff --git a/app/models/screened_url.rb b/app/models/screened_url.rb index 5abe8aced9..3bd7cc1b89 100644 --- a/app/models/screened_url.rb +++ b/app/models/screened_url.rb @@ -42,8 +42,8 @@ end # Table name: screened_urls # # id :integer not null, primary key -# url :string(255) not null -# domain :string(255) not null +# url :string not null +# domain :string not null # action_type :integer not null # match_count :integer default(0), not null # last_match_at :datetime diff --git a/app/models/single_sign_on_record.rb b/app/models/single_sign_on_record.rb index bbccfcb6c9..cb1219855f 100644 --- a/app/models/single_sign_on_record.rb +++ b/app/models/single_sign_on_record.rb @@ -8,14 +8,14 @@ end # # id :integer not null, primary key # user_id :integer not null -# external_id :string(255) not null +# external_id :string not null # last_payload :text not null # created_at :datetime not null # updated_at :datetime not null -# external_username :string(255) -# external_email :string(255) -# external_name :string(255) -# external_avatar_url :string(255) +# external_username :string +# external_email :string +# external_name :string +# external_avatar_url :string # # Indexes # diff --git a/app/models/site_customization.rb b/app/models/site_customization.rb index 501c720845..bc83a126bd 100644 --- a/app/models/site_customization.rb +++ b/app/models/site_customization.rb @@ -217,32 +217,32 @@ end # Table name: site_customizations # # id :integer not null, primary key -# name :string(255) not null +# name :string not null # stylesheet :text # header :text -# header_baked :text # user_id :integer not null # enabled :boolean not null -# key :string(255) not null +# key :string not null # created_at :datetime not null # updated_at :datetime not null # stylesheet_baked :text default(""), not null # mobile_stylesheet :text +# mobile_header :text # mobile_stylesheet_baked :text # footer :text -# footer_baked :text -# mobile_header :text # mobile_footer :text -# mobile_header_baked :text -# mobile_footer_baked :text # head_tag :text # body_tag :text -# head_tag_baked :text -# body_tag_baked :text # top :text # mobile_top :text # embedded_css :text # embedded_css_baked :text +# head_tag_baked :text +# body_tag_baked :text +# header_baked :text +# mobile_header_baked :text +# footer_baked :text +# mobile_footer_baked :text # # Indexes # diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb index ad84ea6810..2a7c7e79d0 100644 --- a/app/models/site_setting.rb +++ b/app/models/site_setting.rb @@ -112,7 +112,7 @@ end # Table name: site_settings # # id :integer not null, primary key -# name :string(255) not null +# name :string not null # data_type :integer not null # value :text # created_at :datetime not null diff --git a/app/models/stylesheet_cache.rb b/app/models/stylesheet_cache.rb index a5397ef159..c9dfa86762 100644 --- a/app/models/stylesheet_cache.rb +++ b/app/models/stylesheet_cache.rb @@ -34,8 +34,8 @@ end # Table name: stylesheet_cache # # id :integer not null, primary key -# target :string(255) not null -# digest :string(255) not null +# target :string not null +# digest :string not null # content :text not null # created_at :datetime # updated_at :datetime diff --git a/app/models/topic.rb b/app/models/topic.rb index 7a370a9261..1db44a557f 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -433,6 +433,7 @@ class Topic < ActiveRecord::Base def update_status(status, enabled, user, opts={}) TopicStatusUpdate.new(self, user).update!(status, enabled, opts) + DiscourseEvent.trigger(:topic_status_updated, self.id, status, enabled) end # Atomically creates the next post number @@ -581,6 +582,8 @@ class Topic < ActiveRecord::Base if private_message? # If the user exists, add them to the message. user = User.find_by_username_or_email(username_or_email) + raise StandardError.new I18n.t("topic_invite.user_exists") if user.present? && topic_allowed_users.where(user_id: user.id).exists? + if user && topic_allowed_users.create!(user_id: user.id) # Create a small action message add_small_action(invited_by, "invited_user", user.username) @@ -604,6 +607,8 @@ class Topic < ActiveRecord::Base else # invite existing member to a topic user = User.find_by_username(username_or_email) + raise StandardError.new I18n.t("topic_invite.user_exists") if user.present? && topic_allowed_users.where(user_id: user.id).exists? + if user && topic_allowed_users.create!(user_id: user.id) # rate limit topic invite RateLimiter.new(invited_by, "topic-invitations-per-day", SiteSetting.max_topic_invitations_per_day, 1.day.to_i).performed! @@ -1051,7 +1056,7 @@ end # Table name: topics # # id :integer not null, primary key -# title :string(255) not null +# title :string not null # last_posted_at :datetime # created_at :datetime not null # updated_at :datetime not null @@ -1066,7 +1071,7 @@ end # avg_time :integer # deleted_at :datetime # highest_post_number :integer default(0), not null -# image_url :string(255) +# image_url :string # off_topic_count :integer default(0), not null # like_count :integer default(0), not null # incoming_link_count :integer default(0), not null @@ -1079,7 +1084,7 @@ end # bumped_at :datetime not null # has_summary :boolean default(FALSE), not null # vote_count :integer default(0), not null -# archetype :string(255) default("regular"), not null +# archetype :string default("regular"), not null # featured_user4_id :integer # notify_moderators_count :integer default(0), not null # spam_count :integer default(0), not null @@ -1089,8 +1094,8 @@ end # score :float # percent_rank :float default(1.0), not null # notify_user_count :integer default(0), not null -# subtype :string(255) -# slug :string(255) +# subtype :string +# slug :string # auto_close_at :datetime # auto_close_user_id :integer # auto_close_started_at :datetime diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb index ce55d512c7..98eefbcd81 100644 --- a/app/models/topic_link.rb +++ b/app/models/topic_link.rb @@ -231,7 +231,7 @@ end # reflection :boolean default(FALSE) # clicks :integer default(0), not null # link_post_id :integer -# title :string(255) +# title :string # crawled_at :datetime # quote :boolean default(FALSE), not null # diff --git a/app/models/twitter_user_info.rb b/app/models/twitter_user_info.rb index 42d4f4d83c..0927c009ae 100644 --- a/app/models/twitter_user_info.rb +++ b/app/models/twitter_user_info.rb @@ -8,7 +8,7 @@ end # # id :integer not null, primary key # user_id :integer not null -# screen_name :string(255) not null +# screen_name :string not null # twitter_user_id :integer not null # created_at :datetime not null # updated_at :datetime not null diff --git a/app/models/upload.rb b/app/models/upload.rb index 49480639d4..8d2c0ffeb9 100644 --- a/app/models/upload.rb +++ b/app/models/upload.rb @@ -14,6 +14,8 @@ class Upload < ActiveRecord::Base has_many :optimized_images, dependent: :destroy + attr_accessor :is_attachment_for_group_message + validates_presence_of :filesize validates_presence_of :original_filename @@ -62,8 +64,9 @@ class Upload < ActiveRecord::Base # options # - content_type - # - origin - # - image_type + # - origin (url) + # - image_type ("avatar", "profile_background", "card_background") + # - is_attachment_for_group_message (boolean) def self.create_for(user_id, file, filename, filesize, options = {}) DistributedMutex.synchronize("upload_#{user_id}_#{filename}") do # do some work on images @@ -141,6 +144,10 @@ class Upload < ActiveRecord::Base upload.height = height upload.origin = options[:origin][0...1000] if options[:origin] + if options[:is_attachment_for_group_message] + upload.is_attachment_for_group_message = true + end + if is_dimensionless_image?(filename, upload.width, upload.height) upload.errors.add(:base, I18n.t("upload.images.size_not_found")) return upload @@ -257,11 +264,11 @@ end # # id :integer not null, primary key # user_id :integer not null -# original_filename :string(255) not null +# original_filename :string not null # filesize :integer not null # width :integer # height :integer -# url :string(255) not null +# url :string not null # created_at :datetime not null # updated_at :datetime not null # sha1 :string(40) diff --git a/app/models/user.rb b/app/models/user.rb index 71ee83831a..667cfb6b55 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -956,42 +956,42 @@ end # # Table name: users # -# id :integer not null, primary key -# username :string(60) not null -# created_at :datetime not null -# updated_at :datetime not null -# name :string(255) -# seen_notification_id :integer default(0), not null -# last_posted_at :datetime -# email :string(513) not null -# password_hash :string(64) -# salt :string(32) -# active :boolean default(FALSE), not null -# username_lower :string(60) not null -# auth_token :string(32) -# last_seen_at :datetime -# admin :boolean default(FALSE), not null -# last_emailed_at :datetime -# trust_level :integer not null -# approved :boolean default(FALSE), not null -# approved_by_id :integer -# approved_at :datetime -# previous_visit_at :datetime -# suspended_at :datetime -# suspended_till :datetime -# date_of_birth :date -# views :integer default(0), not null -# flag_level :integer default(0), not null -# ip_address :inet -# moderator :boolean default(FALSE) -# blocked :boolean default(FALSE) -# title :string(255) -# uploaded_avatar_id :integer -# primary_group_id :integer -# locale :string(10) -# registration_ip_address :inet -# trust_level_locked :boolean default(FALSE), not null -# staged :boolean default(FALSE), not null +# id :integer not null, primary key +# username :string(60) not null +# created_at :datetime not null +# updated_at :datetime not null +# name :string +# seen_notification_id :integer default(0), not null +# last_posted_at :datetime +# email :string(513) not null +# password_hash :string(64) +# salt :string(32) +# active :boolean default(FALSE), not null +# username_lower :string(60) not null +# auth_token :string(32) +# last_seen_at :datetime +# admin :boolean default(FALSE), not null +# last_emailed_at :datetime +# trust_level :integer not null +# approved :boolean default(FALSE), not null +# approved_by_id :integer +# approved_at :datetime +# previous_visit_at :datetime +# suspended_at :datetime +# suspended_till :datetime +# date_of_birth :date +# views :integer default(0), not null +# flag_level :integer default(0), not null +# ip_address :inet +# moderator :boolean default(FALSE) +# blocked :boolean default(FALSE) +# title :string +# uploaded_avatar_id :integer +# locale :string(10) +# primary_group_id :integer +# registration_ip_address :inet +# trust_level_locked :boolean default(FALSE), not null +# staged :boolean default(FALSE), not null # # Indexes # diff --git a/app/models/user_badge.rb b/app/models/user_badge.rb index f78ed824bb..a50bf1be72 100644 --- a/app/models/user_badge.rb +++ b/app/models/user_badge.rb @@ -39,4 +39,5 @@ end # index_user_badges_on_badge_id_and_user_id (badge_id,user_id) # index_user_badges_on_badge_id_and_user_id_and_post_id (badge_id,user_id,post_id) UNIQUE # index_user_badges_on_badge_id_and_user_id_and_seq (badge_id,user_id,seq) UNIQUE +# index_user_badges_on_user_id (user_id) # diff --git a/app/models/user_export.rb b/app/models/user_export.rb index 2895c48ff9..d231c21b36 100644 --- a/app/models/user_export.rb +++ b/app/models/user_export.rb @@ -33,7 +33,7 @@ end # Table name: user_exports # # id :integer not null, primary key -# file_name :string(255) not null +# file_name :string not null # user_id :integer not null # created_at :datetime # updated_at :datetime diff --git a/app/models/user_field.rb b/app/models/user_field.rb index c39644a609..7086f1e0e2 100644 --- a/app/models/user_field.rb +++ b/app/models/user_field.rb @@ -13,12 +13,12 @@ end # Table name: user_fields # # id :integer not null, primary key -# name :string(255) not null -# field_type :string(255) not null +# name :string not null +# field_type :string not null # created_at :datetime # updated_at :datetime # editable :boolean default(FALSE), not null -# description :string(255) not null +# description :string not null # required :boolean default(TRUE), not null # show_on_profile :boolean default(FALSE), not null # position :integer default(0) diff --git a/app/models/user_field_option.rb b/app/models/user_field_option.rb index 2b3036fa40..56299f3ee9 100644 --- a/app/models/user_field_option.rb +++ b/app/models/user_field_option.rb @@ -7,7 +7,7 @@ end # # id :integer not null, primary key # user_field_id :integer not null -# value :string(255) not null +# value :string not null # created_at :datetime # updated_at :datetime # diff --git a/app/models/user_history.rb b/app/models/user_history.rb index e742631f37..e142d9f5ad 100644 --- a/app/models/user_history.rb +++ b/app/models/user_history.rb @@ -50,7 +50,8 @@ class UserHistory < ActiveRecord::Base grant_admin: 32, revoke_admin: 33, grant_moderation: 34, - revoke_moderation: 35) + revoke_moderation: 35, + backup_operation: 36) end # Staff actions is a subset of all actions, used to audit actions taken by staff users. @@ -82,7 +83,8 @@ class UserHistory < ActiveRecord::Base :grant_admin, :revoke_admin, :grant_moderation, - :revoke_moderation] + :revoke_moderation, + :backup_operation] end def self.staff_action_ids @@ -155,16 +157,16 @@ end # details :text # created_at :datetime not null # updated_at :datetime not null -# context :string(255) -# ip_address :string(255) -# email :string(255) +# context :string +# ip_address :string +# email :string # subject :text # previous_value :text # new_value :text # topic_id :integer # admin_only :boolean default(FALSE) # post_id :integer -# custom_type :string(255) +# custom_type :string # category_id :integer # # Indexes diff --git a/app/models/user_open_id.rb b/app/models/user_open_id.rb index 183f241482..188a04ef15 100644 --- a/app/models/user_open_id.rb +++ b/app/models/user_open_id.rb @@ -11,8 +11,8 @@ end # # id :integer not null, primary key # user_id :integer not null -# email :string(255) not null -# url :string(255) not null +# email :string not null +# url :string not null # created_at :datetime not null # updated_at :datetime not null # active :boolean not null diff --git a/app/models/user_option.rb b/app/models/user_option.rb index e6384f061b..91995e1b1c 100644 --- a/app/models/user_option.rb +++ b/app/models/user_option.rb @@ -9,6 +9,10 @@ class UserOption < ActiveRecord::Base @previous_replies_type ||= Enum.new(always: 0, unless_emailed: 1, never: 2) end + def self.like_notification_frequency_type + @like_notification_frequency_type ||= Enum.new(always: 0, first_time_and_daily: 1, first_time: 2, never: 3) + end + def set_defaults self.email_always = SiteSetting.default_email_always self.mailing_list_mode = SiteSetting.default_email_mailing_list_mode @@ -16,6 +20,7 @@ class UserOption < ActiveRecord::Base self.automatically_unpin_topics = SiteSetting.default_topics_automatic_unpin self.email_private_messages = SiteSetting.default_email_private_messages self.email_previous_replies = SiteSetting.default_email_previous_replies + self.email_in_reply_to = SiteSetting.default_email_in_reply_to self.enable_quoting = SiteSetting.default_other_enable_quoting self.external_links_in_new_tab = SiteSetting.default_other_external_links_in_new_tab @@ -26,12 +31,14 @@ class UserOption < ActiveRecord::Base self.new_topic_duration_minutes = SiteSetting.default_other_new_topic_duration_minutes self.auto_track_topics_after_msecs = SiteSetting.default_other_auto_track_topics_after_msecs + self.like_notification_frequency = SiteSetting.default_other_like_notification_frequency + if SiteSetting.default_email_digest_frequency.to_i <= 0 self.email_digests = false else self.email_digests = true - self.digest_after_days ||= SiteSetting.default_email_digest_frequency.to_i + self.digest_after_minutes ||= SiteSetting.default_email_digest_frequency.to_i end true @@ -103,3 +110,30 @@ class UserOption < ActiveRecord::Base end end + +# == Schema Information +# +# Table name: user_options +# +# user_id :integer not null, primary key +# email_always :boolean default(FALSE), not null +# mailing_list_mode :boolean default(FALSE), not null +# email_digests :boolean +# email_direct :boolean default(TRUE), not null +# email_private_messages :boolean default(TRUE), not null +# external_links_in_new_tab :boolean default(FALSE), not null +# enable_quoting :boolean default(TRUE), not null +# dynamic_favicon :boolean default(FALSE), not null +# disable_jump_reply :boolean default(FALSE), not null +# edit_history_public :boolean default(FALSE), not null +# automatically_unpin_topics :boolean default(TRUE), not null +# digest_after_minutes :integer +# auto_track_topics_after_msecs :integer +# new_topic_duration_minutes :integer +# last_redirected_to_top_at :datetime +# email_previous_replies :integer default(1), not null +# +# Indexes +# +# index_user_options_on_user_id (user_id) UNIQUE +# diff --git a/app/models/user_profile.rb b/app/models/user_profile.rb index 38b04b74d5..2dca5c2f10 100644 --- a/app/models/user_profile.rb +++ b/app/models/user_profile.rb @@ -106,8 +106,8 @@ end # Table name: user_profiles # # user_id :integer not null, primary key -# location :string(255) -# website :string(255) +# location :string +# website :string # bio_raw :text # bio_cooked :text # profile_background :string(255) diff --git a/app/serializers/basic_group_serializer.rb b/app/serializers/basic_group_serializer.rb index d9a50ef124..725de396e5 100644 --- a/app/serializers/basic_group_serializer.rb +++ b/app/serializers/basic_group_serializer.rb @@ -12,7 +12,8 @@ class BasicGroupSerializer < ApplicationSerializer :grant_trust_level, :incoming_email, :notification_level, - :has_messages + :has_messages, + :mentionable def include_incoming_email? scope.is_staff? @@ -27,4 +28,8 @@ class BasicGroupSerializer < ApplicationSerializer scope.authenticated? end + def mentionable + object.mentionable?(scope.user, object.id) + end + end diff --git a/app/serializers/user_option_serializer.rb b/app/serializers/user_option_serializer.rb index bf43b41a36..6a40c7a260 100644 --- a/app/serializers/user_option_serializer.rb +++ b/app/serializers/user_option_serializer.rb @@ -9,12 +9,14 @@ class UserOptionSerializer < ApplicationSerializer :dynamic_favicon, :enable_quoting, :disable_jump_reply, - :digest_after_days, + :digest_after_minutes, :automatically_unpin_topics, :edit_history_public, :auto_track_topics_after_msecs, :new_topic_duration_minutes, - :email_previous_replies + :email_previous_replies, + :email_in_reply_to, + :like_notification_frequency def include_edit_history_public? diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb index 5ee0ad8e19..47d9a1b922 100644 --- a/app/services/post_alerter.rb +++ b/app/services/post_alerter.rb @@ -194,10 +194,35 @@ class PostAlerter # TODO decide if it makes sense to also publish a desktop notification end + def should_notify_edit?(notification, opts) + return notification.data_hash["display_username"] != opts[:display_username] + end + + def should_notify_like?(user, notification) + + return true if user.user_option.like_notification_frequency == UserOption.like_notification_frequency_type[:always] + + return true if user.user_option.like_notification_frequency == UserOption.like_notification_frequency_type[:first_time_and_daily] && notification.created_at < 1.day.ago + + return false + end + + def should_notify_previous?(user, notification, opts) + type = notification.notification_type + if type == Notification.types[:edited] + return should_notify_edit?(notification, opts) + elsif type == Notification.types[:liked] + return should_notify_like?(user, notification) + end + return false + end + def create_notification(user, type, post, opts=nil) return if user.blank? return if user.id == Discourse::SYSTEM_USER_ID + return if type == Notification.types[:liked] && user.user_option.like_notification_frequency == UserOption.like_notification_frequency_type[:never] + opts ||= {} # Make sure the user can see the post @@ -226,9 +251,19 @@ class PostAlerter post_number: post.post_number, notification_type: type) - if existing_notification - return unless existing_notification.notification_type == Notification.types[:edited] && - existing_notification.data_hash["display_username"] == opts[:display_username] + return if existing_notification && !should_notify_previous?(user, existing_notification, opts) + + notification_data = {} + + if existing_notification && + existing_notification.created_at > 1.day.ago && + user.user_option.like_notification_frequency == UserOption.like_notification_frequency_type[:always] + + data = existing_notification.data_hash + notification_data["username2"] = data["display_username"] + notification_data["count"] = (data["count"] || 1).to_i + 1 + # don't use destroy so we don't trigger a notification count refresh + Notification.where(id: existing_notification.id).destroy_all end collapsed = false @@ -259,13 +294,21 @@ class PostAlerter UserActionObserver.log_notification(original_post, user, type, opts[:acting_user_id]) - notification_data = { - topic_title: post.topic.title, + topic_title = post.topic.title + # when sending a private message email, keep the original title + if post.topic.private_message? && modifications = post.revisions.map(&:modifications) + if first_title_modification = modifications.find { |m| m.has_key?("title") } + topic_title = first_title_modification["title"][0] + end + end + + notification_data.merge!({ + topic_title: topic_title, original_post_id: original_post.id, original_post_type: original_post.post_type, original_username: original_username, display_username: opts[:display_username] || post.user.username - } + }) if group = opts[:group] notification_data[:group_id] = group.id diff --git a/app/services/random_topic_selector.rb b/app/services/random_topic_selector.rb index 7486311cb6..705bcd51d1 100644 --- a/app/services/random_topic_selector.rb +++ b/app/services/random_topic_selector.rb @@ -47,7 +47,12 @@ class RandomTopicSelector $redis.ltrim(key, count, -1) end - results = results[0] + if !results.is_a?(Array) # Redis is in readonly mode + results = $redis.lrange(key, 0, count-1) + else + results = results[0] + end + results.map!(&:to_i) left = count - results.length diff --git a/app/services/staff_action_logger.rb b/app/services/staff_action_logger.rb index 24ce837183..4e8f8f8cea 100644 --- a/app/services/staff_action_logger.rb +++ b/app/services/staff_action_logger.rb @@ -326,6 +326,13 @@ class StaffActionLogger })) end + def log_backup_operation(opts={}) + UserHistory.create(params(opts).merge({ + action: UserHistory.actions[:backup_operation], + ip_address: @admin.ip_address.to_s + })) + end + private def params(opts=nil) diff --git a/app/services/user_updater.rb b/app/services/user_updater.rb index 3b24efff08..25510fd250 100644 --- a/app/services/user_updater.rb +++ b/app/services/user_updater.rb @@ -18,10 +18,12 @@ class UserUpdater :disable_jump_reply, :edit_history_public, :automatically_unpin_topics, - :digest_after_days, + :digest_after_minutes, :new_topic_duration_minutes, :auto_track_topics_after_msecs, - :email_previous_replies + :email_previous_replies, + :email_in_reply_to, + :like_notification_frequency ] def initialize(actor, user) @@ -53,10 +55,10 @@ class UserUpdater save_options = false - OPTION_ATTR.each do |attribute| - if attributes[attribute].present? - save_options = true + OPTION_ATTR.each do |attribute| + if attributes.key?(attribute) + save_options = true if [true,false].include?(user.user_option.send(attribute)) val = attributes[attribute].to_s == 'true' diff --git a/app/services/username_checker_service.rb b/app/services/username_checker_service.rb index caeea977ae..64beba09b6 100644 --- a/app/services/username_checker_service.rb +++ b/app/services/username_checker_service.rb @@ -6,17 +6,21 @@ class UsernameCheckerService if !validator.valid_format? {errors: validator.errors} else - check_username_availability(username) + check_username_availability(username, email) end end end - def check_username_availability(username) + def check_username_availability(username, email) if User.username_available?(username) - { available: true } + { available: true, is_developer: is_developer?(email) } else { available: false, suggestion: UserNameSuggester.suggest(username) } end end + def is_developer?(value) + Rails.configuration.respond_to?(:developer_emails) && Rails.configuration.developer_emails.include?(value) + end + end diff --git a/app/views/email/_post.html.erb b/app/views/email/_post.html.erb index c081fb5afd..250d1e6d70 100644 --- a/app/views/email/_post.html.erb +++ b/app/views/email/_post.html.erb @@ -1,4 +1,4 @@ - +
- +
@@ -23,7 +23,7 @@
<%= format_for_email(post.cooked) %><%= format_for_email(use_excerpt ? post.excerpt : post.cooked) %>
diff --git a/app/views/email/notification.html.erb b/app/views/email/notification.html.erb index 681dc96afc..363fa65ca4 100644 --- a/app/views/email/notification.html.erb +++ b/app/views/email/notification.html.erb @@ -2,17 +2,22 @@
%{header_instructions}
- <%= render partial: 'email/post', locals: { post: post } %> + <%= render partial: 'email/post', locals: { post: post, use_excerpt: false } %> + + <% if in_reply_to_post.present? || context_posts.present? %> +
%{respond_instructions}
+
+ <% end %> + + <% if in_reply_to_post.present? %> +

<%= t "user_notifications.in_reply_to" %>

+ <%= render partial: 'email/post', locals: { post: in_reply_to_post, use_excerpt: true} %> + <% end %> <% if context_posts.present? %> -
%{respond_instructions}
- -
-

<%= t "user_notifications.previous_discussion" %>

- <% context_posts.each do |p| %> - <%= render partial: 'email/post', locals: { post: p } %> + <%= render partial: 'email/post', locals: { post: p, use_excerpt: false } %> <% end %> <% end %> diff --git a/app/views/invites/redeem_disposable_invite.html.erb b/app/views/invites/redeem_disposable_invite.html.erb new file mode 100644 index 0000000000..cc4b0acc1e --- /dev/null +++ b/app/views/invites/redeem_disposable_invite.html.erb @@ -0,0 +1,7 @@ +
+ <%if flash[:error]%> +
+ <%=flash[:error]%> +
+ <%end%> +
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 4d6575b777..ff7d545b57 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -17,6 +17,11 @@ <%- end %> + + <%= script "preload_store" %> <%= script "locales/#{I18n.locale}" %> <%= script "ember_jquery" %> diff --git a/app/views/users/password_reset.html.erb b/app/views/users/password_reset.html.erb index 93a5fd40cb..2371150d55 100644 --- a/app/views/users/password_reset.html.erb +++ b/app/views/users/password_reset.html.erb @@ -37,7 +37,7 @@

- +

diff --git a/config/initializers/100-logster.rb b/config/initializers/100-logster.rb index 2daf7200fe..8315587eaf 100644 --- a/config/initializers/100-logster.rb +++ b/config/initializers/100-logster.rb @@ -6,6 +6,7 @@ if Rails.env.production? /^PG::Error: ERROR:\s+duplicate key/, /^ActionController::UnknownFormat/, + /^ActionController::UnknownHttpMethod/, /^AbstractController::ActionNotFound/, @@ -55,3 +56,22 @@ Logster.config.current_context = lambda{|env,&blk| Logster.config.subdirectory = "#{GlobalSetting.relative_url_root}/logs" Logster.config.application_version = Discourse.git_version + +redis = Logster.store.redis +Logster.config.redis_prefix = "#{redis.namespace}" +Logster.config.redis_raw_connection = redis.without_namespace + +%w{minute hour}.each do |duration| + site_setting_error_rate = SiteSetting.public_send("alert_admins_if_errors_per_#{duration}") + + if site_setting_error_rate > 0 + Logster.store.public_send( + "register_rate_limit_per_#{duration}", + [Logger::WARN, Logger::ERROR, Logger::FATAL, Logger::UNKNOWN], + site_setting_error_rate + ) do |rate| + + MessageBus.publish("/logs_error_rate_exceeded", { rate: rate, duration: duration }) + end + end +end diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml index c89836ac16..44fa1c0977 100644 --- a/config/locales/client.ar.yml +++ b/config/locales/client.ar.yml @@ -356,7 +356,7 @@ ar: many: "هذا الموضوع له كثير من المشاركات بانتظار الموافقة" other: "هذا الموضوع له {{count}} مشاركات بانتظار الموافقة" confirm: "حفظ التعديلات" - delete_prompt: "هل أنت متأكد أنك تريد حذف %{username}؟ هذا سيحذف جميع مشاركاتك ويحظر بريدك الإلكتروني و عنوانك الـIP ." + delete_prompt: "هل أنت متأكد أنك تريد حذف %{username}؟ جميع مشاركته سوف تحذف كذلك و سوف يحظر كل من بريده الإلكتروني و عنوان الـ IP." approval: title: "المشاركات تحتاج موافقة" description: "لقد استلمنا مشاركتك لكنها تحتاج موافقة المشرف قبل ظهورها. الرجاء الانتظار" @@ -540,9 +540,7 @@ ar: perm_denied_btn: "الصلاحيات ممنوعة " perm_denied_expl: "لقد قمت بالغاء الاشعارات . قم بتفعيل الاشعارات عن طريق اعدادات االمتصفح" disable: "إيقاف الإشعارات " - currently_enabled: "( مفعل مسبقاً )" enable: "تفعيل الإشعارات" - currently_disabled: "( مفعل مسبقاً )" each_browser_note: "ملاحظة : يجب انت تقوم بتغيير هذا الإعداد عند كل مرة تستخدم فيها متصفح جديد ." dismiss_notifications: "جعل الجميع مقروء" dismiss_notifications_tooltip: "جعل جميع اشعارات غيرمقروء الى مقروء" @@ -682,6 +680,9 @@ ar: title: "وسام بطاقة المستخدم" website: "موقع الكتروني" email_settings: "بريد الكتروني" + email_previous_replies: + title: "تضمين مشاركات سابقة في أسفل البريد المرسل" + always: "دائماً" email_digests: title: "إرسال رسالة إلكترونية تحتوي على جديد الموقع عندما لا أزور الموقع" daily: "يومي" @@ -768,6 +769,7 @@ ar: likes_received: "اعجابات مستقبلة" days_visited: "ايام الزياره" posts_read_count: "قراء المواضيع" + top_replies: "أفضل المشاركات" top_topics: "افضل المواضيع" top_badges: "افضل الاوسمه" more_topics: "المزيد من المواضيع" @@ -849,8 +851,8 @@ ar: value_prop: "عندما تنشئ حساب، ننحن نتذكر ما كنت تقرأه بالضبط، و سترجع دائما في المكان الذي تركته، و ستصلك الاشعارات ايضا، هنا و عبر البريد الإلكتروني، في اي وقت ينشأ فيه منشور جديد، و تستطيع أن تُعجب بالمنشورارت لتشارك ما يعجبك :heartbeat:" summary: enabled_description: "أنت تنظر الى ملخص لهذا الموضوع , مشاركات مثيرة للإهتمام بحسب رأي المجتمع" - description: "هناك {{count}} ردود" - description_time: "هناك {{count}} ردود مع تقدير وقت القراءة {{readingTime}} دقائق." + description: "يوجد {{replyCount}} مشاركة." + description_time: "يوجد {{replyCount}} مشاركة, والوقت المقدر للقراءة {{readingTime}} minutes دقيقة." enable: 'لخّص هذا الموضوع' disable: 'عرض جميع المشاركات' deleted_filter: @@ -1134,9 +1136,6 @@ ar: category: "لا يوجد مواضيع في التصنيف {{category}}" top: "لا يوجد مواضيع تستحق أن تكون ضمن الأفضل مع الأسف." search: "لا يوجد نتائج للبحث." - educate: - new: '

مواضيعك الجديدة ستظهر هنا.

بشكل افتراضي ، كل المواضيع ستعتبر جديدة و تحمل الوسم جديد إذا تمت كتابتها قبل يومين على الأكثر.

تستطيع ان تغير المدة من إعداداتك .

' - unread: '

المواضيع الغير مقروءة ستظهر هنا

افتراضياً, سيتم اعتبارالمواضيع غير مقروءة وتحمل الوسم 1 إذا:

  • كتبت موضوع جديد
  • رددت على موضوع
  • قرأت موضوع لأكثر من 4 دقائق.

أو إذا قمت باختيار خيار تتبع موضوع أو إضافته للمواضيع المراقبة من خلال لوحة التحكم بالإشعارات.

تستطيع تغيير الإعدادات من خلال إعداداتك.

' bottom: latest: "لا يوجد المزيد من المواضيع الحديثة" hot: "هذه كل المواضيع التي عليها إقبال عالي حتى هذه اللحظة" @@ -1583,18 +1582,6 @@ ar: bookmark: "التراجع عن التفضيل" like: "التراجع عن الإعجاب" vote: "التراجع عن التصويت" - people: - off_topic: "{{icons}} بلغ أن هذا لاعلاقة له بالموضوع" - spam: "{{icons}} بلغ انه هذا هو سبام" - spam_with_url: "{{icons}} بُلغ انه غير مرغوب به" - inappropriate: "{{icons}} بلغ أنه غير لائق" - notify_moderators: "{{icons}} تنبيه المشرف" - notify_moderators_with_url: "{{icons}} نبه المشرف" - notify_user: "{{icons}} رسالة مُرسلة." - notify_user_with_url: "{{icons}} أرسلت message ." - bookmark: "{{icons}} اضف في المفضلة" - like: "{{icons}} استحسان" - vote: "{{icons}} صوت لهذا" by_you: off_topic: "لقد تم الإبلاغ عن الموضوع على أنه ليس في المكان الصحيح" spam: "تم الإبلاغ عن الموضوع على أنه سبام" @@ -2267,11 +2254,9 @@ ar: is_disabled: "Restore is disabled in the site settings." label: "استعادة" title: "اعادة تخزين النسخة الاحتياطية" - confirm: "هل أنت متأكد من رغبتك في اعادة تخزين النسخة الاحتياطية؟" rollback: label: "اعادة السنخة السابقة" title: "Rollback the database to previous working state" - confirm: "Are your sure you want to rollback the database to the previous working state?" export_csv: user_archive_confirm: "هل أنت متأكد من رغبتك في تحميل جميع مشاركاتك ؟" success: "بدأ التصدير, سيتم إعلامك برسالة عند اكتمال العملية." @@ -2374,9 +2359,6 @@ ar: love: name: 'إعجاب' description: "لون زر الإعجاب." - wiki: - name: 'ويكي' - description: "اللون الأساسي المستخدم كخلفية لمشاركات الويكي." email: title: "رسائل البريد الالكتروني" settings: "اعدادات" @@ -3078,20 +3060,20 @@ ar: name: الرابط الأول description: اضافة رابط لموضوع اخر first_quote: - name: التعليق الأول - description: إقتباسات + name: أول اقتباس + description: اقتبس من عضو read_guidelines: name: اقرأ التعليمات description: اطلع على توجيهات المجتمع reader: name: قارئ - description: قراءة أكثر من 100 تعليق في الموضوع + description: قراءة جميع المشاركات في موضوع فيه أكثر من 100 مشاركة popular_link: name: رابط مشهور description: شارك رابط خارجي بـ 50 نقرة على الأقل. hot_link: name: الرابط الساخن - description: شارك الرابط الخارجي بـ 300 نقرة على الأقل. + description: شارك رابط خارجي بـ 300 نقرة على الأقل. famous_link: name: رابط مشهور description: شارك الرابط الخارجي بـ 1000 نقرة على الأقل diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml index d2dc34c974..822c23ebde 100644 --- a/config/locales/client.bs_BA.yml +++ b/config/locales/client.bs_BA.yml @@ -515,8 +515,8 @@ bs_BA: last_post: Zadnji post summary: enabled_description: "You're viewing a summary of this topic: the most interesting posts as determined by the community." - description: "There are {{count}} replies." - description_time: "There are {{count}} replies with an estimated read time of {{readingTime}} minutes." + description: "There are {{replyCount}} replies." + description_time: "There are {{replyCount}} replies with an estimated read time of {{readingTime}} minutes." enable: 'Summarize This Topic' disable: 'Show All Posts' deleted_filter: diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml index 187f5a0080..1c5aa2ea00 100644 --- a/config/locales/client.cs.yml +++ b/config/locales/client.cs.yml @@ -697,8 +697,8 @@ cs: value_prop: "Pokud si založíš účet, budeme si přesně pomatovat, co jsi četly, takže se vždycky vrátíš do bodu, odkud jsi odešel. Také budeš dostávat upozornění, zde a přes e-mail, kdykoli přibydou nově příspěvky. A můžeš přidávat 'to se mi líbí' a šířit tak lásku. :heartbeat:" summary: enabled_description: "Čtete shrnutí tohoto tématu: nejzajímavější příspěvky podle komunity." - description: "Obsahuje {{count}} odpovědí." - description_time: "Obsahuje {{count}} odpovědí o odhadovaném času čtení {{readingTime}} minut." + description: "Obsahuje {{replyCount}} odpovědí." + description_time: "Obsahuje {{replyCount}} odpovědí o odhadovaném času čtení {{readingTime}} minut." enable: 'Přepnout na "nejlepší příspěvky"' disable: 'Přepnout na normální zobrazení' deleted_filter: diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml index 9c65da8741..e971423ded 100644 --- a/config/locales/client.da.yml +++ b/config/locales/client.da.yml @@ -100,6 +100,8 @@ da: x_years: one: "1 år senere" other: "%{count} år senere" + previous_month: 'Forrige måned' + next_month: 'Næste måned' share: topic: 'del et link til dette emne' post: 'indlæg #%{postNumber}' @@ -110,6 +112,8 @@ da: email: 'send dette link i en e-mail' action_codes: split_topic: "delte dette emne op %{when}" + invited_user: "Inviterede %{who} %{when}" + removed_user: "fjernede %{who} %{when}" autoclosed: enabled: 'lukket %{when}' disabled: 'åbnet %{when}' @@ -173,6 +177,7 @@ da: other: "{{count}} tegn" suggested_topics: title: "Foreslåede emner" + pm_title: "Foreslåede beskeder" about: simple_title: "Om" title: "Om %{title}" @@ -294,6 +299,12 @@ da: one: "1 bruger" other: "%{count} brugere" groups: + empty: + posts: "Der er ingen indlæg af medlemmer af denne gruppe." + members: "Der er ingen medlemmer i denne gruppe." + mentions: "Denne gruppe er ikke nævnt." + messages: "Der er ingen besked til denne gruppe." + topics: "Der er intet emne af medlemmer af denne gruppe." add: "Tilføj" selector_placeholder: "Tilføj medlemmer" owner: "ejer" @@ -313,6 +324,19 @@ da: trust_levels: title: "Tillidsniveau der automatisk tildeles medlemmer når de oprettes:" none: "Ingen" + notifications: + watching: + title: "Kigger" + description: "Du får beskeder om hvert nyt indlæg i hver besked og antallet af nye svar bliver vist." + tracking: + title: "Følger" + description: "Du får besked hvis nogen nævner dit @navn eller svarer dig og antallet af nye svar bliver vist." + regular: + title: "Normal" + description: "Du får besked hvis nogen nævner dit @navn " + muted: + title: "Tavs" + description: "Du får aldrig beskeder om nye emner i denne gruppe." user_action_groups: '1': "Likes givet" '2': "Likes modtaget" @@ -331,6 +355,7 @@ da: all_subcategories: "Alle" no_subcategory: "ingen" category: "Kategori" + category_list: "Vis liste over kategorier" reorder: title: "Ret kategoriernes rækkefølge " title_long: "Omorganiser listen over kategorier" @@ -387,11 +412,13 @@ da: invited_by: "Inviteret af" trust_level: "Tillidsniveau" notifications: "Underretninger" + statistics: "Statistik" desktop_notifications: label: "Desktop-notifikationer" not_supported: "Notifikationer understøttes ikke af denne browser. Beklager." perm_default: "Slå notifikationer til" perm_denied_btn: "Tilladelse nægtet" + perm_denied_expl: "Du nægtede adgang for notifikationer. Tillad notifikationer via indstillingerne i din browser." disable: "Deaktiver notifikationer" currently_enabled: "(slået til)" enable: "Aktiver notifikationer" @@ -439,7 +466,15 @@ da: warnings_received: "advarsler" messages: all: "Alle" + inbox: "Indbakke" + sent: "Sendt" + archive: "Arkiv" groups: "Mine grupper" + bulk_select: "Vælg beskeder" + move_to_inbox: "Flyt til Indbakke" + move_to_archive: "Arkiv" + failed_to_move: "Kunne ikke flytte valgt beskeder (måske problemer med netværket)" + select_all: "Vælg alle" change_password: success: "(e-mail sendt)" in_progress: "(sender e-mail)" @@ -596,6 +631,21 @@ da: same_as_email: "Dit password er det samme som din email adresse." ok: "Din adgangskode ser fin ud." instructions: "Mindst %{count} tegn" + summary: + title: "Resume" + stats: "Statistik" + topic_count: "Emner oprettet" + post_count: "Indlæg oprettet" + likes_given: "Likes givet" + likes_received: "Likes modtaget" + days_visited: "Dage besøgt" + posts_read_count: "Indlæg læst" + top_replies: "Top svar" + top_topics: "Top emner" + top_badges: "Top badges" + more_topics: "Flere emner" + more_replies: "Flere svar" + more_badges: "Flere badges" associated_accounts: "Logins" ip_address: title: "Sidste IP-adresse" @@ -667,8 +717,8 @@ da: value_prop: "Når du opretter en konto, så kan vi huske hvad du har læst, så du altid kan fortsætte, hvor du er kommet til. Du får også notifikationer - her og på email - når nye interessante indlæg postes. Og du kan like indlæg og dele begejstringen. :heartbeat:" summary: enabled_description: "Du ser et sammendrag af dette emne: kun de mest interessante indlæg som andre finder interresante." - description: "Der er {{count}} svar." - description_time: "Der er {{count}} svar og det vil tage ca. {{readingTime}} minutter at læse." + description: "Der er {{replyCount}} svar." + description_time: "Der er {{replyCount}} svar og det vil tage ca. {{readingTime}} minutter at læse." enable: 'Opsummér dette emne' disable: 'Vis alle indlæg' deleted_filter: @@ -752,6 +802,7 @@ da: ctrl: 'Ctrl' alt: 'Alt' composer: + emoji: "Emoji :)" more_emoji: "mere..." options: "Indstillinger" whisper: "hvisken" @@ -848,6 +899,9 @@ da: moved_post: "

{{username}} moved {{description}}

" linked: "

{{username}} {{description}}

" granted_badge: "

Du blev tildelt '{{description}}'

" + group_message_summary: + one: "

{{count}} besked i din {{group_name}} inbox

" + other: "

{{count}} beskeder i din {{group_name}} inbox

" alt: mentioned: "Nævnt af" quoted: "Citeret af" @@ -862,8 +916,10 @@ da: moved_post: "Dit indlæg blev flyttet af" linked: "Link til dit indlæg" granted_badge: "Badge tildelt" + group_message_summary: "Besker i gruppens indbakke" popup: mentioned: '{{username}} nævnte dig i "{{topic}}" - {{site_title}}' + group_mentioned: '{{username}} nævnte dig i "{{topic}}" - {{site_title}}' quoted: '{{username}} citerede dig i "{{topic}}" - {{site_title}}' replied: '{{username}} svarede dig i "{{topic}}" - {{site_title}}' posted: '{{username}} skrev i "{{topic}}" - {{site_title}}' @@ -964,6 +1020,12 @@ da: create: 'Nyt emne' create_long: 'Opret et nyt emne i debatten' private_message: 'Start en besked' + archive_message: + help: 'Flyt beskeder til dit arkiv' + title: 'Arkiv' + move_to_inbox: + title: 'Flyt til Indbakke' + help: 'Flyt beskeder tilbage til Indbakke' list: 'Emner' new: 'nyt emne' unread: 'ulæste' @@ -1014,6 +1076,7 @@ da: auto_close_title: 'Indstillinger for automatisk lukning' auto_close_save: "Gem" auto_close_remove: "Luk ikke dette emne automatisk" + auto_close_immediate: "Seneste indlæg i emnet er allerede %{hours} timer gammelt så emnet bliver lukket med det samme." progress: title: emnestatus go_top: "top" @@ -1134,6 +1197,7 @@ da: success: "Vi har inviteret denne bruger til at være med i denne besked." error: "Beklager, der skete en fejl, da vi forsøgte at invitere brugeren." group_name: "gruppe navn" + controls: "Emnestyring" invite_reply: title: 'Invitér' username_placeholder: "brugernavn" @@ -1250,6 +1314,8 @@ da: yes_value: "Ja" via_email: "dette indlæg blev oprettet via email" whisper: "dette indlæg er en privat hvisken for moderatorer" + wiki: + about: "dette indlæg er en wiki" archetypes: save: 'Gem indstillinger' controls: @@ -1682,6 +1748,7 @@ da: refresh_report: "Genopfrisk rapporten" start_date: "Start dato" end_date: "Slut dato" + groups: "Alle grupper" commits: latest_changes: "Seneste ændringer: opdatér ofte!" by: "af" @@ -1964,13 +2031,17 @@ da: name: 'wiki' description: "Basis farven der bruges som baggrund i wiki posts." email: + title: "Emails" settings: "Indstillinger" + templates: "Skabeloner" preview_digest: "Forhåndsvisning af sammendrag" sending_test: "Sender test email..." error: "ERROR - %{server_error}" test_error: "Der opstod et problem med at sende test emailen. Dobbelt check dine email indstillinger, verificer at din server ikke blokerer email forbindelser og prøv så igen." sent: "Sendt" skipped: "Droppet" + received: "Modtaget" + rejected: "Afvist" sent_at: "Sendt" time: "Tidspunkt" user: "Bruger" @@ -1988,6 +2059,19 @@ da: last_seen_user: "Sidst sete bruge:" reply_key: "Svarnøgle" skipped_reason: "Begrundelse" + incoming_emails: + from_address: "Fra" + to_addresses: "Til" + cc_addresses: "Cc" + subject: "Emne" + error: "Fejl" + none: "Ingen indkommende emails fundet" + filters: + from_placeholder: "from@example.com" + to_placeholder: "to@example.com" + cc_placeholder: "cc@example.com" + subject_placeholder: "Emne..." + error_placeholder: "Fejl" logs: none: "Ingen logs fundet" filters: @@ -2037,6 +2121,7 @@ da: change_site_setting: "skift indstillinger for site" change_site_customization: "skift tilpasning af site" delete_site_customization: "slet tilpasning af site" + change_site_text: "skift tekst for site" suspend_user: "suspendér user" unsuspend_user: "ophæv suspendering af bruger" grant_badge: "tildel badge" @@ -2050,6 +2135,12 @@ da: change_category_settings: "ret kategori-indstillinger" delete_category: "slet kategori" create_category: "opret kategori" + block_user: "bloker bruger" + unblock_user: "fjern blokering af bruger" + grant_admin: "tildel admin" + revoke_admin: "fjern admin" + grant_moderation: "tildel moderation" + revoke_moderation: "fjern moderation" screened_emails: title: "Blokerede e-mails" description: "Følgende e-mail-adresser kontrolleres når nogen prøver at oprette en konto, og oprettelsen vil enten blive blokeret, eller der vil blive foretaget en anden handling." @@ -2215,6 +2306,8 @@ da: deactivate_failed: "Der opstod et problem ved deaktivering af brugeren." unblock_failed: 'Der opstod et problem ved ophævelsen af brugerens blokering.' block_failed: 'Der opstod et problem ved blokering af brugeren.' + block_confirm: 'Er du sikker på, at du vil blokere brugeren? Bruger kan ikke længere oprette emner eller indlæg.' + block_accept: 'Ja, bloker brugeren' deactivate_explanation: "En deaktiveret bruger skal genvalidere deres e-mail." suspended_explanation: "En suspenderet bruger kan ikke logge ind." block_explanation: "En blokeret bruger kan ikke oprette indlæg eller starte emner." @@ -2228,6 +2321,7 @@ da: unlock_trust_level: "Lås tillidsniveau op" tl3_requirements: title: "Krav for fortrolighedsniveau 3" + table_title: "I de sidste %{time_period} dage:" value_heading: "værdi" requirement_heading: "Obligatoriske" visits: "Besøg" @@ -2495,6 +2589,10 @@ da: mark_tracking: 'm, t Følg emne' mark_watching: 'm, w Iagtag emne' badges: + earned_n_times: + one: "Fortjente dette badge 1 gang" + other: "Fortjente dette badge %{count} gange." + more_with_badge: "Andre med dette badge" title: Badges allow_title: "kan bruges som titel" multiple_grant: "kan gives flere gange" diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml index 30a9605535..f726d1e024 100644 --- a/config/locales/client.de.yml +++ b/config/locales/client.de.yml @@ -372,7 +372,7 @@ de: reorder: title: "Kategorien neu sortieren" title_long: "Neustrukturierung der Kategorieliste" - fix_order: "Positionen fixieren" + fix_order: "Positionen korrigieren" fix_order_tooltip: "Nicht alle Kategorien haben eine eindeutige Positionsnummer, was zu unerwarteten Ergebnissen führen kann." save: "Reihenfolge speichern" apply_all: "Anwenden" @@ -459,7 +459,7 @@ de: tracked_categories: "Verfolgt" tracked_categories_instructions: "Du wirst automatisch allen neuen Themen in diesen Kategorien folgen. Die Anzahl der neuen Antworten wird bei den betroffenen Themen angezeigt." muted_categories: "Stummgeschaltet" - muted_categories_instructions: "Du erhältst keine Benachrichtigungen über neue Themen in dieser Kategorie und die Themen werden auch nicht in der Liste der letzten Themen erscheinen." + muted_categories_instructions: "Du erhältst keine Benachrichtigungen über neue Themen in dieser Kategorie und die Themen werden auch nicht in der Liste der aktuellen Themen erscheinen." delete_account: "Lösche mein Benutzerkonto" delete_account_confirm: "Möchtest du wirklich dein Benutzerkonto permanent löschen? Diese Aktion kann nicht rückgängig gemacht werden!" deleted_yourself: "Dein Benutzerkonto wurde erfolgreich gelöscht." @@ -731,8 +731,8 @@ de: value_prop: "Wenn du ein Benutzerkonto anlegst, merken wir uns, was du gelesen hast, damit du immer dort fortsetzten kannst, wo du aufgehört hast. Du kannst auch Benachrichtigungen – hier oder per E-Mail – erhalten, wenn neue Beiträge verfasst werden. Beiträge, die dir gefallen, kannst du mit einem Like versehen und diese Freude mit allen teilen. :heartbeat:" summary: enabled_description: "Du siehst gerade eine Zusammenfassung des Themas: die interessantesten Beiträge, die von der Community bestimmt wurden." - description: "Es gibt {{count}} Antworten." - description_time: "Es gibt {{count}} Antworten mit einer geschätzten Lesezeit von {{readingTime}} Minuten." + description: "Es gibt {{replyCount}} Antworten." + description_time: "Es gibt {{replyCount}} Antworten mit einer geschätzten Lesezeit von {{readingTime}} Minuten." enable: 'Zusammenfassung vom Thema erstellen' disable: 'Alle Beiträge anzeigen' deleted_filter: @@ -2068,7 +2068,7 @@ de: format: "Format" html: "HTML" text: "Text" - last_seen_user: "Letzter Benutzer:" + last_seen_user: "Benutzer zuletzt gesehen:" reply_key: "Antwort-Schlüssel" skipped_reason: "Grund des Überspringens" incoming_emails: @@ -2254,7 +2254,7 @@ de: moderator: "Moderator?" admin: "Administrator?" blocked: "Geblockt?" - staged: "Insziniert?" + staged: "Vorbereitet?" show_admin_profile: "Administration" edit_title: "Titel bearbeiten" save_title: "Titel speichern" @@ -2324,7 +2324,7 @@ de: deactivate_explanation: "Ein deaktivierter Benutzer muss seine E-Mail-Adresse erneut bestätigen." suspended_explanation: "Ein gesperrter Benutzer kann sich nicht anmelden." block_explanation: "Ein geblockter Benutzer kann keine Themen erstellen oder Beiträge veröffentlichen." - stage_explanation: "Ein inszenierter Nutzer kann nur via E-Mail zu gewissen Themen beitragen." + stage_explanation: "Ein vorbereiteter Nutzer kann nur via E-Mail zu gewissen Themen beitragen." trust_level_change_failed: "Beim Wechsel der Vertrauensstufe ist ein Fehler aufgetreten." suspend_modal_title: "Benutzer sperren" trust_level_2_users: "Benutzer mit Vertrauensstufe 2" @@ -2525,7 +2525,7 @@ de: crawling_description: "Wenn Discourse Themen für deine Beiträge erstellt wird es falls kein RSS/ATOM-Feed verfügbar ist versuchen, den Inhalt aus dem HTML-Code zu extrahieren. Dies ist teilweise schwierig, weshalb hier CSS-Regeln angegeben werden können, die die Extraktion erleichtern." embed_by_username: "Benutzername für Beitragserstellung" embed_post_limit: "Maximale Anzahl der Beiträge, welche eingebettet werden" - embed_username_key_from_feed: "Schlüssel, um Discourse-Benutzernamen aus Feed zu extrahieren." + embed_username_key_from_feed: "Schlüssel, um Discourse-Benutzernamen aus Feed zu ermitteln." embed_truncate: "Kürze die eingebetteten Beiträge" embed_whitelist_selector: "CSS Selektor für Elemente, die in Einbettungen erlaubt sind." embed_blacklist_selector: "CSS Selektor für Elemente, die in Einbettungen entfernt werden." diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 6891ca5432..af4246d77d 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -193,6 +193,8 @@ en: more: "More" less: "Less" never: "never" + every_30_minutes: "every 30 minutes" + every_hour: "every hour" daily: "daily" weekly: "weekly" every_two_weeks: "every two weeks" @@ -511,7 +513,7 @@ en: muted_users: "Muted" muted_users_instructions: "Suppress all notifications from these users." muted_topics_link: "Show muted topics" - automatically_unpin_topics: "Automatically unpin topics when you reach the bottom." + automatically_unpin_topics: "Automatically unpin topics when I reach the bottom." staff_counters: flags_given: "helpful flags" @@ -627,18 +629,27 @@ en: website: "Web Site" email_settings: "Email" + like_notification_frequency: + title: "Notify when liked" + always: "Always" + first_time_and_daily: "First time a post is liked and daily" + first_time: "First time a post is liked" + never: "Never" email_previous_replies: - title: "Include previous replies" + title: "Include previous replies at the bottom of emails" unless_emailed: "unless previously sent" always: "always" never: "never" email_digests: title: "When I don't visit here, send an email digest of what's new:" + every_30_minutes: "every 30 minutes" + every_hour: "hourly" daily: "daily" every_three_days: "every three days" weekly: "weekly" every_two_weeks: "every two weeks" + email_in_reply_to: "Include an excerpt of replied to post in emails" 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" @@ -776,9 +787,11 @@ en: 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." 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." too_few_topics_notice: "Let's get this discussion started! There are currently %{currentTopics} / %{requiredTopics} topics. New visitors need some conversations to read and respond to." too_few_posts_notice: "Let's get this discussion started! There are currently %{currentPosts} / %{requiredPosts} posts. New visitors need some conversations to read and respond to." + logs_error_rate_exceeded_notice: "%{timestamp}: Current rate of %{rate} errors/%{duration} has exceeded site settings's limit of %{siteSettingLimit} errors/%{duration}." learn_more: "learn more..." @@ -882,6 +895,9 @@ en: twitter: title: "with Twitter" message: "Authenticating with Twitter (make sure pop up blockers are not enabled)" + instagram: + title: "with Instagram" + message: "Authenticating with Instagram (make sure pop up blockers are not enabled)" facebook: title: "with Facebook" message: "Authenticating with Facebook (make sure pop up blockers are not enabled)" @@ -1002,6 +1018,10 @@ en: posted: "

{{username}} {{description}}

" edited: "

{{username}} {{description}}

" liked: "

{{username}} {{description}}

" + liked_2: "

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

" + liked_many: + one: "

{{username}}, {{username2}} and 1 other {{description}}

" + other: "

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

" private_message: "

{{username}} {{description}}

" invited_to_private_message: "

{{username}} {{description}}

" invited_to_topic: "

{{username}} {{description}}

" @@ -1535,17 +1555,14 @@ en: like: "Undo like" vote: "Undo vote" people: - off_topic: "{{icons}} flagged this as off-topic" - spam: "{{icons}} flagged this as spam" - spam_with_url: "{{icons}} flagged this as spam" - inappropriate: "{{icons}} flagged this as inappropriate" - notify_moderators: "{{icons}} notified moderators" - notify_moderators_with_url: "{{icons}} notified moderators" - notify_user: "{{icons}} sent a message" - notify_user_with_url: "{{icons}} sent a message" - bookmark: "{{icons}} bookmarked this" - like: "{{icons}} liked this" - vote: "{{icons}} voted for this" + off_topic: "flagged this as off-topic" + spam: "flagged this as spam" + inappropriate: "flagged this as inappropriate" + notify_moderators: "notified moderators" + notify_user: "sent a message" + bookmark: "bookmarked this" + like: "liked this" + vote: "voted for this" by_you: off_topic: "You flagged this as off-topic" spam: "You flagged this as spam" @@ -1701,7 +1718,6 @@ en: flagging: title: 'Thanks for helping to keep our community civil!' - private_reminder: 'flags are private, only visible to staff' action: 'Flag Post' take_action: "Take Action" notify_action: 'Message' @@ -1713,7 +1729,7 @@ en: submit_tooltip: "Submit the private flag" take_action_tooltip: "Reach the flag threshold immediately, rather than waiting for more community flags" cant: "Sorry, you can't flag this post at this time." - notify_staff: 'Notify Staff' + notify_staff: 'Notify staff privately' formatted_name: off_topic: "It's Off-Topic" inappropriate: "It's Inappropriate" @@ -2356,6 +2372,7 @@ en: revoke_admin: "revoke admin" grant_moderation: "grant moderation" revoke_moderation: "revoke moderation" + backup_operation: "backup operation" 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." diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml index b65b513439..1bc738d842 100644 --- a/config/locales/client.es.yml +++ b/config/locales/client.es.yml @@ -731,8 +731,8 @@ es: value_prop: "Cuando te registras, recordamos lo que has leído, para que puedas volver justo donde estabas leyendo. También recibes notificaciones, por aquí y por email, cuando se publican nuevos mensajes. ¡También puedes darle a Me gusta a los mensajes! :heartbeat:" summary: enabled_description: "Estás viendo un resumen de este tema: los posts más interesantes determinados por la comunidad." - description: "Hay {{count}} respuestas." - description_time: "Hay {{count}} respuestas con un tiempo de lectura estimado de {{readingTime}} minutos." + description: "Hay {{replyCount}} respuestas." + description_time: "Hay {{replyCount}} respuestas con un tiempo de lectura estimado de {{readingTime}} minutos." enable: 'Resumir este Tema' disable: 'Ver Todos los Posts' deleted_filter: diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml index ae24711f45..3f4ea08d51 100644 --- a/config/locales/client.fa_IR.yml +++ b/config/locales/client.fa_IR.yml @@ -81,6 +81,8 @@ fa_IR: other: "%{count} ماه بعد" x_years: other: "%{count} سال بعد" + previous_month: 'ماه پیشین' + next_month: 'ماه بعد' share: topic: 'پیوندی به این موضوع را به اشتراک بگذارید' post: 'ارسال #%{postNumber}' @@ -226,7 +228,6 @@ fa_IR: has_pending_posts: other: "این عنوان دارای {{count}} نوشته‌ی در انتظار تایید است" confirm: "ذخیره سازی تغییرها" - delete_prompt: "آیا مطمئن هستی از پاک کردن این %{username}? این باعث پاک شدن تمام پست ها و منجر به بلاک شدن ایمیل و IP می شود." approval: title: "نوشته نیاز به تایید دارد" description: "ما نوشته شما را دریافت کرده ایم ولی نیاز به تایید آن توسط یکی از مدیران است قبل از اینکه نمایش داده شود. لطفا صبر داشته باشید." @@ -384,9 +385,7 @@ fa_IR: perm_default: "فعال کردن اعلانات" perm_denied_btn: "دسترسی رد شد" disable: "غیرفعال کردن اعلانات" - currently_enabled: "(در حال حاضر فعال است)" enable: "فعال کردن اعلانات" - currently_disabled: "(در حال حاضر غیرفعال است)" each_browser_note: "نکته: شما باید این تنظیمات را در هر مرورگری که استفاده میکنید تغییر دهید." dismiss_notifications: "علامت گذاری همه به عنوان خوانده شده" dismiss_notifications_tooltip: "علامت گذاری همه اطلاعیه های خوانده نشده به عنوان خوانده شده" @@ -662,8 +661,6 @@ fa_IR: value_prop: "وقتی که شما یک حساب کابری ایجاد میکنید, ما به خاطر میسپاریم که شما دقیقا در حال خواندن چه چیزی بودید, بنابراین شما همیشه برمی گردید از جایی که خواندن را رها کردید. همچنین شما اعلانات را دریافت میکنید, اینجا و از طریق ایمیل, هر زمان که ارسال جدیدی فرستاده شود. و شما میتوانید ارسال ها را پسند کنید تا در محبت آن سهیم باشید. :heartbeat:" summary: enabled_description: "شما خلاصه ای از این موضوع را می بینید: بالاترین‌ نوشته های انتخاب شده توسط انجمن." - description: "{{count}} پاسخ" - description_time: "وجود دارد {{count}} پاسخ ها برا اساس زمان خواندن{{readingTime}} دقیقه." enable: 'خلاصه این موضوع' disable: 'نمایش همه نوشته‌ها' deleted_filter: @@ -936,9 +933,6 @@ fa_IR: category: "هیچ موضوعاتی در {{category}} نیست." top: "موضوع برتر وجود ندارد." search: " هیچ نتیجه جستجویی وجود ندارد." - educate: - new: '

موضوعات جدید در اینجا قرار می گیرند.

به طور پیش فرض، موضوعات جدید در نظر گرفته خواهند شد و نشان داده می شوند جدید شاخص اگر آنها در 2 روز گذشته ایجاد شده باشند

شما می توانید این را برای خود تغییر دهید تنظیمات.

' - unread: '

موضوعات خوانده نشده شما در اینجا قرار می گیرند.

به طور پیش فرض، موضوعات خوانده نشده در نظر گرفته خواهند شد و شمارش خوانده نشده ها نشان داده می شود 1 اگر شما:

  • موضوع ایجاد کرده اید
  • به موضوع پاسخ داده اید
  • خواندن موضوع در بیش از 4 دقیقه

و یا اگر شما به صراحت مجموعه ای از موضوع مورد ردیابی و یا تماشا از طریق کنترل اطلاع رسانی در پایین هر موضوع انتخاب کرده اید.

شما می توانید این را تغییر دهید. تنظیمات.

' bottom: latest: "موضوع تازهٔ دیگری نیست." hot: "موضوع داغ دیگری نیست." @@ -1273,18 +1267,6 @@ fa_IR: bookmark: "برداشتن نشانک" like: "خنثی سازی لایک" vote: "خنثی سازی امتیاز" - people: - off_topic: "{{icons}} برای این مورد پرچم آف-‌تاپیک زد" - spam: "{{icons}} برای این مورد پرچم هرزنامه زد" - spam_with_url: "{{icons}} پرچم گذاری شداین یک هرزنامه است" - inappropriate: "{{icons}} با پرچم گزاری این مورد را نامناسب بدان" - notify_moderators: "{{icons}} مدیران را آگاه کرد" - notify_moderators_with_url: "{{icons}} مدیران را آگاه کرد" - notify_user: "{{icons}} ارسال یک پیام خصوصی" - notify_user_with_url: "{{icons}} ارسال پیام خصوصی" - bookmark: "{{icons}} این را نشانه‌گذاری کرد" - like: "{{icons}} این مورد را پسندید" - vote: "{{icons}} رأی داد به این " by_you: off_topic: "شما برای این مورد پرچم آف-تاپیک زدید" spam: "شما برای این مورد پرچم هرزنامه زدید" @@ -1796,11 +1778,9 @@ fa_IR: is_disabled: "بازگردانی در تنظیمات سایت از کار انداخته شده است." label: "بازیابی" title: "بازیابی پشتیبان" - confirm: "آیا مطمئنید که می‌خواهید پشتیبان را برگردانید؟" rollback: label: "عقبگرد" title: "عقب گرد پایگاه داده به حالت کار قبلی" - confirm: "آیا مطمئن هستید به بازگشت به حالت کار قبلی پایگاه داده ؟" export_csv: user_archive_confirm: "آیا مطمئنید که می‌خواهید نوشته‌هایتان را دانلود کنید؟" success: "فرایند برون ریزی، به شما از طریق پیام اطلاع رسانی خواهد شد وقتی این فرایند تکمیل شود." @@ -1903,9 +1883,6 @@ fa_IR: love: name: 'دوست داشتن' description: "رنگ دکمه های لایک" - wiki: - name: 'ویکی' - description: "رنگ پایه استفاده شده برای پس زمینه نوشته ها ی ویکی ." email: settings: "تنظیمات" preview_digest: "پیشنمایش خلاصه" diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml index e3f9a11817..9d22b193b9 100644 --- a/config/locales/client.fi.yml +++ b/config/locales/client.fi.yml @@ -269,7 +269,7 @@ fi: one: "1 viesti ketjussa odottaa hyväksyntää" other: "{{count}} viestiä ketjussa odottaa hyväksyntää" confirm: "Tallenna muutokset" - delete_prompt: "Haluatko varmasti poistaa käyttäjän %{username}? Kaikki käyttäjän kirjoittamat viestit poistetaan ja tämän sähköposti- sekä IP-osoitteille asetetaan esto." + delete_prompt: "Haluatko todella poistaa käyttäjän %{username}? Kaikki hänen kirjoittamansa viestit poistetaan. Lisäksi hänen sähköposti- ja IP-osoitteillensa laitetaan esto." approval: title: "Viesti odottaa hyväksyntää" description: "Olemme vastaanottaneet viestisi, mutta se täytyy vielä hyväksyä ennen, kuin se näytetään sivustolla. Ole kärsivällinen." @@ -433,9 +433,7 @@ fi: perm_denied_btn: "Ei oikeuksia" perm_denied_expl: "Olet kieltänyt ilmoitukset. Salli ilmoitukset selaimesi asetuksista." disable: "Poista ilmoitukset käytöstä" - currently_enabled: "(nyt käytössä)" enable: "Näytä ilmoituksia" - currently_disabled: "(pois käytöstä)" each_browser_note: "Huom: Sinun täytyy vaihtaa tämä asetus kaikissa selaimista, joita käytät." dismiss_notifications: "Merkitse kaikki luetuiksi" dismiss_notifications_tooltip: "Merkitse kaikki lukemattomat ilmoitukset luetuiksi" @@ -571,12 +569,18 @@ fi: title: "Käyttäjäkortin tunnus" website: "Nettisivu" email_settings: "Sähköposti" + email_previous_replies: + title: "Liitä aiemmat vastaukset mukaan sähköpostin alaosaan" + unless_emailed: "ellei aiemmin lähetetty" + always: "aina" + never: "ei koskaan" email_digests: title: "Lähetä tiivistelmä uusista viesteistä sähköpostilla, jos en käy sivustolla " daily: "päivittäin" every_three_days: "joka kolmas päivä" weekly: "viikottain" every_two_weeks: "joka toinen viikko" + email_in_reply_to: "Liitä sähköpostiin lyhennelmä viestistä, johon vastataan" email_direct: "Lähetä minulle sähköposti, jos joku lainaa viestiäni, vastaa viestiini, viittaa @nimeeni, tai kutsuu minut viestiketjuun" email_private_messages: "Lähetä minulle sähköposti, kun joku lähettää minulle viestin" email_always: "Lähetä sähköposti-ilmoitukset, vaikka olen aktiivinen palstalla." @@ -731,8 +735,8 @@ fi: value_prop: "Kun luot tilin, muistamme mitä olet lukenut, jotta voit aina palata keskusteluissa takaisin oikeaan kohtaan. Saat myös ilmoituksia, täällä tai sähköpostilla, kun uusia viestejä kirjoitetaan. Voit myös tykätä viesteistä. :heartbeat:" summary: enabled_description: "Tarkastelet tiivistelmää tästä ketjusta, sen mielenkiintoisimpia viestejä käyttäjien toiminnan perusteella." - description: "Tässä ketjussa on {{count}} viestiä." - description_time: "Ketjussa on {{count}} viestiä, joiden arvioitu lukemisaika on {{readingTime}} minuuttia." + description: "Vastauksia on {{replyCount}} kpl." + description_time: "Vastauksia on {{replyCount}}. Niiden lukemiseen menee arviolta {{readingTime}} minuuttia." enable: 'Näytä ketjun tiivistelmä' disable: 'Näytä kaikki viestit' deleted_filter: @@ -1012,9 +1016,6 @@ fi: category: "Alueella {{category}} ei ole ketjua." top: "Huippuketjuja ei ole." search: "Hakutuloksia ei löytynyt." - educate: - new: '

Uudet ketjut ilmestyvät tähän.

Oletuksena, ketjut tulkitaan uusiksi ja niiden yhteydessä näytetäänuusi-merkki, kun ne on luotu edellisen kahden päivän aikana.

Voit muuttaa tätä käyttäjäasetuksistasi.

' - unread: '

Lukemattomat viestit ilmestyvät tähän.

Oletuksena, ketjut tulkitaan lukemattomiksi ja niiden yhteydessä näytetään 1 jos olet:

  • luonut ketjun
  • vastannut ketjuun
  • lukenut ketjua enemmän, kuin 4 minuuttia

tai, jos olet erikseen merkannut ketjun seurantaan tai tarkkailuun ketjun lopusta löytyvästä painikkeesta.

Voit muuttaa tätä käyttäjäasetuksistasi.

' bottom: latest: "Tuoreimpia ketjuja ei ole enempää." hot: "Kuumia ketjuja ei ole enempää." @@ -1378,18 +1379,6 @@ fi: bookmark: "Peru kirjanmerkki" like: "Peru tykkäys" vote: "Peru ääni" - people: - off_topic: "{{icons}} liputtivat tämän asiaan kuulumattomaksi" - spam: "{{icons}} liputtivat tämän roskapostiksi" - spam_with_url: "{{icons}} liputtivat tämän roskapostiksi" - inappropriate: "{{icons}} liputtivat tämän asiattomaksi" - notify_moderators: "{{icons}} ilmoittivat valvojille" - notify_moderators_with_url: "{{icons}} ilmoittivat valvojille" - notify_user: "{{icons}} lähetti viestin" - notify_user_with_url: "{{icons}} lähetti viestin" - bookmark: "{{icons}} lisäsivät tämän kirjanmerkkeihinsä" - like: "{{icons}} tykkäsivät tästä" - vote: "{{icons}} äänestivät tätä" by_you: off_topic: "Liputit tämän asiaankuulumattomaksi" spam: "Liputit tämän roskapostiksi" @@ -1934,11 +1923,9 @@ fi: is_disabled: "Palautus on estetty sivuston asetuksissa." label: "Palauta" title: "Palauta varmuuskopio" - confirm: "Oletko varma, että haluat palauttaa tämän varmuuskopion?" rollback: label: "Palauta" title: "Palauta tietokanta edelliseen toimivaan tilaan" - confirm: "Oletko varma, että haluat palauttaa tietokannan edelliseen toimivaan tilaan?" export_csv: user_archive_confirm: "Oletko varma, että haluat ladata viestisi?" success: "Vienti on käynnissä. Saat ilmoituksen viestillä, kun prosessi on valmis." @@ -2041,9 +2028,6 @@ fi: love: name: 'tykkäys' description: "Tykkäyspainikkeen väri." - wiki: - name: 'wiki' - description: "Wiki-viestien taustaväri." email: title: "Sähköpostit" settings: "Asetukset" @@ -2080,6 +2064,13 @@ fi: subject: "Otsikko" error: "Virhe" none: "Uusia sähköpostiviestejä ei löydetty." + modal: + date: "Päivämäärä" + from: "Lähettäjä" + to: "Vastaanottaja" + cc: "Kopio" + subject: "Otsikko" + body: "Leipäteksti" filters: from_placeholder: "from@example.com" to_placeholder: "to@example.com" @@ -2155,6 +2146,7 @@ fi: revoke_admin: "peru ylläpitäjän oikeudet" grant_moderation: "myönnä valvojan oikeudet" revoke_moderation: "peru valvojan oikeudet" + backup_operation: "varmuuskopiointi" 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ä." diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml index 9b5f0f066b..ca39f64ba3 100644 --- a/config/locales/client.fr.yml +++ b/config/locales/client.fr.yml @@ -380,7 +380,7 @@ fr: posts: "Messages" topics: "Sujets" latest: "Récents" - latest_by: "dernièr sujet de" + latest_by: "dernier sujet de" toggle_ordering: "modifier le mode du tri" subcategories: "Sous-catégories" topic_stats: "Le nombre de nouveaux sujets." @@ -433,9 +433,7 @@ fr: perm_denied_btn: "Permission Refusée" perm_denied_expl: "Vous n'avez pas autorisé les notifications. Autorisez-les depuis les paramètres de votre navigateur." disable: "Désactiver les notifications" - currently_enabled: "(activé actuellement)" enable: "Activer les notifications" - currently_disabled: "(désactivé actuellement)" each_browser_note: "Note : Vous devez changer ce paramètre sur chaque navigateur que vous utilisez." dismiss_notifications: "Marquer tout comme lu" dismiss_notifications_tooltip: "Marquer comme lues toutes les notifications non lues" @@ -571,12 +569,18 @@ fr: title: "Badge pour la carte de l'utilisateur" website: "Site internet" email_settings: "Courriel" + email_previous_replies: + title: "Inclure les réponses précédentes en bas des courriels" + unless_emailed: "sauf si déjà envoyé" + always: "toujours" + never: "jamais" email_digests: title: "Quand je ne visite pas ce site, m'envoyer un résumé des nouveautés par courriel:" daily: "quotidien" every_three_days: "tous les trois jours" weekly: "hebdomadaire" every_two_weeks: "toutes les deux semaines" + 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" @@ -731,8 +735,8 @@ fr: value_prop: "Quand vous créez votre compte, nous stockons ce que vous avez lu pour vous positionner systématiquement sur le bon emplacement à votre retour. Vous avez également des notifications, ici et par courriel, quand de nouveaux messages sont postés. Et vous pouvez aimer les messages pour partager vos coups de cœurs. :heartbeat:" summary: enabled_description: "Vous visualisez un résumé de ce sujet : les messages importants choisis par la communauté." - description: "Il y a {{count}} réponses." - description_time: "Il y a {{count}} réponses avec un temps estimé de lecture de {{readingTime}} minutes." + description: "Il y a {{replyCount}} réponses." + description_time: "Il y a {{replyCount}} réponses avec un temps estimé de lecture de {{readingTime}} minutes." enable: 'Résumer ce sujet' disable: 'Afficher tous les messages' deleted_filter: @@ -1013,12 +1017,8 @@ fr: top: "Il n'y a pas de meilleurs sujets." search: "Votre recherche ne retourne aucun résultat." educate: - new: '

Vos nouveaux sujets apparaissent ici

Par défaut, les sujets sont considérés comme nouveau et affiche l''indicateur nouveau lorsqu''ils ont été crées dans les deux derniers jours.

- - Vous pouvez modifier cela dans vos préférences.

' - unread: '

Vos sujets non-lus apparaissent ici

Par défaut, les sujets sont considérés comme non-lus et affichent le nombre de messages non-lus 1 sont ceux:

- -
  • Que vous avez crées
  • Auxquels vous avez répondu
  • Que vous avez lu plus de 4 minutes

Ou que vous avez explicitement suivis ou surveillés

Vous pouvez modifier cela dans vos préférences.

' + new: '

Vos nouveaux sujets apparaissent ici

Par défaut, les sujets sont considérés comme nouveaux et affichent l''indicateur nouveau lorsqu''ils ont été créés depuis moins de 2 jours.

Vous pouvez modifier cela dans vos préférences.

' + unread: '

Vos sujets non-lus apparaissent ici

Par défaut, les sujets sont considérés comme non-lus et affichent le nombre de messages non-lus 1 sont ceux:

  • Que vous avez crées
  • Auxquels vous avez répondu
  • Que vous avez lu plus de 4 minutes

Ou que vous avez explicitement suivis ou surveillés

Vous pouvez modifier cela dans vos préférences.

' bottom: latest: "Il n'y a plus de sujet à lire." hot: "Il n'y a plus de sujet populaire à lire." @@ -1383,17 +1383,14 @@ fr: like: "Annuler j'aime" vote: "Retirer votre vote" people: - off_topic: "{{icons}} l'ont signalé comme étant hors-sujet" - spam: "{{icons}} l'ont signalé comme étant du spam" - spam_with_url: "{{icons}} signalé ceci comme spam" - inappropriate: "{{icons}} l'ont signalé comme inapproprié" - notify_moderators: "{{icons}} l'ont signalé pour modération" - notify_moderators_with_url: "{{icons}} l'ont signalé pour modération" - notify_user: "{{icons}} a envoyé un message" - notify_user_with_url: "{{icons}} a envoyé un message" - bookmark: "{{icons}} l'ont ajouté à leurs signets" - like: "{{icons}} l'ont aimé" - vote: "{{icons}} ont voté pour" + off_topic: "signalé comme hors-sujet." + spam: "signalé comme spam" + inappropriate: "signalé comme inapproprié" + notify_moderators: "signalé aux modérateurs" + notify_user: "a envoyé un message" + bookmark: "ajouté aux signets" + like: "a aimé ceci" + vote: "a voté pour ce message" by_you: off_topic: "Vous l'avez signalé comme étant hors-sujet" spam: "Vous l'avez signalé comme étant du spam" @@ -1942,7 +1939,7 @@ fr: rollback: label: "Revenir en arrière" title: "Restaurer (RollBack) la base de données à l'état de travail précédent" - confirm: "Êtes-vous sûr de vouloir restaurer (rollback) la base de données à l'état de fonctionnement précédent?" + confirm: "Êtes-vous sûr de vouloir restaurer la base de données à l'état de fonctionnement précédent?" export_csv: user_archive_confirm: "Êtes-vous sûr de vouloir télécharger vos messages?" success: "L'exportation a été initialisé. Vous serez averti par message lorsque le traitement sera terminé." @@ -2045,9 +2042,6 @@ fr: love: name: 'aimer' description: "La couleur du bouton \"J'aime\"." - wiki: - name: 'wiki' - description: "Couleur de base utilisée pour le fond des messages de type wiki." email: title: "Courriels" settings: "Paramètrage" @@ -2084,6 +2078,19 @@ fr: subject: "Objet" error: "Erreur" none: "Aucun courriel reçu." + modal: + title: "Détails du courriel entrant" + error: "Erreur" + return_path: "Return-Path" + message_id: "Message-Id" + in_reply_to: "In-Reply-To" + references: "References" + date: "Date" + from: "From" + to: "à" + cc: "Cc" + subject: "Objet" + body: "Corps" filters: from_placeholder: "from@example.com" to_placeholder: "to@example.com" @@ -2159,6 +2166,7 @@ fr: revoke_admin: "Révoquer les droits d'admin" grant_moderation: "Accorder les droits de modération" revoke_moderation: "Révoquer les droits de modération" + backup_operation: "sauvegarde" 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." diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml index dcd24e4f39..c2a191f2ae 100644 --- a/config/locales/client.he.yml +++ b/config/locales/client.he.yml @@ -686,8 +686,8 @@ he: value_prop: "כשאתה נרשם, אנחנו זוכרים בדיוק מה קראת כך כשאתה חוזר אתה ממשיך בדיוק מאיפה שהפסקת. בנוסף אתה תקבל התראות דרך האתר ודרך הדואר האלקטרוני שלך כשפוסטים חדשים נוצרים ועוד משהו, אתה יכול לעשות לייק לפוסטים שאהבת. :heartbeat:" summary: enabled_description: "אתם צופים בסיכום פוסט זה: הפרסומים המעניינים ביותר כפי שסומנו על ידי הקהילה." - description: "ישנן {{count}} תגובות" - description_time: "ישנן {{count}} תגובות, עם הערכת זמן קריאה של כ- {{readingTime}} דקות ." + description: "ישנן {{replyCount}} תגובות" + description_time: "ישנן {{replyCount}} תגובות, עם הערכת זמן קריאה של כ- {{readingTime}} דקות ." enable: 'סכם פוסט זה' disable: 'הצג את כל ההודעות' deleted_filter: diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml index 01638e495a..4a714c6e7d 100644 --- a/config/locales/client.it.yml +++ b/config/locales/client.it.yml @@ -712,8 +712,8 @@ it: value_prop: "Quando hai un account ci ricordiamo esattamente cosa stavi leggendo, così potrai riprendere da dove ti eri fermato. Inoltre ricevi le notifiche, sia qui sia via email, ogni volta che ci saranno nuovi messaggi. Inoltre potrai metterei i \"Mi piace\" ai messaggi e condividerne l'apprezzamento. :heartbeat:" summary: enabled_description: "Stai visualizzando un riepilogo dell'argomento: è la comunità a determinare quali sono i messaggi più interessanti." - description: "Ci sono {{count}} risposte." - description_time: "Ci sono {{count}} risposte con un tempo stimato di lettura di {{readingTime}} minuti." + description: "Ci sono {{replyCount}} risposte." + description_time: "Ci sono {{replyCount}} risposte con un tempo stimato di lettura di {{readingTime}} minuti." enable: 'Riassumi Questo Argomento' disable: 'Mostra Tutti i Messaggi' deleted_filter: diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml index dd1989681a..481d6608ef 100644 --- a/config/locales/client.ja.yml +++ b/config/locales/client.ja.yml @@ -199,6 +199,7 @@ ja: revert: "戻す" failed: "失敗" switch_to_anon: "匿名モード" + switch_from_anon: "匿名モード停止" banner: close: "バナーを閉じる。" edit: "このバナーを編集 >>" @@ -593,8 +594,8 @@ ja: sign_up: "新しいアカウントを作成" summary: enabled_description: "トピックのまとめを表示されています。" - description: "{{count}} 返信があります。" - description_time: "全てを確認するのに {{readingTime}} 分 前後を要する {{count}} 個の回答があります。" + description: "{{replyCount}} 返信があります。" + description_time: "全てを確認するのに {{readingTime}} 分 前後を要する {{replyCount}} 個の回答があります。" enable: 'このトピックを要訳する' disable: '全ての投稿を表示する' deleted_filter: diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml index b68af57710..a57b3f0944 100644 --- a/config/locales/client.ko.yml +++ b/config/locales/client.ko.yml @@ -244,7 +244,7 @@ ko: has_pending_posts: other: "이 토픽은 {{count}}개의 승인 대기중인 게시글이 있습니다." confirm: "변경사항 저장" - delete_prompt: "정말로 %{username} 회원을 삭제하시겠습니까? 게시글이 모두 삭제되고 IP와 이메일이 블락됩니다." + delete_prompt: "정말로 %{username}; 회원을 삭제하시겠습니까? 게시글이 모두 삭제되고 IP와 이메일이 차단됩니다." approval: title: "게시글 승인 필요" description: "새로운 게시글이 있습니다. 그러나 이 게시글이 보여지려면 운영자의 승인이 필요합니다." @@ -307,7 +307,7 @@ ko: members_mods_and_admins: "그룹 멤버, 운영자, 관리자만" everyone: "모두" trust_levels: - title: "멤버들이 추가될때 멤버들의 Trust level이 자동으로 획득됩니다." + title: "멤버들이 추가되면 회원등급이 자동으로 부여됩니다:" none: "없음" notifications: watching: @@ -403,9 +403,7 @@ ko: perm_denied_btn: "권한 거부" perm_denied_expl: "통지를 위한 허용을 거절했었습니다. 브라우저 설정을 통해서 통지를 허용해주세요." disable: "알림 비활성화" - currently_enabled: "(현재 활성화됨)" enable: "알림 활성화" - currently_disabled: "(현재 비활성화됨)" each_browser_note: "노트: 사용하시는 모든 브라우저에서 이 설정을 변경해야합니다." dismiss_notifications: "모두 읽음으로 표시" dismiss_notifications_tooltip: "읽지 않은 알림을 모두 읽음으로 표시" @@ -417,10 +415,10 @@ ko: change: "변경" moderator: "{{user}}님은 운영자입니다" admin: "{{user}}님은 관리자 입니다" - moderator_tooltip: "이 사용자는 운영자 입니다" - admin_tooltip: "이 사용자는 관리자입니다." - blocked_tooltip: "이 사용자는 차단되었습니다" - suspended_notice: "이 사용자는 {{date}}까지 접근 금지 되었습니다." + moderator_tooltip: "이 회원은 운영자 입니다" + admin_tooltip: "이 회원은 관리자입니다." + blocked_tooltip: "이 회원은 차단되었습니다" + suspended_notice: "이 회원은 {{date}}까지 접근 금지 되었습니다." suspended_reason: "이유: " github_profile: "Github" mailing_list_mode: "(토픽이나 카테고리의 알림을 끄지 않는 한) 모든 새로운 글에 대해 메일을 보내주세요." @@ -436,9 +434,9 @@ ko: delete_yourself_not_allowed: "지금은 계정을 삭제할 수 없습니다. 관리자에게 연락해 주세요." unread_message_count: "메시지" admin_delete: "삭제" - users: "사용자" + users: "회원" muted_users: "알람 끄기" - muted_users_instructions: "이 사용자들이 보낸 알림 모두 숨김" + muted_users_instructions: "이 회원이 보낸 알림 모두 숨김" muted_topics_link: "알림을 끈 토픽 보기" automatically_unpin_topics: "토픽을 끝까지 보면 자동으로 핀이 해제됩니다." staff_counters: @@ -537,15 +535,21 @@ ko: log_out: "로그아웃" location: "위치" card_badge: - title: "사용자 카드 뱃지" + title: "사용자 카드 배지" website: "웹사이트" email_settings: "이메일" + email_previous_replies: + title: "이메일 밑부분에 이전 댓글을 포함합니다." + unless_emailed: "예전에 발송된 것이 아닌 한" + always: "항상" + never: "절대" email_digests: title: "사이트 방문이 없을 경우, 새로운 글을 요약하여 메일로 보냄" daily: "매일" every_three_days: "매 3일마다" weekly: "매주" every_two_weeks: "격주" + email_in_reply_to: "이메일에 글 응답내용을 발췌해서 포함하기 " email_direct: "누군가 나를 인용했을 때, 내 글에 답글을 달았을때, 내 이름을 멘션했을때 혹은 토픽에 나를 초대했을 떄 이메일 보내기" email_private_messages: "누군가 나에게 메시지를 보냈을때 이메일 보내기" email_always: "사이트를 이용중 일 때도 이메일 알림 보내기" @@ -615,18 +619,18 @@ ko: summary: title: "요약" stats: "통계" - topic_count: "생성된 토픽" - post_count: "생성된 포스트" - likes_given: "좋아요 누름" - likes_received: "좋아요 받음" - days_visited: "접속한 날짜" - posts_read_count: "읽은 포스트" - top_replies: "최고 인기 댓글" - top_topics: "최고 인기 토픽" - top_badges: "최고 뱃지" - more_topics: "다른이에게 준 좋아요" - more_replies: "더 많은 답글" - more_badges: "뱃지 더 보기" + topic_count: "새토픽 갯수" + post_count: "새글 갯수" + likes_given: "좋아요 눌러준 횟수" + likes_received: "좋아요 선물받은 횟수" + days_visited: "방문일수" + posts_read_count: "읽은글 갯수" + top_replies: "인기 댓글" + top_topics: "인기 토픽" + top_badges: "인기 배지" + more_topics: "토픽 더 보기" + more_replies: "답글 더 보기" + more_badges: "배지 더 보기" associated_accounts: "로그인" ip_address: title: "마지막 IP 주소" @@ -671,6 +675,9 @@ ko: read_only_mode: enabled: "이 사이트는 현재 읽기전용 모드입니다. 브라우징은 가능하지만, 댓글달기, 좋아요 등 다른 행위들은 현재 비활성화 되어있습니다." login_disabled: "사이트가 읽기 전용모드로 되면서 로그인은 비활성화되었습니다." + too_few_topics_and_posts_notice: "토론을 시작하시죠! 현재 %{currentTopics} / %{requiredTopics} 토픽과 %{currentPosts} / %{requiredPosts} 글이 있습니다. 새 방문자는 읽고 응답할 대화꺼리가 좀 필요해요." + too_few_topics_notice: "토론을 시작하시죠! 현재 %{currentTopics} / %{requiredTopics} 토픽이 있습니다. 새 방문자는 읽고 응답할 대화꺼리가 좀 필요해요." + too_few_posts_notice: "토론을 시작하시죠! 현재 %{currentPosts} / %{requiredPosts} 글이 있습니다. 새 방문자는 읽고 응답할 대화꺼리가 좀 필요해요." learn_more: "더 배우기" year: '년' year_desc: '지난 365일간 생성된 토픽' @@ -695,8 +702,8 @@ ko: value_prop: "회원가입 하시면 글을 어디까지 읽으셨는지 저희가 기억하기 때문에, 언제든지 마지막 읽은 위치로 바로 돌아갈 수 있답니다. 그리고 새글이 뜰때마다 이 화면과 이메일로 알림을 받을수도 있고, 좋아요를 클릭해서 글에 대한 애정을 표현하실 수도 있어요. :heartbeat:" summary: enabled_description: "현재 커뮤니티에서 가장 인기있는 토픽의 요약본을 보고 있습니다:" - description: "{{count}}개의 답글이 있습니다." - description_time: "총 {{count}}개의 댓글이 있습니다. 예상 소요 시간은 {{readingTime}}분입니다.." + description: "댓글이 {{replyCount}}개 있습니다." + description_time: "댓글이 {{replyCount}}개 있고 다 읽는데 {{readingTime}} 분이 걸립니다." enable: '이 토픽을 요약Show All Posts' disable: '모든 포스트 보기' deleted_filter: @@ -710,10 +717,10 @@ ko: remove_allowed_user: "{{name}}에게서 온 메시지를 삭제할까요?" email: '이메일' username: '아이디' - last_seen: '마지막 접근' + last_seen: '마지막 접속' created: '생성' created_lowercase: '최초 글' - trust_level: '신뢰도' + trust_level: '회원등급' search_hint: '아이디, 이메일 혹은 IP 주소' create_account: title: "회원 가입" @@ -792,6 +799,7 @@ ko: saved_local_draft_tip: "로컬로 저장됩니다." similar_topics: "작성하려는 내용과 비슷한 토픽들..." drafts_offline: "초안" + group_mentioned: "{{group}}을 이용해서 {{count}} 명의 회원에게 알림을 보내려고 합니다." error: title_missing: "제목은 필수 항목입니다" title_too_short: "제목은 최소 {{min}} 글자 이상이어야 합니다." @@ -812,6 +820,7 @@ ko: title_placeholder: "이야기 나누고자 하는 내용을 한문장으로 적는다면?" edit_reason_placeholder: "why are you editing?" show_edit_reason: "(add edit reason)" + reply_placeholder: "여기에 타이핑 하세요. 마크다운 또는 BBCode, HTML 포맷을 이용하세요. 이미지를 끌어오거나 붙여넣기 하세요." view_new_post: "새로운 글을 볼 수 있습니다." saving: "저장 중..." saved: "저장 완료!" @@ -862,6 +871,7 @@ ko: more: "이전 알림을 볼 수 있습니다." total_flagged: "관심 표시된 총 글" mentioned: "

{{username}} {{description}}

" + group_mentioned: "

{{username}} {{description}}

" quoted: "

{{username}} {{description}}

" replied: "

{{username}} {{description}}

" posted: "

{{username}} {{description}}

" @@ -873,7 +883,9 @@ ko: invitee_accepted: "

{{username}} accepted your invitation

" moved_post: "

{{username}} moved {{description}}

" linked: "

{{username}} {{description}}

" - granted_badge: "

'{{description}}' 뱃지를 받았습니다.

" + granted_badge: "

'{{description}}' 배지를 받았습니다.

" + group_message_summary: + other: "

{{group_name}} 메시지상자에 {{count}}개의 메시지가 있습니다

" alt: mentioned: "멘션 by" quoted: "인용 by" @@ -887,10 +899,11 @@ ko: invitee_accepted: "다음 사람에 의해 초대가 수락됨." moved_post: "다음 사람에 의해서 당신의 글이 이동됨" linked: "당신 글로 링크하기" - granted_badge: "뱃지가 수여됨." + granted_badge: "배지가 수여됨." group_message_summary: "그룹 메시지함의 메시지" popup: mentioned: '"{{topic}}" - {{site_title}}에서 {{username}} 님이 나를 멘션했습니다' + group_mentioned: '"{{topic}}" - {{site_title}}에서 {{username}} 님이 당신을 언급했습니다' quoted: '"{{topic}}" - {{site_title}}에서 {{username}} 님이 나를 인용했습니다' replied: '"{{topic}}" - {{site_title}}에서 {{username}} 님이 내게 답글을 달았습니다' posted: '"{{topic}}" - {{site_title}}에서 {{username}}님이 글을 게시하였습니다' @@ -902,18 +915,24 @@ ko: from_my_computer: "컴퓨터에서 가져오기" from_the_web: "인터넷에서 가져오기" remote_tip: "이미지 링크" + remote_tip_with_attachments: "이미니자 파일 링크 {{authorized_extensions}}" local_tip: "기기에서 이미지 선택" + local_tip_with_attachments: "디바이스에서 이미지나 파일을 선택하세요 {{authorized_extensions}}" hint: "(드래그&드랍으로 업로드 가능)" + hint_for_supported_browsers: "편집창에 이미지를 끌어다 놓거나 붙여넣기 할 수도 있습니다" uploading: "업로드 중입니다..." select_file: "파일 선택" image_link: "이 이미지를 누르면 이동할 링크" search: sort_by: "다음으로 정렬" + relevance: "관련성" latest_post: "가장 최근 글" most_viewed: "가장 많이 본" most_liked: "가장 많이 좋아요를 받은" select_all: "모두 선택" clear_all: "다 지우기" + result_count: + other: "\"{{term}}\" 검색결과 {{count}} 개" title: "토픽, 글, 사용자, 카테고리 검색" no_results: "검색 결과가 없습니다" no_more_results: "더 이상 결과가 없습니다." @@ -932,11 +951,14 @@ ko: current_user: '사용자 페이지로 이동' topics: bulk: + unlist_topics: "토픽 내리기" reset_read: "읽기 초기화" delete: "토픽 삭제" dismiss: "해지" dismiss_read: "읽지않음 전부 해지" dismiss_button: "해지..." + dismiss_tooltip: "새 글을 무시하거나 토픽 추적 멈추기" + also_dismiss_topics: "이 토픽 추적하는 걸 멈추고 내가 읽지 않은 걸 다시는 보여주지 않습니다" dismiss_new: "새글 제거" toggle: "토픽 복수 선택" actions: "일괄 적용" @@ -959,8 +981,8 @@ ko: top: "Top 토픽이 없습니다." search: "검색 결과가 없습니다." educate: - new: '

새로운 토픽은 여기에서 볼 수 있습니다.

기본 설정으로 2일 이내에 생성된 토픽은 새로운 것으로 간주되며 new 표시가 나타납니다.

환경설정에서 설정을 변경 할 수 있습니다.

' - unread: '

읽지 않은 토픽은 여기에서 볼 수 있습니다.

기본 설정으로 다음과 같은 경우 토픽은 읽지 않은 것으로 간주되며 읽지 않은 개수 1 가 표시됩니다.

  • 토픽을 만든 경우
  • 토픽에 리플을 단 경우
  • 토픽을 4분 이상 읽은 경우

또는 각 토픽 아래에 있는 알림 설정에서 해당 토픽을 추적하거나 지켜보도록 설정한 경우

환경설정에서 설정을 변경 할 수 있습니다.

' + new: '

회원님의 토픽은 여기에 나타납니다.

기본적으로 생긴 지 이틀 안된 토픽은 새것으로 간주하고 new 표시가 뜹니다.

바꾸고 싶으면 환경설정으로 가보세요.

' + unread: '

회원님이 읽지 않은 토픽은 여기에 나타납니다.

기본적으로 토픽은 읽지 않은 것으로 간주하고 다음과 같은 조건 중 하나를 만족하면 읽지 않은 글갯수 1 을 표시합니다:

  • 토픽 만들기
  • 토픽에 댓글달기
  • 토픽을 4분 이상 읽기

또는 토픽을 추적하거나 지켜보기 위해 각 토픽의 밑부분에 달린 알림제어판에서 설정하는 경우도 포합됩니다.

설정을 바꾸려면 환경설정 페이지로 가세요.

' bottom: latest: "더 이상 읽을 최신 토픽이 없습니다" hot: "더 이상 읽을 인기있는 토픽이 없습니다" @@ -974,15 +996,18 @@ ko: search: "더이상 검색 결과가 없습니다." topic: unsubscribe: + stop_notifications: "{{title}}에 대한 알림은 이제 덜 받게 됩니다." change_notification_state: "현재 당신의 알림 설정 : " filter_to: " {{post_count}} 게시글 in 토픽" create: '새 토픽 만들기' create_long: '새로운 토픽 만들기' private_message: '메시지 시작' archive_message: + help: '메시지를 아카이브로 옮기기' title: '저장됨' move_to_inbox: title: '수신함으로 이동' + help: '메시지를 편지함으로 되돌리기' list: '토픽 목록' new: '새로운 토픽' unread: '읽지 않은' @@ -1027,6 +1052,7 @@ ko: auto_close_title: '자동으로 닫기 설정' auto_close_save: "저장" auto_close_remove: "이 토픽을 자동으로 닫지 않기" + auto_close_immediate: "토픽에 마지막 글이 올라온 지 %{hours} 시간 지났기 때문에 이 토픽은 즉시 닫힐 예정입니다." progress: title: 진행 중인 토픽 go_top: "맨위" @@ -1076,6 +1102,7 @@ ko: description: "이 메시지에 대해 어떠한 알림도 받지 않지 않습니다." muted: title: "알림 없음" + description: "이 토픽에 대해 어떠한 알림도 받지 않고 최신글 목록에도 나타나지 않을 것입니다." actions: recover: "토픽 다시 복구" delete: "토픽 삭제" @@ -1085,7 +1112,7 @@ ko: auto_close: "자동으로 닫기..." pin: "토픽 고정..." unpin: "토픽 고정 취소..." - unarchive: "보관 안된 토픽" + unarchive: "토픽 보관 취소" archive: "토픽 보관" invisible: "목록에서 제외하기" visible: "목록에 넣기" @@ -1106,9 +1133,9 @@ ko: title: '공유' help: '이 토픽의 링크를 공유' flag_topic: - title: '신고' - help: '운영자에게 이 글을 신고합니다.' - success_message: '성공적으로 토픽을 신고 하였습니다.' + title: '신고하기' + help: '이 토픽을 주의깊게 보거나 비밀리에 주의성 알림을 보내기 위해 신고합니다' + success_message: '신고했습니다' feature_topic: title: "Feature 토픽" pin: " {{categoryLink}} 카테고리 토픽 목록 상단에 고정 until" @@ -1116,14 +1143,23 @@ ko: unpin: "이 토픽을 {{categoryLink}} 카테고리 상단에서 제거 합니다." unpin_until: "{{categoryLink}} 카테고리 토픽 목록 상단에서 이 토픽을 제거하거나 %{until}까지 기다림." pin_note: "개별적으로 사용자가 토픽 고정을 취소할 수 있습니다." + pin_validation: "토픽을 고정하려면 날짜를 지정해야 합니다." + not_pinned: " {{categoryLink}} 카테고리에 고정된 토픽이 없습니다." + already_pinned: + other: "{{categoryLink}}에 고정된 토픽 갯수: {{count}}" pin_globally: "모든 토픽 목록 상단 고정 until" confirm_pin_globally: "이미 {{count}}개의 토픽이 전역적으로 고정되어 있습니다. 너무 많은 토픽이 고정되어 있으면 새로운 사용자나 익명사용자에게 부담이 될 수 있습니다. 정말로 이 토픽을 전역적으로 고정하시겠습니까?" unpin_globally: "모든 토픽 목록 상단에서 이 토픽을 제거" unpin_globally_until: "모든 토픽 목록 상단에서 이 토픽을 제거하거나 %{until}까지 기다림." global_pin_note: "개별적으로 사용자가 토픽 고정을 취소할 수 있습니다." + not_pinned_globally: "전역적으로 고정된 토픽이 없습니다." + already_pinned_globally: + other: "전역적으로 고정된 토픽 갯수: {{count}}" make_banner: "이 토픽을 모든 페이지의 상단에 나타나는 배너로 만들기" remove_banner: "모든 페이지에서 나타나는 배너에서 제거" banner_note: "사용자는 배너를 닫음으로써 배너를 나타나지 않게 할 수 있습니다. 단지 어떤 기간동안 딱 하나의 토픽만이 배너로 지정 가능합니다." + no_banner_exists: "배너 토픽이 없습니다." + banner_exists: "현재 배너 토픽이 있습니다." inviting: "초대 중..." automatically_add_to_groups_optional: "이 초대는 다음 그룹에 대한 접근 권한을 포함합니다: (선택, 관리자만 가능)" automatically_add_to_groups_required: "이 초대는 다음 그룹에 대한 접근 권한을 포함합니다: (필수, 관리자만 가능)" @@ -1180,6 +1216,8 @@ ko: change_timestamp: title: "타임스탬프 변경" action: "타임스탬프 변경" + invalid_timestamp: "타임스탬프는 미래값으로 할 수 없습니다." + error: "토픽 타임스탬프를 바꾸는 중 에러가 발생하였습니다." multi_select: select: '선택' selected: '({{count}})개가 선택됨' @@ -1204,7 +1242,7 @@ ko: show_full: "전체 글 보기" show_hidden: '숨겨진 내용을 표시' deleted_by_author: - other: "(작성자에 의해 취소된 글입니다. 신고당한 글이 아니면 %{count} 시간 뒤에 자동으로 삭제됩니다)" + other: "(작성자에 의해 취소된 글입니다. 글이 신고된 것이 아닌 한 %{count} 시간 뒤에 자동으로 삭제됩니다)" expand_collapse: "확장/축소" gap: other: "{{count}}개의 숨겨진 답글 보기" @@ -1216,6 +1254,9 @@ ko: other: "{{count}} 좋아요" has_likes_title: other: "{{count}}명이 이 글을 좋아합니다" + has_likes_title_only_you: "당신이 이 글을 좋아합니다." + has_likes_title_you: + other: "당신 외 {{count}}명이 이 글을 좋아합니다" errors: create: "죄송합니다. 글을 만드는 동안 오류가 발생했습니다. 다시 시도하십시오." edit: "죄송합니다. 글을 수정하는 중에 오류가 발생했습니다. 다시 시도하십시오." @@ -1234,6 +1275,8 @@ ko: yes_value: "예" via_email: "이 토픽은 이메일을 통해 등록되었습니다." whisper: "이 포스트는 운영자를 위한 비공개 귓말입니다." + wiki: + about: "이 글은 위키(wiki) 입니다." archetypes: save: '옵션 저장' controls: @@ -1243,7 +1286,7 @@ ko: undo_like: "'좋아요' 취소" edit: "이 글 편집" edit_anonymous: "이 토픽을 수정하려면 먼저 로그인을 해야합니다." - flag: "운영자에게 이 글을 신고합니다." + flag: "이 토픽에 관심을 가지기 위해 깃발을 표시해두고 개인적으로 알림을 받습니다" delete: "이 글을 삭제합니다." undelete: "이 글 삭제를 취소합니다." share: "이 글에 대한 링크를 공유합니다." @@ -1260,18 +1303,19 @@ ko: revert_to_regular: "스태프 색상 제거하기" rebake: "HTML 다시 빌드하기" unhide: "숨기지 않기" + change_owner: "소유자 변경" actions: - flag: '신고' + flag: '신고하기' defer_flags: - other: "신고 연기" + other: "신고 보류하기" it_too: - off_topic: "Flag it too" - spam: "저도 신고합니다" - inappropriate: "저도 신고합니다" - custom_flag: "신고 추가하기" - bookmark: "Bookmark it too" - like: "저도 '좋아요' 줄래요" - vote: "Vote for it too" + off_topic: "나도 신고하기" + spam: "나도 신고하기" + inappropriate: "나도 신고하기" + custom_flag: "나도 신고하기" + bookmark: "나도 북마크하기" + like: "나도 좋아해요" + vote: "나도 투표하기" undo: off_topic: "신고 취소" spam: "신고 취소" @@ -1280,60 +1324,57 @@ ko: like: "좋아요 취소" vote: "투표 취소" people: - off_topic: "{{icons}}님이 이 글을 토픽에서 제외했습니다." - spam: "{{icons}} 스팸으로 신고되었습니다" - spam_with_url: "{{icons}} 스팸으로 표시됨" - inappropriate: "{{icons}} 부적절하다고 신고했습니다" - notify_moderators: "{{icons}}님은 이 글을 운영자에게 보고했습니다." - notify_moderators_with_url: "{{icons}}님은 이 글을 운영자에게 보고했습니다." - notify_user: "{{icons}} 메시지를 보냈습니다" - notify_user_with_url: "{{icons}} 메시지를 보냈습니다." - bookmark: "{{icons}}님이 북마크했습니다." - like: "{{icons}}님이 좋아합니다." - vote: "{{icons}}님이 투표했습니다." + off_topic: "주제에서 벗어났다고 신고했습니다" + spam: "스팸으로 신고했습니다" + inappropriate: "부적절한 글로 신고했습니다" + notify_moderators: "운영자에게 알렸습니다" + notify_user: "글쓴이에게 메시지를 보냈습니다" + bookmark: "북마크 했습니다" + like: "좋아해요" + vote: "이곳에 투표했습니다" by_you: - off_topic: "이 글을 토픽에서 벗어남으로 신고함" - spam: "이 글을 스팸으로 신고함" - inappropriate: "이 글을 부적절로 신고함" - notify_moderators: "이 글을 운영자에게 보고함" - notify_user: "이 사용자에게 메시지를 보냈습니다." - bookmark: "이 글을 북마크함" - like: "'좋아요' 했습니다" - vote: "이 글에 투표함" + off_topic: "이글을 주제에서 벗어났다고 신고했습니다" + spam: "이글을 스팸으로 신고했습니다" + inappropriate: "이 글을 부적절한 컨텐츠로 신고했습니다" + 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}}명의 사용자가 이 사용자에게 메시지를 보냈습니다." + other: "당신 외 {{count}}명이 글쓴이에게 메시지를 보냈습니다" bookmark: - other: "나와 {{count}}명의 다른 사람들이 북마크 했습니다." + other: "당신 외 {{count}}명이 북마크 했습니다" like: - other: "나와 {{count}}명의 다른 사람들이 좋아합니다." + other: "당신 외 {{count}}명이 좋아합니다" vote: - other: "나와 {{count}}명의 다른 사람들이 이 포스트에 투표했습니다." + 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}}명이 이 사용자에게 메시지를 보냈습니다." + other: "{{count}}명이 글쓴이에게 메시지를 보냈습니다" bookmark: - other: "{{count}}명의 사용자가 이 글을 북마크했습니다." + other: "{{count}}명이 북마크했습니다" like: - other: "{{count}}명이 이 글을 좋아합니다" + other: "{{count}}명이 좋아합니다" vote: - other: "{{count}}명의 사용자가 이 글을 추천했습니다." + other: "{{count}}명이 이 글에 투표했습니다" delete: confirm: other: "모든 글들을 삭제하시겠습니까?" @@ -1369,6 +1410,7 @@ ko: topic_template: "토픽 템플릿" delete: '카테고리 삭제' create: '새 카테고리' + create_long: '새 카테고리 만들기' save: '카테고리 저장' slug: '카테고리 Slug' slug_placeholder: '(Optional) dashed-words for url' @@ -1379,7 +1421,7 @@ ko: topic: "카테고리 토픽" logo: "카테고리 로고 이미지" background_image: "카테고리 백그라운드 이미지" - badge_colors: "뱃지 색상" + badge_colors: "배지 색상" background_color: "배경 색상" foreground_color: "글씨 색상" name_placeholder: "짧고 간결해야합니다" @@ -1398,7 +1440,8 @@ ko: email_in_allow_strangers: "계정이 없는 익명 유저들에게 이메일을 받습니다." email_in_disabled: "이메일로 새 토픽 작성하기 기능이 비활성화되어 있습니다. 사이트 설정에서 '이메일로 새 토픽작성하기'를 활성화 해주세요." email_in_disabled_click: '"email in" 활성화' - allow_badges_label: "뱃지가 이 카테고리에서 주어질 수 있도록 허용" + suppress_from_homepage: "홈페이지에서 이 카테고리를 감춥니다." + allow_badges_label: "배지가 이 카테고리에서 주어질 수 있도록 허용" edit_permissions: "권한 수정" add_permission: "권한 추가" this_year: "올해" @@ -1418,33 +1461,34 @@ ko: muted: title: "알림 꺼짐" flagging: - title: '우리 커뮤니티에 기여해 주셔서 감사합니다.' - private_reminder: '신고는 오직 관리자만 볼 수 있습니다.' - action: '글 신고하기' - take_action: "조치를 취하기" - notify_action: '메시지' - delete_spammer: "스팸 사용자 삭제" - delete_confirm: "이 사용자의 %{posts}개의 게시글과 %{topics}개의 토픽을 삭제하고 IP주소 %{ip_address}와 이메일 %{email}을 영구 블락하려고 합니다. 이 사용자가 악성 사용자임이 확실합니까? " - yes_delete_spammer: "예, 스팸 사용자 삭제." + title: '우리 커뮤니티 질서를 지키는데 도와주셔서 감사합니다!' + private_reminder: '신고는 비밀이기 때문에 오직 운영진들만 볼 수 있습니다' + action: '글 신고했습니다' + take_action: "조치하기" + notify_action: '메시지 보내기' + delete_spammer: "네, 스패머 회원을 삭제합니다" + delete_confirm: "이 회원의 글 %{posts}개 및 토픽 %{topics}개를 삭제하고 IP주소 %{ip_address}와 이메일 %{email}을 영구 차단하려고 합니다. 이 회원이 정말 스패머 확실합니까?" + yes_delete_spammer: "예, 스팸 회원을 삭제합니다" ip_address_missing: "(알 수 없음)" - hidden_email_address: "(감춰짐)" - submit_tooltip: "신고 접수하기" + hidden_email_address: "(숨김)" + submit_tooltip: "비밀 신고하기" take_action_tooltip: "커뮤니티의 신고 수가 채워지기 기다리지 않고, 바로 신고 수를 제재 수준까지 채웁니다." - cant: "죄송합니다, 지금 이 글을 신고 할 수 없습니다." + cant: "죄송합니다, 지금은 이 글을 신고할 수 없습니다" + notify_staff: '운영진에게 알리기' formatted_name: - off_topic: "오프 토픽입니다." - inappropriate: "부적절함" + off_topic: "주제에 벗어났습니다" + inappropriate: "부적절 컨텐츠입니다" spam: "스팸입니다" custom_placeholder_notify_user: "구체적이고, 건설적이며, 항상 친절하세요." - custom_placeholder_notify_moderators: "구체적으로 사용자님께서 걱정하는 것과 가능한 모든 관련된 링크를 제공해주세요." + custom_placeholder_notify_moderators: "구체적으로 회원님이 걱정하는 내용과 가능한 모든 관련된 링크를 제공해주세요." custom_message: at_least: "최소한 {{n}}자를 입력하세요" more: "{{n}} 이동합니다" left: "{{n}} 나머지" flagging_topic: - title: "우리 커뮤니티에 기여해 주셔서 감사합니다." - action: "신고된 토픽" - notify_action: "메시지" + title: "우리 커뮤니티 질서를 지키는데 도와주셔서 감사합니다!" + action: "토픽 신고하기" + notify_action: "메시지 보내기" topic_map: title: "토픽 요약" participants_title: "빈번한 게시자" @@ -1505,6 +1549,9 @@ ko: with_topics: "%{filter} 토픽" with_category: "%{filter} %{category} 토픽" latest: + title: "최근글" + title_with_count: + other: "최근글 ({{count}})" help: "가장 최근 토픽" hot: title: "인기 있는 글" @@ -1520,9 +1567,19 @@ ko: title_in: "카테고리 - {{categoryName}}" help: "카테고리별로 그룹화 된 모든 토픽" unread: + title: "읽지 않은 글" + title_with_count: + other: "읽지 않은 글 ({{count}})" help: "지켜보거나 추적 중인 읽지 않은 토픽 " + lower_title_with_count: + other: "{{count}} unread" new: + lower_title_with_count: + other: "{{count}} new" lower_title: "new" + title: "새글" + title_with_count: + other: "새글 ({{count}})" help: "며칠 내에 만들어진 토픽" posted: title: "내 글" @@ -1531,9 +1588,12 @@ ko: title: "북마크" help: "북마크된 토픽" category: + title: "{{categoryName}}" + title_with_count: + other: "{{categoryName}} ({{count}})" help: "{{categoryName}}카테고리의 최신 토픽" top: - title: "인기" + title: "인기글" help: "작년 또는 지난 달, 지난 주, 어제에 활발했던 토픽" all: title: "전체 시간" @@ -1610,6 +1670,7 @@ ko: refresh_report: "보고서 새로고침" start_date: "시작일" end_date: "종료일" + groups: "모든 그룹" commits: latest_changes: "최근 변경 사항: 자주 업데이트하십시오!" by: "에 의해" @@ -1618,31 +1679,31 @@ ko: old: "지난" active: "활성화된" agree: "동의" - agree_title: "이 신고가 올바르고 타당한지 확인하세요." + agree_title: "이 신고가 올바르고 타당함을 확인합니다" agree_flag_modal_title: "동의 및 ..." - agree_flag_hide_post: "동의 (포스트 숨기기 + 개인 메시지 보내기)" - agree_flag_hide_post_title: "Hide this post and automatically send the user a message urging them to edit it" - agree_flag_restore_post: "동의하기(글 복원)" + 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_flag_title: "신고 제거하기. 현재 어떠한 행위를 할 필요 없음" + defer_flag_title: "신고 제거하기. 별도추가조치는 더이상 필요없습니다" delete: "삭제" delete_title: "신고에서 멘션된 글 삭제하기" - delete_post_defer_flag: "글을 삭제하고 신고에 결정을 따름" + delete_post_defer_flag: "글을 삭제하고 신고를 보류함" delete_post_defer_flag_title: "글을 삭제하고 첫번째 글이면 토픽 삭제하기" delete_post_agree_flag: "글을 삭제하고 신고에 동의함" delete_post_agree_flag_title: "글을 삭제하고 첫번째 글이면 토픽 삭제하기" delete_flag_modal_title: "삭제하고.." delete_spammer: "스패머 삭제" - delete_spammer_title: "사용자와 사용자가 작성한 모든 토픽과 글을 삭제함 " - disagree_flag_unhide_post: "Disagree (글 감추기 취소)" + delete_spammer_title: "글쓴이의 모든 글과 토픽을 삭제하고 회원계정도 제거하기" + disagree_flag_unhide_post: "동의안함 (글 숨김 취소)" disagree_flag_unhide_post_title: "글의 모든 신고를 삭제하고 글을 볼 수 있도록 변경" - disagree_flag: "Disagree" + disagree_flag: "동의안함" disagree_flag_title: "신고를 유효하지 않거나 올바르지 않은 것으로 거부함" clear_topic_flags: "완료" - clear_topic_flags_title: "이 토픽을 조사하였고 이슈는 해결되었습니다. 플래그를 지우기 위해 완료를 클리하세요" + clear_topic_flags_title: "토픽 조사를 끝냈고 이슈를 해결했습니다. 신고를 지우기 위해 완료를 클릭하세요" more: "(더 많은 답글...)" dispositions: agreed: "agreed" @@ -1685,15 +1746,23 @@ ko: delete_confirm: "이 그룹을 삭제 하시겠습니까?" delete_failed: "이것은 자동으로 생성된 그룹입니다. 삭제할 수 없습니다." delete_member_confirm: "'%{group}' 그룹에서 '%{username}'을 제외시키겠습니까?" + delete_owner_confirm: "'%{username}' 님에게서 소유자권한을 제거할까요?" name: "이름" add: "추가" add_members: "사용자 추가하기" custom: "Custom" + bulk_complete: "회원들이 그룹에 추가되었습니다." + bulk: "그룹에 한꺼번에 추가하기" + bulk_paste: "한 줄당 하나씩 아이디 또는 이메일 리스트를 붙여넣기 하세요." + bulk_select: "(그룹을 선택하세요)" automatic: "자동화" automatic_membership_email_domains: "이 목록의 있는 항목과 사용자들이 등록한 이메일 도메인이 일치할때 이 그룹에 포함" automatic_membership_retroactive: "이미 등록된 사용자에게 같은 이메일 도메인 규칙 적용하기" default_title: "Default title for all users in this group" primary_group: "Automatically set as primary group" + group_owners: 소유자 + add_owners: 소유자 추가하기 + incoming_email_placeholder: "이메일 주소를 입력하세요" api: generate_master: "마스터 API 키 생성" none: "지금 활성화된 API 키가 없습니다." @@ -1767,11 +1836,11 @@ ko: is_disabled: "사이트 설정에서 '복구 기능'이 비활성화 되어있습니다." label: "복구" title: "백업을 이용하여 복구" - confirm: "정말 이 백업을 이용하여 복구할까요?" + confirm: "정말 이 백업으로 복원할까요?" rollback: label: "롤백" title: "데이터베이스를 이전 workiong state로 되돌리기" - confirm: "정말로 이전 작업 상태로 데이터베이스를 롤백하시겠습니까?" + confirm: "데이타베이스를 이전 상태로 롤백 또는 되돌리기 할까요?" export_csv: user_archive_confirm: "정말로 내 글을 다운로드 받습니까?" success: "Export initiated, you will be notified via message when the process is complete." @@ -1823,6 +1892,10 @@ ko: opacity: "투명도" copy: "복사" email_templates: + title: "이메일 템플릿" + subject: "제목" + multiple_subjects: "이 이메일 양식은 제목이 여러가지 있습니다." + body: "본문" none_selected: "편집하려는 이메일 템플릿을 선택하세요." revert: "변경사항 취소" revert_confirm: "정말로 변경사항을 되돌리시겠습니까?" @@ -1870,9 +1943,6 @@ ko: love: name: '사랑' description: "좋아요 버튼 색" - wiki: - name: '위키' - description: "위키 글의 배경색으로 사용될 기본 색상" email: title: "이메일" settings: "설정" @@ -1902,6 +1972,31 @@ ko: last_seen_user: "마지막으로 본 사용자" reply_key: "답글 단축키" skipped_reason: "생략 이유" + incoming_emails: + from_address: "보내는사람" + to_addresses: "받는사람" + cc_addresses: "참조" + subject: "제목" + error: "에러" + none: "수신된 이메일이 없습니다." + modal: + error: "에러" + return_path: "Return-Path" + message_id: "Message-Id" + in_reply_to: "In-Reply-To" + references: "레퍼런스" + date: "날짜" + from: "보내는사람" + to: "받는사람" + cc: "참조" + subject: "제목" + body: "본문" + filters: + from_placeholder: "from@example.com" + to_placeholder: "to@example.com" + cc_placeholder: "cc@example.com" + subject_placeholder: "제목..." + error_placeholder: "에러" logs: none: "로그가 없습니다." filters: @@ -1945,8 +2040,8 @@ ko: no_previous: "이전 값이 없습니다." deleted: "새로운 값이 없습니다. 기록이 삭제되었습니다." actions: - delete_user: "사용자 삭제" - change_trust_level: "신뢰도 변경" + delete_user: "회원 삭제" + change_trust_level: "회원등급 변경" change_username: "아이디 변경" change_site_setting: "사이트 설정 변경" change_site_customization: "사이트 커스텀화 변경" @@ -1954,8 +2049,8 @@ ko: change_site_text: "site text 변경" suspend_user: "suspend user" unsuspend_user: "unsuspend user" - grant_badge: "뱃지 부여" - revoke_badge: "뱃지 회수" + grant_badge: "배지 부여" + revoke_badge: "배지 회수" check_email: "이메일 확인" delete_topic: "토픽 삭제" delete_post: "글 삭제" @@ -1967,6 +2062,11 @@ ko: create_category: "카테고리 만들기" block_user: "사용자 차단" unblock_user: "사용자 차단 해제" + grant_admin: "관리자권한 부여" + revoke_admin: "관리자권한 회수" + grant_moderation: "운영자권한 부여" + revoke_moderation: "운영자권한 회수" + backup_operation: "백업 작업" screened_emails: title: "블락된 이메일들" description: "누군가가 새로운 계정을 만들면 아래 이메일 주소는 체크되고 등록은 블락됩니다, 또는 다른 조치가 취해집니다." @@ -2026,16 +2126,16 @@ ko: reject_selected: other: "거부한 사용자 ({{count}}명)" titles: - active: '활성화된 사용자' - new: '새로운 사용자' - pending: '검토가 필요한 사용자' - newuser: '사용자 신뢰도 0 (새로운 사용자)' - basic: '사용자 신뢰도 1 (초보 사용자)' - member: '사용자 신뢰도 2 (회원)' - regular: '사용자 신뢰도 3 (정규)' - leader: '사용자 신뢰도 4 (지도자)' + active: '활동적인 회원' + new: '신규회원' + pending: '검토 대기중인 회원' + newuser: '0등급 회원 (신규가입 회원)' + basic: '1등급 회원 (초보 회원)' + member: '2등급 회원 (부회원)' + regular: '3등급 회원 (정회원)' + leader: '4등급 회원 (리더)' staff: "스태프" - admins: '관리자 사용자 목록' + admins: '관리자' moderators: '운영자' blocked: '블락된 사용자들' suspended: '접근 금지된 사용자들' @@ -2064,6 +2164,7 @@ ko: moderator: "운영자?" admin: "관리자?" blocked: "블락" + staged: "격리조치?" show_admin_profile: "관리자" edit_title: "제목 수정" save_title: "제목 저장" @@ -2130,39 +2231,40 @@ ko: deactivate_explanation: "비활성화 사용자는 이메일 인증을 다시 받아야합니다." suspended_explanation: "접근 금지된 유저는 로그인 할 수 없습니다." block_explanation: "블락 사용자는 글을 작성하거나 토픽을 작성할 수 없습니다." - trust_level_change_failed: "신뢰도 변경에 문제가 있습니다." + stage_explanation: "격리조치된 회원은 특정 토픽에만 이메일로만 글을 쓸 수 있습니다." + trust_level_change_failed: "회원등급 변경에 실패했습니다." suspend_modal_title: "거부된 사용자" - trust_level_2_users: "신뢰도 2 사용자들" - trust_level_3_requirements: "사용자 신뢰도 3 이상이 필요" - trust_level_locked_tip: "신뢰도 시스템이 잠겼습니다. 시스템이 사용자를 승급이나 강등시키지 않을 것 입니다." - trust_level_unlocked_tip: "신뢰도 시스템이 잠금이 해제되었습니다. 시스템은 사용자를 승급이나 강등 시킬 것입니다." - lock_trust_level: "신뢰도 시스템 잠금" - unlock_trust_level: "신뢰도 시스템 잠금 해제" + trust_level_2_users: "2등급 회원들" + trust_level_3_requirements: "회원등급 3 이상이어야 합니다." + trust_level_locked_tip: "회원등급이 고정되었습니다. 시스템이 회원등급을 올리거나 내리지 않을 것입니다." + trust_level_unlocked_tip: "회원등급 고정이 풀렸습니다. 시스템이 회원등급을 자동적으로 올리거나 내릴 것입니다." + lock_trust_level: "회원등급 고정" + unlock_trust_level: "회원등급 고정 해제" tl3_requirements: - title: "레벨 3 권한이 필요합니다." + title: "3등급 회원이 되기 위한 자격" table_title: "지난 %{time_period} 일간" value_heading: "값" - requirement_heading: "필수" - visits: "방문수" + requirement_heading: "자격요건" + visits: "방문횟수" days: "일" - topics_replied_to: "답글 달린 토픽" - topics_viewed: "읽은 토픽 수" - topics_viewed_all_time: "읽은 토픽 수 (전체 기간)" - posts_read: "읽은 글 수" - posts_read_all_time: "읽은 글 수 (전체 기간)" - flagged_posts: "신고된 글" - flagged_by_users: "신고한 사용자들" - likes_given: "선사한 '좋아요'" - likes_received: "받은 '좋아요'" - likes_received_days: "받은 '좋아요' : 특정일" - likes_received_users: "받은 좋아요: 순사용자(unique users)" - qualifies: "신뢰 등급 3의 조건에 부합합니다." - does_not_qualify: "신뢰 등급 3의 조건에 부합하지 않습니다." + topics_replied_to: "댓글 달은 토픽 갯수" + topics_viewed: "열어본 토픽 갯수" + topics_viewed_all_time: "열어본 토픽 갯수 (전체 기간)" + posts_read: "읽은 글 갯수" + posts_read_all_time: "읽은 글 갯수 (전체 기간)" + flagged_posts: "신고당한 글 갯수" + flagged_by_users: "신고한 회원수" + likes_given: "'좋아요' 선물한 횟수" + likes_received: "'좋아요' 받은 횟수" + likes_received_days: "한번이라도 '좋아요' 받아본 날짜횟수" + likes_received_users: "한번이라도 '좋아요' 선물해준 회원수" + qualifies: "3등급회원 자격을 만족합니다" + does_not_qualify: "3등급회원 자격을 만족하지 않습니다" will_be_promoted: "곧 승급 됩니다." will_be_demoted: "곧 강등됩니다." on_grace_period: "현재 승급 유예 기간이므로 강등되지 않습니다." - locked_will_not_be_promoted: "신뢰도 시스템이 잠겼습니다. 승급되지 않습니다." - locked_will_not_be_demoted: "신뢰도 시스템이 잠겼습니다. 강등되지 않습니다." + locked_will_not_be_promoted: "회원등급이 고정되었습니다. 승급되지 않을 것입니다." + locked_will_not_be_demoted: "회원등급이 고정되었습니다. 강등되지 않을 것입니다." sso: title: "Single Sign On" external_id: "External ID" @@ -2220,86 +2322,86 @@ ko: add_url: "URL 추가" add_host: "Host 추가" categories: - all_results: 'All' + all_results: '전체' required: '필수' basic: '기본 설정' - users: '사용자' + users: '회원' posting: '글' email: '이메일' files: '파일' - trust: '신뢰도' + trust: '회원등급' security: '보안' onebox: "Onebox" - seo: 'SEO' + seo: '검색엔진최적화(SEO)' spam: '스팸' rate_limits: '제한' developer: '개발자' embedding: "Embedding" - legal: "합법적인" + legal: "법률조항" uncategorized: '카테고리 없음' backups: "백업" login: "로그인" plugins: "플러그인" - user_preferences: "사용자 환경 설정" + user_preferences: "회원 환경설정" badges: - title: 뱃지 - new_badge: 새로운 뱃지 + title: 배지 + new_badge: 새 배지 new: New name: 이름 - badge: 뱃지 + badge: 배지 display_name: 표시 이름 description: 설명 - badge_type: 뱃지 종류 + badge_type: 배지 종류 badge_grouping: 그룹 badge_groupings: - modal_title: 뱃지 그룹으로 나누기 + modal_title: 배지 그룹으로 나누기 granted_by: 배지 부여자 granted_at: 배지 수여일 - reason_help: ( 토픽이나 게시글 링크) + reason_help: (토픽 또는 댓글로 가는 링크) save: 저장 delete: 삭제 - delete_confirm: 정말로 이 뱃지를 삭제하시겠습니까? + delete_confirm: 정말로 이 배지를 삭제할까요? revoke: 회수 - reason: 원인 + reason: 이유 expand: 확장 … - revoke_confirm: 정말로 이 뱃지를 회수하시겠습니까? - edit_badges: 뱃지 수정 - grant_badge: 뱃지 부여 - granted_badges: 부여된 뱃지 + revoke_confirm: 정말로 이 배지를 회수할까요? + edit_badges: 배지 수정 + grant_badge: 배지 부여 + granted_badges: 부여된 배지 grant: 부여 - no_user_badges: "%{name}님은 수여받은 뱃지가 없습니다." - no_badges: 받을 수 있는 뱃지가 없습니다. - none_selected: "시작하려면 뱃지를 선택하세요" - allow_title: 뱃지를 칭호로 사용 가능하도록 허용 + no_user_badges: "%{name}님은 배지가 없습니다." + no_badges: 받을 수 있는 배지가 없습니다. + none_selected: "시작하려면 배지를 선택하세요" + allow_title: 배지를 칭호로 사용 가능하도록 허용 multiple_grant: 중복 부여할 수 있도록 허용 - listable: 공개 뱃지 페이지에 표시되는 뱃지입니다. - enabled: 뱃지 기능 사용 + listable: 공개 배지 페이지에 표시되는 배지입니다. + enabled: 배지 기능 사용 icon: 아이콘 image: 이미지 - icon_help: "Font Awesome class나 이미지 주소를 사용합니다" - query: 뱃지 Query(SQL) - target_posts: 포스트들을 타겟으로 하는 query - auto_revoke: 매일 회수 query를 실행한다. - show_posts: 뱃지 페이지에서 뱃지를 받게한 글을 보여줍니다. + icon_help: "이미지 주소로 Font Awesome 클래스 또는 URL을 사용합니다" + query: 배지 쿼리(SQL) + target_posts: 글들을 대상으로 하는 쿼리 + auto_revoke: 회수 쿼리를 매일 실행 + show_posts: 배지 페이지에서 배지를 받게한 글을 보여줍니다. trigger: Trigger trigger_type: none: "매일 업데이트" - post_action: "사용자가 포스트에 액션을 했을 때" - post_revision: "사용자가 포스트를 수정거나 작성했을 때" - trust_level_change: "사용자의 신뢰도가 변했을 떄" - user_change: "사용자가 수정되거나 생성되었을 때" + post_action: "회원이 글에 액션을 할 때" + post_revision: "회원이 새글을 쓰거나 글을 수정할 때" + trust_level_change: "회원등급이 바뀔 때" + user_change: "회원이 생성되거나 수정될 때" preview: - link_text: "수여된 뱃지 미리보기" - plan_text: "Query plan 미리보기" - modal_title: "뱃지 Query 미리보기" - sql_error_header: "Query에 오류가 있습니다." - error_help: "뱃지 query의 도움말을 보려면 다음의 링크를 확인하세요." + link_text: "수여된 배지 미리보기" + plan_text: "쿼리 플랜 미리보기" + modal_title: "배지 쿼리 미리보기" + sql_error_header: "질의 중 오류가 발생했습니다" + error_help: "배지 쿼리 도움말을 보려면 다음 링크를 확인하세요." bad_count_warning: header: "주의!" - text: "사라진 뱃지 샘플이 있습니다. 뱃지 query가 존재하지 않는 user ID나 post ID를 반환할 경우 발생합니다. 예상하지 못한 결과를 일으킬 수 있으니 query를 다시 한번 확인하세요." - no_grant_count: "할당된 뱃지가 없습니다." + text: "사라진 배지 샘플이 있습니다. 배지 query가 존재하지 않는 user ID나 post ID를 반환할 경우 발생합니다. 예상하지 못한 결과를 일으킬 수 있으니 query를 다시 한번 확인하세요." + no_grant_count: "할당된 배지가 없습니다." grant_count: - other: "%{count}개의 뱃지가 할당됨." + other: "%{count}개의 배지가 할당됨." sample: "샘플:" grant: with: %{username} @@ -2307,28 +2409,35 @@ ko: with_post_time: %{username} for post in %{link} at %{time} with_time: %{username} at %{time} emoji: - title: "Emoji" - help: "모든 사용자가 사용가능한 새로운 이미지를 추가. (프로 팁: 여러개의 파일을 드래그 & 드롭으로 한번에)" - add: "새로운 Emoji 추가" + title: "이모지" + help: "모든 사람이 쓸 수 있는 이모지를 추가합니다. (팁: 여러개 파일을 한 번에 드래그 & 드롭할 수 있어요)" + add: "새 이모지 추가" name: "이름" image: "이미지" - delete_confirm: "정말 :%{name}: emoji를 삭제하시겠습니까?" + delete_confirm: "정말로 :%{name}: 이모지를 삭제할까요?" embedding: get_started: "다른 웹사이트에 Discourse를 임베드하려면 호스트 추가부터 하세요" confirm_delete: "정말로 host를 삭제할까요?" - title: "Embedding" + sample: "Discourse 토픽을 웨사이트에 삽입(embed)하기 위해 다음 HTML코드를 이용하세요. REPLACE_ME 부분을 당신이 삽입하려는 웨사이트의 정식URL로 바꿔치기 하시면 됩니다." + title: "삽입(Embedding)" host: "허용 Host" edit: "편집" category: "카테고리에 게시" add_host: "Host 추가" - settings: "Embedding 설정" - feed_settings: "Feed 설정" - crawling_settings: "클롤러 설정" - embed_post_limit: "글 개수가 최대치입니다" - embed_truncate: "임베드된 글 비우기" + settings: "삽입(Embedding) 설정" + feed_settings: "피드 설정" + feed_description: "당신 사이트의 RSS/ATOM 피드를 알려주시면 Discourse가 그 사이트 컨텐트를 더 잘 가져올 수 있습니다." + crawling_settings: "크롤러 설정" + crawling_description: "When Discourse creates topics for your posts, if no RSS/ATOM feed is present it will attempt to parse your content out of your HTML. Sometimes it can be challenging to extract your content, so we provide the ability to specify CSS rules to make extraction easier." + embed_by_username: "토픽 생성 시 사용할 회원이름(Username)" + embed_post_limit: "삽입(embed)할 글 최대갯수" + embed_username_key_from_feed: "피드에서 discourse usename을 꺼내오기 위한 키(key)" + embed_truncate: "임베드된 글 뒷부분 잘라내기" + embed_whitelist_selector: "CSS selector for elements that are allowed in embeds" + embed_blacklist_selector: "CSS selector for elements that are removed from embeds" feed_polling_enabled: "RSS/ATOM으로 글 가져오기" - feed_polling_url: "RSS/ATOM 피드로 긁을 URL" - save: "Embedding 설정 저장하기" + feed_polling_url: "긁어올 RSS/ATOM 피드 URL" + save: "삽입(Embedding) 설정 저장하기" permalink: title: "고유링크" url: "URL" @@ -2357,8 +2466,10 @@ ko: new: 'g, n 새로운' unread: 'g, u 읽지 않은' categories: 'g, c 카테고리' - top: 'g, t 인기' + top: 'g, t 인기글' bookmarks: 'g, b 북마크' + profile: 'g, p 프로필' + messages: 'g, m 메시지' navigation: title: 'Navigation' jump: '# 글 번호로' @@ -2377,6 +2488,7 @@ ko: help: '? 키보드 도움말 열기' dismiss_new_posts: 'x, r 새글을 읽은 상태로 표시하기' dismiss_topics: 'x, t 토픽 무시하기' + log_out: 'shift+z shift+z 로그아웃' actions: title: 'Actions' bookmark_topic: 'f 토글 북마크 토픽' @@ -2397,16 +2509,19 @@ ko: mark_tracking: 'm, t 토픽 알람 : 추적하기' mark_watching: 'm, w 토픽 알람 : 주시하기' badges: - title: 뱃지 + earned_n_times: + other: "이 배지를 %{count}번 받았습니다" + more_with_badge: "이 배지를 받은 다른사람들" + title: 배지 allow_title: "can be used as a title" multiple_grant: "can be awarded multiple times" badge_count: - other: "뱃지 %{count}개" + other: "배지 %{count}개" more_badges: other: "+%{count} More" granted: other: "%{count} 개 부여" - select_badge_for_title: 칭호로 사용할 뱃지를 선택하세요 + select_badge_for_title: 칭호로 사용할 배지를 선택하세요 none: "<없음>" badge_grouping: getting_started: @@ -2414,102 +2529,102 @@ ko: community: name: 커뮤니티 trust_level: - name: 신뢰 등급 + name: 회원등급 other: name: 기타 posting: name: 글 관련 배지 badge: editor: - name: 편집자 - description: 첫 포스트 편집 + name: 에디터 + description: 첫 글 작성 basic_user: - name: 기본 - description: 부여되면 커뮤니티의 기본 기능 수행 가능 + name: 초보회원 + description: 초보회원은 커뮤니티의 기본기능을 사용할 수 있습니다 member: - name: 멤버 - description: Granted invitations + name: 부회원 + description: 부회원은 다른 사람을 커뮤티니에 초대할 수 있습니다 regular: - name: Regular - description: Granted recategorize, rename, followed links and lounge + name: 정회원 + description: 정회원은 토픽 제목과 카테고리를 바꾸거나 HTML Link Follow 기능을 사용, 정회원 전용카테고리에 접근할 수 있습니다. leader: - name: 중견 - description: Granted global edit, pin, close, archive, split and merge + name: 리더 + description: 리더는 모든 글을 수정하거나 토픽 핀고정, 토픽닫기, 토픽아카이빙, 토픽쪼개기, 토픽합치기 등을 할 수 있습니다. welcome: - name: 환영합니다 - description: 좋아요 받음 + name: 웰컴 + description: 좋아요 선물받음 autobiographer: name: 자서전 작가 - description: 사용자의 프로필 정보를 작성함 + description: 회원 프로필 정보를 작성했습니다 anniversary: - name: 기념일 - description: Active member for a year, posted at least once + name: 1주년 + description: 1년동안 열심히 활동하고 글도 1개이상 썼습니다 nice_post: - name: 괜찮은 글 - description: 작성한 글이 좋아요를 10개 받았습니다. 이 뱃지는 중복 수여 가능합니다. + name: Nice Post + description: 작성한 글이 좋아요를 10개 받았습니다. 이 배지는 여러번 받을 수 있습니다. good_post: - name: 좋은 글 - description: 작성한 글이 좋아요를 25개 받았습니다. 이 뱃지는 중복 수여 가능합니다. + name: Good Post + description: 작성한 글이 좋아요를 25개 받았습니다. 이 배지는 여러번 받을 수 있습니다. great_post: - name: 굉장히 좋은 글 - description: 작성한 글이 좋아요를 50개 받았습니다. 이 뱃지는 중복 수여 가능합니다. + name: Great Post + description: 작성한 글이 좋아요를 50개 받았습니다. 이 배지는 여러번 받을 수 있습니다. nice_topic: - name: Nice 토픽 - description: 10개의 '좋아요'를 받았습니다. 이 뱃지는 여러번 받을 수 있습니다. + name: Nice Topic + description: 10개의 '좋아요'를 받았습니다. 이 배지는 여러번 받을 수 있습니다. good_topic: - name: Good 토픽 - description: 25개의 '좋아요'를 받았습니다. 이 뱃지는 여러번 받을 수 있습니다. + name: Good Topic + description: 25개의 '좋아요'를 받았습니다. 이 배지는 여러번 받을 수 있습니다. great_topic: - name: Great 토픽 - description: 50개의 '좋아요'를 받았습니다. 이 뱃지는 여러번 받을 수 있습니다. + name: Great Topic + description: 50개의 '좋아요'를 받았습니다. 이 배지는 여러번 받을 수 있습니다. nice_share: - name: Nice 공유 - description: 25명의 사용자로부터 공유되었습니다 + name: Nice Share + description: 방문자 25명이 글을 공유했습니다 good_share: - name: Good 공유 - description: 300명의 사용자로부터 공유되었습니다 + name: Good Share + description: 방문자 300명의 글을 공유했습니다 great_share: - name: Great 공유 - description: 1000명의 사용자로부터 공유되었습니다 + name: Great Share + description: 방문자 1000명이 글을 공유했습니다 first_like: - name: 첫 좋아요 + name: 처음 좋아요 description: 처음으로 글에 '좋아요'를 했습니다. first_flag: - name: 첫 신고 + name: 처음 신고해요 description: 글을 처음으로 신고하였습니다. promoter: - name: Promoter - description: 사용자 초대 + name: 후원자 + description: 회원을 1명 초대했습니다 campaigner: - name: Campaigner - description: 기본 사용자 3명 초대하기 (신뢰도 1) + name: 운동가 + description: 초보회원(1등급회원) 3명을 초대했습니다 champion: - name: Champion - description: 기본 사용자 5명 초대하기 (신뢰도 2) + name: 챔피언 + description: 초보회원(2등급회원) 5명을 초대했습니다 first_share: - name: 첫 공유 - description: 처음으로 글을 공유했습니다. + name: 처음 공유해요 + description: 처음으로 글을 공유했습니다 first_link: - name: 첫 링크 - description: 글 작성시, 다른 토픽으로 가는 링크를 처음으로 추가하였습니다. + name: 처음 링크걸어요 + description: 다른 토픽으로 가는 링크를 처음으로 추가했습니다 first_quote: - name: 첫 인용 - description: 글 작성시 다른 사용자의 글을 인용하였습니다. + name: 처음 인용해요 + description: 회원을 인용했습니다 read_guidelines: name: 가이드라인 읽음 description: 커뮤니티 가이드라인 을 읽었습니다. reader: name: 독서가 - description: 100개가 넘는 댓글이 달린 토픽의 댓글을 모두 읽었습니다. + description: 100개가 넘는 댓글이 달린 토픽의 댓글을 모두 읽었습니다 popular_link: name: 인기 링크 - description: 50회 이상 클릭이 발생한 외부 링크 게시 + description: 게시한 외부링크가 50회 이상 클릭되었습니다 hot_link: - name: HOT 링크 - description: 300회 이상 클릭이 발생한 외부 링크 게시 + name: 핫 링크 + description: 게시한 외부링크가 300회 이상 클릭되었습니다 famous_link: - name: Famous 링크 - description: 1000회 이상 클릭이 발생한 외부 링크 게시 + name: 완전유명 링크 + description: 게시한 외부링크가 1000회 이상 클릭되었습니 google_search: |

Google 검색

diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml index 4a19e0c17e..64f5311e8a 100644 --- a/config/locales/client.nb_NO.yml +++ b/config/locales/client.nb_NO.yml @@ -645,8 +645,8 @@ nb_NO: value_prop: "Når du registrerer deg husker vi hvor langt du har lest, så du starter på riktig sted neste gang du åpner en tråd. Du får også varsler, her og på e-post når det skjer ting i diskusjonene du vil følge. I tillegg kan du like innlegg :heartbeat:" summary: enabled_description: "Du ser for øyeblikket en oppsummering av dette emnet: de mest interessante innleggene i følge nettsamfunnet." - description: "Det er {{count}} svar." - description_time: "Det er {{count}} svar med en estimert lesetid på {{readingTime}} minutter." + description: "Det er {{replyCount}} svar." + description_time: "Det er {{replyCount}} svar med en estimert lesetid på {{readingTime}} minutter." enable: 'Oppsummer dette emnet' disable: 'Vis alle innlegg' deleted_filter: diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml index daab5b8e4b..76d75644f3 100644 --- a/config/locales/client.nl.yml +++ b/config/locales/client.nl.yml @@ -100,6 +100,8 @@ nl: x_years: one: "1 jaar later" other: "%{count} jaren later" + previous_month: 'Vorige Maand' + next_month: 'Volgende Maand' share: topic: 'deel een link naar deze topic' post: 'bericht #%{postNumber}' @@ -132,6 +134,19 @@ nl: disabled: 'niet zichtbaar %{when}' topic_admin_menu: "Adminacties voor topic" emails_are_disabled: "Alle uitgaande e-mails zijn uitgeschakeld door een beheerder. Geen enkele vorm van e-mail notificatie wordt verstuurd." + s3: + regions: + us_east_1: "US Oost (N. Virginia)" + us_west_1: "US West (N. California)" + us_west_2: "US West (Oregon)" + us_gov_west_1: "AWS GovCloud (US)" + eu_west_1: "EU (Ierland)" + eu_central_1: "EU (Frankfurt)" + ap_southeast_1: "Azië Pacific (Singapore)" + ap_southeast_2: "Azië Pacific (Sydney)" + ap_northeast_1: "Azië Pacific (Tokyo)" + ap_northeast_2: "Azië Pacific (Seoul)" + sa_east_1: "Zuid Amerika (Sao Paulo)" edit: 'bewerk de titel en categorie van deze topic' not_implemented: "Die functie is helaas nog niet beschikbaar. Sorry!" no_value: "Nee" @@ -175,6 +190,7 @@ nl: other: "{{count}} tekens" suggested_topics: title: "Aanbevolen topics" + pm_title: "Voorgestelde Berichten" about: simple_title: "Over" title: "Over %{title}" @@ -253,7 +269,7 @@ nl: one: "Voor deze topic staat 1 bericht klaar om goedgekeurd te worden" other: "Voor dit topic staan {{count}} berichten klaar om goedgekeurd te worden" confirm: "Sla wijzigingen op" - delete_prompt: "Weet je zeker dat je %{username} wilt verwijderen? Dit zal alle zijn berichten verwijderen en zal zijn email en ip-adres blokkeren." + delete_prompt: "Weet je zeker dat je %{username} wilt verwijderen? Dit verwijdert al hun post en blokkeert hun IP adres en E-mail adres." approval: title: "Bericht vereist goedkeuring" description: "We hebben je nieuwe bericht ontvangen, maar deze moet eerst goedgekeurd worden door een moderator voordat deze zichtbaar wordt. Wees a.u.b. geduldig." @@ -296,6 +312,12 @@ nl: one: "1 lid" other: "%{count} leden" groups: + empty: + posts: "Er zijn geen posts van leden van deze groep." + members: "Er zijn geen leden in deze groep." + mentions: "Deze groep wordt niet benoemd." + messages: "Er zijn geen berichten voor deze groep." + topics: "Er is geen onderwerp door de leden van deze groep." add: "Voeg toe" selector_placeholder: "Voeg leden toe" owner: "eigenaar" @@ -306,6 +328,7 @@ nl: members: "Leden" posts: "Berichten" alias_levels: + title: "Wie kan deze groep een bericht sturen en taggen?" nobody: "Niemand" only_admins: "Alleen admins" mods_and_admins: "Alleen moderatoren and admins" @@ -314,6 +337,19 @@ nl: trust_levels: title: "Trustlevel dat automatisch wordt toegekend aan nieuwe gebruikers:" none: "Geen" + notifications: + watching: + title: "Kijken naar" + description: "Je krijgt een notificatie bij elke nieuwe post of bericht, en het aantal nieuwe reacties wordt weergeven." + tracking: + title: "Volgen" + description: "Je krijgt een notificatie wanneer iemand jouw @name noemt of reageert, en het aantal nieuwe reacties wordt weergeven." + regular: + title: "Normaal" + description: "Je krijgt een notificatie wanneer iemand jouw @name noemt of reageert." + muted: + title: "Gedempt" + description: "Je krijgt geen notificatie over nieuwe onderwerpen in deze groep." user_action_groups: '1': "Likes gegeven" '2': "Likes ontvangen" @@ -332,6 +368,7 @@ nl: all_subcategories: "alle" no_subcategory: "geen" category: "Categorie" + category_list: "Geef categorieën lijst weer." reorder: title: "Categorieën herschikken " title_long: "Reorganiseer de categorielijst" @@ -388,15 +425,15 @@ nl: invited_by: "Uitgenodigd door" trust_level: "Trustlevel" notifications: "Notificaties" + statistics: "Statistieken " desktop_notifications: label: "Desktopnotificaties" not_supported: "Notificaties worden niet ondersteund door deze browser. Sorry." perm_default: "Notificaties aanzetten" perm_denied_btn: "Toestemming geweigerd" + perm_denied_expl: "Je blokkeert notificaties. Sta deze toe in je browser instellingen." disable: "Notificaties uitschakelen" - currently_enabled: "(momenteel ingeschakeld)" enable: "Notificaties inschakelen" - currently_disabled: "(momenteel uitgeschakeld)" each_browser_note: "Let op: Je moet deze optie instellen voor elke browser die je gebruikt." dismiss_notifications: "Markeer alles als gelezen" dismiss_notifications_tooltip: "Markeer alle ongelezen berichten als gelezen" @@ -431,6 +468,7 @@ nl: muted_users: "Negeren" muted_users_instructions: "Negeer alle meldingen van deze leden." muted_topics_link: "Toon gedempte topics." + automatically_unpin_topics: "ontspelt onderwerp automatische wanneer de bodem is bereikt." staff_counters: flags_given: "behulpzame markeringen" flagged_posts: "gemarkeerde berichten" @@ -439,6 +477,15 @@ nl: warnings_received: "waarschuwingen" messages: all: "Alle" + inbox: "Postvak In" + sent: "Verzend" + archive: "Archiveren" + groups: "Mijn Groepen" + bulk_select: "Selecteer berichten" + move_to_inbox: "Verplaats naar Postvak In" + move_to_archive: "Archiveren" + failed_to_move: "Het is niet gelukt om het geselecteerde bericht te verplaatsen (Waarschijnlijk is de internetconnectie verbroken)" + select_all: "Selecteer Alles" change_password: success: "(e-mail verzonden)" in_progress: "(e-mail wordt verzonden)" @@ -483,6 +530,10 @@ nl: ok: "We sturen een e-mail ter bevestiging" invalid: "Vul een geldig e-mailadres in " authenticated: "Je e-mail is geauthenticeerd door {{provider}}" + frequency_immediately: "We zullen je onmiddellijk e-mailen als je hetgeen waarover we je e-mailen niet gelezen hebt." + frequency: + one: "We zullen je alleen maar e-mailen als we je de laatste {{count}} minuten niet gezien hebben." + other: "We zullen je alleen maar e-mailen als we je de laatste {{count}} minuten niet gezien hebben." name: title: "Naam" instructions: "Je volledige naam (optioneel)" @@ -518,12 +569,18 @@ nl: title: "Badge van gebruikersprofiel" website: "Website" email_settings: "E-mail" + email_previous_replies: + title: "Voeg de vorige reacties bij onderaan de emails" + unless_emailed: "tenzij eerder verzonden" + always: "altijd" + never: "nooit" email_digests: title: "Stuur me een mail met de laatste updates wanneer ik de site niet bezoek:" daily: "dagelijks" every_three_days: "elke drie dagen" weekly: "wekelijks" every_two_weeks: "elke twee weken" + email_in_reply_to: "Voeg een deel van de reactie toe in de emails" email_direct: "Stuur me een e-mail wanneer iemand me citeert, reageert op mijn bericht, mijn @gebruikersnaam noemt of uitnodigt voor een topic." email_private_messages: "Ontvang een mail wanneer iemand je een bericht heeft gestuurd." email_always: "Stuur me e-mail notificaties, zelfs als ik ben actief op de site" @@ -591,6 +648,21 @@ nl: same_as_email: "Je wachtwoord is hetzelfde als je e-mail." ok: "Je wachtwoord ziet er goed uit." instructions: "Minimaal %{count} tekens." + summary: + title: "Overzicht " + stats: "Statistieken " + topic_count: "Topics gemaakt" + post_count: "Bericht aangemaakt" + likes_given: "'Vind ik leuks' gegeven" + likes_received: "'Vind ik leuks' ontvangen" + days_visited: "Dagen bezocht" + posts_read_count: "Berichten gelezen" + top_replies: "Beste Reacties" + top_topics: "Top Topics" + top_badges: "Top Badges" + more_topics: "Meer Topics" + more_replies: "Meer Antwoorden" + more_badges: "Meer Badges" associated_accounts: "Logins" ip_address: title: "Laatste IP-adres" @@ -633,6 +705,7 @@ nl: logout: "Je bent uitgelogd." refresh: "Ververs" read_only_mode: + enabled: "De site is in alleen lezen modus. Interactie is niet mogelijk." login_disabled: "Zolang de site in read-only modus is, kan er niet ingelogd worden." too_few_topics_and_posts_notice: "Laten we de discussie starten! Er zijn al %{currentTopics} / %{requiredTopics} topics en %{currentPosts} / %{requiredPosts} berichten. Nieuwe bezoekers hebben conversaties nodig om te lezen en reageren." too_few_topics_notice: "Laten we de discussie starten! Er zijn al %{currentTopics} / %{requiredTopics} topics en %{currentPosts} / %{requiredPosts} berichten. Nieuwe bezoekers hebben conversaties nodig om te lezen en reageren." @@ -662,8 +735,8 @@ nl: value_prop: "Wanneer je een account aangemaakt hebt, herinneren deze wat je gelezen hebt, zodat je direct door kan lezen vanaf waar je gestopt bent. Je krijgt ook notificaties, hier en via email, wanneer nieuwe posts gemaakt zijn. En je kan ook nog posts liken :heartbeat:" summary: enabled_description: "Je leest een samenvatting van dit topic: alleen de meeste interessante berichten zoals bepaald door de community. " - description: "Er zijn {{count}} reacties." - description_time: "Er zijn {{count}} reacties met een gemiddelde leestijd van {{readingTime}} minuten." + description: "Er zijn {{replyCount}} reacties." + description_time: "Er zijn {{replyCount}} reacties met een geschatte leestijd van{{readingTime}} minuten." enable: 'Samenvatting Topic' disable: 'Alle berichten' deleted_filter: @@ -747,6 +820,7 @@ nl: ctrl: 'Ctrl' alt: 'Alt' composer: + emoji: "Emoji :)" more_emoji: "meer..." options: "Opties" whisper: "Fluister" @@ -758,6 +832,7 @@ nl: saved_local_draft_tip: "lokaal opgeslagen" similar_topics: "Jouw topic lijkt op..." drafts_offline: "concepten offline" + group_mentioned: "Door het gebruik van {{group}}, sta je op het punt {{count}} op de hoogte te brengen." error: title_missing: "Titel is verplicht" title_too_short: "Titel moet uit minstens {{min}} tekens bestaan" @@ -812,6 +887,7 @@ nl: toggler: "verberg of toon de editor" modal_ok: "OK" modal_cancel: "Annuleer" + cant_send_pm: "Sorry, je kan geen berichten sturen naar %{username}." admin_options_title: "Optionele stafinstellingen voor deze topic" auto_close: label: "Tijd waarna topic automatisch wordt gesloten:" @@ -828,6 +904,7 @@ nl: more: "bekijk oudere notificaties" total_flagged: "aantal gemarkeerde berichten" mentioned: "

{{username}} {{description}}

" + group_mentioned: "

{{username}} {{description}}

" quoted: "

{{username}} {{description}}

" replied: "

{{username}} {{description}}

" posted: "

{{username}} {{description}}

" @@ -840,6 +917,9 @@ nl: moved_post: "

{{username}} verplaatste {{description}}

" linked: "

{{username}} {{description}}

" granted_badge: "

'{{description}}' ontvangen

" + group_message_summary: + one: "

{{count}} berichten in jouw {{group_name}} inbox

" + other: "

{{count}} berichten in jouw {{group_name}} inbox

" alt: mentioned: "Genoemd door" quoted: "Gequoot door" @@ -854,8 +934,10 @@ nl: moved_post: "Je bericht is verplaatst door" linked: "Link naar je bericht" granted_badge: "Badge toegekend" + group_message_summary: "Berichten in groep Postvak In" popup: mentioned: '{{username}} heeft je genoemd in "{{topic}}" - {{site_title}}' + group_mentioned: '{{username}} noemde jouw naam in "{{topic}}" - {{site_title}}' quoted: '{{username}} heeft je geciteerd in "{{topic}}" - {{site_title}}' replied: '{{username}} heeft je beantwoord in "{{topic}}" - {{site_title}}' posted: '{{username}} heeft een bericht geplaats in "{{topic}}" - {{site_title}}' @@ -911,6 +993,7 @@ nl: dismiss_read: "Alle ongelezen afwijzen" dismiss_button: "Afwijzen..." dismiss_tooltip: "Alleen nieuwe posts afwijzen of stop het volgen van topics" + also_dismiss_topics: "Stop het volgen van deze topics, zodat deze nooit meer als ongelezen worden weergegeven. " dismiss_new: "markeer nieuwe berichten als gelezen" toggle: "toggle bulkselectie van topics" actions: "Bulk Acties" @@ -934,8 +1017,8 @@ nl: top: "Er zijn geen top-topics." search: "Er zijn geen zoekresultaten gevonden." educate: - new: '

Je nieuwe topics verschijnen hier.

Standaard worden topics als nieuw beschouwd en tonen een nieuw indicator als ze gemaakt zijn in de afgelopen 2 dagen.

Je kan dit aanpassen in je voorkeuren.

' - unread: '

Je ongelezen topics verschijnen hier.

Standaard worden topics als ongelezen beschouwd en tonen een ongelezen aantal 1 als je:

  • Het topic gemaakt hebt
  • Geantwoord hebt in het topic
  • Het topic meer dan 4 minuten hebt gelezen

Of als je het topic expliciet hebt gemarkeerd als Te Volgen via de notificatieknop onder aan de pagina van elk topic.

Je kan dit aanpassen in je instellingen.

' + new: '

Je nieuwe topics verschijnen hier.

Standaard worden topics als nieuw weergegeven en als nieuw weergegeven als deze binnen de laatste 2 dagen zijn aangemaakt.

Visit your voorkeuren om dit te veranderen.

' + unread: '

Je ongelezen berichten verschijnen hier.

Standaard worden topics als nieuw beschouwd en zullen als ongelezen worden weergegeven1 als je:

  • de topic hebt aangemaakt
  • reageert op dit bericht
  • leest voor meer dan 4 minuten

Of als je het topic als volgen hebt gemarkeerd of hebt bekeken via het notificatie onderaan elk bericht.

Bezoek jouwvoorkeuren om dit te veranderen

' bottom: latest: "Er zijn geen recente topics." hot: "Er zijn geen polulaire topics meer." @@ -955,6 +1038,12 @@ nl: create: 'Nieuw topic' create_long: 'Maak een nieuw topic' private_message: 'Stuur een bericht' + archive_message: + help: 'Verplaats berichten naar jouw archief ' + title: 'Archiveren ' + move_to_inbox: + title: 'Verplaats naar Postvak In' + help: 'Verplaats het bericht terug naar Postvak in' list: 'Topics' new: 'nieuw topic' unread: 'ongelezen' @@ -1005,6 +1094,7 @@ nl: auto_close_title: 'Instellingen voor automatisch sluiten' auto_close_save: "Opslaan" auto_close_remove: "Sluit deze topic niet automatisch" + auto_close_immediate: "De laatste post in dit topic is al %{hours} uur oud, dus dit topic wordt meteen gesloten." progress: title: voortgang van topic go_top: "bovenaan" @@ -1096,14 +1186,24 @@ nl: unpin_until: "Zet deze topic niet langer bovenaan in de {{categoryLink}} categorie of wacht tot %{until}." pin_note: "Gebruikers kunnen het vastpinnen voor dit topic voor zichzelf ongedaan maken." pin_validation: "Een datum is vereist om deze topic vast te pinnen." + not_pinned: "Er zijn geen topics vastgepind in {{categoryLink}}." + already_pinned: + one: "Topics welke vastgepind zijn in {{categoryLink}}: {{count}}" + other: "Topics welke vastgepind zijn in {{categoryLink}}: {{count}}." pin_globally: "Zet deze topic bovenaan in alle topic lijsten tot" confirm_pin_globally: "Je hebt al {{count}} globaal vastgepinde topics. Teveel vastgepinde topics kunnen storend zijn voor nieuwe en anonieme gebruikers. Weet je zeker dat je nog een topic globaal wilt vastpinnen?" unpin_globally: "Zorg ervoor dat dit topic niet langer bovenaan alle topic lijsten komt." unpin_globally_until: "Zet deze topic niet langer bovenaan in alle topic lijsten of wacht tot %{until}." global_pin_note: "Gebruikers kunnen dit topic voor zichzelf ontpinnen." + not_pinned_globally: "Er zijn geen globaal vastgepinde topics." + already_pinned_globally: + one: "Topics welke globaal vastgepind zijn: {{count}}" + other: "Topics welke globaal vastgepind zijn: {{count}}." make_banner: "Zorg ervoor dat dit topic een banner wordt welke bovenaan alle pagina's komt." remove_banner: "Verwijder de banner die bovenaan alle pagina's staat." banner_note: "Gebruikers kunnen de banner negeren door deze te sluiten. Er kan maar een topic gebannered zijn." + no_banner_exists: "Er is geen banner topic." + banner_exists: "Er is op het ogenblik een banner topic." inviting: "Uitnodigen..." automatically_add_to_groups_optional: "Deze uitnodiging geeft ook toegang tot de volgende groepen: (optioneel, alleen voor beheerders)" automatically_add_to_groups_required: "Deze uitnodiging geeft ook toegang tot de volgende groepen: (Verplicht, alleen voor beheerders)" @@ -1115,6 +1215,7 @@ nl: success: "Deze gebruiker is uitgenodigd om in de conversatie deel te nemen." error: "Sorry, er is iets misgegaan bij het uitnodigen van deze persoon" group_name: "groepsnaam" + controls: "Topic Controls" invite_reply: title: 'Uitnodigen' username_placeholder: "gebruikersnaam" @@ -1209,6 +1310,10 @@ nl: has_likes_title: one: "iemand vind dit bericht leuk" other: "{{count}} mensen vinden dit bericht leuk" + has_likes_title_only_you: "Je vind dit bericht leuk" + has_likes_title_you: + one: "jij en 1 anderen vinden dit leuk" + other: "jij en {{count}} anderen vinden dit leuk" errors: create: "Sorry, er is iets misgegaan bij het plaatsen van je bericht. Probeer het nog eens." edit: "Sorry, er is iets misgegaan bij het bewerken van je bericht. Probeer het nog eens." @@ -1227,6 +1332,8 @@ nl: yes_value: "Ja, verwijderen" via_email: "dit bericht kwam binnen via e-mail" whisper: "deze posts zijn alleen toegankelijk voor moderators" + wiki: + about: "dit bericht is een wiki" archetypes: save: 'Bewaar instellingen' controls: @@ -1276,17 +1383,14 @@ nl: like: "Vind het niet meer leuk" vote: "Stem niet meer" people: - off_topic: "{{icons}} markeerden dit als off-topic" - spam: "{{icons}} markeerden dit als spam" - spam_with_url: "{{icons}} markeerde dit als spam" - inappropriate: "{{icons}} markeerden dit als ongepast" - notify_moderators: "{{icons}} lichtte moderators in" - notify_moderators_with_url: "{{icons}} lichtte moderators in" - notify_user: "{{icons}} verstuurde een bericht" - notify_user_with_url: "{{icons}} verstuurde een bericht" - bookmark: "{{icons}} voegden dit toe aan hun bladwijzers" - like: "{{icons}} vinden dit leuk" - vote: "{{icons}} hebben hier op gestemd" + off_topic: "heeft dit als off-topic gemeld" + spam: "markeerde dit als spam" + inappropriate: "markeerde dit als ongepast" + notify_moderators: "lichtte moderators in" + notify_user: "Stuur een bericht" + bookmark: "bladwijzer deze" + like: "Vind dit leuk" + vote: "stemde voor dit" by_you: off_topic: "Jij markeerde dit als off-topic" spam: "Jij markeerde dit als spam" @@ -1450,6 +1554,7 @@ nl: submit_tooltip: "Verstuur de privé markering" take_action_tooltip: "Bereik de vlag drempel direct, in plaats van het wachten op meer gemeenschapsvlaggen" cant: "Sorry, je kan dit bericht momenteel niet melden." + notify_staff: 'Licht de staf in' formatted_name: off_topic: "Het is off topic" inappropriate: "Het is ongepast" @@ -1531,6 +1636,10 @@ nl: with_topics: "%{filter} topics" with_category: "%{filter} %{category} topics" latest: + title: "Laatste" + title_with_count: + one: "Laatste (1)" + other: "Laatste ({{count}})" help: "topics met recente reacties" hot: title: "Populair" @@ -1546,9 +1655,23 @@ nl: title_in: "Categorie - {{categoryName}}" help: "alle topics gesorteerd op categorie" unread: + title: "Ongelezen" + title_with_count: + one: "Ongelezen (1)" + other: "Ongelezen ({{count}})" help: "topics die je volgt of bijhoudt met ongelezen berichten" + lower_title_with_count: + one: "1 ongelezen" + other: "{{count}} ongelezen" new: + lower_title_with_count: + one: "1 nieuw" + other: "{{count}} nieuw" lower_title: "nieuw" + title: "Nieuw" + title_with_count: + one: "Nieuw (1)" + other: "({{count}}) Nieuwe" help: "topics gemaakt in de afgelopen dagen" posted: title: "Mijn berichten" @@ -1557,6 +1680,10 @@ nl: title: "Bladwijzers" help: "topics waar je een bladwijzer aan toe hebt gevoegd" category: + title: "{{categoryName}}" + title_with_count: + one: "{{categoryName}} (1)" + other: "{{categoryName}} ({{count}})" help: "recente topics in de categorie {{categoryName}}" top: title: "Top" @@ -1636,6 +1763,7 @@ nl: refresh_report: "Ververs Rapport" start_date: "Start datum" end_date: "Eind datum" + groups: "Alle groepen" commits: latest_changes: "Laatste wijzigingen: update regelmatig!" by: "door" @@ -1732,6 +1860,8 @@ nl: primary_group: "Automatisch ingesteld als primaire groep" group_owners: Eigenaren add_owners: Eigenaren toevoegen + incoming_email: "Aangepaste inkomende email adressen " + incoming_email_placeholder: "Voer je email adres in" api: generate_master: "Genereer Master API Key" none: "Er zijn geen actieve API keys" @@ -1805,11 +1935,11 @@ nl: is_disabled: "Herstellen is uitgeschakeld in de instellingen." label: "Herstel" title: "Herstel van deze backup" - confirm: "Weet je zeker dat je van deze backup wil herstellen?" + confirm: "Weet je zeker dat je deze backup wilt terugzetten? " rollback: label: "Herstel" title: "Herstel de database naar de laatst werkende versie" - confirm: "Weet je zeker dat je de database wil herstellen naar de laatste versie?" + confirm: "Weet je zeker dat je de database wilt terugzetten naar de vorige staat?" export_csv: user_archive_confirm: "Weet je zeker dat je al je berichten wil downloaden?" success: "Exporteren is gestart, je zult gewaarschuwd worden als het proces is beeindigd." @@ -1860,6 +1990,14 @@ nl: color: "Kleur" opacity: "Doorzichtigheid" copy: "Kopieër" + email_templates: + title: "Email Sjabloon " + subject: "Onderwerp" + multiple_subjects: "Dit email sjabloon heeft meerdere onderwerpen." + body: "Body" + none_selected: "Kies een email sjabloon om te beginnen met bewerken." + revert: "Maak wijzigingen ongedaan" + revert_confirm: "Weet je zeker dat je de veranderingen ongedaan wilt maken?" css_html: title: "CSS/HTML" long_title: "CSS en HTML aanpassingen" @@ -1904,17 +2042,18 @@ nl: love: name: 'liefde' description: "De like knop kleur." - wiki: - name: 'wiki' - description: "Basiskleur die gebruikt wordt voor de achtergrond van wiki berichten." email: + title: "E-mails" settings: "Instellingen" + templates: "Sjablonen " preview_digest: "Voorbeeld digestmail" sending_test: "Testmail wordt verstuurd..." error: "FOUT - %{server_error}" test_error: "Er ging iets mis bij het versturen van de testmail. Kijk nog eens naar je mailinstellinen, controleer of je host mailconnecties niet blokkeert. Probeer daarna opnieuw." sent: "Verzonden" skipped: "Overgeslagen" + received: "Ontvangen" + rejected: "Geweigerd " sent_at: "Verzonden op" time: "Tijd" user: "Gebruiker" @@ -1932,6 +2071,32 @@ nl: last_seen_user: "Laatste online:" reply_key: "Reply key" skipped_reason: "Reden van overslaan" + incoming_emails: + from_address: "Van" + to_addresses: "Naar" + cc_addresses: "Cc" + subject: "Onderwerp" + error: "Error" + none: "Geen inkomende emails gevonden." + modal: + title: "Inkomende Email Details" + error: "Error" + return_path: "Teruggaan-Pad" + message_id: "Bericht-Id" + in_reply_to: "In-Reactie-Op" + references: "Referenties " + date: "Datum" + from: "Van" + to: "Naar" + cc: "Cc" + subject: "Onderwerp" + body: "Body" + filters: + from_placeholder: "from@example.com" + to_placeholder: "to@example.com" + cc_placeholder: "cc@example.com" + subject_placeholder: "Onderwerp.." + error_placeholder: "Error" logs: none: "Geen logs gevonden." filters: @@ -1981,6 +2146,7 @@ nl: change_site_setting: "verander instellingen" change_site_customization: "verander site aanpassingen" delete_site_customization: "verwijder site aanpassingen" + change_site_text: "Verander site tekst" suspend_user: "schors gebruiker" unsuspend_user: "hef schorsing op" grant_badge: "ken badge toe" @@ -1994,6 +2160,13 @@ nl: change_category_settings: "verander categorie instellingen" delete_category: "categorie verwijderen" create_category: "categorie creeren" + block_user: "blokkeer gebruiker" + unblock_user: "deblokkeer gebruiker" + grant_admin: "Ken Beheerdersrechten toe" + revoke_admin: "Ontneem beheerdersrechten" + grant_moderation: "Geef modereerrechten" + revoke_moderation: "Ontneem modereerrechten" + backup_operation: "backup handeling" screened_emails: title: "Gescreende e-mails" description: "Nieuwe accounts met een van deze mailadressen worden geblokkeerd of een andere actie wordt ondernomen." @@ -2060,6 +2233,9 @@ nl: pending: 'Nog niet geaccepteerde leden' newuser: 'Leden met Trust Level 0 (Nieuw lid)' basic: 'Leden met Trust Level 1 (Lid)' + member: 'Leden op Trust Level 2 (Lid)' + regular: 'Leden op Trust Level 3 (Vaste bezoeker)' + leader: 'Leden op Trust Level 4 (Leider)' staff: "Stafleden" admins: 'Administrators' moderators: 'Moderators' @@ -2092,6 +2268,7 @@ nl: moderator: "Moderator?" admin: "Beheerder?" blocked: "Geblokkeerd?" + staged: "Opvoeren?" show_admin_profile: "Beheerder" edit_title: "Wijzig titel" save_title: "Bewaar titel" @@ -2156,9 +2333,12 @@ nl: deactivate_failed: "Er ging iets mis bij het deactiveren van deze gebruiker." unblock_failed: 'Er ging iets mis bij het deblokkeren van deze gebruiker.' block_failed: 'Er ging iets mis bij het blokkeren van deze gebruiker.' + block_confirm: 'Weet je zeker dat je deze gebruikt wilt blokkeren? Deze gebruikers is dan niet meer in staat om nieuwe topics of berichten te plaatsen.' + block_accept: 'Ja, blokkeer deze gebruiker' deactivate_explanation: "Een gedeactiveerde gebruiker moet zijn e-mailadres opnieuw bevestigen." suspended_explanation: "Een geschorste gebruiker kan niet meer inloggen." block_explanation: "Een geblokkeerde gebruiker kan geen topics maken of reageren op topics." + stage_explanation: "Een opgevoerde gebruiker kan alleen via email in bepaalde topics berichten." trust_level_change_failed: "Er ging iets mis bij het wijzigen van het trust level van deze gebruiker." suspend_modal_title: "Schors gebruiker" trust_level_2_users: "Trust Level 2 leden" @@ -2169,6 +2349,7 @@ nl: unlock_trust_level: "Deblokkeer Trust Level" tl3_requirements: title: "Vereisten voor Trust Level 3" + table_title: "In de laatste %{time_period} dagen:" value_heading: "Waarde" requirement_heading: "Vereiste" visits: "Bezoeken" @@ -2229,7 +2410,15 @@ nl: confirm: 'Bevestiging' dropdown: "Uitklapbaar" site_text: + description: "Je kunt alle tekst of jouw forum aanpassen. Begin met zoeken hieronder:" + search: "Zoek voor tekst die je graag wilt bewerken." title: 'Tekst Inhoud' + edit: 'bewerk' + revert: "Maak wijzigingen ongedaan" + revert_confirm: "Weet je zeker dat je de veranderingen ongedaan wilt maken?" + go_back: "Terug naar zoeken" + recommended: "We bevelen je aan die tekst aan te passen naar je eigen ingeving. " + show_overriden: 'Bekijk alleen bewerkte instellingen' site_settings: show_overriden: 'Bekijk alleen bewerkte instellingen' title: 'Instellingen' @@ -2317,6 +2506,10 @@ nl: bad_count_warning: header: "LET OP!" text: "Er zijn vermiste toekennings-voorbeelden. Dit gebeurt als de badge query gebruikers- of bericht-ID's retourneert die niet bestaan. Dit kan onverwachte resultaten veroorzaken op een later tijdstip - kijk a.u.b. uw query goed na." + no_grant_count: "Geen badges om toe te wijzen." + grant_count: + one: "1 badge toe te wijzen." + other: "%{count} badges toe te wijzen." sample: "Voorbeeld:" grant: with: %{username} @@ -2424,6 +2617,10 @@ nl: mark_tracking: 'm, t Markeer topic als volgen' mark_watching: 'm, w Markeer topic als in de gaten houden' badges: + earned_n_times: + one: "Verdiende deze badge 1 keer" + other: "Verdiende deze badge %{count} keer" + more_with_badge: "Andere met deze badge" title: Badges allow_title: "kan als titel gebruikt worden" multiple_grant: "kan meerdere keren toegekend worden" diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml index 2d9005ccb5..cd19d4c817 100644 --- a/config/locales/client.pl_PL.yml +++ b/config/locales/client.pl_PL.yml @@ -700,8 +700,8 @@ pl_PL: value_prop: "Jeśli stworzysz konto, zapamiętamy przeczytane przez Ciebie wpisy i tematy, dzięki czemu zawsze powrócisz do odpowiedniego miejsca. Otrzymasz też powiadomienia o nowych wpisach. Dodatkowo możliwe będzie polubienie ciekawych wpisów :heartbeat:" summary: enabled_description: "Przeglądasz podsumowanie tego tematu: widoczne są jedynie najbardziej wartościowe wpisy zdaniem uczestników. " - description: "Istnieją {{count}} odpowiedzi." - description_time: "Istnieją {{count}} odpowiedzi z czasem czytania oszacowanym na {{readingTime}} minut." + description: "Istnieją {{replyCount}} odpowiedzi." + description_time: "Istnieją {{replyCount}} odpowiedzi z czasem czytania oszacowanym na {{readingTime}} minut." enable: 'Podsumuj ten temat' disable: 'Pokaż wszystkie wpisy' deleted_filter: diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml index a555464c5e..ebd3179847 100644 --- a/config/locales/client.pt.yml +++ b/config/locales/client.pt.yml @@ -100,6 +100,8 @@ pt: x_years: one: "1 ano mais tarde" other: "%{count} anos mais tarde" + previous_month: 'Mês Anterior' + next_month: 'Mês Seguinte' share: topic: 'partilhar uma hiperligação para este tópico' post: 'Mensagem #%{postNumber}' @@ -110,6 +112,8 @@ pt: email: 'enviar esta hiperligação por email' action_codes: split_topic: "dividir este tópico %{when}" + invited_user: "Convidou %{who} %{when}" + removed_user: "Removeu %{who} %{when}" autoclosed: enabled: 'fechado %{when}' disabled: 'aberto %{when}' @@ -130,6 +134,19 @@ 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." + s3: + regions: + us_east_1: "Este dos E.U.A. (Virgínia do Norte)" + us_west_1: "Oeste dos E.U.A. (California do Norte)" + us_west_2: "Oeste dos E.U.A. (Óregon)" + us_gov_west_1: "AWS GovCloud (E.U.A.)" + eu_west_1: "U.E. (Irlanda)" + eu_central_1: "U.E. (Francoforte)" + ap_southeast_1: "Ásia-Pacífico (Singapura)" + ap_southeast_2: "Ásia-Pacífico (Sydney)" + ap_northeast_1: "Ásia-Pacífico (Tóquio)" + ap_northeast_2: "Ásia-Pacífico (Seoul)" + sa_east_1: "América do Sul (São Paulo)" edit: 'editar o título e a categoria deste tópico' not_implemented: "Essa funcionalidade ainda não foi implementada, pedimos desculpa!" no_value: "Não" @@ -173,6 +190,7 @@ pt: other: "{{count}} caracteres" suggested_topics: title: "Tópicos Sugeridos" + pm_title: "Mensagens Sugeridas" about: simple_title: "Acerca" title: "Acerca de %{title}" @@ -413,6 +431,7 @@ pt: not_supported: "Não são suportadas notificações neste navegador. Desculpe." perm_default: "Ligar Notificações" perm_denied_btn: "Permissão Negada" + perm_denied_expl: "Negou a permissão para as notificações. Autorize as notificações através das configurações do seu navegador." disable: "Desativar Notificações" currently_enabled: "(atualmente ativo)" enable: "Ativar Notificações" @@ -466,6 +485,7 @@ pt: groups: "Os Meus Grupos" bulk_select: "Selecionar mensagens" move_to_inbox: "Mover para Caixa de Entrada" + move_to_archive: "Arquivo" failed_to_move: "Falha ao mover as mensagens selecionadas (talvez a sua rede esteja em baixo)" select_all: "Selecionar Tudo" change_password: @@ -624,6 +644,21 @@ pt: same_as_email: "A sua palavra-passe é a mesma que o seu email." ok: "A sua palavra-passe parece correta." instructions: "Pelo menos %{count} caracteres." + summary: + title: "Sumário" + stats: "Estatísticas" + topic_count: "Tópicos Criados" + post_count: "Mensagens Criadas" + likes_given: "Gostos Dados" + likes_received: "Gostos Recebidos" + days_visited: "Dias Visitados" + posts_read_count: "Mensagens Lidas" + top_replies: "Respostas" + top_topics: "Melhores Tópicos" + top_badges: "Melhores Distintivos" + more_topics: "Mais Tópicos" + more_replies: "Mais Respostas" + more_badges: "Mais Distintivos" associated_accounts: "Contas associadas" ip_address: title: "Último endereço IP" @@ -666,6 +701,7 @@ pt: logout: "A sua sessão estava encerrada." refresh: "Atualizar" read_only_mode: + enabled: "Este sítio encontra-se no modo só de leitura. Por favor continue a navegar mas responder, dar gostos e outras acções estão de momento desativadas." login_disabled: "A função de início de sessão está desativada enquanto o sítio se encontrar no modo só de leitura." too_few_topics_and_posts_notice: "Vamos começar esta discussão! Atualmente existem %{currentTopics} / %{requiredTopics} tópicos e %{currentPosts} / %{requiredPosts} mensagens. Novos visitantes precisam de conversações para ler e responder a." too_few_topics_notice: "Vamos começar esta discussão! Atualmente existem %{currentTopics} / %{requiredTopics} tópios. Novos visitantes precisam de algumas conversações para ler e responder a." @@ -695,8 +731,8 @@ pt: value_prop: "Quando cria uma conta, nós lembramo-nos exatamente do que leu, por isso volta sempre ao sítio onde ficou. Também recebe notificações, aqui ou por email, sempre que novas mensagens são feitas. E pode gostar de mensagens para partilhar o amor. :heartbeat:" summary: enabled_description: "Está a ver um resumo deste tópico: as mensagens mais interessantes são determinados pela comunidade." - description: "Existem {{count}} respostas." - description_time: "Existem {{count}} respostas com um tempo de leitura estimado de {{readingTime}} minutos." + description: "Existem {{replyCount}} respostas." + description_time: "Existem {{replyCount}} respostas com um tempo de leitura estimado de {{readingTime}} minutos." enable: 'Resumir Este Tópico' disable: 'Mostrar Todas As Mensagens' deleted_filter: @@ -780,6 +816,7 @@ pt: ctrl: 'Ctrl' alt: 'Alt' composer: + emoji: "Emoji :)" more_emoji: "mais..." options: "Opções" whisper: "susurro" @@ -876,6 +913,9 @@ pt: moved_post: "

{{username}} moveu {{description}}

" linked: "

{{username}} {{description}}

" granted_badge: "

Ganhou '{{description}}'

" + group_message_summary: + one: "

{{count}} mensagem na caixa de entrada do seu grupo {{group_name}}

" + other: "

{{count}} mensagens na caixa de entrada do seu grupo {{group_name}}

" alt: mentioned: "Mencionado por" quoted: "Citado por" @@ -890,6 +930,7 @@ pt: moved_post: "A sua mensagem foi movida por" linked: "Hiperligação para a sua mensagem" granted_badge: "Distintivo concedido" + group_message_summary: "Mensagens na caixa de entrada do seu grupo" popup: mentioned: '{{username}} mencionou-o em "{{topic}}" - {{site_title}}' group_mentioned: '{{username}} mencionou-o em "{{topic}}" - {{site_title}}' @@ -1721,6 +1762,7 @@ pt: refresh_report: "Atualizar relatório" start_date: "Data de Início" end_date: "Data final" + groups: "Todos os grupos" commits: latest_changes: "Últimas alterações: atualize com frequência!" by: "por" @@ -2003,13 +2045,17 @@ pt: name: 'wiki' description: "Cor base utilizada para o fundo de mensagens wiki" email: + title: "Emails" settings: "Configurações" + templates: "Templates" preview_digest: "Pré-visualizar Resumo" sending_test: "A enviar Email de teste..." error: "ERRO - %{server_error}" test_error: "Occorreu um problema no envio do email de teste. Por favor verifique novamente as suas definições de email, verifique se o seu host não está a bloquear conexões de email, e tente novamente." sent: "Enviado" skipped: "Ignorado" + received: "Recebido" + rejected: "Rejeitado" sent_at: "Enviado em" time: "Tempo" user: "Utilizador" @@ -2027,6 +2073,19 @@ pt: last_seen_user: "Último Utilizador Visto:" reply_key: "Chave de Resposta" skipped_reason: "Ignorar Motivo" + incoming_emails: + from_address: "De" + to_addresses: "Para" + cc_addresses: "Cc" + subject: "Assunto" + error: "Erro" + none: "Nenhum email de entrada encontrado." + filters: + from_placeholder: "de@exemplo.com" + to_placeholder: "para@exemplo.com" + cc_placeholder: "cc@exemplo.com" + subject_placeholder: "Assunto..." + error_placeholder: "Erro" logs: none: "Nenhuns logs encontrados." filters: @@ -2090,6 +2149,12 @@ pt: change_category_settings: "alterar configurações de categoria" delete_category: "eliminar categoria" create_category: "criar categoria" + block_user: "utilizador bloqueado" + unblock_user: "Desbloquear utilizador" + grant_admin: "conceder administração" + revoke_admin: "revogar administração" + grant_moderation: "conceder moderação" + revoke_moderation: "revogar moderação" 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." @@ -2191,6 +2256,7 @@ pt: moderator: "Moderador?" admin: "Administração?" blocked: "Bloqueado?" + staged: "Temporário?" show_admin_profile: "Administração" edit_title: "Editar Título" save_title: "Guardar Título" @@ -2255,9 +2321,12 @@ pt: deactivate_failed: "Ocorreu um problema ao desativar o utilizador." unblock_failed: 'Ocorreu um problema ao desbloquear o utilizador.' block_failed: 'Ocorreu um problema ao bloquear o utilizador.' + block_confirm: 'Tem a certeza que pretende bloquear este utilizador? Este não será capaz de criar novos tópicos ou mensagens.' + block_accept: 'Sim, bloquear este utilizador' deactivate_explanation: "Um utilizador desativado deve revalidar o seu email." suspended_explanation: "Um utilizador suspenso não pode iniciar sessão." block_explanation: "Um utilizador bloqueado não pode publicar mensagens ou iniciar tópicos." + stage_explanation: "Um utilizador em estado temporário pode apenas publicar por email em tópicos específicos." trust_level_change_failed: "Ocorreu um problema ao alterar o Nível de Confiança do utilizador." suspend_modal_title: "Utilizador Suspenso" trust_level_2_users: "Utilizadores no Nível de Confiança 2" @@ -2536,6 +2605,10 @@ pt: mark_tracking: 'm, t Acompanhar tópico' mark_watching: 'm, w Vigiar este tópico' badges: + earned_n_times: + one: "Ganhou este distintivo 1 vez" + other: "Ganhou este distintivo %{count} vezes" + more_with_badge: "Outros com este distintivo" title: Distintivos allow_title: "pode ser usado como título" multiple_grant: "pode ser premiado múltiplas vezes" diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml index 84dbeab8a2..3bb279e16f 100644 --- a/config/locales/client.pt_BR.yml +++ b/config/locales/client.pt_BR.yml @@ -688,8 +688,8 @@ pt_BR: value_prop: "Quando você cria uma conta, nós lembramos exatamente o que você leu, assim você sempre volta exatamente aonde estava. Você também recebe notificações, aqui e por e-mail, quando novas mensagens são feitas. E você pode curtir tópicos para compartilhar o amor. :heartbeat:" summary: enabled_description: "Você está vendo um sumário deste tópico: os posts mais interessantes conforme determinados pela comunidade." - description: "Há {{count}} respostas." - description_time: "Há {{count}} respostas com um tempo de leitura estimado de {{readingTime}} minutos." + description: "Há {{replyCount}} respostas." + description_time: "Há {{replyCount}} respostas com um tempo de leitura estimado de {{readingTime}} minutos." enable: 'Resumir Este Tópico' disable: 'Exibir Todas as Mensagens' deleted_filter: diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml index d0ddfd41d7..aadd4603e9 100644 --- a/config/locales/client.ro.yml +++ b/config/locales/client.ro.yml @@ -173,7 +173,7 @@ ro: sign_up: "Înregistrare" log_in: "Autentificare" age: "Vârsta" - joined: "Adăugat" + joined: "Înregistrat" admin_title: "Admin" flags_title: "Semnalare" show_more: "Detaliază" @@ -661,7 +661,7 @@ ro: network_fixed: "Se pare ca și-a revenit." server: "Ceva nu a funcționat." forbidden: "Nu sunteţi autorizat să vedeţi aceasta." - not_found: "Oops, aplicatia incearca sa incarce un URL care nu exista." + not_found: "Oops, aplicația încearcă să încarce un URL care nu există." unknown: "Ceva nu a funcționat." buttons: back: "Înapoi" @@ -698,8 +698,8 @@ ro: value_prop: "Cand creati un cont nou, vom retine exact ce ati citit, astfel continuati intotdeauna de unde ati ramas. Deasemenea primiti notificari, aici sau prin email atunci se posteaza ceva nou. Puteti \"aprecia\" postari pentru a impartasi iubire :heartbeat:" summary: enabled_description: "Vizualizați sumarul discuției: cea mai interesantă postare, așa cum a fost determinată de comunitate. Pentru toate postările, faceți click dedesubt." - description: "Există {{count}} de răspunsuri." - description_time: "Există {{count}} de răspunsuri cu timp de citit estimat la {{readingTime}} de minute." + description: "Există {{replyCount}} de răspunsuri." + description_time: "Există {{replyCount}} de răspunsuri cu timp de citit estimat la {{readingTime}} de minute." enable: 'Fă sumarul discuției' disable: 'Arată toate postările' deleted_filter: @@ -906,6 +906,7 @@ ro: category: "Caută în categoria\"{{category}}\" " topic: "Caută în această discuție" private_messages: "Caută mesaje" + new_item: "nou" go_back: 'înapoi' not_logged_in_user: 'pagina utilizatorului cu sumarul activităților și preferințelor' current_user: 'mergi la pagina proprie de utilizator' @@ -960,7 +961,7 @@ ro: new: 'discuție nouă' unread: 'necitită' new_topics: - one: '1 subiect nou' + one: 'Un subiect nou' few: '{{count}} subiecte noi' other: '{{count}} subiecte noi' unread_topics: @@ -987,7 +988,7 @@ ro: few: "aveţi {{count}} mesaje vechi necitite în această discuţie." other: "aveţi {{count}} mesaje vechi necitite în această discuţie." new_posts: - one: "este 1 mesaj nou în această discuţie de la ultima citire" + one: "este un mesaj nou în această discuţie de la ultima citire" few: "sunt {{count}} mesaje noi în această discuţie de la ultima citire" other: "sunt {{count}} mesaje noi în această discuţie de la ultima citire" likes: @@ -1055,8 +1056,8 @@ ro: actions: recover: "Rescrie discuție" delete: "Șterge Discuție" - open: "Deschide discuție" - close: "Închide discuție" + open: "Redeschide discuția" + close: "Închide discuția" multi_select: "Selectează discuţiile ..." auto_close: "Închide automat" pin: "Fixează discuţia pe pagină..." @@ -1155,6 +1156,9 @@ ro: few: "Va rugăm să alegeţi noul propietar pentru cele {{count}} mesajele postate de {{old_user}}." other: "Va rugăm să alegeţi noul propietar pentru cele {{count}} mesajele postate de {{old_user}}." instructions_warn: " aveți în vedere că nicio notificare ce privește această postare nu va fi transferabilă retroactiv către noul utilizator.
Avertisment: Acum, nicio informație ce depinde de postare nu va fi transferată noului utilizator. Folosiți cu grijă." + change_timestamp: + title: "Schimbă data publicării" + action: "schimbă data publicării" multi_select: select: 'selectează' selected: 'selectate ({{count}})' @@ -1539,8 +1543,12 @@ ro: other: "Necitite ({{count}})" help: "discuțiile pe care le vizualizați sau urmariți momentan ce includ postări necitite" new: - lower_title: "noi" - title: "Nou" + lower_title: "nou" + title: "Noi" + title_with_count: + one: "Nou (1)" + few: "Noi ({{count}})" + other: "Noi ({{count}})" help: "discuții create în ultimele zile" posted: title: "Postările mele" @@ -1772,7 +1780,7 @@ ro: title: "Dezactivearea modului doar-citire" label: "Dezactivează modul doar-citire" logs: - none: "Nu exista rapoarte..." + none: "Nu există rapoarte..." columns: filename: "Numele fișierului" size: "Mărime" diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml index 7d8afc6506..52ecb1d2eb 100644 --- a/config/locales/client.ru.yml +++ b/config/locales/client.ru.yml @@ -138,6 +138,8 @@ ru: few: "%{count} года спустя" many: "%{count} лет спустя" other: "%{count} лет спустя" + previous_month: 'Предыдущий Месяц' + next_month: 'Следующий Месяц' share: topic: 'Поделиться ссылкой на эту тему' post: 'Ссылка на сообщение №%{postNumber}' @@ -229,6 +231,7 @@ ru: other: "{{count}} букв" suggested_topics: title: "Похожие темы" + pm_title: "Похожие Сообщения" about: simple_title: "Информация" title: "Информация про %{title}" @@ -767,8 +770,8 @@ ru: value_prop: "После регистрации мы сможем запоминать, где вы закончили чтение, а когда вы заглянете в ту или иную тему снова, мы откроем ее там, где вы остановились в прошлый раз. Мы также сможем уведомлять вас о новых ответах в любимых темах в вашем личном кабинете или по электронной почте. А самое приятное - после регистрации можно ставить сердечки, тем самым выражая свою симпатию автору. :heartbeat:" summary: enabled_description: "Вы просматриваете выдержку из темы - только самые интересные сообщения по мнению сообщества." - description: "Есть {{count}} ответ(ов)." - description_time: "В теме {{count}} сообщений с ожидаемым временем чтения {{readingTime}} минут." + description: "Есть {{replyCount}} ответ(ов)." + description_time: "В теме {{replyCount}} сообщений с ожидаемым временем чтения {{readingTime}} минут." enable: 'Сводка по теме' disable: 'Показать все сообщения' deleted_filter: diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml index f8b621c609..1785589903 100644 --- a/config/locales/client.sk.yml +++ b/config/locales/client.sk.yml @@ -119,6 +119,8 @@ sk: one: "1 rok neskôr" few: "%{count} roky neskôr" other: "%{count} rokov neskôr" + previous_month: 'Predchádzajúci mesiac' + next_month: 'Nasledujúci mesiac' share: topic: 'zdieľaj odkaz na túto tému' post: 'príspevok #%{postNumber}' @@ -209,6 +211,7 @@ sk: other: "{{count}} znakov" suggested_topics: title: "Odporúčané témy" + pm_title: "Odporúčané správy" about: simple_title: "O fóre" title: "O %{title}" @@ -458,6 +461,7 @@ sk: not_supported: "Tento prehliadač nepodporuje upozornenia. Prepáčte." perm_default: "Zapnúť upozornenia" perm_denied_btn: "Prístup zamietnutý" + perm_denied_expl: "Povolenie pre zobrazenie notifikácií ste zakázali. Notifikácie povolíte v nastaveniach vášho prehliadača." disable: "Zakázať upozornenia" currently_enabled: "(momentálne povolené)" enable: "Povoliť upozornenia" @@ -511,6 +515,7 @@ sk: groups: "Moje skupiny" bulk_select: "Označ správy" move_to_inbox: "Presuň do prijatej pošty" + move_to_archive: "Archív" failed_to_move: "Zlyhalo presunutie označených správ (možno je chyba vo vašom pripojení)" select_all: "Označ všetky" change_password: @@ -759,8 +764,8 @@ sk: value_prop: "Keď si vytvoríte účet, zapamätáme si čo ste čítali, takže sa môžete vrátiť presne tam, kde ste prestali. Okrem toho dostanete upozornenie tu, aj na váš e-mail, vždy keď pribudnú nové príspevky. A môžete označiť príspevky ktoré sa vám páčia. :heartbeat:" summary: enabled_description: "Pozeráte sa na zhrnutie tejto témy: najzaujímavejšie príspevky podľa výberu komunity." - description: "Je tu {{count}} odpovedí." - description_time: "Je tu {{count}} odpovedí s priemerným časom čítania {{readingTime}} minút." + description: "Je tu {{replyCount}} odpovedí." + description_time: "Je tu {{replyCount}} odpovedí s priemerným časom čítania {{readingTime}} minút." enable: 'Zhrnutie tejto témy' disable: 'Zobraziť všetky príspevky' deleted_filter: @@ -941,6 +946,10 @@ sk: moved_post: "

{{username}} presunul {{description}}

" linked: "

{{username}} {{description}}

" granted_badge: "

Získal '{{description}}'

" + group_message_summary: + one: "

{{count}} správa vo vašej {{group_name}} schránke

" + few: "

{{count}} správy vo vašej {{group_name}} schránke

" + other: "

{{count}} správ vo vašej {{group_name}} schránke

" alt: mentioned: "Spomenutý od" quoted: "Citovaný od" @@ -955,6 +964,7 @@ sk: moved_post: "Váš príspevok bol presunutý " linked: "Odkaz na váš príspevok" granted_badge: "Priznaný odznak" + group_message_summary: "Správy v skupinovej schránke" popup: mentioned: '{{username}} vás spomenul v "{{topic}}" - {{site_title}}' group_mentioned: '{{username}} vás spomenul v "{{topic}}" - {{site_title}}' @@ -1836,6 +1846,7 @@ sk: refresh_report: "Obnoviť report" start_date: "Od" end_date: "Do" + groups: "Všetky skupiny" commits: latest_changes: "Najnov3ie zmeny. Prosime aktualizujte čo najčastejšie!" by: "podľa" @@ -2229,6 +2240,10 @@ sk: create_category: "vytvoriť kategóriu" block_user: "blokovať používateľa" unblock_user: "odblokovať používateľa" + grant_admin: "udeliť admin" + revoke_admin: "odobrať admin" + grant_moderation: "udeliť moderovanie" + revoke_moderation: "odvolať moderovanie" screened_emails: title: "Kontrolované emaily" description: "Keď niekto skúsi vytvoriť nový účet, nasledujúce emailove adresy budú preverené a registrácia bude zablokovaná, alebo bude vykonaná nejaka iná akcia. " diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml index d8fe81d4fa..85c7110c0f 100644 --- a/config/locales/client.sq.yml +++ b/config/locales/client.sq.yml @@ -615,8 +615,8 @@ sq: hide_forever: "jo faleminderit" summary: enabled_description: "You're viewing a summary of this topic: the most interesting posts as determined by the community." - description: "Janë {{count}} përgjigje." - description_time: "There are {{count}} replies with an estimated read time of {{readingTime}} minutes." + description: "Janë {{replyCount}} përgjigje." + 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' deleted_filter: diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml index 7f9de18c7d..3917f6b597 100644 --- a/config/locales/client.sv.yml +++ b/config/locales/client.sv.yml @@ -633,8 +633,8 @@ sv: hide_forever: "Nej tack" summary: enabled_description: "Sammanfattning över de inlägg som användarna tycker är mest intressanta." - description: "Det finns {{count}} svar." - description_time: "Det finns {{count}} svar med en uppskattad lästid på {{readingTime}} minuter." + description: "Det finns {{replyCount}} svar." + description_time: "Det finns {{replyCount}} svar med en uppskattad lästid på {{readingTime}} minuter." enable: 'Sammanfatta detta ämne' disable: 'Visa alla inlägg' deleted_filter: diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml index 78510ca5d0..a9a8ab6c39 100644 --- a/config/locales/client.te.yml +++ b/config/locales/client.te.yml @@ -489,8 +489,8 @@ te: last_post: చివరి టపా summary: enabled_description: "మీరు ఈ విషయపు సారాంశము చదువుతున్నారు. ఆసక్తికర టపాలు కమ్యునిటీ ఎంచుకుంటుంది. " - description: "అక్కడ మొత్తం {{count}} జవాబులు ఉన్నాయి" - description_time: "అక్కడ మొత్తం {{count}} జవాబులు ఉన్నాయి. వీటిని చదవడానికి సుమారుగా {{readingTime}} నిమిషాలు పడ్తాయి." + description: "అక్కడ మొత్తం {{replyCount}} జవాబులు ఉన్నాయి" + description_time: "అక్కడ మొత్తం {{replyCount}} జవాబులు ఉన్నాయి. వీటిని చదవడానికి సుమారుగా {{readingTime}} నిమిషాలు పడ్తాయి." enable: 'ఈ విషయాన్ని సంగ్రహించు' disable: 'అన్ని టపాలూ చూపు' deleted_filter: diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml index dd61fc96fb..140fafe2ff 100644 --- a/config/locales/client.tr_TR.yml +++ b/config/locales/client.tr_TR.yml @@ -659,8 +659,8 @@ tr_TR: value_prop: "Bir hesap oluşturduğunuzda, tam olarak neyi okuyor olduğunuzu hatırlarız, böylece her zaman okumayı bırakmış olduğunuz yere geri gelirsiniz. Ayrıca burada, yeni gönderiler yağıldığında email yoluyla bildirim alırsınız. Ve sevgiyi paylaşmak için gönderileri beğenebilirsiniz. :heartbeat:" summary: enabled_description: "Bu konunun özetini görüntülemektesiniz: topluluğun en çok ilgisini çeken gönderiler" - description: "{{count}} sayıda cevap var." - description_time: "Tahmini okunma süresi {{readingTime}} dakika olan {{count}} sayıda cevap var." + description: "{{replyCount}} sayıda cevap var." + description_time: "Tahmini okunma süresi {{readingTime}} dakika olan {{replyCount}} sayıda cevap var." enable: 'Bu Konuyu Özetle.' disable: 'Tüm Gönderileri Göster' deleted_filter: diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml index 7623c339b5..b3451cc2dd 100644 --- a/config/locales/client.vi.yml +++ b/config/locales/client.vi.yml @@ -698,8 +698,8 @@ vi: value_prop: "Khi bạn tạo tài khoản, website nhớ chính xác những gì bạn đã đọc, vì vậy bạn sẽ luôn trở lại đúng nơi đã rời đi. Bạn cũng có thể nhận thông báo ở đây hoặc qua email mỗi khi có bài viết mới. Bạn cũng có thể like bài viết để chia sẻ cảm xúc của mình. :heartbeat:" summary: enabled_description: "Bạn đang xem một bản tóm tắt của chủ đề này: các bài viết thú vị nhất được xác định bởi cộng đồng." - description: "Có {{count}} trả lời" - description_time: "Đây là {{count}} trả lời tương ứng với thời gian đọc {{readingTime}} phút." + description: "Có {{replyCount}} trả lời" + description_time: "Đây là {{replyCount}} trả lời tương ứng với thời gian đọc {{readingTime}} phút." enable: 'Tóm tắt lại chủ đề' disable: 'HIển thị tất cả các bài viết' deleted_filter: diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml index e65ef2746d..2ac5a03f3b 100644 --- a/config/locales/client.zh_CN.yml +++ b/config/locales/client.zh_CN.yml @@ -58,7 +58,7 @@ zh_CN: almost_x_years: other: "近%{count}年" date_month: "MMMDo" - date_year: "YY-MM-D" + date_year: "YY年MMM" medium: x_minutes: other: "%{count}分钟" @@ -93,6 +93,8 @@ zh_CN: email: '用电子邮件发送这个链接' action_codes: split_topic: "于%{when}分割了该主题" + invited_user: "于%{when}邀请%{who}" + removed_user: "于%{when}移除%{who}" autoclosed: enabled: '于%{when}关闭' disabled: '于%{when}开启' @@ -161,7 +163,7 @@ zh_CN: weekly: "每周" every_two_weeks: "每两周" every_three_days: "每三天" - max_of_count: "最多 {{count}}" + max_of_count: "不超过 {{count}}" alternation: "或" character_count: other: "%{count} 个字符" @@ -172,8 +174,8 @@ zh_CN: simple_title: "关于" title: "关于%{title}" stats: "站点统计" - our_admins: "我们的管理员们" - our_moderators: "我们的版主们" + our_admins: "我们的管理员" + our_moderators: "我们的版主" stat: all_time: "所有时间内" last_7_days: "7 天以内" @@ -184,7 +186,7 @@ zh_CN: user_count: "新用户" active_user_count: "活跃用户" contact: "联系我们" - contact_info: "在遇到影响站点的重大错误或者紧急事件时，请通过 %{contact_info} 联系我们。" + contact_info: "当有重大或者紧急事件时，请通过 %{contact_info} 联系我们。" bookmarked: title: "书签" clear_bookmarks: "删除书签" @@ -199,7 +201,7 @@ zh_CN: remove: "删除书签" confirm_clear: "你确定要删除该主题的所有书签吗？" topic_count_latest: - other: "{{count}} 个新主题或更新的主题。" + other: "{{count}} 个近期的主题或更新的主题。" topic_count_unread: other: "{{count}} 未读主题。" topic_count_new: @@ -216,14 +218,14 @@ zh_CN: uploaded: "上传完成！" enable: "启用" disable: "禁用" - undo: "重做" + undo: "重置" revert: "撤销" failed: "失败" switch_to_anon: "匿名模式" switch_from_anon: "退出匿名模式" banner: close: "隐藏横幅。" - edit: "编辑横幅>>" + edit: "编辑该横幅 >>" choose_topic: none_found: "没有找到主题。" title: @@ -242,7 +244,7 @@ zh_CN: has_pending_posts: other: "这个主题有 {{count}} 个帖子等待审核" confirm: "保存修改" - delete_prompt: "你确定要删除%{username}？这将删除他们的所有帖子并封禁这个邮箱和 IP 地址。" + delete_prompt: "你确定要删除%{username}吗？这将删除他们的所有帖子并封禁这个邮箱和 IP 地址。" approval: title: "帖子需要审核" description: "我们已经保存了你的帖子，不过帖子需要由管理员先审核才能显示。请耐心。" @@ -284,11 +286,11 @@ zh_CN: other: "%{count} 位用户" groups: empty: - posts: "此小组成员没有回复" - members: "此小组没有成员" - mentions: "此小组没有通知" - messages: "此小组没有消息" - topics: "此小组成员没有主题帖" + posts: "此小组的成员没有发表过帖子。" + members: "此小组没有成员。" + mentions: "此小组没有被提及过。" + messages: "此小组没有发送过消息。" + topics: "此小组的成员没有发表过主题。" add: "添加" selector_placeholder: "添加成员" owner: "所有者" @@ -401,9 +403,7 @@ zh_CN: perm_denied_btn: "拒绝授权" perm_denied_expl: "你拒绝了通知提醒的权限。设置浏览器允许通知提醒。" disable: "禁用通知" - currently_enabled: "（目前已启用）" enable: "启用通知" - currently_disabled: "（目前已禁用）" each_browser_note: "注意：你必须在任何你使用的浏览器中更改这项设置。" dismiss_notifications: "标记所有为已读" dismiss_notifications_tooltip: "标记所有未读通知为已读" @@ -538,12 +538,18 @@ zh_CN: title: "用户资料徽章" website: "网站" email_settings: "电子邮箱" + email_previous_replies: + title: "包括邮件底下的以前的回复" + unless_emailed: "除非曾经发送过" + always: "总是" + never: "从不" email_digests: title: "当我不访问时，向我的邮箱发送最新信息：" daily: "每天" every_three_days: "每三天" weekly: "每周" every_two_weeks: "每两周" + email_in_reply_to: "在邮件中包含回复的摘要文本" email_direct: "当有人引用我、回复我的帖子，@提及你或邀请你至主题时发送一封邮件给我" email_private_messages: "当有人给发消息给我时发送一封邮件给我" email_always: "即使我在论坛中活跃时也发送电子邮件提醒给我" @@ -696,8 +702,8 @@ zh_CN: value_prop: "当你创建了账户，我们能准确地追踪你的阅读进度，所以你能够在下一次访问时回到你上次阅读到的地方。你也可以在有新帖子的时候收到网页和邮件通知。并且你可以赞任何帖子来分享你的感谢。:heartbeat:" summary: enabled_description: "你正在查看这个主题的概括版本：由社群认定的最有意思的帖子。" - description: "有 {{count}} 个回复。" - description_time: "主题有 {{count}} 个回复，大约要花 {{readingTime}} 分钟阅读。" + description: "有 {{replyCount}} 个回复。" + description_time: "有 {{replyCount}} 个回复，大约要花 {{readingTime}} 分钟阅读。" enable: '概括本主题' disable: '显示所有帖子' deleted_filter: @@ -964,7 +970,7 @@ zh_CN: selected: other: "你已经选择了 {{count}}个主题" none: - unread: "你没有未阅主题。" + unread: "你没有未读主题。" new: "你没有新主题可读。" read: "你尚未阅读任何主题。" posted: "你尚未在任何主题中发帖。" @@ -975,8 +981,8 @@ zh_CN: top: "没有最佳主题。" search: "没有搜索结果。" educate: - new: '

近期的主题将在这里显示。

默认情况下，近两天创建的主题是近期主题，并会显示一个新的标识。

你可以在你的设置中改变这一行为。

' - unread: '

这里是你的未读主题。

默认情况下，下述主题将被认为是未读的，并会显示未读数目：1 如果你：

  • 创建了该主题
  • 回复了该主题
  • 阅读该主题超过 4 分钟

或者你在主题底部的通知控制中选择了追踪或监视。

你可以改变你的用户设置。

' + new: '

这里显示了对于你的近期主题。

默认情况下，下述主题将被认为是近期发表的，如果他们在这 2 天内才创建，还会显示一个近期标志。

访问你的用户设置修改。

' + unread: '

这里显示了你的未读主题。

默认情况下，下述主题将被认为是未读的，并且会在旁边显示未读的数量1。如果你：

  • 创建了该主题
  • 回复了该主题
  • 阅读该主题超过 4 分钟

或者你在主题底部的通知控制中选择了追踪或监视。

访问你的用户设置修改

' bottom: latest: "没有更多主题可看了。" hot: "没有更多热门主题可看了。" @@ -994,7 +1000,7 @@ zh_CN: change_notification_state: "您现在的提醒状态是" filter_to: "本主题中的 {{post_count}} 帖" create: '新主题' - create_long: '创建一个新主题' + create_long: '创作新主题' private_message: '发送消息' archive_message: help: '移动消息到存档' @@ -1277,7 +1283,7 @@ zh_CN: save: '保存选项' controls: reply: "开始给本帖撰写回复" - like: "赞本帖" + like: "点个赞" has_liked: "你已经赞了本帖" undo_like: "撤销赞" edit: "编辑本帖" @@ -1295,8 +1301,8 @@ zh_CN: admin: "帖子管理" wiki: "使其成为维基帖子" unwiki: "使其成为普通帖子" - convert_to_moderator: "增加职员颜色" - revert_to_regular: "移除职员颜色" + convert_to_moderator: "添加管理人员颜色标记" + revert_to_regular: "移除管理人员颜色标记" rebake: "重建 HTML" unhide: "显示" change_owner: "更改所有权" @@ -1320,17 +1326,14 @@ zh_CN: like: "撤销赞" vote: "撤销投票" people: - off_topic: "{{icons}} 标记为偏离主题" - spam: "{{icons}} 标记为垃圾" - spam_with_url: "{{icons}} 标记为垃圾信息" - inappropriate: "{{icons}} 标记此为不当内容" - notify_moderators: "{{icons}} 向版主报告它" - notify_moderators_with_url: "{{icons}} 通知了版主" - notify_user: "{{icons}} 发送了一个消息" - notify_user_with_url: "{{icons}} 发送了一个消息" - bookmark: "{{icons}} 对它做了书签" - like: "{{icons}} 赞了它" - vote: "{{icons}} 对它投票" + off_topic: "标记为偏离主题" + spam: "标记为垃圾信息" + inappropriate: "标记为不当内容" + notify_moderators: "通知版主" + notify_user: "发送消息" + bookmark: "书签收藏" + like: "赞了它" + vote: "已给本帖投票" by_you: off_topic: "你报告它偏离主题" spam: "你报告它为垃圾信息" @@ -1458,14 +1461,14 @@ zh_CN: title: "追踪" description: "你将会自动追踪这些分类中的所有新主题。你会在别人@你或回复你的帖子时才会收到通知，并且新帖数量也将在这些主题后显示。" regular: - title: "常规" + title: "普通" description: "如果某人@你或者回复你，你将收到通知。" muted: title: "免打扰" description: "你不会收到这些分类中的任何新主题通知，并且他们将不会出现在最新列表中。" flagging: title: '感谢帮助社群远离邪恶！' - private_reminder: '标记是不公开的，只有职员才可以见到' + private_reminder: '标记是不公开的，只有管理人员才可以见到' action: '报告帖子' take_action: "立即执行" notify_action: '消息' @@ -1494,7 +1497,7 @@ zh_CN: notify_action: "消息" topic_map: title: "主题概要" - participants_title: "频繁发帖者" + participants_title: "主要发帖者" links_title: "热门链接" links_shown: "显示所有 {{totalLinks}} 个链接..." clicks: @@ -1843,7 +1846,7 @@ zh_CN: is_disabled: "站点设置中禁用了恢复功能。" label: "恢复" title: "恢复该备份" - confirm: "你确定要重置该备份吗？" + confirm: "你确定要从该备份中恢复吗？" rollback: label: "回滚" title: "将数据库回滚到之前的工作状态" @@ -1856,7 +1859,7 @@ zh_CN: button_text: "导出" button_title: user: "以CSV格式导出所有用户列表" - staff_action: "以CSV格式导出所有职员操作历史记录" + staff_action: "以CSV格式导出所有管理人员操作历史记录" screened_email: "以 CSV 格式导出所有已显示的电子邮件列表。" screened_ip: "以 CSV 格式导出所有已显示的IP地址列表。" screened_url: "以 CSV 格式导出所有已显示的URL列表。" @@ -1916,7 +1919,7 @@ zh_CN: new_name: "新的颜色方案" copy_name_prefix: "复制于" delete_confirm: "删除这个颜色方案？" - undo: "重做" + undo: "重置" undo_title: "撤销你对这个颜色的编辑至上一次保存的状态。" revert: "撤销" revert_title: "重置这个颜色至 Discourse 的默认颜色方案" @@ -1950,9 +1953,6 @@ zh_CN: love: name: '赞' description: "赞按钮的颜色。" - wiki: - name: '维基编辑' - description: "维基帖子的背景颜色" email: title: "邮件" settings: "设置" @@ -1989,6 +1989,19 @@ zh_CN: subject: "主题" error: "错误" none: "没有找到进站邮件。" + modal: + title: "进站邮件详情" + error: "错误" + return_path: "Return-Path" + message_id: "Message-Id" + in_reply_to: "In-Reply-To" + references: "References" + date: "日期" + from: "来自" + to: "发至" + cc: "抄送" + subject: "主题" + body: "内容" filters: from_placeholder: "from@example.com" to_placeholder: "to@example.com" @@ -2064,6 +2077,7 @@ zh_CN: revoke_admin: "撤销管理员权限" grant_moderation: "授予版主权限" revoke_moderation: "撤销版主权限" + backup_operation: "备份操作" screened_emails: title: "被屏蔽的邮件地址" description: "当有人试图用以下邮件地址注册时，将受到阻止或其它系统操作。" @@ -2113,7 +2127,7 @@ zh_CN: new: "新建" active: "活跃" pending: "待定" - staff: '职员' + staff: '管理人员' suspended: '禁止登录' blocked: '禁止参与讨论' suspect: '怀疑' @@ -2130,8 +2144,8 @@ zh_CN: basic: '信用等级为1的用户（基本用户）' member: '信用等级为2的用户（成员）' regular: '信用等级为3的用户（活跃）' - leader: '信用等级为4的用户（领导）' - staff: "职员" + leader: '信用等级为4的用户（资深）' + staff: "管理人员" admins: '管理员' moderators: '版主' blocked: '被封用户' @@ -2232,16 +2246,16 @@ zh_CN: trust_level_change_failed: "改变用户等级时出现了一个问题。" suspend_modal_title: "被禁用户" trust_level_2_users: "二级信任等级用户" - trust_level_3_requirements: "三级信任等级需求" + trust_level_3_requirements: "信任等级 3 要求" trust_level_locked_tip: "信任等级已经被锁定，系统将不会升降用户的信任等级" trust_level_unlocked_tip: "信任等级已经解锁，系统将自动升降用户的信任等级" lock_trust_level: "锁定信任等级" unlock_trust_level: "解锁信任等级" tl3_requirements: - title: "3 级信任等级的需求" + title: "信任等级 3 的要求" table_title: "在最近%{time_period}天：" value_heading: "价值" - requirement_heading: "需求" + requirement_heading: "要求" visits: "访问" days: "天数" topics_replied_to: "回复的主题" @@ -2253,7 +2267,7 @@ zh_CN: flagged_by_users: "标记的用户" likes_given: "给出的赞" likes_received: "收到的赞" - likes_received_days: "收到的赞：每天" + likes_received_days: "收到的赞：独立天数" likes_received_users: "收到的赞：每用户" qualifies: "符合等级3的信用度" does_not_qualify: "未符合等级3的信用度" @@ -2545,7 +2559,7 @@ zh_CN: name: 活跃用户 description: 已授予重分类、重命名、跟踪链接和贵宾室 leader: - name: 领导 + name: 资深 description: 已授予 全局编辑、固定、关闭、存档、分割和合并 welcome: name: 欢迎 diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml index 708c7307f7..3100d87adb 100644 --- a/config/locales/client.zh_TW.yml +++ b/config/locales/client.zh_TW.yml @@ -601,8 +601,8 @@ zh_TW: sign_up: "註冊" summary: enabled_description: "你正在檢視此討論話題的摘要：在這個社群裡最熱門的文章。" - description: "共有 {{count}} 個回覆。" - description_time: "共有 {{count}} 個回覆，大約需要 {{readingTime}} 分鐘閱讀。" + description: "共有 {{replyCount}} 個回覆。" + description_time: "共有 {{replyCount}} 個回覆，大約需要 {{readingTime}} 分鐘閱讀。" enable: '以摘要檢視此討論話題' disable: '顯示所有文章' deleted_filter: diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml index f6d09f6179..8a9a652988 100644 --- a/config/locales/server.ar.yml +++ b/config/locales/server.ar.yml @@ -931,7 +931,6 @@ ar: suppress_reply_directly_above: "لا تظهر للتوسع في الرد لعلى وظيفة عندما يكون هناك سوى رد واحد مباشرة فوق هذا المنصب." suppress_reply_when_quoting: "لا تظهر للتوسع في الرد لعلى وظيفة عندما يكون هناك سوى رد واحد مباشرة فوق هذا المنصب." max_reply_history: "الحد الأقصى لعدد الردود على توسيع عند توسيع في الرد ل" - experimental_reply_expansion: "إخفاء ردود المتوسطة عند توسيع ردا على (تجريبي)" topics_per_period_in_top_summary: "عدد من أهم الموضوعات هو مبين في موجز أعلى الافتراضية المواضيع." topics_per_period_in_top_page: "عدد من أهم الموضوعات هو مبين في موجز أعلى الافتراضية المواضيع." redirect_users_to_top_page: "إعادة توجيه تلقائيا للمستخدمين الجدد وغائبة لمدة طويلة إلى أعلى الصفحة." diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml index 34bef2d429..a65ccd1097 100644 --- a/config/locales/server.de.yml +++ b/config/locales/server.de.yml @@ -187,7 +187,7 @@ de: - Verwende gebräuchliche, gut definierte Wörter, damit dein Thema *gefunden* werden kann. Wähle eine Kategorie, um es mit ähnlichen Themen zu gruppieren. - Für mehr Tips, [siehe unsere Community-Richtlinien](/guidelines). Dieses Panel wird nur bei deinen ersten %{education_posts_text} angezeigt. + Mehr Tipps findest du in [unseren Community-Richtlinien](/guidelines). Dieses Panel wird nur bei deinen ersten %{education_posts_text} angezeigt. new-reply: | Willkommen bei %{site_name} — **Danke für deinen Beitrag zum Thema!** @@ -676,7 +676,6 @@ de: min_search_term_length: "Minimale zulässige Länge der Suche in Zeichen." search_tokenize_chinese_japanese_korean: "Zwinge die Suche, Chinesisch, Japanisch und Koreanisch zu erkennen, auch wenn die Seite keine dieser Sprachen nutzt" allow_uncategorized_topics: "Erlaube Themen ohne Kategorie zu erstellen. ACHTUNG: Falls es unkategorisierte Themen gibt, musst du sie neu kategorisieren, bevor du diese Option abschaltest." - uncategorized_description: "Beschreibung der Kategorie für unkategorisierte Themen. Leer lassen, wenn keine Beschreibung erwünscht ist." allow_duplicate_topic_titles: "Erlaube Themen mit identischen und doppelten Titeln." unique_posts_mins: "Minuten, nach denen ein Nutzer denselben Inhalt noch einmal posten kann." educate_until_posts: "Zeige das Hilfe-Panel im Editor sobald ein Nutzer einen seiner ersten (n) Beiträge zu schreiben beginnt." @@ -762,7 +761,6 @@ de: suppress_reply_directly_above: "Verstecke das erweiterbare „Antwort auf“-Feld in einem Beitrag, wenn der beantwortete Beitrag direkt darüber angezeigt wird." suppress_reply_when_quoting: "Verstecke das erweiterbare „Antwort auf“-Feld in einem Beitrag, wenn der Beitrag den beantworteten Beitrag zitiert." max_reply_history: "Maximale Anzahl an Antworten beim Ausklappen von in-reply-to" - experimental_reply_expansion: "Verstecke dazwischenliegende Beiträge, wenn der beantwortete Beitrag erweitert wird (experimentell)." topics_per_period_in_top_summary: "Anzahl der Themen, die in der Top-Themübersicht angezeigt werden." topics_per_period_in_top_page: "Anzahl der Themen, die in der mit \"Mehr zeigen\" erweiterten Top-Themenübersicht angezeigt werden." redirect_users_to_top_page: "Verweise neue und länger abwesende Nutzer automatisch zur Top Übersichtsseite" @@ -1014,7 +1012,7 @@ de: feed_polling_enabled: "NUR WENN EINGEBETTET: Bestimmt, ob Inhalte eines RSS-/ATOM-Feeds als zusätzliche Beiträge dargestellt werden." feed_polling_url: "NUR WENN EINGEBETTET: URL des einzubettenden RSS-/ATOM-Feeds." embed_by_username: "Discourse-Benutzername des Benutzers, der die eingebetteten Themen erstellt." - embed_username_key_from_feed: "Schlüsse, um Discourse-Benutzernamen aus Feed zu ziehen." + embed_username_key_from_feed: "Schlüssel, um Discourse-Benutzernamen aus Feed zu ermitteln." embed_truncate: "Kürze die eingebetteten Beiträge" embed_post_limit: "Maximale Anzahl der Beiträge die eingebettet werden." embed_username_required: "Der Benutzername ist für die Betragserstellung notwendig" @@ -1078,7 +1076,6 @@ de: moved_post: "%{display_username} hat deinen Beitrag nach %{link} verschoben." private_message: "%{display_username} hat Dir eine Nachricht geschickt: %{link}" invited_to_private_message: "%{display_username} hat dich zu einer Unterhaltung eingeladen: %{link}" - invited_to_topic: "%{display_username} hat dich in ein Thema eingeladen: %{link}" invitee_accepted: "%{display_username} hat deine Einladung angenommen." linked: "%{display_username} hat dich auf %{link} verlinkt" granted_badge: "Sie haben %{link} verdient" @@ -1175,8 +1172,6 @@ de: characters: "darf nur aus Zahlen und Buchstaben bestehen" unique: "muss eindeutig sein" blank: "muss angegeben werden" - must_begin_with_alphanumeric: "muss mit einem Buchstaben, einer Zahl oder einem Unterstrich beginnen" - must_end_with_alphanumeric: "muss mit einem Buchstaben, einer Zahl oder einem Unterstrich enden" must_not_contain_two_special_chars_in_seq: "muss keine Reihenfolge von 2 oder mehr Sonderzeichen (.-_) haben" must_not_end_with_confusing_suffix: "Darf nicht mit einem Suffix wie json, png, etc. enden." email: @@ -1185,6 +1180,10 @@ de: ip_address: blocked: "Von Deiner IP Adresse aus ist es nicht erlaub sich zu registrieren." max_new_accounts_per_registration_ip: "Weitere Registrierungen sind von deiner IP-Adresse aus nicht gestattet (limit erreicht). Kontaktiere einen Administrator mit dem Problem damit er dir helfen kann." + flags_reminder: + subject_template: + one: "Eine Markierung wartet auf Bearbeitung" + other: "%{count} Markierungen warten auf Bearbeitung" unsubscribe_mailer: subject_template: "Bestätige, dass du nicht länger E-Mail Updates von %{site_title} erhalten möchtest" text_body_template: | @@ -1236,87 +1235,10 @@ de: (Wenn der Link abgelaufen ist, wähle "Passwort vergessen" aus, wenn du dich mit deiner E-Mail Adresse einloggen möchtest.) test_mailer: subject_template: "[%{site_name}] Test der Mailzustellbarkeit" - text_body_template: | - Das ist eine zu Testzwecken versendete E-Mail von - - [**%{base_url}**][0] - - E-Mail-Zustellbarkeit ist komplex. Hier sind einige wichtige Dinge, die du überprüfen solltest: - - - Sei dir *sicher*, dass in den Einstellungen die `notification email` auf die korrekte Absender-Adresse gesetzt ist. **Der in der „From“ Adresse angegebene Domainname wird für die Überprüfung der versendeten E-Mails herangezogen.** - - - Du solltest wissen, wie du den Quelltext einer E-Mail in deinem E-Mail-Client betrachten kannst, um die E-Mail-Header auf Hinweise zu untersuchen. Bei Gmail findest du den Menüpunkt „Original anzeigen“ im Dropdown-Menü in der rechten, oberen Ecke jeder E-Mail. - - - **WICHTIG:** Hat dein Internetprovider Reverse-DNS-Einträge eingetragen, um den zum Versenden von E-Mails verwendeten IP-Adressen die passenden Domainnamen zuzuordnen? Du kannst [den PTR-Eintrag hier testen][2]. Wenn Dein Internetprovider nicht die passenden Reverse-DNS-Einträge eingetragen hat, ist es sehr unwahrscheinlich, dass deine E-Mails zugestellt werden. - - - Ist der [SPF-Eintrag][8] deiner Domain korrekt? Du kannst [den SPF-Eintrag hier testen][1]. Beachte, dass TXT der korrekte, offizielle Typ für SPF-Einträge ist. - - - Ist der [DKIM-Eintrag][3] deiner Domain korrekt? Das verbessert die Zustellbarkeit der E-Mails erheblich. Du kannst den [DKIM-Eintrag hier testen][7]. - - - Wenn du deinen eigenen Mailserver betreibst, überprüfe, dass die IP-Adressen deines Mailservers [nicht auf einer schwarzen Liste stehen][4]. Prüfe auch dass dieser definitiv einen vollständig qualifizierten Hostnamen in seinen HELO-Nachrichten verwendet, der per DNS aufgelöst werden kann. Falls das nicht der Fall ist, werden deine E-Mails von vielen E-Mail-Anbietern abgelehnt. - - (Der *einfache* Weg ist sich bei [Mandrill][md] oder [Mailgun][mg] oder [Mailjet][mj] anzumelden. Deren großzügiges, kostenloses Abo zum E-Mail-Versand ist für kleine Foren ausreichend. Du musst allerdings trotzdem die SPF und DKIM Einträge in deinem DNS einrichten!) - - Wir hoffen, dass der Mail-Zustelltest erfolgreich war! - - Viel Erfolg, - - deine Freunde von [Discourse](http://www.discourse.org) - - [0]: %{base_url} - [1]: http://www.kitterman.com/spf/validate.html - [2]: http://mxtoolbox.com/ReverseLookup.aspx - [3]: http://www.dkim.org/ - [4]: http://whatismyipaddress.com/blacklist-check - [7]: http://dkimcore.org/tools/dkimrecordcheck.html - [8]: http://www.openspf.org/SPF_Record_Syntax - [md]: http://mandrill.com - [mg]: http://www.mailgun.com/ - [mj]: https://www.mailjet.com/pricing new_version_mailer: subject_template: "[%{site_name}] Neue Discourse Version, Update verfügbar" - text_body_template: | - Eine neue Version von [Discourse](http://www.discourse.org) ist verfügbar. - - Deine Version: %{installed_version} - Neue Version: **%{new_version}** - - Das kannst du jetzt tun: - - - Schaue dir an was neu ist [GitHub changelog](https://github.com/discourse/discourse/commits/master). - - - Update direkt von deinem Browser aus über [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). - - - Besuche [meta.discourse.org](http://meta.discourse.org) für Neuigkeiten, Diskussionen, und Support für Discourse. new_version_mailer_with_notes: subject_template: "[%{site_name}] Update verfügbar" - text_body_template: | - Eine neue Version von [Discourse](http://www.discourse.org) ist verfügbar. - - Deine Version: %{installed_version} - Neue Version: **%{new_version}** - - Das kannst du jetzt tun: - - - Schaue dir an was neu ist [GitHub changelog](https://github.com/discourse/discourse/commits/master). - - - Update direkt von deinem Browser aus über [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). - - - Besuche [meta.discourse.org](http://meta.discourse.org) für Neuigkeiten, Diskussionen, und Support für Discourse. - - ### Release notes - - %{notes} - flags_reminder: - flags_were_submitted: - one: "Folgende Markierungen wurden währen der letzten Stunden vorgenommen." - other: "Folgende Markierungen wurden währen der letzten %{count} Stunden vorgenommen." - please_review: "Bitte überprüfe sie." - post_number: "Beitrag" - how_to_disable: 'Die Benachrichtungen für markierte Beiträge kann deaktiviert oder in ihrer Häufigkeit geändert werden mittels des Wertes unter "notify about flags after".' - subject_template: - one: "Eine Markierung wartet auf Bearbeitung" - other: "%{count} Markierungen warten auf Bearbeitung" queued_posts_reminder: subject_template: one: "[%{site_name}] %{count} auf Freischaltung wartender Beitrag." @@ -1453,8 +1375,22 @@ de: Dein Benutzerkonto, assoziiert mit dieser E-Mail Adresse ist nicht aktiviert. Bitte aktiviere dein Konto bevor du E-Mails sendest. email_reject_reply_user_not_matching: subject_template: "[%{site_name}] E-Mail Problem -- Antwort Nutzer stimmt nicht überein" + text_body_template: | + Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (mit dem Titel %{former_title}) hat nicht funktioniert. + + Deine Antwort wurde von einer anderen E-Mail-Adresse versandt als wir erwartet haben, weshalb wir nicht sicher wissen ob das die gleiche Person ist. Probiere eine andere Absenderadresse oder wende dich an einen Mitarbeiter. + email_reject_no_message_id: + subject_template: "[%{site_name}] E-Mail-Problem -- Keine Message-Id" + text_body_template: | + Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (mit dem Titel %{former_title}) hat nicht funktioniert. + + Wir konnten keinen `Message-Id`-Header in der E-Mail finden. Probiere eine andere Absenderadresse oder wende dich an einen Mitarbeiter. email_reject_no_account: subject_template: "[%{site_name}] E-Mail-Problem -- Unbekanntes Konto" + text_body_template: | + Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (mit dem Titel %{former_title}) hat nicht funktioniert. + + Wir konnten keinen Account finden, der zu deiner E-Mail-Adresse passt. Probiere eine andere Absenderadresse oder wende dich an einen Mitarbeiter. email_reject_empty: subject_template: "[%{site_name}] E-Mail-Problem -- Kein Inhalt" text_body_template: | @@ -1475,17 +1411,24 @@ de: Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (Titel: %{former_title}) hat nicht funktioniert. Dein Nutzerkonto verfügt nicht über die nötigen Rechte, um in dieser Kategorie ein neues Thema anzulegen. Wenn du glaubst, dass dies ein Irrtum ist, nimm bitte Kontakt mit einem unserer Mitarbeiter auf. + email_reject_strangers_not_allowed: + subject_template: "[%{site_name}] E-Mail-Problem -- Zugriff nicht erlaubt" + text_body_template: | + Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (mit dem Titel %{former_title}) hat nicht funktioniert. + + Die Kategorie, an die du diese E-Mail gesendet hast, erlaubt nur Antworten von Nutzern mit gültigem Konto und bekannter E-Mail-Adresse. Wenn du glaubst, dass dies ein Fehler ist, wende dich bitte an einen Mitarbeiter. + email_reject_invalid_post: + subject_template: "[%{site_name}] E-Mail-Problem -- Ungültiger Beitrag" + text_body_template: | + Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (mit dem Titel %{former_title}) hat nicht funktioniert. + + Mögliche Gründe sind komplizierte Formatierung und zu lange oder kurze Nachrichten. Bitte versuche es erneut oder schreibe deinen Beitrag über die Website. + email_reject_invalid_post_specified: + subject_template: "[%{site_name}] E-Mail-Problem -- Ungültiger Beitrag" email_reject_reply_key: subject_template: "[%{site_name}] E-Mail-Problem -- Unbekannter Antwort-Schlüssel" - text_body_template: | - Es tut uns leid, aber die E-Mail-Nachricht an %{destination} (Titel: „%{former_title}“) hat nicht geklappt. - Der angegebene Antwort-Schlüssel ist ungültig oder unbekannt. Wir wissen daher nicht auf welchen Beitrag diese E-Mail antwortet. Kontaktiere einen Mitarbeiter. email_reject_topic_not_found: subject_template: "[%{site_name}] E-Mail Problem -- Thema nicht gefunden" - text_body_template: | - Entschuldigung, aber mit deiner E-Mail-Nachricht an %{destination} (Titel: %{former_title}) gab es ein Problem. - - Das Thema ist uns nicht bekannt oder es wurde gelöscht bzw. geschlossen. Wenn du glaubst, dass dies ein Irrtum ist, nimm bitte Kontakt mit einem unserer Mitarbeiter auf. email_reject_topic_closed: subject_template: "[%{site_name}] E-Mail Problem -- Thema geschlossen" text_body_template: | @@ -1494,16 +1437,8 @@ de: Das Thema ist uns nicht bekannt oder es wurde gelöscht bzw. geschlossen. Wenn du glaubst, dass dies ein Irrtum ist, nimm bitte Kontakt mit einem unserer Mitarbeiter auf. email_reject_auto_generated: subject_template: "[%{site_name}] E-Mail Problem -- Automatisch erzeugte Antwort" - text_body_template: | - Entschuldigung, aber mit deiner E-Mail-Nachricht an %{destination} (Titel: %{former_title}) gab es ein Problem. - - Das Thema wurde geschlossen. Wenn du glaubst das dies ein Irrtum ist, nimm bitte Kontakt mit einem unserer Mitarbeiter auf. email_error_notification: subject_template: "[%{site_name}] E-Mail-Problem -- POP-Authentifizierungsfehler" - text_body_template: | - Es gab einen Authentifizierungsfehler beim Abrufen von Mails vom POP-Server. - - Bitte stelle sicher, dass du die POP-Zugangsdaten in [den Seiteneinstellungen](%{base_url}/admin/site_settings/category/email) korrekt konfiguriert hast. too_many_spam_flags: subject_template: "Neues Benutzerkonto gesperrt" text_body_template: | @@ -1569,7 +1504,6 @@ de: eingeladen. Bitte besuche diesen Link um die Unterhaltung zu lesen: %{base_url}%{url} user_invited_to_topic: - subject_template: "[%{site_name}] %{username} hat dich zum Thema '%{topic_title}' eingeladen" text_body_template: |2 %{username} hat dich zum Thema @@ -1674,7 +1608,6 @@ de: Wenn dieser Link nicht klickbar ist, kopiere ihn in die Adresszeile deines Web-Browsers. page_not_found: - title: "Die angeforderte Seite existiert nicht oder ist privat." popular_topics: "Beliebt" recent_topics: "Aktuell" see_more: "Mehr" diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 1524c92f1f..35f537c9bb 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -59,7 +59,7 @@ en: 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." strangers_not_allowed_error: "Happens when a user tried to create a new topic in a category they're not a member of." - insufficient_trust_level_error: "Happens when a use tried to create a new topic in a category they don't have the required trust level for." + insufficient_trust_level_error: "Happens when a user tried to create a new topic in a category they don't have the required trust level for." reply_user_not_matching_error: "Happens when a reply came in from a different email address the notification was sent to." topic_not_found_error: "Happens when a reply came in but the related topic has been deleted." topic_closed_error: "Happens when a reply came in but the related topic has been closed." @@ -201,6 +201,7 @@ en: rss_description: latest: "Latest topics" hot: "Hot topics" + top: "Top topics" posts: "Latest posts" too_late_to_edit: "That post was created too long ago. It can no longer be edited or deleted." @@ -374,6 +375,7 @@ en: self_parent: "A subcategory's parent cannot be itself" depth: "You can't nest a subcategory under another" email_in_already_exist: "Incoming email address '%{email_in}' is already in use for '%{category_name}' category." + invalid_email_in: "'%{email_in}' is not a valid email address." cannot_delete: uncategorized: "Can't delete Uncategorized" has_subcategories: "Can't delete this category because it has sub-categories." @@ -877,9 +879,6 @@ en: suppress_reply_directly_above: "Don't show the expandable in-reply-to on a post when there is only a single reply directly above this post." suppress_reply_when_quoting: "Don't show the expandable in-reply-to on a post when post quotes reply." max_reply_history: "Maximum number of replies to expand when expanding in-reply-to" - - experimental_reply_expansion: "Hide intermediate replies when expanding a reply to (experimental)" - topics_per_period_in_top_summary: "Number of top topics shown in the default top topics summary." topics_per_period_in_top_page: "Number of top topics shown on the expanded 'Show More' top topics." redirect_users_to_top_page: "Automatically redirect new and long absent users to the top page." @@ -916,6 +915,7 @@ en: reserved_usernames: "Usernames for which signup is not allowed." min_password_length: "Minimum password length." + min_admin_password_length: "Minimum password length for Admin." block_common_passwords: "Don't allow passwords that are in the 10,000 most common passwords." enable_sso: "Enable single sign on via an external site (WARNING: USERS' EMAIL ADDRESSES *MUST* BE VALIDATED BY THE EXTERNAL SITE!)" @@ -941,6 +941,10 @@ en: twitter_consumer_key: "Consumer key for Twitter authentication, registered at http://dev.twitter.com" twitter_consumer_secret: "Consumer secret for Twitter authentication, registered at http://dev.twitter.com" + enable_instagram_logins: "Enable Instagram authentication, requires instagram_consumer_key and instagram_consumer_secret" + instagram_consumer_key: "Consumer key for Instagram authentication" + instagram_consumer_secret: "Consumer secret Instagram authentication" + enable_facebook_logins: "Enable Facebook authentication, requires facebook_app_id and facebook_app_secret" facebook_app_id: "App id for Facebook authentication, registered at https://developers.facebook.com/apps" facebook_app_secret: "App secret for Facebook authentication, registered at https://developers.facebook.com/apps" @@ -955,6 +959,7 @@ en: backup_frequency: "How frequently we create a site backup, in days." enable_s3_backups: "Upload backups to S3 when complete. IMPORTANT: requires valid S3 credentials entered in Files settings." s3_backup_bucket: "The remote bucket to hold backups. WARNING: Make sure it is a private bucket." + s3_disable_cleanup: "Disable the removal of backups from S3 when removed locally." backup_time_of_day: "Time of day UTC when the backup should occur." backup_with_uploads: "Include uploads in scheduled backups. Disabling this will only backup the database." @@ -980,6 +985,9 @@ en: max_invites_per_day: "Maximum number of invites a user can send per day." max_topic_invitations_per_day: "Maximum number of topic invitations a user can send per day." + alert_admins_if_errors_per_minute: "Number of errors per minute in order to trigger an admin alert. A value of 0 disables this feature. NOTE: requires restart." + alert_admins_if_errors_per_hour: "Number of errors per hour in order to trigger an admin alert. A value of 0 disables this feature. NOTE: requires restart." + suggested_topics: "Number of suggested topics shown at the bottom of a topic." limit_suggested_to_category: "Only show topics from the current category in suggested topics." @@ -1002,6 +1010,8 @@ en: default_opengraph_image_url: "URL of the default opengraph image." + allow_all_attachments_for_group_messages: "Allow all email attachments for group messages." + enable_flash_video_onebox: "Enable embedding of swf and flv (Adobe Flash) links in oneboxes. WARNING: may introduce security risks." default_invitee_trust_level: "Default trust level (0-4) for invited users." @@ -1234,7 +1244,7 @@ en: emoji_set: "How would you like your emoji?" enforce_square_emoji: "Force a square aspect ratio to all emojis." - approve_post_count: "The amount of posts from a new user that must be approved" + approve_post_count: "The amount of posts from a new or basic user that must be approved" approve_unless_trust_level: "Posts for users below this trust level must be approved" notify_about_queued_posts_after: "If there are posts that have been waiting to be reviewed for more than this many hours, an email will be sent to the contact email. Set to 0 to disable these emails." @@ -1245,6 +1255,8 @@ en: default_email_always: "Send an email notification even when the user is active by default." default_email_previous_replies: "Include previous replies in emails by default." + default_email_in_reply_to: "Include excerpt of replied to post in emails by default." + default_other_new_topic_duration_minutes: "Global default condition for which a topic is considered new." default_other_auto_track_topics_after_msecs: "Global default time before a topic is automatically tracked." default_other_external_links_in_new_tab: "Open external links in a new tab by default." @@ -1253,6 +1265,8 @@ en: default_other_disable_jump_reply: "Don't jump to user's post after they reply by default." default_other_edit_history_public: "Make the post revisions public by default." + default_other_like_notification_frequency: "Notify users on likes by default" + default_topics_automatic_unpin: "Automatically unpin topics when the user reaches the bottom by default." default_categories_watching: "List of categories that are watched by default." @@ -1389,6 +1403,7 @@ en: reserved_username: "That username is not allowed." missing_user_field: "You have not completed all the user fields" close_window: "Authentication is complete. Close this window to continue." + already_logged_in: "Oops, looks like you are attempting to accept an invitation for another user. If you are not %{current_user}, please log out and try again." user: no_accounts_associated: "No accounts associated" @@ -1493,9 +1508,9 @@ en: - If you run your own mail server, check to make sure the IPs of your mail server are [not on any email blacklists][4]. Also verify that it is definitely sending a fully-qualified hostname that resolves in DNS in its HELO message. If not, this will cause your email to be rejected by many mail services. - - Send a test email to [mail-tester.com][mt] to verify that everything is working correctly. + - We highly recommend you **send a test email to [mail-tester.com][mt]** to verify that all the above is working correctly. - (The *easy* way is to create a free account on [Mandrill][md] or [Mailgun][mg] or [Mailjet][mj], which have free generous free mailing plans and will be fine for small communities. You'll still need to set up the SPF and DKIM records in your DNS, though!) + (The *easy* way is to create a free account on [SendGrid][sg], [SparkPost][sp], [Mailgun][mg] or [Mailjet][mj], which have free generous free mailing plans and will be fine for small communities. You'll still need to set up the SPF and DKIM records in your DNS, though!) We hope you received this email deliverability test OK! @@ -1510,7 +1525,8 @@ en: [4]: http://whatismyipaddress.com/blacklist-check [7]: http://dkimcore.org/tools/dkimrecordcheck.html [8]: http://www.openspf.org/SPF_Record_Syntax - [md]: http://mandrill.com + [sg]: https://sendgrid.com/ + [sp]: https://www.sparkpost.com/ [mg]: http://www.mailgun.com/ [mj]: https://www.mailjet.com/pricing [mt]: http://www.mail-tester.com/ @@ -1518,13 +1534,11 @@ en: new_version_mailer: subject_template: "[%{site_name}] New Discourse version, update available" text_body_template: | - A new version of [Discourse](http://www.discourse.org) is available. + Hooray, a new version of [Discourse](http://www.discourse.org) is available! :) Your version: %{installed_version} New version: **%{new_version}** - You may want to: - - See what's new in the [GitHub changelog](https://github.com/discourse/discourse/commits/master). - Upgrade from your browser at [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). @@ -1534,13 +1548,11 @@ en: new_version_mailer_with_notes: subject_template: "[%{site_name}] update available" text_body_template: | - A new version of [Discourse](http://www.discourse.org) is available. + Hooray, a new version of [Discourse](http://www.discourse.org) is available! :) Your version: %{installed_version} New version: **%{new_version}** - You may want to: - - See what's new in the [GitHub changelog](https://github.com/discourse/discourse/commits/master). - Upgrade from your browser at [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). @@ -2000,14 +2012,16 @@ en: user_notifications: previous_discussion: "Previous Replies" + in_reply_to: "In Reply To" unsubscribe: title: "Unsubscribe" description: "Not interested in getting these emails? No problem! Click below to unsubscribe instantly:" header_instructions: '' reply_by_email: "[Visit Topic](%{base_url}%{url}) or reply to this email to respond" - visit_link_to_respond: "[Visit Topic](%{base_url}%{url}) to respond" reply_by_email_pm: "[Visit Message](%{base_url}%{url}) or reply to this email to respond" + only_reply_by_email: "Reply to this email to respond" + visit_link_to_respond: "[Visit Topic](%{base_url}%{url}) to respond" visit_link_to_respond_pm: "[Visit Message](%{base_url}%{url}) to respond" posted_by: "Posted by %{username} on %{post_date}" @@ -2254,7 +2268,7 @@ en: If the above link is not clickable, try copying and pasting it into the address bar of your web browser. page_not_found: - title: "The page you requested doesn't exist or is private." + title: "Oops! That page doesn’t exist or is private." popular_topics: "Popular" recent_topics: "Recent" see_more: "More" @@ -2741,3 +2755,6 @@ en: performance_report: initial_post_raw: This topic includes daily performance reports for your site. initial_topic_title: Website performance reports + + topic_invite: + user_exists: "Sorry, that user has already been invited. You may only invite a user to a topic once." diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml index 22dc369c50..4a666bfea9 100644 --- a/config/locales/server.es.yml +++ b/config/locales/server.es.yml @@ -30,6 +30,19 @@ es: emails: incoming: default_subject: "Email entrante desde %{email}" + errors: + empty_email_error: "Sucede cuando el texto en bruto del email que recibimos está en blanco." + no_message_id_error: "Sucede cuando el email no tiene Id del mensaje en el encabezado." + auto_generated_email_error: "Sucede cuando la 'prioridad' en el encabezado está establecida en: lista, basura, en masa o auto_respuesta, o cuando algún otro encabezado contiene: auto-enviado, auto-respondido o auto-generado." + no_body_detected_error: "Sucede cuando no podemos extraer el cuerpo del mensaje y no hay archivos adjuntos." + inactive_user_error: "Sucede cuando el emisor no está activo." + blocked_user_error: "Sucede cuando el emisor ha sido bloqueado." + bad_destination_address: "Sucede cuando ninguna de las direcciones de email en los campos Para/Cc/Bcc coincide con un email configurado como dirección de correo entrante." + strangers_not_allowed_error: "Sucede cuando un usuario intentó crear un nuevo tema en una categoría de la que no forma parte." + insufficient_trust_level_error: "Sucede cuando un usuario intentó crear un nuevo tema en una categoría para la que no tiene el nivel de confianza requerido." + reply_user_not_matching_error: "Sucede cuando una respuesta vino de una dirección de email diferente a la que fue enviada la notificación." + topic_not_found_error: "Sucede cuando entró una respuesta pero el tema relacionado ha sido eliminado." + topic_closed_error: "Sucede cuando entró una respuesta pero el tema relacionado ha sido cerrado. " errors: &errors format: '%{attribute} %{message}' messages: @@ -153,6 +166,7 @@ es: rss_description: latest: "Temas recientes" hot: "Temas candentes" + top: "Top temas" posts: "Últimos posts" too_late_to_edit: "Ese post fue publicado hace demasiado tiempo. No puede ser editado ni eliminado." excerpt_image: "imagen" @@ -295,6 +309,7 @@ es: self_parent: "La categoría primaria de una subcategoría no puede ser ella misma." depth: "No se puede anidar una subcategoría debajo de otra" email_in_already_exist: "La dirección de email entrante '%{email_in}' ya está en uso para la categoría '%{category_name}'." + invalid_email_in: "'%{email_in}' no es una dirección de email válida." cannot_delete: uncategorized: "Sin categoría no se puede eliminar" has_subcategories: "No se puede eliminar esta categoría porque tiene sub-categorías." @@ -687,7 +702,6 @@ es: min_search_term_length: "Extensión mínima de una búsqueda válida, en número de caracteres" search_tokenize_chinese_japanese_korean: "Forzar la búsqueda a tokenizar Chino/Japonés/Coreano incluso en sitios que no basados en esos idiomas" allow_uncategorized_topics: "Permitir la creación de temas sin categoría. AVISO: Si ya hay algún tema sin categoría, debes recategorizarlo antes de activar esta opción." - uncategorized_description: "La descripción de la categoría Sin categoría. Déjalo en blanco para no añadir descripción." allow_duplicate_topic_titles: "Permitir temas con títulos idénticos, duplicados." unique_posts_mins: "¿Cuántos minutos deben pasar antes de que un usuario pueda publicar el mismo contenido de nuevo?" educate_until_posts: "Cuando el usuario comienza a escribir su primer o primeros (n) posts, mostrar un pop-up con el panel de consejos para nuevos usuarios en el editor." @@ -773,7 +787,6 @@ es: suppress_reply_directly_above: "No mostrar el en-respuesta-a desplegable en un post cuando solo hay una sola respuesta justo encima del post." suppress_reply_when_quoting: "No mostrar el desplegable en-respuesta-a en un post cuando el post cite la respuesta." max_reply_history: "Número máximo de respuestas a mostrar al expandir en-respuesta-a" - experimental_reply_expansion: "Ocultar respuestas intermedias cuando se expande una respuesta (experimental)" topics_per_period_in_top_summary: "Número de mejores temas mostrados en el resumen de mejores temas." topics_per_period_in_top_page: "Número de mejores temas mostrados en la vista expandida al clicar en 'ver más'." redirect_users_to_top_page: "Redirigir automáticamente a los nuevos usuarios y a los ausentes de larga duración a la página de mejores temas." @@ -866,6 +879,7 @@ es: external_system_avatars_enabled: "Usar un servicio externo para los avatares." external_system_avatars_url: "Dirección URL del servicio externo para los avatares. Sustituciones permitidas: {username} {first_letter} {color} {size}" default_opengraph_image_url: "URL de la imagen opengraph por defecto." + allow_all_attachments_for_group_messages: "Permitir todos los archivos adjuntos de email para los mensajes a grupos." enable_flash_video_onebox: "Habilitar el embebido de enlaces swf y flv (Adobe Flash) en formato Onebox. AVISO: podría introducir riesgos de seguridad." default_invitee_trust_level: "Nivel de confianza por defecto (0-4) para usuarios invitados." default_trust_level: "Nivel de confianza por defecto (0-4) para los nuevos usuarios. ¡AVISO! Cambiar esto puede resultar en riesgo por spam." @@ -1048,6 +1062,8 @@ es: default_email_direct: "Enviar un email cuando alguien cite/responda/mencione o invite al usuario por defecto." default_email_mailing_list_mode: "Enviar un email por cada nuevo post por defecto." default_email_always: "Enviar una notificación por email aunque el usuario esté activo por defecto." + default_email_previous_replies: "Incluir por defecto respuestas previas en los emails." + default_email_in_reply_to: "Incluir por defecto un extracto del post al que se ha respondido en los emails." default_other_new_topic_duration_minutes: "Condición por defecto para que un tema sea considerado nuevo" default_other_auto_track_topics_after_msecs: "Tiempo por defecto hasta que un tema sea seguido automáticamente." default_other_external_links_in_new_tab: "Abrir enlaces externos en una nueva pestaña por defecto." @@ -1077,6 +1093,8 @@ es: pop3_polling_username_is_empty: "Debes establecer un usuario de 'pop3 polling' antes de activar el polling POP3." pop3_polling_password_is_empty: "Debes establecer una contraseña de 'pop3 polling' antes de activar el polling POP3." pop3_polling_authentication_failed: "La autenticación POP3 falló. Por favor, verifica tus credenciales pop3." + reply_by_email_address_is_empty: "Debes establecer el campo 'reply by email address' antes de activar respuesta por email." + pop3_polling_disabled: "Debes habilitar primero el polling POP3 antes de activar respuesta por email." notification_types: group_mentioned: "%{group_name} ha sido mencionado en %{link}" mentioned: "%{display_username} te ha mencionado en %{link}" @@ -1088,7 +1106,7 @@ es: moved_post: "%{display_username} ha movido tu post a %{link}" private_message: "%{display_username} te ha enviado un mensaje: %{link}" invited_to_private_message: "%{display_username} te ha invitado a un hilo de mensajes: %{link}" - invited_to_topic: "%{display_username} te ha invitado a un tema: %{link}" + invited_to_topic: "%{display_username} te invitó a %{link}" invitee_accepted: "%{display_username} ha aceptado tu invitación" linked: "%{display_username} te enlazó en %{link}" granted_badge: "Obtuviste %{link}" @@ -1177,6 +1195,7 @@ es: reserved_username: "Ese nombre de usuario no está permitido." missing_user_field: "No has completado todos los campos de usuario" close_window: "Autenticación completa. Cierra esta ventana para continuar." + already_logged_in: "Ups, parece que estás intentando aceptar una invitación dirigida a otro usuariol. Si no eres %{current_user}, por favor cierra sesión e inténtalo de nuevo." user: no_accounts_associated: "No hay cuentas relacionadas." username: @@ -1185,8 +1204,8 @@ es: characters: "solo debe incluir números y letras" unique: "debe ser único" blank: "debe estar presente" - must_begin_with_alphanumeric: "debe empezar con una letra, número o guión bajo" - must_end_with_alphanumeric: "debe terminar con una letra, número o guión bajo" + must_begin_with_alphanumeric_or_underscore: "debe comenzar con una letra, un número o un guión bajo" + must_end_with_alphanumeric: "debe terminar con una letra o un número" must_not_contain_two_special_chars_in_seq: "no debe contener una secuencia de 2 o más caracteres especiales (.-_)" must_not_end_with_confusing_suffix: "no debe terminar con un sufijo que lleve a confusión como .json o .png etc." email: @@ -1195,6 +1214,13 @@ es: ip_address: blocked: "No se permiten nuevos registros desde tu dirección IP." max_new_accounts_per_registration_ip: "No se permiten nuevos registros desde tu dirección IP (alcanzado el límite máximo). Contacta un miembro del staff." + flags_reminder: + flags_were_submitted: + one: "Hay reportes enviados hace 1 hora. Por favor, revísalos." + other: "Hay reportes enviados hace %{count} horas. Por favor, revísalos." + subject_template: + one: "1 reporte esperando ser atendidos." + other: "%{count} reportes esperando ser atendidos." unsubscribe_mailer: subject_template: "Confirma que no quieres recibir más emails de %{site_title}" text_body_template: | @@ -1237,87 +1263,10 @@ es: (Si el enlace anterior ha caducado, utiliza "Olvidé mi contraseña" cuando vayas a iniciar sesión con tu dirección de email.) test_mailer: subject_template: "[%{site_name}] Prueba de envío de email" - text_body_template: | - Este es un correo electrónico de prueba de - - [**%{base_url}**][0] - - La entrega de correo electrónico es complicada. Aquí hay unas cuantas cosas importantes que deberías comprobar primero: - - - *Asegúrate* de ajustar la dirección `notification email` desde: correctamente en los ajustes de tu sitio. **El dominio especificado en la dirección "from" de los emails que envíes es el dominio contra el que se validará tu email**. - - - Entérate de como ver el código fuente del email desde tu cliente de correo, para que así puedas examinar las cabeceras para ver pistas importantes. En Gmail está la opción "mostrar original" en el menú de lista desplegable en la parte superior derecha de cada email. - - - **IMPORTANTE:** ¿Tu ISP tiene registros de DNS inversa para asociar los nombres de dominio y las direcciones IP desde donde envías los correos? [Comprueba tu registro PTR Inverso][2] aquí. Si tu ISP no introduce el puntero de registro DNS inverso adecuado, es muy improbable que cualquiera de tus correos pueda ser entregado. - - - ¿Es el [registro SPF][8] de tu dominio correcto? [Comprueba tu registro SPF][1] aquí. Ten en cuenta que TXT es el tipo de registro oficial correcto para SPF. - - - ¿Es el [registro DKIM][3] de tu dominio correcto? Esto puede mejorar significativamente la entregabilidad de correos. [Comprueba tu registro DKIM][7] aquí. - - - Si estás corriendo tu propio servidor de correo, asegúrate de que las IPs de tu servidor de correo [no están en ninguna lista negra de correos][4]. También verifica que definitivamente se está enviando un nombre de huésped "hostname" completamente cualificado que resuelva en DNS en su mensaje HELO. Si no es así, esto causará que tu correo sea denegado por muchos servicios de correo. - - (La forma *fácil* es crear una cuenta gratuíta en [Mandrill][md] o [Mailgun][mg] o [Mailjet][mj], que proveen generosamente planes de mailing gratuítos y serán adecuados para pequeñas comunidades. ¡De todas formas todavía tendrás que configurar los registros SPF y DKIM en tus DNS!) - - ¡Esperamos que recibas esta prueba de entregabilidad de correo electrónico correctamente! - - Buena suerte, - - Tus amigos de [Discourse](http://www.discourse.org) - - [0]: %{base_url} - [1]: http://www.kitterman.com/spf/validate.html - [2]: http://mxtoolbox.com/ReverseLookup.aspx - [3]: http://www.dkim.org/ - [4]: http://whatismyipaddress.com/blacklist-check - [7]: http://dkimcore.org/tools/dkimrecordcheck.html - [8]: http://www.openspf.org/SPF_Record_Syntax - [md]: http://mandrill.com - [mg]: http://www.mailgun.com/ - [mj]: https://www.mailjet.com/pricing new_version_mailer: subject_template: "[%{site_name}] Nueva versión de Discourse, actualización disponible" - text_body_template: | - Está disponible una nueva versión de [Discourse](http://www.discourse.org). - - Tu versión: %{installed_version} - Nueva versión: **%{new_version}** - - Tal vez quieras: - - - Ver qué hay de nuevo en el [historial de cambios de GitHub](https://github.com/discourse/discourse/commits/master). - - - Actualizar desde tu navegador en [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). - - - Visitar [meta.discourse.org](http://meta.discourse.org) para ver noticias, debatir u obtener soporte de Discourse. new_version_mailer_with_notes: subject_template: "[%{site_name}] actualización disponible" - text_body_template: | - Está disponible una nueva versión de [Discourse](http://www.discourse.org). - - Tu versión: %{installed_version} - Nueva versión: **%{new_version}** - - Tal vez quieras: - - - Ver qué hay de nuevo en el [historial de cambios de GitHub](https://github.com/discourse/discourse/commits/master). - - - Actualizar desde tu navegador en [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). - - - Visitar [meta.discourse.org](http://meta.discourse.org) para ver noticias, debatir u obtener soporte de Discourse. - - ### Notas de lanzamiento - - %{notes} - flags_reminder: - flags_were_submitted: - one: "Estos reportes fueron enviados desde hace 1 hora." - other: "Estos reportes fueron enviados desde hace %{count} horas." - please_review: "Por favor, revísalos." - post_number: "post" - how_to_disable: 'Puedes desactivar o cambiar la frecuencia de este email de recordatorio mediante la opción "notify about flags after".' - subject_template: - one: "1 reporte esperando ser atendidos." - other: "%{count} reportes esperando ser atendidos." queued_posts_reminder: subject_template: one: "[%{site_name}] 1 post esperando ser revisado" @@ -1457,10 +1406,6 @@ es: subject_template: "[%{site_name}] Problema relacionado con el email -- No coincide el usuario de la respuesta" email_reject_no_account: subject_template: "[%{site_name}] Problema con el correo electrónico -- Cuenta Desconocida" - text_body_template: | - Lo sentimos, pero tu email para %{destination} (titulado %{former_title}) se ha rechazado. - - No hay una cuenta de usuario asociada con esta dirección de email. Intenta enviarlo con otra dirección de email o contacta con algún miembro del Staff. email_reject_empty: subject_template: "[%{site_name}] Problema con el correo electrónico -- Sin Contenido" text_body_template: | @@ -1483,16 +1428,8 @@ es: Tu cuenta no tiene los privilegios para publicar nuevos temas en esa categoría. Si crees que esto es un error, contacta a un moderador o administrador. email_reject_reply_key: subject_template: "[%{site_name}] Problema con el correo electrónico -- Clave de Respuesta Desconocida" - text_body_template: | - Lo sentimos, pero tu email para %{destination} (titulado %{former_title}) se ha rechazado. - - La clave de respuesta proporcionada no es válida o es desconocida, por lo que no sabemos a qué responde este email. Contacta con algún miembro del staff. email_reject_topic_not_found: subject_template: "[%{site_name}] Problema con el correo electrónico -- Tema no encontrado" - text_body_template: | - Lo sentimos, pero tu email para %{destination} (titulado %{former_title}) no funcionó. - - El tema al que estás respondiendo ya no existe, quizá debe haber sido eliminado. Si crees que esto es un error, contacta a un administrador. email_reject_topic_closed: subject_template: "[%{site_name}] Problema con el correo electrónico -- Tema cerrado" text_body_template: | @@ -1501,16 +1438,8 @@ es: El tema actualmente está cerrado y no acepta más respuestas. Si crees que esto es un error, contacta a un administrador. email_reject_auto_generated: subject_template: "[%{site_name}] Problema con el correo electrónico -- Respuesta Auto Generada" - text_body_template: | - Lo sentimos, pero tu mensaje de correo electrónico para %{destination} (titulado %{former_title}) no funcionó. - - Tu respuesta de correo fue marcada como "generada automáticamente" y no aceptamos esto. Si crees que se trata de un error contacta con un administrador. email_error_notification: subject_template: "[%{site_name}] Problema con el correo electrónico -- Error de autenticación POP" - text_body_template: | - Ha habido un error de autenticación mientras se ejecutaba el polling de los emails desde el servidor POP. - - Por favor, asegúrate de que se han configurado las credenciales POP correctamente en los [ajustes del sitio](%{base_url}/admin/site_settings/category/email). too_many_spam_flags: subject_template: "Cuenta nueva bloqueada" text_body_template: | @@ -1576,12 +1505,14 @@ es: subject_pm: "[MP]" user_notifications: previous_discussion: "Respuestas anteriores" + in_reply_to: "En respuesta a" unsubscribe: title: "Darse de baja" description: "¿No estás interesado en recibir estos emails? ¡No hay problema! Haz clic abajo para darte de baja de forma instantánea:" reply_by_email: "[Visita el tema](%{base_url}%{url}) o responde a este email para comentar" - visit_link_to_respond: "[Visita el tema](%{base_url}%{url}) para comentar" reply_by_email_pm: "[Visita el mensaje](%{base_url}%{url}) o responde a este email para comentar" + only_reply_by_email: "Responde a este email para comentar" + visit_link_to_respond: "[Visita el tema](%{base_url}%{url}) para comentar" visit_link_to_respond_pm: "[Visita el mensaje](%{base_url}%{url}) para comentar" posted_by: "Publicado por %{username} el %{post_date}" user_invited_to_private_message_pm: @@ -1615,7 +1546,7 @@ es: Por favor, visita este enlace para ver el mensaje: %{base_url}%{url} user_invited_to_topic: - subject_template: "[%{site_name}] %{username} te ha invitado a un tema '%{topic_title}'" + subject_template: "[%{site_name}] %{username} te invitó a '%{topic_title}'" text_body_template: |2 %{username} te invitó al hilo @@ -1662,6 +1593,17 @@ es: --- %{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: | @@ -1795,7 +1737,7 @@ es: Si el enlace anterior no es clicable, prueba copiándolo y pegándolo en la barra de direcciones de tu navegador. page_not_found: - title: "La página que deseas ver no existe o es privada." + title: "¡Ups! Esa página no existe o es privada." popular_topics: "Populares" recent_topics: "Recientes" see_more: "Más" diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml index 5b66093ba5..d96cbb7f1e 100644 --- a/config/locales/server.fa_IR.yml +++ b/config/locales/server.fa_IR.yml @@ -699,7 +699,6 @@ fa_IR: suppress_reply_directly_above: "in-reply-to قابل بزرگ شدن را نشان نده در یک نوشته وقتی فقط یک پاسخ بالای این نوشته است." suppress_reply_when_quoting: "in-reply-to قابل بزرگ شدن را نشان نده در یک نوشته وقتی به یک نوشته پاسخ داده می شود." max_reply_history: "حداکثر تعداد پاسخ ها به توسعه زمان گسترش in-reply-to" - experimental_reply_expansion: "پاسخ های میانی را مخفی کن زمان توسعه یک پاسخ به (آزمایشی) " topics_per_period_in_top_summary: "تعداد بهتریت جستارهای نشان داده شده در بخش پیش فرض خلاصه بهترین جستارها." topics_per_period_in_top_page: "تعداد جستارهای خوب نشان داده شود در بخش گسترش یافته \" بیشتر نشان بده\" بهترین جستارها. " redirect_users_to_top_page: "بطور خودکار کاربران جدید و کاربران غایب را به بهترین صفحه هدایت کن." diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml index ee1b40ac85..efcf5c357d 100644 --- a/config/locales/server.fi.yml +++ b/config/locales/server.fi.yml @@ -695,7 +695,6 @@ fi: min_private_message_title_length: "Viestin otsikon merkkien minimimäärä viestille" min_search_term_length: "Haun merkkien minimimäärä" allow_uncategorized_topics: "Salli ketjujen luominen valitsematta aluetta. VAROITUS: Sinun täytyy siirtää alueettomat ketjut jollekin alueelle, ennen tämän asetuksen poistamista käytöstä." - uncategorized_description: "Alueettomien ketjujen alueen kuvaus. Jätä tyhjäksi, jos et halua käyttää kuvausta." allow_duplicate_topic_titles: "Salli ketjun luominen identtisellä otsikolla." unique_posts_mins: "Kuinka monta minuuttia, kunnes käyttäjä voi luoda uudestaan saman sisältöisen viestin" educate_until_posts: "Näytä uuden käyttäjän ohje, kun käyttäjä alkaa kirjoittamaan ensimmäistä (n) viestiään viestikenttään." @@ -781,7 +780,6 @@ fi: suppress_reply_directly_above: "Älä näytä vastauksena-painiketta viestin yläreunassa, jos viestissä on vastattu vain edelliseen viestiin." suppress_reply_when_quoting: "Älä näytä vastauksena-painiketta viestin yläreunassa, kun viestissä on lainaus." max_reply_history: "Maksimimäärä vastauksia, jotka avataan klikattaessa 'vastauksena' painiketta" - experimental_reply_expansion: "Piilota välilliset vastaukset, kun 'vastauksena' avataan (kokeellinen)" topics_per_period_in_top_summary: "Ketjujen lukumäärä, joka näytetään oletuksena Huiput-listauksissa." topics_per_period_in_top_page: "Ketjujen lukumäärä, joka näytetään laajennetussa Huiput-listauksessa." redirect_users_to_top_page: "Ohjaa uudet ja kauan poissa olleet käyttäjät automaattisesti huiput-sivulle." @@ -972,6 +970,7 @@ fi: display_name_on_email_from: "Näytä sähköpostien lähettäjinä käyttäjien koko nimet" unsubscribe_via_email: "Salli käyttäjän lakkauttaa sähköposti-ilmoitukset lähettämällä sähköpostiviesti, jonka otsikossa tai leipätekstissä esiintyy sana \"unsubscribe\"" unsubscribe_via_email_footer: "Liitä sähköpostiviestien alaosaan linkki, jonka avulla saaja voi lakkauttaa sähköposti-ilmoitukset" + delete_email_logs_after_days: "Poista sähköpostilokit (N) päivän jälkeen. Aseta 0 säilyttääksesi ikuisesti." pop3_polling_enabled: "Pollaa sähköpostivastaukset POP3:lla." pop3_polling_ssl: "Käytä SSL-salausta yhdistettäessä POP3-palvelimeen. (Suositellaan)" pop3_polling_period_mins: "Tiheys minuuteissa kuinka usein POP3 tililtä tarkastetaan uudet sähköpostit. HUOM: vaatii uudelleenkäynnistyksen." @@ -1026,7 +1025,7 @@ fi: show_time_gap_days: "Jos kahden viestin välissä on kulunut näin monta päivää, näytä aikaväli ketjussa." invites_per_page: "Oletuksena montako kutsua näytetään käyttäjäsivulla." short_progress_text_threshold: "Kuinka monen viestin jälkeen ketjun edistyspalkissa näytetään vain nykyisen viestin numero. Jos muutat palkin leveyttä, voit joutua muuttamaan tätä arvoa." - default_code_lang: "Oletusarvoinen ohjelmointikieli syntaksin korostukseen Github koodiblokeissa (lang-auto, ruby, python etc.)" + default_code_lang: "Oletusarvoinen ohjelmointikieli syntaksin korostukseen Github koodiblokeissa (lang-auto, ruby, python jne.)" warn_reviving_old_topic_age: "Kun käyttäjä alkaa kirjoittamaan vastausta ketjuun, jonka uusin viesti on tätä vanhempi päivissä, näytetään varoitus. Poista käytöstä asettamalla arvoksi 0." autohighlight_all_code: "Pakota koodin korostus kaikkiin esimuotoiltuihin tekstiblokkeihin, vaikka käyttäjä ei määrittelisi kieltä." highlighted_languages: "Syntaksin korostamisen säännöt. (Varoitus: liian monen kielen sisällyttäminen voi vaikuttaa suorituskykyyn) katso demo: https://highlightjs.org/static/demo/" @@ -1097,7 +1096,6 @@ fi: moved_post: "%{display_username} siirsi viestisi tänne %{link}" private_message: "%{display_username} lähetti sinulle viestin: %{link}" invited_to_private_message: "%{display_username} kutsui sinut viestiin: %{link}" - invited_to_topic: "%{display_username} kutsui sinut ketjuun: %{link}" invitee_accepted: "%{display_username} hyväksyi kutsusi" linked: "%{display_username} linkitti sinuun täällä %{link}" granted_badge: "Ansaitsit %{link}" @@ -1194,8 +1192,6 @@ fi: characters: "täytyy koostua vain numeroista, kirjaimista ja alaviivoista" unique: "täytyy olla uniikki" blank: "pakollinen kenttä" - must_begin_with_alphanumeric: "täytyy alkaa kirjaimella, numerolla tai alaviivalla" - must_end_with_alphanumeric: "täytyy loppua kirjaimeen, numeroon tai alaviivaan" must_not_contain_two_special_chars_in_seq: "ei saa sisältää peräkkäin kahta tai useampaa erikoismerkkiä (.-_)" must_not_end_with_confusing_suffix: "ei voi päättyä harhaanjohtavaan päätteeseen kuten .json tai .png jne." email: @@ -1204,8 +1200,19 @@ fi: ip_address: blocked: "Uusien tilien luonti tästä IP-osoitteesta ei ole sallittu." max_new_accounts_per_registration_ip: "Rekisteröitymisiä ei oteta vastaan IP-osoitteestasi (maksimimäärä saavutettu). Ota yhteyttä henkilökuntaan." + flags_reminder: + subject_template: + one: "Yksi liputus odottaa käsittelyä" + other: "%{count} liputusta odottaa käsittelyä" unsubscribe_mailer: subject_template: "Vahvista, ettet enää halua, että %{site_title} lähettää sinulle sähköpostimuistutuksia." + text_body_template: | + Joku (mahdollisesti sinä) pyysi, ettei sähköposti-ilmoituksia sivustolta %{site_domain_name} enää lähetettäisi tähän osoitteeseen. + Vahvista pyyntö klikkaamalla linkkiä: + + %{confirm_unsubscribe_link} + + Jos haluat jatkossakin saada sähköposti-ilmoituksia, voit jättää tämän viestin huomiotta. invite_mailer: subject_template: "%{invitee_name} kutsui sinut ketjuun '%{topic_title}' sivustolla %{site_domain_name}" text_body_template: | @@ -1249,90 +1256,10 @@ fi: (jos yllä oleva linkki on vanhentunut, valitse "unohdin salasanani" kirjautuessasi sisään sähköpostiosoitteellasi) test_mailer: subject_template: "[%{site_name}] Sähköpostin toimitettavuustesti" - text_body_template: | - Tämä on testisähköposti sivustolta - - [**%{base_url}**][0] - - Sähköpostin toimitus on monimutkaista. Tässä on muutama tärkeä asia, jotka kannattaa tarkistaa ensin: - - - *Varmista,* että `ilmoitusten sähköpostiosoitteen` from: kenttä on asetettu oikein sivuston asetuksissa. **Sähköpostin varmennus tapahtuu "from"-kentän sähköpostiosoitteen verkkotunnusta vastaan**. - - - Selvitä, miten sähköpostiohjelmassasi saa näkyville *sähköpostin raakadatan,* jotta voit tutkia viestin tunnistetiedot. Gmailissa tämä tapahtuu "näytä kokonaan" valinnalla viestin oikeassa yläkulmassa olevasta valikosta. - - - **TÄRKEÄÄ:** Onko palveluntarjoajasi syöttänyt reverse DNS kentän verkkotunnuksille ja IP osoitteille, joists lähetät sähköpostia? [Kokeile Reverse PTR tietuetta][2] täällä. Jos palveluntarjoajasi ei tarjoa kunnollista reverse DNS pointer tietuetta, on hyvin epätodennäköistä, että mikään sähköposti menee perille. - - - Onko verkkotunnuksesi [SPF record][8] oikein? [Kokeile SPF tietuetta][1] täällä. Huomaa, että TXT oikea tietuetyyppi SPF tietueelle. - - - Onko verkkotunnuksesi [DKIM tietue][3] oikein? Tämä vaikuttaa merkittävästi sähköpostin toimitettavuuteen. [Kokeile DKIM tietuetta][7] täällä. - - - Jos käytät omaa sähköpostipalvelinta, tarkista että palvelimen IP osoite [ei ole millään sähköpostin mustalla listalla][4]. - - - Tarkista myös, että se varmasti lähettää oikean muotoisen isäntänimen HELO viestissään, joka palauttaa oikean DNS tietueen. Jos näin ei ole, sähköposti hylätään monissa sähköpostipalveluissa. - - (Helpoin tapa on luoda ilmainen tili [Mandrilliin][md], [Mailguniin][mg] tai [Mailjetiin][mj], joide ilmaiset palvelut riittävät hyvin piemen palstan käyttöön. Muista silti asettaa SPF ja DKIM tietueet DNS:ään!) - - Toivottavasti tämä testisähköposti meni perille OK! - - Onnea matkaan, - - Ystäväsi [Discourselta](http://www.discourse.org) - - [0]: %{base_url} - [1]: http://www.kitterman.com/spf/validate.html - [2]: http://mxtoolbox.com/ReverseLookup.aspx - [3]: http://www.dkim.org/ - [4]: http://whatismyipaddress.com/blacklist-check - [7]: http://dkimcore.org/tools/dkimrecordcheck.html - [8]: http://www.openspf.org/SPF_Record_Syntax - [md]: http://mandrill.com - [mg]: http://www.mailgun.com/ - [mj]: https://www.mailjet.com/pricing new_version_mailer: subject_template: "[%{site_name}] Uusi Discourse versio, päivitys saatavilla" - text_body_template: |+ - Uusi versio [Discoursesta](http://www.discourse.org) on saatavilla - - Sinun versiosi: %{installed_version} - Uusin versio: **%{new_version}** - - Voit haluta: - - - Tarkastella mitä uutta on [GitHubin muutoslokissa](https://github.com/discourse/discourse/commits/master). - - - Asentaa päivityksen vierailemalla osoitteessa [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). - - - Vierailla osoitteessa [meta.discourse.org](http://meta.discourse.org) englanninkielisten uutisten, keskustelun ja tuen Discourselle vuoksi. - new_version_mailer_with_notes: subject_template: "[%{site_name}] päivitys saatavilla" - text_body_template: | - Uusi versio [Discoursesta](http://www.discourse.org) on saatavilla - - Sinun versiosi: %{installed_version} - Uusin versio: **%{new_version}** - - Voit haluta: - - - Tarkastella mitä uutta on [GitHubin muutoslokissa](https://github.com/discourse/discourse/commits/master). - - - Asentaa päivityksen vierailemalla osoitteessa [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). - - - Vierailla osoitteessa [meta.discourse.org](http://meta.discourse.org) englanninkielisten uutisten, keskustelun ja tuen Discourselle vuoksi. - - ### Julkaisutiedot - - %{notes} - flags_reminder: - flags_were_submitted: - one: "Nämä liput annettiin yli tunti sitten." - other: "Nämä liput annettiin yli %{count} tuntia sitten." - please_review: "Ole hyvä ja tarkasta ne." - post_number: "viesti" - how_to_disable: 'Voit muuttaa tämän sähköpostimuistutuksen tiheyttä tai ottaa sen pois käytöstä muuttamalla "notify about flags after"-asetusta.' - subject_template: - one: "Yksi liputus odottaa käsittelyä" - other: "%{count} liputusta odottaa käsittelyä" queued_posts_reminder: subject_template: one: "[%{site_name}] 1 viesti odottaa hyväksyntää" @@ -1370,6 +1297,95 @@ fi: Kuitenkin, jos viesti piilotetaan toisen kerran, se pysyy piilotettuna, kunnes henkilökunta selvittää tilanteen – jonka jälkeen voi seurata muita seuraamuksia, mukaan lukien tilisi hyllyttäminen. Saadaksesi lisätietoja, lue [yhteisön säännöt](%{base_url}/guidelines). + usage_tips: + text_body_template: | + Tässä muutama nopea ohje, joiden avulla pääset alkuun: + + ## Lukeminen + + Lukeaksesi lisää, **jatka vain sivun vierittämistä alaspäin!** + + Kun uusia vastauksia tai ketjuja luodaan, ne ilmestyvät näkyviin automaattisesti - sivua ei tarvitse ladata uudelleen. + + ## Navigointi + + - Haku, käyttäjäprofiilisi ja palstan ☰ valikko avautuvat klikkaamalla **oikeassa yläkulmassa olevia painikkeita**. + + - Ketjun otsikkoa klikkaamalla pääset aina ketjun **uusimpaan lukemattomaan viestiin**. Hypätäksesi ketjun alkuun tai loppuun, klikkaa sen sijaan uusinta toimintaa tai viestien lukumäärää. + + + + - Kun olet lukemassa viestiketjua, klikkaa edistymispalkkia oikealla alhaalla tuodaksesi esiin navigaatiopainikkeet. Pääset hyppäämään viestin alkuun klikkaamalla ketjun otsikkoa. Näppäile ? tuodaksesi esiin listan näppäimistöoikoteistä. + + + + ## Vastaaminen + + - Vastataksesi **ketjuun yleisesti**, käytä ketjun lopussa. + + - Vastataksesi **tietylle henkilölle**, käytä heidän viestissään. + + - Vastataksesi **uudessa ketjussa**, käytä viestin oikealla puolella. Sekä vanha, että uusi ketju yhdistetään toisiinsa automaattisesti. + + Vastauksesi muotoilussa voit käyttää yksinkertaisia HTML-, BBCode- tai [Markdown](http://commonmark.org/help/)-komentoja: + + Tämä on **lihavoitu**. + Tämä on lihavoitu. + Tämä on [b]lihavoitu[/b]. + + Haluatko oppia enemmän Markdownista? [Käy kymmenen minuutin mittainen englanninkielinen tutoriaali!](http://commonmark.org/help/tutorial/) + + Lainataksesi toista käyttäjää, valitse teksti, jota haluat lainata ja klikkaa mitä hyvänsä Vastaa-painiketta. Toista lisätäksesi useampia lainauksia. + + + + Toinen käyttäjä saa ilmoituksen viestistäsi, jos mainitset hänet viestissäsi. Aloita kirjoittamaan `@` ja voit valita käyttäjänimen listasta. + + + + [Tavallisia Emojia](http://www.emoji.codes/) voit lisätä nimeltä kirjoittamalla `:` tai voit käyttä perinteisiä hymiöitä, kuten `:)` + + + + Luodaksesi esikatselun linkistä, liitä se omalle rivilleen: + + + + ## Toiminnot + + Jokaisen viestin alalaidassa on joukko painikkeita: + + + + Anna kirjoittajan tietää, että arvostit lukemaasi viestiä käyttämällä **tykkää** painiketta. Laitetaan hyvä kiertämään! + + Jos huomaat jossain viestissä ongelman, saata asia yksityisesti kirjoittajan tai [palstan henkilökunnan](%{base_url}/about) tietoon **liputa** painikkeella. Voit myös **jakaa** linkin viestiin tai **lisätä sen kirjanmerkkeihin** käyttäjäsivullesi myöhempää tarkastelua varten. + + ## Ilmoitukset + + Kun joku vastaa viestiisi, lainaa viestiäsi tai mainitsee `@käyttäjänimesi`, ilmestyy sivun oikeaan yläkulmaan numero. Sieltä pääset tarkastelemaan **ilmoituksiasi**. + + + + Eikä tarvitse murehtia siitä, että et huomaisi uusia vastauksia. Saat sähköpostin uusista ilmoituksista jos et ole paikalla, kun ne saapuvat. + + ## Omat asetukset + + - Oletuksena kaikki alle kaksi päivää vanhat keskustelut ovat uusia. + + - Kaikkia keskusteluita **joissa olet ollut mukana** (luomalla, vastaamalla tai lukemalla pitkään) seurataan automaattisesti. Näet siniset uusien ja lukemattomien lukumäärän ilmaisimet näiden ketjujen yhteydessä. + + + + Voit vaihtaa minkä tahansa viestiketjun ilmoitusasetuksia ketjun alalaidassa olevalla painikkeella. + + + + Voit myös asettaa ilmoitusasetuksen aluekohtaisesti, jos haluat seurata jokaista ketjua tietyllä keskustelualueella. Voit muuttaa näitä asetuksia [käyttäjäasetuksissasi](%{base_url}/my/preferences). + + ## Yhteisön luottamus + + Sitä mukaa kun osallistut palstan keskusteluihin, keräät yhteisön luottamusta ja uudelle käyttäjälle asetetut rajoitukset poistuvat automaattisesti. Korkeammilla [luottamustasoilla](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) saat vielä enemmän valtuuksia, joiden avulla voit auttaa yhteisön ylläpitämisessä. welcome_user: subject_template: "Tervetuloa sivustolle %{site_name}!" text_body_template: | @@ -1454,12 +1470,26 @@ fi: csv_export_failed: subject_template: "Datan vienti epäonnistui" text_body_template: "Pahoittelemme, mutta datan vientisi epäonnistui. Tarkasta lokit tai ota yhteyttä henkilökuntaan." + email_reject_insufficient_trust_level: + subject_template: "[%{site_name}] Sähköpostiongelma -- Riittämätön luottamustaso" + text_body_template: | + Pahoittelut, sähköpostiviestiäsi tänne: %{destination} (otsikolla %{former_title}) ei voitu toimittaa. + + Tilisi luottamustaso ei ole riittävä, jotta saisit lähettää uusia ketjuja tähän sähköpostiosoitteeseen. Jos uskot, että tämä johtuu virheestä, ota yhteyttä henkilökuntaan. + email_reject_inactive_user: + subject_template: "[%{site_name}] Sähköpostiongelma -- Aktivoimaton käyttäjä" + text_body_template: | + Pahoittelemme, mutta sähköpostin lähettäminen tänne %{destination} (otsikolla %{former_title}) ei onnistunut. + + Käyttäjätiliä tällä sähköpostiosoitteella ei ole aktivoitu. Aktivoi käyttäjätili ennen sähköpostien lähettämistä. email_reject_reply_user_not_matching: + subject_template: "[%{site_name}] Sähköpostiongelma -- Käyttäjä ei täsmää" text_body_template: | Pahoittelut, sähköpostiviestisi lähetys kohteeseen %{destination} (titled %{former_title}) ei onnistunut. Viestisi ei saapunut siitä sähköpostiosoitteesta josta odotimme, joten emme voineet olla varmoja lähettäjästä. Kokeile lähettää viestisi toisesta sähköpostiosoitteesta tai ota yhteyttä henkilökuntaan. email_reject_no_message_id: + subject_template: "[%{site_name}] Sähköpostiongelma -- Ei viestin Id:tä" text_body_template: | Pahoittelut, sähköpostiviestisi lähetys kohteeseen %{destination} (titled %{former_title}) ei onnistunut. @@ -1499,6 +1529,20 @@ fi: Mahdollisia syitä ovat muuan muassa: ei-tuettu muotoilu, liian suuri viesti, liian pieni viesti. Ole hyvä ja yritä uudelleen; voit myös lähettää viestisi sivuston kautta, jos tämä ongelma ei vaikuta poistuvan. email_reject_invalid_post_specified: subject_template: "[%{site_name}] Sähköpostiongelma -- Lähetysvirhe" + text_body_template: | + Pahoittelemme, mutta sähköpostin lähettäminen tänne %{destination} (otsikolla %{former_title}) ei onnistunut. + + Syy: + + %{post_error} + + Jos voit korjata ongelman, yritä uudelleen. + email_reject_invalid_post_action: + subject_template: "[%{site_name}] Sähköpostiongelma -- Kielletty viestitoiminto" + text_body_template: | + Pahoittelemme, mutta sähköpostin lähettäminen tänne %{destination} (otsikolla %{former_title}) ei onnistunut. + + Toimintoa ei tunnistettu. Yritä uudelleen tai lähetä viesti nettisivun kautta, jos ongelma jatkuu. email_reject_reply_key: subject_template: "[%{site_name}] Sähköpostiongelma -- Tuntematon vastausavain" text_body_template: | @@ -1526,15 +1570,17 @@ fi: email_reject_auto_generated: subject_template: "[%{site_name}] Sähköpostiongelma -- Automaattivastaus" text_body_template: | - Pahoittelut, sähköpostiviestiäsi tänne: %{destination} (otsikolla %{former_title}) ei voitu toimittaa. + Pahoittelut, sähköpostiviestisi lähetys kohteeseen %{destination} (titled %{former_title}) ei onnistunut. - Sähköpostiasi epäillään automaattisesti generoiduksi, jota emme hyväksy. Jos uskot, että on tapahtunut virhe, ota yhteys palstan henkilökuntaan. + Järjestelmä havaitsi viestisi olevan tietokoneen automaattisesti luoma, eikä sitä voitu siksi hyväksyä. Jos uskot tämän olevan virhe, ota yhteyttä henkilökuntaan. email_error_notification: subject_template: "[%{site_name}] Sähköpostiongelma -- POP-autentikoinnin virhe" text_body_template: | - Sähköpostin pollauksessa POP-palvelimelta tapahtui autentikointivirhe. + Sähköpostin pollauksessa POP-serveriltä tapahtui autentikointivirhe. - Varmista, että POP tunnukset on asetettu oikein [sivuston asetuksissa](%{base_url}/admin/site_settings/category/email). + Varmista, että olet konfiguroinut POP-tunnukset oikein [sivuston asetuksissa](%{base_url}/admin/site_settings/category/email). + + Jos POP-sähköpostitilille on nettikäyttöliittymä, voit joutua kirjautumaan sinne ja tarkistamaan asetukset. too_many_spam_flags: subject_template: "Uusi tili on estetty" text_body_template: | @@ -1592,6 +1638,8 @@ fi: download_remote_images_disabled: subject_template: "Linkattujen kuvien lataaminen on otettu pois käytöstä" text_body_template: "Asetus `download_remote_images_to_local` on otettu pois käytöstä, koska vapaan tilan rajoitus `download_remote_images_threshold` saavutettiin." + unsubscribe_link: | + Jos et enää halua ilmoituksia tästä ketjusta, [klikkaa tätä](%{unsubscribe_url}). Jos et halua sähköposti-ilmoituksia, muuta [tilisi asetuksia](%{user_preferences_url}). unsubscribe_via_email_link: | tai, [klikkaa tästä](mailto:reply@%{hostname}?subject=unsubscribe), jos et halua näitä viestejä sähköpostiisi. subject_re: "VS:" @@ -1602,7 +1650,9 @@ fi: title: "Peru tilaus" description: "Etkö halua vastaanottaa näitä sähköposteja? Ei hätää! Klikkaa alta peruaksesi tilauksen välittömästi:" reply_by_email: "Vastaa [vierailemalla ketjussa](%{base_url}%{url}) tai vastaamalla tähän sähköpostiin." - visit_link_to_respond: "Vastaa [vierailemalla ketjussa](%{base_url}%{url})." + reply_by_email_pm: "Vastaa [vierailemalla ketjussa](%{base_url}%{url}) tai vastaamalla tähän sähköpostiin." + visit_link_to_respond: "Vastaa [vierailemalla ketjussa](%{base_url}%{url})" + visit_link_to_respond_pm: "Vastaa [vierailemalla ketjussa](%{base_url}%{url})." posted_by: "Käyttäjältä %{username} %{post_date}" user_invited_to_private_message_pm: subject_template: "[%{site_name}] %{username} kutsui sinut viestiin '%{topic_title}'" @@ -1635,7 +1685,6 @@ fi: Klikkaa tätä linkkiä nähdäksesi viestin: %{base_url}%{url} user_invited_to_topic: - subject_template: "[%{site_name}] %{username} kutsui sinut viestiin '%{topic_title}'" text_body_template: |2 %{username} kutsui sinut keskusteluun @@ -1815,7 +1864,6 @@ fi: Jos linkkiä ei voi klikata, yritä kopioida ja liittää se selaimen osoiteriville. page_not_found: - title: "Pyytämääsi sivua ei ole tai se on yksityinen." popular_topics: "Suosittuja" recent_topics: "Tuoreimpia" see_more: "Lisää" diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml index a86d2f685e..8adea1b983 100644 --- a/config/locales/server.fr.yml +++ b/config/locales/server.fr.yml @@ -16,7 +16,7 @@ fr: short_no_year: "%B %-d" date_only: "%B %-d, %Y" date: - month_names: [null, Janvier, Février, Mars, Avril, Mai, Juin, Juillet, Aout, Septembre, Octobre, Novembre, Decembre] + month_names: [null, janvier, février, mars, avril, mai, juin, juillet, août, septembre, octobre, novembre, décembre] <<: *datetime_formats title: "Discourse" topics: "Sujets" @@ -30,6 +30,18 @@ fr: emails: incoming: default_subject: "Courriel arrivant de %{email}" + errors: + empty_email_error: "Arrive quand le courriel reçu était vide." + no_message_id_error: "Arrive quand le courrier n'a pas d'en-tête \"Message-Id\"." + no_body_detected_error: "Arrive quand il est impossible d'extraire le corps du message et qu'il n'y a pas de pièces-jointes." + inactive_user_error: "Arrive quand l'expéditeur n'est pas actif." + blocked_user_error: "Arrive quand l'expéditeur a été bloqué." + bad_destination_address: "Arrive quand aucune des adresses de courriel dans les champs To/Cc/Bcc ne correspondent à une adresse de courriel entrante configurée." + strangers_not_allowed_error: "Arrive quand un utilisateur a essayé de créer un nouveau sujet dans une catégorie dans laquelle il n'est pas membre." + insufficient_trust_level_error: "Arrive quand un utilisateur a essayé de créer un nouveau sujet dans une catégorie dans laquelle il n'a pas un niveau de confiance suffisant." + 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é." errors: &errors format: '%{attribute} %{message}' messages: @@ -80,7 +92,7 @@ fr: min_username_length_exists: "Il n'est pas possible de définir une longeur minimale de pseudo qui soit plus court qu'un pseudo qui existe déjà." min_username_length_range: "Il n'est pas possible de définir un minimum plus grand qu'un maximum." max_username_length_exists: "Il n'est pas possible de définir une longeur maximale de pseudo qui soit plus court qu'un pseudo qui existe déjà." - max_username_length_range: "Vous ne pouvez pas mettre le maximum sous le minimum" + max_username_length_range: "Il n'est pas possible de définir un maximum plus petit que le minimum." default_categories_already_selected: "Vous ne pouvez pas séléctionner une catégorie qui est utilisée dans une autre liste." s3_upload_bucket_is_required: "Vous ne pouvez pas activer l'upload sur S3 avant d'avoir renseigné le 's3_upload_bucket'." bulk_invite: @@ -111,26 +123,26 @@ fr: replies: one: "1 réponse" other: "%{count} réponses" - no_mentions_allowed: "Désolé, vous ne pouvez pas mentionner d'utilisateur." + no_mentions_allowed: "Désolé, vous ne pouvez pas mentionner d'autres utilisateurs." too_many_mentions: - one: "Désolé, vous ne pouvez mentionner que 1 utilisateur." - other: "Désolé, vous ne pouvez mentionner que %{count} utilisateurs dans un sujet." - no_mentions_allowed_newuser: "Désolé, les nouveaux utilisateurs ne peuvent pas mentionner d'utilisateur." + one: "Désolé, vous ne pouvez mentionner qu'un utilisateur dans un message." + other: "Désolé, vous ne pouvez mentionner que %{count} utilisateurs dans un message." + no_mentions_allowed_newuser: "Désolé, les nouveaux utilisateurs ne peuvent pas mentionner d'autres utilisateurs." too_many_mentions_newuser: - one: "Désolé, les nouveaux utilisateurs ne peuvent mentionner que 1 utilisateur dans un message." + one: "Désolé, les nouveaux utilisateurs ne peuvent mentionner qu'un utilisateur dans un message." other: "Désolé, les nouveaux utilisateurs ne peuvent mentionner que %{count} utilisateurs dans un message." no_images_allowed: "Désolé, les nouveaux utilisateurs ne peuvent pas ajouter d'image dans les messages." too_many_images: - one: "Désolé, les nouveaux utilisateurs ne peuvent ajouter que 1 image." - other: "Désolé, les nouveaux utilisateurs ne peuvent ajouter que %{count} images." + one: "Désolé, les nouveaux utilisateurs ne peuvent ajouter qu'une image dans un message." + other: "Désolé, les nouveaux utilisateurs ne peuvent ajouter que %{count} images dans un message." no_attachments_allowed: "Désolé, les nouveaux utilisateurs ne peuvent pas ajouter de fichiers dans leurs messages." too_many_attachments: - one: "Désolé, les nouveaux utilisateurs ne peuvent ajouter que 1 fichier dans leurs messages." + one: "Désolé, les nouveaux utilisateurs ne peuvent ajouter qu'un fichier dans leurs messages." other: "Désolé, les nouveaux utilisateurs ne peuvent ajouter que %{count} fichiers dans leurs messages." - no_links_allowed: "Désolé, les nouveaux utilisateurs ne peuvent pas insérer de liens." + no_links_allowed: "Désolé, les nouveaux utilisateurs ne peuvent pas insérer de liens dans leurs messages." too_many_links: - one: "Désolé, les nouveaux utilisateurs ne peuvent insérer qu'un seul lien." - other: "Désolé, les nouveaux utilisateurs ne peuvent insérer que %{count} liens." + one: "Désolé, les nouveaux utilisateurs ne peuvent insérer qu'un seul lien par message." + other: "Désolé, les nouveaux utilisateurs ne peuvent insérer que %{count} liens par message." spamming_host: "Désolé, vous ne pouvez pas insérer de lien vers ce domaine." user_is_suspended: "Les utilisateurs suspendus ne sont pas autorisés à poster de messages." topic_not_found: "Une erreur est survenue. Peut-être que ce sujet a été fermé ou supprimé pendant que vous le regardiez?" @@ -153,6 +165,7 @@ fr: rss_description: latest: "Sujets récents" hot: "Sujets populaires" + top: "Meilleurs sujets" posts: "Messages récents" too_late_to_edit: "Ce message a été créé il y a trop longtemps. Il ne peut plus être modifié ou supprimé." excerpt_image: "image" @@ -163,7 +176,7 @@ fr: can_not_modify_automatic: "Vous ne pouvez pas modifier un groupe automatique" member_already_exist: "'%{username}' est déjà membre de ce groupe." invalid_domain: "'%{domain}' n'est pas un domaine valide." - invalid_incoming_email: "'%{incoming_email}' n'est pas une adresse e-mail valide." + invalid_incoming_email: "'%{incoming_email}' n'est pas une adresse de courriel valide." default_names: everyone: "tous" admins: "administrateurs" @@ -299,6 +312,7 @@ fr: self_parent: "Le parent d'une sous-catégorie ne peut pas être elle-même" depth: "Vous ne pouvez pas imbriquer une sous-catégorie sous une autre" email_in_already_exist: "L'adresse courriel entrante '%{email_in}' est déjà utilisée pour la catégorie '%{category_name}'." + invalid_email_in: "'%{email_in}' n'est pas une adresse de courriel valide." cannot_delete: uncategorized: "Vous ne pouvez pas supprimer Sans Catégorie" has_subcategories: "Vous ne pouvez pas supprimer cette catégorie car elle a des sous-catégories." @@ -450,8 +464,8 @@ fr: description: 'Ce message contient du contenu qu''une personne raisonnable jugerait offensant, abusif ou en violation de la charte de notre communauté.' long_form: 'signalé comme inapproprié' notify_user: - title: 'Envoyer à @{{username}} un message' - description: 'Je veux parler directement et de manière privée à cette personne à propos de son message.' + title: 'Envoyer un message à @{{username}} ' + description: 'Je veux parler à cette personne directement et de manière privée à propos de son message.' long_form: 'utilisateur contacté' email_title: 'Votre message sur "%{title}"' email_body: "%{link}\n\n%{message}" @@ -484,7 +498,7 @@ fr: long_form: 'signalé comme inapproprié' notify_moderators: title: "Autre chose" - description: 'Ce message requiert l''attention d''un responsable d''après la charte de la communauté, conditions générales de service, ou pour une autre raison indéterminée.' + description: 'Ce message requiert l''attention d''un responsable d''après la charte de la communauté, les conditions générales de service, ou pour une autre raison indéterminée.' long_form: 'signalé pour modération' email_title: 'Ce sujet "%{title}" requière l''attention d''un modérateur' email_body: "%{link}\n\n%{message}" @@ -733,6 +747,7 @@ fr: summary_likes_required: "Nombre de J'aime minimum dans un sujet avant que le 'Résumé du sujet' soit activé" summary_percent_filter: "Quand un utilisateur clique sur 'Résumé du sujet', montrer le top % des messages" summary_max_results: "Nombre maximum de messages retournés par 'Résumé de ce sujet'" + enable_private_messages: "Autorise les utilisateurs de niveau de confiance 1 à créer des messages et à répondre (configurable via le niveau de confiance minimum pour envoyer des messages)." enable_long_polling: "Utiliser les requêtes longues pour le flux de notifications." long_polling_base_url: "Racine de l'url utilisée pour les requêtes longues (dans le cas de l'utilisation d'un CDN pour fournir du contenu dynamique, pensez à le configurer en mode \"origin pull\") par exemple: http://origin.site.com" long_polling_interval: "Délai d'attente du serveur avant de répondre aux clients lorsqu'il n'y a pas de données à envoyer\n(réservé aux utilisateurs connectés)" @@ -775,7 +790,6 @@ fr: suppress_reply_directly_above: "Ne pas afficher 'en réponse à' sur un message quand la seule réponse est juste en dessus de ce dernier." suppress_reply_when_quoting: "Ne pas affiché le panneau \"En réponse à\" sur un message qui répond à une citation." max_reply_history: "Nombre maximum de réponses à développer lors du développement d'une \"réponse à\"" - experimental_reply_expansion: "Masquer les réponses intermédiaires lors de l'ouverture d'une répondre à (expérimental)" topics_per_period_in_top_summary: "Nombre de meilleurs sujets affichés dans le résumé par défaut des meilleurs sujets." topics_per_period_in_top_page: "Nombre de meilleurs sujets affichés lorsqu'on sélectionne \"Voir plus\" des meilleurs sujets." redirect_users_to_top_page: "Rediriger automatiquement les nouveaux utilisateurs et les longues absences sur la page Top." @@ -870,6 +884,7 @@ fr: external_system_avatars_enabled: "Utilisez un service d'avatars externe." external_system_avatars_url: "URL du système de service d'avatars externe. Substitutions permises: {username} {first_letter} {color} {size}" default_opengraph_image_url: "URL de l'image par défaut pour les balises Open Graph." + allow_all_attachments_for_group_messages: "Autorise toutes les pièces-jointes pour les messages de groupes." enable_flash_video_onebox: "Activer l'utilisation de swf et flv (Adobe Flash) dans les boites imbriquées. ATTENTION : cela pourrait introduire un risque de sécurité." default_invitee_trust_level: "Niveau de confiance par défaut (0-4) pour les invités." default_trust_level: "Niveau de confiance par défaut (entre 0 et 4) pour tous les nouveaux utilisateurs. ATTENTION ! Changer ce paramètre peut vous exposer à des spams." @@ -905,8 +920,10 @@ fr: newuser_max_mentions_per_post: "Nombre maximum de @pseudo qu'un nouvel utilisateur peut mentionner dans un message." newuser_max_replies_per_topic: "Nombre maximum de réponses qu'un nouvel utilisateur peut faire dans une même discussion avant que quelqu'un lui réponde." max_mentions_per_post: "Nombre maximal de @pseudo que tout le monde peut mentionner dans un message." + 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 les notifications par courriel, afin de laisser aux utilisateurs l'opportunité de modifier 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." @@ -941,6 +958,8 @@ fr: newuser_spam_host_threshold: "Limite du nombre de liens vers un même host compris dans `newuser_spam_host_posts` qu'un nouvel utilisateur peut insérer dans un message avant d'être considérer comme un spam." white_listed_spam_host_domains: "Une liste des domaines exclus des hôtes testés comme spam. Les nouveaux utilisateurs ne seront jamais restreint dans la création de message contenant des liens vers ses domaines. " staff_like_weight: "Quel poids supplémentaire donner aux J'aime de l'équipe." + topic_view_duration_hours: "Compte la vue d'un sujet une seule fois par IP ou par utilisateur toutes les N heures" + user_profile_view_duration_hours: "Compte la vue d'un profil d'utilisateur une seule fois par IP ou par utilisateur qui visite toutes les N heures" levenshtein_distance_spammer_emails: "Lorsque des courriels correspondent à des spammer, la différence du nombre de caractère permettra toujours une correspondance floue." max_new_accounts_per_registration_ip: "S'il y a déjà (n) Niveau de confiance 0 comptes à partir de cette adresse IP ( et aucun n'est un membre du personnel ou au NC2 ou ultérieure), ne plus accepter de nouvelles inscriptions de cette IP." min_ban_entries_for_roll_up: "En cliquant sur le bouton Consolider, une liste d'au moins (N) adresses interdites sera remplacée par une plage de sous réseau." @@ -958,6 +977,10 @@ fr: disable_emails: "Désactiver l'envoi de les courriels depuis Discourse." strip_images_from_short_emails: "Retirer les images des courriels dont la taille est inférieur à 2800 Octets" short_email_length: "Taille des courriels courts en Octets" + display_name_on_email_from: "Affiche les noms complets dans le champ From du courriel." + unsubscribe_via_email: "Autorise les utilisateurs à se désinscrire des courriels en envoyant un courriel avec \"se désinscrire\" 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." 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." @@ -984,7 +1007,7 @@ fr: automatically_download_gravatars: "Télécharger les gravatars pour les utilisateurs lors de la création de compte ou de la modification de courriel." digest_topics: "Nombre maximum de sujets à afficher dans le courriel de résumé." digest_min_excerpt_length: "Taille minimum du résumé des messages dans les courriels, en caractères." - delete_digest_email_after_days: "Ne pas envoyer de résumés courriel aux utilisateurs qui n'ont pas visité le site depuis (n) jours." + delete_digest_email_after_days: "Ne pas envoyer de résumés courriel aux utilisateurs qui n'ont pas visité le site depuis plus de (n) jours." disable_digest_emails: "Désactiver les résumés par courriels pour tous les utilisateurs." detect_custom_avatars: "Vérifier ou non si les utilisateurs ont envoyé une photo de profil personnalisée." max_daily_gravatar_crawls: "Nombre maximum de fois que Discourse vérifiera Gravatar pour des avatars personnalisés en une journée." @@ -994,14 +1017,19 @@ fr: allow_anonymous_posting: "Permettre aux utilisateurs de passer en mode anonyme" anonymous_posting_min_trust_level: "Le niveau de confiance minimum pour passer en mode anonyme." anonymous_account_duration_minutes: "Pour protéger l'anonymat, créer un nouveau compte anonyme tous les N minutes pour chaque utilisateur. Exemple: si 600 est choisi, dès 600 minutes après le dernier message ET que l'utilisateur passe en mode anonyme, un nouveau compte anonyme lui sera crée." + hide_user_profiles_from_public: "Désactive les cartes utilisateurs, les profils utilisateurs et les répertoires utilisateurs pour les utilisateurs anonymes." allow_profile_backgrounds: "Autoriser les utilisateurs à envoyer des arrières-plans de profil." + sequential_replies_threshold: "Nombre de messages successifs qu'un utilisateur peut poster dans un sujet avant d'être averti d'avoir posté un nombre excessif de réponses qui se suivent." enable_mobile_theme: "Les appareils mobiles utilisent un thème adapté aux mobiles, avec la possibilité de passer à la totalité du site. Désactivez cette option si vous voulez utiliser une feuille de style personnalisée qui répond à tous les types de client." dominating_topic_minimum_percent: "Quel est le pourcentage de messages un utilisateur doit poster dans un sujet avant d'être rappelé à l'ordre pour laissé la communauté répondre." + disable_avatar_education_message: "Désactiver le message incitant à changer l'avatar." daily_performance_report: "Analyser les logs de NGINX quotidiennement et poster un sujet Responsables Uniquement avec les détails" suppress_uncategorized_badge: "Ne pas afficher le badge pour les sujets non catégorisés dans les listes des sujets." permalink_normalizations: "Appliquer l'expression régulière suivante avant de faire correspondre les permaliens, par exemple /(\\/topic.*)\\?.*/\\1 supprimera les query strings des routes des sujets. Le format est regex+string, utilisez \\1 etc. pour accéder aux captures" global_notice: "Affiche un bandeau global URGENT pour tout les utilisateurs du site, laissez vide pour le cacher (HTML autorisé)." disable_edit_notifications: "Désactiver les notifications de modifications par l'utilisateur système lorsque l'option 'download_remote_images_to_local' est activée." + automatically_unpin_topics: "Désépingler automatiquement le sujet lorsque l'utilisateur atteint la fin." + read_time_word_count: "Nombre de mots par minute servant de base de calcul à l'estimation du temps de lecture." full_name_required: "Le nom complet est requis dans le profil utilisateur." enable_names: "Autoriser l'affichage des noms complets des utilisateurs dans leur profil, sur leur carte d'utilisateur et dans les courriels. Décocher pour cacher les noms complets partout." display_name_on_posts: "Afficher le nom complet de l'utilisateur dans ses messages en plus de son @pseudo." @@ -1025,6 +1053,7 @@ fr: enable_cdn_js_debugging: "Autoriser /logs à afficher correctement les erreurs en ajoutant des permissions de crossorigin sur toutes les inclusions de js." show_create_topics_notice: "Si le site contient moins de 5 sujets publics, afficher un message pour demander aux administrateurs de créer d'autres sujets." delete_drafts_older_than_n_days: Supprimer les brouillons plus vieux que (n) jours. + vacuum_db_days: "Exécuter VACUUM ANALYZE pour récupérer de l'espace dans la base de données après une migration (mettre à 0 pour désactiver)" prevent_anons_from_downloading_files: "Refuser le téléchargement de pièces jointes aux utilisateurs anonymes. ATTENTION: cela empêchera de fonctionner les ressources envoyées en pièce jointe qui ne sont pas des images." slug_generation_method: "Choisissez une méthode de génération d'identifiant. \"encodé\" générera des chaines de caractères encodées avec des pourcentages. \"aucune\" désactivera complètement les identifiants." enable_emoji: "Activer les emojis" @@ -1038,11 +1067,15 @@ fr: default_email_direct: "Envoyer un courriel quand quelqu'un cite/répond à/mentionne ou invite un utilisateur." default_email_mailing_list_mode: "Envoyer un courriel pour chaque nouveau message." default_email_always: "Envoyer une notification courriel même quand l'utilisateur est actif." + default_email_previous_replies: "Inclure par défaut les réponses précédentes dans les courriels." + default_other_new_topic_duration_minutes: "Paramètre global de temps pendant lequel un sujet est considéré comme nouveau." + default_other_auto_track_topics_after_msecs: "Paramètre global fixant le temps par défaut au bout duquel un sujet est suivi automatiquement." default_other_external_links_in_new_tab: "Par défaut, ouvrir tous les liens externes dans un nouvel onglet" default_other_enable_quoting: "Par défaut, proposer la citation du texte surligné." default_other_dynamic_favicon: "Par défaut, faire apparaître le nombre de sujets récemment créés ou mis à jour sur l'icône navigateur." default_other_disable_jump_reply: "Par défaut, ne pas se déplacer au nouveau message après avoir répondu." default_other_edit_history_public: "Par défaut, rendre publiques les révisions de message." + default_topics_automatic_unpin: "Par défaut, désépingler automatiquement le sujet lorsque l'utilisateur atteint la fin." 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." @@ -1060,6 +1093,9 @@ fr: invalid_string_min: "Doit être d'au moins %{count} caractères." invalid_string_max: "Ne doit pas être supérieur à %{max} caractères." invalid_reply_by_email_address: "La valeur doit contenir '%{reply_key}' et être différente de la notification email." + pop3_polling_host_is_empty: "Vous devez indiquer le \"nom d'un serveur pop3\" avant d'activer le relevé via POP3." + pop3_polling_username_is_empty: "Vous devez indiquer le \"login utilisateur pop3\" avant d'activer le relevé via POP3." + pop3_polling_password_is_empty: "Vous devez indiquer le \"mot de passe pop3\" avant d'activer le relevé via POP3." pop3_polling_authentication_failed: "Echec d'authentication POP3. Veuillez contrôler vos détails POP3." notification_types: group_mentioned: "%{group_name} a été mentionné dans %{link}" @@ -1072,7 +1108,7 @@ fr: moved_post: "%{display_username} a déplacé votre message vers %{link}" private_message: "%{display_username} vous a envoyé un message : %{link}" invited_to_private_message: "%{display_username} vous a invité dans une discussion: %{link}" - invited_to_topic: "%{display_username} vous a invité dans un sujet: %{link}" + invited_to_topic: "%{display_username} vous a invité à %{link}" invitee_accepted: "%{display_username} a accepté votre invitation" linked: "%{display_username} a mentionné l'un de vos messages : %{link}" granted_badge: "Vous avez gagné %{link}" @@ -1161,6 +1197,7 @@ fr: reserved_username: "Ce pseudo n'est pas autorisé." missing_user_field: "Vous n'avez pas renseigné l'ensemble des champs utilisateur" close_window: "Identification terminée. Fermez cette fenêtre pour continuer." + already_logged_in: "Oups, on dirait que vous essayez d'accepter une invitation d'un autre utilisateur. Si vous n'êtes pas %{current_user}, veuillez vous déconnecter et réessayer." user: no_accounts_associated: "Aucun compte associé" username: @@ -1169,8 +1206,8 @@ fr: characters: "doit inclure uniquement des chiffres, lettres et caractères de soulignement" unique: "doit être unique" blank: "doit être présent" - must_begin_with_alphanumeric: "doit débuter par une lettre ou un nombre ou un underscore" - must_end_with_alphanumeric: "doit terminer par une lettre, un chiffre ou un caractère souligné (underscore)" + must_begin_with_alphanumeric_or_underscore: "doit commencer par une lettre, un chiffre ou un tiret du bas." + must_end_with_alphanumeric: "doit finir par une lettre ou un chiffre" must_not_contain_two_special_chars_in_seq: "ne doit pas contenir une séquence de 2 caractères spéciaux ou plus (.-_)" must_not_end_with_confusing_suffix: "ne doit pas se terminer avec un suffixe déroutant comme .json ou .png etc." email: @@ -1179,6 +1216,13 @@ fr: ip_address: blocked: "Les nouvelles inscriptions ne sont pas acceptées depuis votre adresse IP." max_new_accounts_per_registration_ip: "Les nouvelles inscriptions ne sont pas autorisées depuis votre adresse IP (limite atteinte). Contactez un responsable." + flags_reminder: + flags_were_submitted: + one: "Un signalement a été soumis il y a plus d'une heure. Veuillez la passer en revue." + other: "Des signalements ont été soumis il y a plus de %{count} heures. Veuillez les passer en revue." + subject_template: + one: "un signalement en attente de traitement" + other: "%{count} signalements en attente de traitement." unsubscribe_mailer: subject_template: "Confirmez que vous ne souhaitez plus recevoir d'email de mise à jour de %{site_title}" text_body_template: | @@ -1188,7 +1232,7 @@ fr: %{confirm_unsubscribe_link} - Si vous souhaitez continuer à recevoir les emails, vous pouvez ignorer cette email. + Si vous souhaitez continuer à recevoir les emails, vous pouvez ignorer cet email. invite_mailer: subject_template: "%{invitee_name} vous a invité(e) à participer à '%{topic_title}' sur %{site_domain_name}" text_body_template: | @@ -1232,87 +1276,10 @@ fr: (Si le lien est expiré, choisissez "J'ai oublié mon mot de passe" lorsque vous essayez de vous connecter avec votre adresse mail.) test_mailer: subject_template: "[%{site_name}] Test de délivrabilité d'un courriel" - text_body_template: | - Ceci est un courriel de test de - - [**%{base_url}**][0] - - Assurer la distribution de courriel est compliqué. Voici un certain nombre de points importants que vous devez vérifier au préalable: - - - Soyez *certain* de renseigner le champs from: de la `notification par email` correctement dans votre configuration. **Le nom de domaine renseigné dans l'addresse "from" des courriels que vous envoyez sera le nom de domaine utilisé pour la validation**. - - - Sachez comment consulter le format brut d'un courriel dans votre client de courriel, pour vous permettre de consulter les entêtes pour obtenirs des indices importants. Dans Gmail, c'est l'option "show original" dans le menu contextuel situé en haut à droite de chaque courriel. - - - **IMPORTANT:** Does your ISP have a reverse DNS record entered to associate the domain names and IP addresses you send mail from? [Test your Reverse PTR record][2] here. If your ISP does not enter the proper reverse DNS pointer record, it's very unlikely any of your email will be delivered. - - - l'enregistrement [SPF record][8] de votre nom de domaine est-il correcte ? [Testez votre enregistrement SPF][1] ici Veuillez noter que le type officiel d'enregistrment est TXT pour l'enregistrement SPF. - - - l'enregistrement [DKIM record][3] de votre nom de domaine est-il correcte ? Ce point particulier augmentera de manière significative la bonne distribution de vos courriels. [Testez votre enregistrement DKIM][7] ici. - - - If you run your own mail server, check to make sure the IPs of your mail server are [not on any email blacklists][4]. Also verify that it is definitely sending a fully-qualified hostname that resolves in DNS in its HELO message. If not, this will cause your email to be rejected by many mail services. - - (La mannière la plus *facile* est de créer un compte gratuit sur [Mandrill][md] ou [Mailgun][mg] ou [Mailjet][mj], qui ont des options gratuites généreuses et qui seront parfaite pour de petites communautés. Vous devrez quand même configurer les entrées SPF et DKIM dans votre DNS!) - - Nous espérons que vous avez bien reçu ce courriel de test de distribution ! - - Bonne chance, - - Vos amis de [Discourse](http://www.discourse.org) - - [0]: %{base_url} - [1]: http://www.kitterman.com/spf/validate.html - [2]: http://mxtoolbox.com/ReverseLookup.aspx - [3]: http://www.dkim.org/ - [4]: http://whatismyipaddress.com/blacklist-check - [7]: http://dkimcore.org/tools/dkimrecordcheck.html - [8]: http://www.openspf.org/SPF_Record_Syntax - [md]: http://mandrill.com - [mg]: http://www.mailgun.com/ - [mj]: https://www.mailjet.com/pricing new_version_mailer: subject_template: "[%{site_name}] Nouvelle version de Discourse, mise à jour disponible" - text_body_template: | - Une nouvelle version de [Discourse](http://www.discourse.org) est disponible. - - Votre version: %{installed_version} - Nouvelle version: **%{new_version}** - - Vous voulez peut-être: - - - Voir les nouveautés sur le [changelog de GitHub](https://github.com/discourse/discourse/commits/master). - - - Mettre à jour depuis votre navigateur en allant sur [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) - - - Visiter [meta.discourse.org](http://meta.discourse.org) pour vous tenir au courant, discuter et avoir de l'aide à propos de Discourse. new_version_mailer_with_notes: subject_template: "[%{site_name}] mise à jour disponible" - text_body_template: | - Une nouvelle version de [Discourse](http://www.discourse.org) est disponible. - - Votre version: %{installed_version} - Nouvelle version: **%{new_version}** - - Vous voulez peut-être: - - - Voir les nouveautés sur le [changelog de GitHub](https://github.com/discourse/discourse/commits/master). - - - Mettre à jour depuis votre navigateur en allant sur [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) - - - Visiter [meta.discourse.org](http://meta.discourse.org) pour vous tenir au courant, discuter et avoir de l'aide à propos de Discourse. - - ### Notes de mise à jour - - %{notes} - flags_reminder: - flags_were_submitted: - one: "Il y a un signalement qui a été soumis il y a plus de %{count} heures." - other: "Ces signalements ont été soumis il y a plus de %{count} heures." - please_review: "Veuillez examiner cela." - post_number: "message" - how_to_disable: 'Vous pouvez désactiver ou modifier la fréquence de ce courriel de rappel via le réglage "m''informer sur les signalements".' - subject_template: - one: "un signalement en attente de traitement" - other: "%{count} signalements en attente de traitement." queued_posts_reminder: subject_template: one: "[%{site_name}] 1 message en attente de modération" @@ -1453,7 +1420,7 @@ fr: text_body_template: "Merci d'avoir rejoint %{site_name} et bienvenue ! \n\n%{new_user_tips}\n\nNous croyons au [comportement communautaire civilisé](%{base_url}/guidelines) en tous temps. \n\nAmusez-vous bien ! \n\n(Si, en tant que nouvel utilisateur, vous avez besoin de communiquer avec un [responsable](%{base_url}/about), répondez simplement à ce message.)\n" welcome_invite: subject_template: "Bienvenue sur %{site_name} !" - text_body_template: "Merci d'avoir accepté votre invitation sur %{site_name} et bienvenue !\n\nNous avons créé un nouveau compte : **%{username}**, et vous y êtes connecté. Vous pouvez changer votre pseudo en allant sur [votre profil][prefs].\n\nPour vous reconnecter :\n\n1. Toujours **utiliser la même adresse de courriel que celle de l'invitation** que vous avez reçue. Autrement, nous ne pourrons pas vous reconnaître.\n\n2. Créer un mot de passe unique sur votre [sur votre profil][prefs] et connectez-vous avec. \n\n%{new_user_tips}\n\nNous croyons au [comportement communautaire civilisé](%{base_url}/guidelines) en tous temps.\n\nAmusez-vous bien !\n\n(Si, en tant que nouvel utilisateur, vous avez besoin de communiquer avec un [responsable](%{base_url}/about), répondez simplement à ce message).\n\n[prefs] : %{user_preferences_url}\n" + text_body_template: "Merci d'avoir accepté votre invitation sur %{site_name} et bienvenue !\n\nNous avons créé un nouveau compte : **%{username}**, et vous y êtes connecté. Vous pouvez changer votre pseudo en allant sur [votre profil][prefs].\n\nPour vous reconnecter :\n\n1. Toujours **utiliser la même adresse de courriel que celle de l'invitation** que vous avez reçue. Autrement, nous ne pourrons pas vous reconnaître.\n\n2. Créer un mot de passe unique sur votre [sur votre profil][prefs] et connectez-vous avec. \n\n%{new_user_tips}\n\nNous croyons au [comportement communautaire civilisé](%{base_url}/guidelines) en tous temps.\n\nAmusez-vous bien !\n\n(Si, en tant que nouvel utilisateur, vous avez besoin de communiquer avec un [responsable](%{base_url}/about), répondez simplement à ce message).\n\n[prefs]: %{user_preferences_url}\n" backup_succeeded: subject_template: "Sauvegarde terminée avec succès" text_body_template: "La sauvegarde a bien réussie.\nVisitez [la section admin > sauvegarde](%{base_url}/admin/backups) pour télécharger votre nouvelle sauvegarde." @@ -1669,12 +1636,14 @@ fr: subject_pm: "[MP]" user_notifications: previous_discussion: "Réponses précédentes" + in_reply_to: "En réponse à" unsubscribe: title: "Désabonnement" description: "Ces courriels ne vous intéressent pas ? Aucun problème ! Cliquez ci-dessous pour vous désabonner immédiatement :" reply_by_email: "[Visiter sujet](%{base_url}%{url}) ou répondre à ce courriel pour répondre." - visit_link_to_respond: "[Visiter sujet](%{base_url}%{url}) pour répondre." reply_by_email_pm: "[Visiter message](%{base_url}%{url}) ou répondre à ce courriel pour répondre." + only_reply_by_email: "Répondre à ce courriel pour répondre" + visit_link_to_respond: "[Visiter sujet](%{base_url}%{url}) pour répondre." visit_link_to_respond_pm: "[Visiter message](%{base_url}%{url}) pour répondre." posted_by: "Ecrit par %{username} le %{post_date}" user_invited_to_private_message_pm: @@ -1696,7 +1665,6 @@ fr: Veuillez suivre ce lien pour consulter le message: %{base_url}%{url} user_invited_to_topic: - subject_template: "[%{site_name}] %{username} vous a invité dans le sujet '%{topic_title}'" text_body_template: "\n%{username} vous a invité à une conversation\n\n> **%{topic_title}**\n>\n> %{topic_excerpt}\n\nsur \n\n> %{site_title} -- %{site_description}\n\nVeuillez suivre ce lien pour voir le message: %{base_url}%{url}\n" user_replied: subject_template: "[%{site_name}] %{topic_title}" @@ -1731,6 +1699,8 @@ fr: --- %{respond_instructions} + user_linked: + subject_template: "[%{site_name}] %{topic_title}" user_mentioned: subject_template: "[%{site_name}] %{topic_title}" text_body_template: | @@ -1857,7 +1827,7 @@ fr: Si le lien ci-dessus n'est pas cliquable, essayez de le copier et coller dans la barre d'adresse de votre navigateur web. page_not_found: - title: "La page que vous avez demandé n'existe pas ou est privée." + title: "Oops! Cette page n'existe pas ou est privée." popular_topics: "Populaires" recent_topics: "Récents" see_more: "Plus" diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml index 008299cdde..e79e6d50eb 100644 --- a/config/locales/server.he.yml +++ b/config/locales/server.he.yml @@ -727,7 +727,6 @@ he: suppress_reply_directly_above: "אל תציגו את את אפשרות ההרחבה \"בתגובה ל..\" לפרסום כאשר יש רק תגובה אחת ישירה מעל לפרסום זה." suppress_reply_when_quoting: "אל תציגו את הפרסום המקורי בפרסומים שמצטטים תגובות" max_reply_history: "מספר התגובות המקסימלי להרחבה כאשר מרחיבים \"בתגובה ל\"" - experimental_reply_expansion: "החבא תגובות ביניים כאשר מרחיבים תגובה (ניסיוני)" topics_per_period_in_top_summary: "מספר הנושאים המוצגים בבריכת המחדל של סיכום הנושאים." topics_per_period_in_top_page: "מספר הנושאים הראשונים המוצגים בתצוגה המורחבת של \"הצג עוד\"." redirect_users_to_top_page: "כוון באופן אוטומטי משתמשים חדשים וכאלה שנעדרו במשך זמן לראש העמוד." diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml index 3d12040e83..969ba7c39d 100644 --- a/config/locales/server.it.yml +++ b/config/locales/server.it.yml @@ -728,7 +728,6 @@ it: suppress_reply_directly_above: "Non mostrare in-risposta-a espandibile in un messaggio quando c'è una sola risposta sopra quel messaggio. " suppress_reply_when_quoting: "Non mostrare in-risposta-a espandibile in un messaggio quando il messaggio include la citazione." max_reply_history: "Numero massimo di risposte da espandere quando si espande in-risposta-a" - experimental_reply_expansion: "Nascondi le risposte intermedie quando si espande una risposta (sperimentale)" topics_per_period_in_top_summary: "Numero di argomenti di punta mostrati nel riepilogo di default." topics_per_period_in_top_page: "Numero di argomenti di punta mostrati nella vista espansa 'Mostra Altro'" redirect_users_to_top_page: "Redirigi automaticamente i nuovi utenti e quelli assenti da tempo sulla pagina degli argomenti di punta." diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml index ab3086d599..98e5f8cdd5 100644 --- a/config/locales/server.ja.yml +++ b/config/locales/server.ja.yml @@ -631,7 +631,6 @@ ja: suppress_reply_directly_above: "ポストに回答が１つしかない場合、ポストのin-reply-toを表示しない" suppress_reply_when_quoting: "ポストが引用返信だった場合、ポストのin-reply-toを表示しない" max_reply_history: "回答のin-reply-toを展開する最大数" - experimental_reply_expansion: "回答を展開するときに、その間にある回答を非表示にする(実験)" topics_per_period_in_top_summary: "デフォルトのトピックサマリに表示されるトップトピックの数" topics_per_period_in_top_page: "'もっと見る'を展開したときに表示するトップトピックの数" redirect_users_to_top_page: "新規ユーザーと長く不在のユーザーをトップページに自動的にリダイレクトさせる" diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml index 14b7ff0b02..dc8cfc2971 100644 --- a/config/locales/server.ko.yml +++ b/config/locales/server.ko.yml @@ -10,6 +10,14 @@ ko: short_date_no_year: "M월 D일" short_date: "YYYY-M-D" long_date: "YYYY-M-D a h:mm" + datetime_formats: &datetime_formats + formats: + short: "%Y-%m-%d" + short_no_year: "%B %-d" + date_only: "%B %-d, %Y" + date: + month_names: [] + <<: *datetime_formats title: "Discourse" topics: "글타래" posts: "글" @@ -19,6 +27,9 @@ ko: purge_reason: "비활성화된 계정은 자동적으로 삭제됩니다." disable_remote_images_download_reason: "디스크저장공간이 부족하여 원격 이미지 다운로드 기능이 비활성화 되었습니다." anonymous: "익명" + emails: + incoming: + default_subject: "%{email} 으로부터 받은 이메일" errors: &errors format: '%{attribute} %{message}' messages: @@ -71,6 +82,7 @@ ko: not_found: "요청한 URL이나 리소스를 찾지 못했습니다." invalid_access: "요청한 리소스를 볼 권한이 없습니다." read_only_mode_enabled: "현재 읽기 전용 모드입니다." + reading_time: "읽은 시간" likes: "좋아요" too_many_replies: other: "죄송합니다. 신규 가입자는 글 하나에 %{count}개까지만 댓글을 달 수 있습니다." @@ -111,6 +123,7 @@ ko: rss_description: latest: "최신 글타래" hot: "인기 글타래" + top: "인기 토픽" posts: "최근 글" too_late_to_edit: "이 글은 작성된 지 너무 오랜 기간이 지났습니다. 수정 또는 삭제할 수 없습니다." excerpt_image: "이미지" @@ -232,6 +245,7 @@ ko: self_parent: "하위 카테고리의 부모는 자신이 될 수 없습니다." depth: "하위 카테고리는 계층 구조로 사용할 수 없습니다." email_in_already_exist: "'%{email_in}' 수신용 이메일 주소는 '%{category_name}' 카테고리 에서 사용 중입니다." + invalid_email_in: "'%{email_in}' 은 유효한 이메일 주소가 아닙니다." cannot_delete: uncategorized: "Uncategorized는 삭제할 수 없습니다." has_subcategories: "하위 카테고리가 있어, 삭제할 수 없습니다." @@ -327,6 +341,7 @@ ko: please_continue: "%{site_name}으로 가기" error: "이메일 주소를 변경하는데 문제가 있습니다. 주소가 이미 사용되고 있나요?" activation: + action: "여기를 눌러 계정을 활성화하세요." already_done: "죄송합니다. 이 계정 확인 링크는 더 이상 유효하지 않습니다." please_continue: "계정이 활성화 되었습니다; 홈페이지로 이동합니다." continue_button: "%{site_name}으로 가기" @@ -349,11 +364,13 @@ ko: description: '이 글은 다른 사용자들에게 공격적이나 모욕적 또는 침해적인 글을 담고 있습니다.' long_form: '부적절함으로 신고하기' notify_user: + title: '@{{username}} 님에게 메시지를 보냅니다' long_form: '메세지한 유저' email_title: '"%{title}" 내의 당신의 글' email_body: "%{link}\n\n%{message}" notify_moderators: title: "뭔가 다른것" + long_form: '주의를 위해 운영진에게 신고했습니다' email_body: "%{link}\n\n%{message}" bookmark: title: '북마크' @@ -415,6 +432,10 @@ ko: title: "새 사용자" xaxis: "일" yaxis: "새로운 사용자 수" + profile_views: + title: "회원 프로필 조회수" + xaxis: "일" + yaxis: "회원 프로필 조회된 횟수" topics: title: "글타래들" xaxis: "일" @@ -498,6 +519,10 @@ ko: title: "총" xaxis: "일" yaxis: "총 API 요청" + page_view_logged_in_mobile_reqs: + xaxis: "일" + page_view_anon_mobile_reqs: + xaxis: "일" http_background_reqs: title: "백그라운드" xaxis: "일" @@ -530,6 +555,10 @@ ko: title: "답글 없는 주제" xaxis: "일" yaxis: "총" + mobile_visits: + title: "사용자 방문횟수" + xaxis: "일" + yaxis: "방문 횟수" dashboard: rails_env_warning: "당신의 서버는 %{env} 모드에서 실행되고 있습니다." ruby_version_warning: "당신은 문제가 자주 발생하는 루비 버전 2.0.0을 사용하시고 있습니다. 247 또는 이후 패치 레벨로 업그레이드를 해주세요." @@ -566,7 +595,6 @@ ko: min_private_message_title_length: "메세지 제목의 최소 길이" min_search_term_length: "검색을 하기 위한 최소 글자 수" allow_uncategorized_topics: "카테고리 없이 게시 허용. 주의: 카테고리 없는 글은 이 항목을 비활성화에 하기전에 카테고리 설정을 해야 합니다." - uncategorized_description: "'카테고리 없음' 카테고리의 설명, 설명을 쓰지 않으려면 빈칸으로 놔둔다." allow_duplicate_topic_titles: "같은 제목의 동일한 글타래 허용" unique_posts_mins: "같은 컨텐츠를 다시 글 할 수 있는 기간(분)" educate_until_posts: "새로운 사용자가 글를 작성할 시 글 작성 방법에 대한 교육패널을 보여주는데, 해당 패널이 보여지는 초기 글 개수" @@ -643,7 +671,6 @@ ko: suppress_reply_directly_above: "단 하나의 댓글 위의 글이 하나 있는 상황에서 '~에 대한 댓글'을 보여주지 않음." suppress_reply_when_quoting: "글안에 답글이 인용될 때 in-reply-to를 보여주지 않습니다." max_reply_history: "덧글 확장해서 보여지는 최대 갯수" - experimental_reply_expansion: "답글을 펼쳤을 때 중간 답글을 숨깁니다(실험 중)" topics_per_period_in_top_summary: "인기 글타래 요약에 기본으로 보여질 글타래 수" topics_per_period_in_top_page: "인기 글타래에서 '더 보기'를 요청할 시 보여질 글타래 수" redirect_users_to_top_page: "자동으로 신규 사용자와 오래간만에 들어온 사용자를 탑 페이지로 리다이렉트 시킴" @@ -664,6 +691,9 @@ ko: invite_passthrough_hours: "사용되어진 방문키를 로그인하는데 재사용할 수 있는 기간, 시간" invite_only: "공개 가입은 불가하도록 설정됨. 초대를 받아야만 신규 가입 가능함." login_required: "글을 읽으려면 인증(로그인)이 필요함" + min_username_length: "아이디 최소길이 (문자 갯수)" + max_username_length: "아이디 최대길이 (문자 갯수)" + reserved_usernames: "회원가입 금지된 아이디 목록" min_password_length: "비밀번호 최소 글자수." block_common_passwords: "가장 흔히 사용되는 10,000개 비밀번호 목록에 있는 비밀번호를 사용하는 것을 허용하지 않음." enable_sso: "외부사이트 Single Sign On, SSO를 통해 로그인 활성화(경고: 유저의 이메일 주소는 반드시 외부에서 확인해야합니다!)" @@ -825,7 +855,6 @@ ko: automatically_download_gravatars: "사용자가 계정을 만들거나 이메일을 변경하자마자 Gravatar를 다운로드합니다." digest_topics: "요약 이메일에서 보여질 최대 글타래 개수" digest_min_excerpt_length: "요약 이메일에서 최소 글 발췌 수" - delete_digest_email_after_days: "(n)일동안 사이트에서 보지 못한 사용자에게는 이메일 요약을 보내지 않습니다." disable_digest_emails: "모든 유저들 이메일 다이제스트 못하게 하기" max_daily_gravatar_crawls: "하루에 Discourse가 커스텀 아파타를 위해 Gravatar를 체크하는 최대 횟수" public_user_custom_fields: "유저가 쓸 수 있는 공개 커스텀 필드 목록" @@ -895,7 +924,6 @@ ko: moved_post: "%{display_username} 사용자가 %{link} 에 당신의 글을 이동하였습니다." private_message: "%{display_username} 회원님이 메세지를 보냈습니다: %{link}" invited_to_private_message: "%{display_username} 회원님이 메세지에 초대했습니다: %{link}" - invited_to_topic: "%{display_username} 회원님이 글타래에 초대했습니다: %{link}" invitee_accepted: "%{display_username} 사용자가 당신의 초대를 수락하였습니다." linked: "%{display_username} 사용자가 %{link} 에서 당신을 링크했습니다." granted_badge: "당신은 %{link}를 획득했습니다." @@ -982,6 +1010,9 @@ ko: ip_address: blocked: "이 IP주소에서는 가입이 안됩니다." max_new_accounts_per_registration_ip: "이 IP에서는 가입이 더이상 되지 않습니다(최대 가입 제한 도달). 스태프에게 연락주세요." + flags_reminder: + subject_template: + other: "%{count}개의 신고가 접수 대기 중" invite_mailer: subject_template: "%{invitee_name} 회원님이 %{site_domain_name} 에 '%{topic_title}'에 초대하였습니다." text_body_template: | @@ -1018,86 +1049,10 @@ ko: subject_template: "%{site_name} 계정을 위해 비밀번호 설정" test_mailer: subject_template: "[%{site_name}] 이메일 발송 테스트" - text_body_template: | - 이것은 테스트 이메일 양식입니다. - - [**%{base_url}**][0] - - 이메일 발송은 어렵습니다. 먼저 체크해야 할 몇가지 사항을 알려드립니다: - - - `알림 이메일` 발신지 주소가 사이트 설정에 적었는지 *확실히* 보세요. **발신지 이메일 주소에 적힌 도메인은 받는 곳에서 검사하게 될 도메인입니다**. - - - 이메일 raw source를 이메일 클라이언트에서 보는 방법을 알아두고 이메일 헤더에서 중요한 단서를 찾도록 합니다. Gmail에서는, 각 메일의 오른쪽 위에 있는 드롭다운 메뉴의 "원본보기" 옵션입니다. - - - **중요:** 당신의 ISP회사가 도메인네임과 IP주소를 연결시켜주러 들어오는 a reverse DNS record 갖고 있나요? [Reverse PTR record 테스트][2]해보세요. ISP회사가 적절한 reverse DNS pointer record를 안 넣었다면, 어떤 이메일도 발송이 안될 수 있습니다. - - - 이메일 도메인의 [SPF record][8]가 제대로 설정됐나요? [SPF record 테스트][1]해보세요. 참고로 TXT가 제대로된 공식 SPF 타입입니다. - - - 이메일 도메인의 [DKIM record][3]가 제대로 설정됐나요? 이게 이메일 전송에 큰 영향을 줍니다. [your DKIM record 테스트][7]해보세요. - - - 스스로 이메일서버를 운영중이라면, 메일서버 IP가 [블랙리스트][4]에 안들어 가있는지 확실히 봐야합니다. 또 DNS의 HELO 메세지로 resolve가 되는 완벽히 인증된 호스트네임으로 제대로 보내고 있는지 확인해야 합니다. 아니라면 대부분의 받는 쪽 메일 서비스에서 거절 받을 겁니다. - - (한 가지 *쉬운* 방법은 [Mandrill][md]이나 [Mailgun][mg]이나 [Mailjet][mj]에 가입해 메일링 서비스를 받는 것이고 작은 커뮤니티에서는 괜찮을 겁니다. 그래도 SPF레코드 DKIM레코드는 DNS에 등록해줘야합니다!) - - 우리도 이 이메일 전송 테스트를 제대로 받았기를 바랍니다. - - 행운을 빕니다. - - 당신의 친구 [Discourse](http://www.discourse.org) - - [0]: %{base_url} - [1]: http://www.kitterman.com/spf/validate.html - [2]: http://mxtoolbox.com/ReverseLookup.aspx - [3]: http://www.dkim.org/ - [4]: http://whatismyipaddress.com/blacklist-check - [7]: http://dkimcore.org/tools/dkimrecordcheck.html - [8]: http://www.openspf.org/SPF_Record_Syntax - [md]: http://mandrill.com - [mg]: http://www.mailgun.com/ - [mj]: https://www.mailjet.com/pricing new_version_mailer: subject_template: "[%{site_name}] 새 Discourse 버전으로 업데이트 가능." - text_body_template: | - [Discourse](http://www.discourse.org) 새 버전이 나왔습니다. - - 현재 이 Discourse 버전: %{installed_version} - 새 버전: **%{new_version}** - - 제안: - - - [GitHub changelog](https://github.com/discourse/discourse/commits/master)에 뭐가 바뀌었는지 확인해보세요. - - - 브라우저 상에서 [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade)로 들어가 업그레이드가 가능합니다. - - - [meta.discourse.org](http://meta.discourse.org) 포럼에서 Discourse 관련 지원, 토의, 뉴스를 보실 수 있습니다. new_version_mailer_with_notes: subject_template: "[%{site_name}] 업데이트 가능." - text_body_template: |+ - [Discourse](http://www.discourse.org) 새 버전이 나왔습니다. - - 현재 이 Discourse 버전: %{installed_version} - 새 버전: **%{new_version}** - - 제안: - - - [GitHub changelog](https://github.com/discourse/discourse/commits/master)에 뭐가 바뀌었는지 확인해보세요. - - - 브라우저 상에서 [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade)로 들어가 업그레이드가 가능합니다. - - - [meta.discourse.org](http://meta.discourse.org) 포럼에서 Discourse 관련 지원, 토의, 뉴스를 보실 수 있습니다. - - ### 릴리즈 노트 - - %{notes} - - flags_reminder: - flags_were_submitted: - other: "이 신고들은 %{count}시간 전에 접수 됐습니다." - please_review: "후기를 써주세요." - post_number: "글" - how_to_disable: '"notify about flags after" 설정을 통해 이메일 알림의 빈도를 변경하거나 비활성화할 수 있습니다.' - subject_template: - other: "%{count}개의 신고가 접수 대기 중" queued_posts_reminder: subject_template: other: "[%{site_name}]의 %{count}개의 글이 검토를 기다리고 있습니다." @@ -1134,6 +1089,99 @@ ko: 하지만 글이 한번 더 커뮤니티에서 숨김이 된 경우 스태프가 풀어주기 전까지 숨김해제가 안되며 계정 정지 등의 조치가 취해질 수 있습니다. 조언을 얻기 위해, [커뮤니티 가이드라인](%{base_url}/guidelines)을 참고해 주세요. + usage_tips: + text_body_template: | + 시작하기 위한 몇 가지 간단한 팁을 알려드릴께요: + + ## 읽기 + + 더 읽으시려면, **그냥 계속해서 스크롤다운 하세요!** + + 새 댓글이나 새 포픽이 올라오면 자동으로 나타나기 때문에 페이지 새로고침할 필요가 없습니다. + + ## 탐색 + + - 검색 또는 ☰ 메뉴, 사용자페이지는 **화면 우상단에 있는 아이콘 버튼**을 사용하세요. + + - 토픽을 선택하면 항상 당신이 그 토픽에서 **읽지 않은 다음 댓글**로 바로 갑니다. 제일 위나 아래로 가려면, 댓글 카운트 또는 마지막 댓글 날짜를 선택하세요. + + + + - 토픽을 읽는 도중에는, 우하단에 있는 프로그레스 바를 이용해서 전체 탐색하세요. 토픽 제목을 선택하면 제일 위로 바로 갈 수 있답니다. 초스피드 키보드 단축키 목록이 궁금하면 ?키를 누르세요. + + + + ## 댓글달기 + + - 토픽에 **평범하게 댓글 달때**는, 토픽 맨 밑에 있는 버튼을 이용하세요. + + - **특정 사람**에게 댓글 달때는, 그 글에 딸린 버튼을 이용하세요. + + - **새로운 토픽으로** 댓글 달때는, 글 오른쪽에 있는 버튼을 이용하세요. 오래된 토픽과 새 토픽 모두 자동적으로 함께 링크됩니다. + + 댓글은 간단한 HTML 또는 BBCode, [마크다운 (Markdown)](http://commonmark.org/help/) 형식으로 쓸 수 있습니다. + + 이건 **볼드체**입니다. + 이건 볼드체입니다. + 이건 [b]볼드체[/b]입니다. + + 마크다운을 배우고 싶으시다면? [저희의 10분짜리 재밌는 인터랙티브 튜토리얼을 해보세요!](http://commonmark.org/help/tutorial/) + + 인용문을 삽입하려면, 인용하고 싶은 텍스트를 선택한 다음에 댓글달기(응답하기) 버튼 아무거나 누르세요. 인용문이 여러개면 앞 동작을 반복하세요. + + + + 댓을을 누군가에게 알리고 싶을 때는 그 사람 이름을 언급하세요. `@` 키를 쳐서 사용자이름 선택하기를 시작할 수 있답니다. + + + + [표준 이모지(Emoji)](http://www.emoji.codes/)를 사용하려면, 그냥 `:`키를 눌러서 매칭되는 이름을 찾거나 예전부터 써온 `;)` 웃음표시를 이용하세요. + + + + 링크 요약을 생성하려면, 편집기 화면에 그 링크를 그냥 아래처럼 붙여넣기 하세요: + + + + ## 액션 + + 각각의 글 밑에는 액션 버튼들이 있습니다: + + + + 누군가의 글이 마음에 쏙 들어서 감사표시를 하고 싶으면 **좋아요** 버튼을 이용하세요. 애정을 공유하는 거에요! + + 누군가의 글에 문제가 있으면, **신고** 버튼으로 글쓴이에게 또는 [우리 운영진](%{base_url}/about)에게 개인적으로 조용히 알려주세요. 그 글로 가는 링크를 **공유**하거나 **북마크**해서 당신의 사용자 페이지에서 나중에 참고할 수도 있습니다. + + ## 알림 + + 누군가 당신에게 댓글달거나 당신의 글을 인용, 또는 당신의 `@아이디`를 언급하면, 페이지 우상단에 숫자가 즉시 나타납니다. **알림**으로 접근할 때 그걸 이용하세요. + + + + 댓글 놓칠까봐 걱정하지 마세요 - 당신이 없는 사이에 온 알림은 이메일로 보내드릴 꺼에요. + + ## 환경설정 + + - **쓴지 이틀이 안 된** 모든 토픽은 새글로 간주합니다. + + - **당신이 활동적으로 참여한** (글쓰기, 댓글달기, 일정시간 이상 읽기 등) 토픽은 자동적으로 추적됩니다. + + 이 토픽들 바로 옆에는 파란색 new 또는 읽지 않는 댓글수가 표시됩니다: + + + + 토픽 맨 밑에 있는 알림제어판을 통해 어떤 토픽이든지 알림설정을 바꿀 수 있습니다. + + + + 그리고 만일 특정 카테고리의 모든 새토픽을 지켜보고 싶으면, 카테고리 별로 알림설정 할 수 있습니다. + + 설정을 바꾸려면 [당신의 사용자 환경설정](%{base_url}/my/preferences)을 참고하세요. + + ## 커뮤니티 신뢰 + + 이곳에 참여하시면, 시간이 지남에 따라 커뮤니티의 신뢰를 받게 되고 정회원이 되어 신규회원 제한은 사라질 꺼에요. 충분이 높은 [회원등급이 되면](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924), 우리 커뮤니티를 함께 꾸려나가는 걸 도와줄 새능력을 얻을 껍니다. welcome_user: subject_template: "%{site_name} 사이트에 오신것을 환영합니다!" text_body_template: | @@ -1220,10 +1268,6 @@ ko: text_body_template: "죄송합니다. 데이터 추출에 실패하였습니다. 로그를 확인하시거나 관리자에게 문의해주세요." email_reject_no_account: subject_template: "[%{site_name}] 이메일 문제 -- 모르는 계정" - text_body_template: | - 죄송합니다 이메일 메세지 %{destination} (titled %{former_title})가 안 됐습니다. - - 이 이메일 주소로 되어있는 사용자 계정이 없습니다. 다른 이메일 주소로 보내거나 스태프에게 연락 주세요. email_reject_empty: subject_template: "[%{site_name}] 이메일 문제 -- 내용 없음" email_reject_parsing: @@ -1240,25 +1284,15 @@ ko: 이 카테고리에서 새 글타래를 작성하는 데 필요한 회원등급이 없습니다. 오류라고 생각되면 스태프에게 연락주세요. email_reject_reply_key: subject_template: "[%{site_name}] 이메일 문제 -- 잘못된 답글 Key" - text_body_template: | - 죄송합니다 이메일 메세지 %{destination} (titled %{former_title})가 안 됐습니다. - - 받은 답글 key가 올바르지 않거나 모르는 key여서 어디에 답글을 달아야 하는지 모르겠스빈다. 스태프에게 연락주세요. email_reject_topic_not_found: subject_template: "[%{site_name}] 이메일 문제 -- 글타래 못 찾음" - text_body_template: "죄송합니다, 이메일 메세지 %{destination} (titled %{former_title})가 안 됐습니다. \n\n답글하려는 글타래가 더이상 존재하지 않습니다, 아마 지워졌을 수도 있습니다. 오류라고 생각되면 스태프에게 연락주세요.\n" email_reject_topic_closed: subject_template: "[%{site_name}] 이메일 문제 -- 글타래 닫힘" - text_body_template: "죄송합니다, 이메일 메세지 %{destination} (titled %{former_title})가 안 됐습니다. \n\n답글하려는 글타래가 닫혔거나 더이상 답글을 받지 않스빈다. 오류라고 생각되면 스태프에게 연락 주세요.\n" + text_body_template: "죄송합니다, 이메일 메세지 %{destination} (titled %{former_title})가 안 됐습니다. \n\n답글하려는 글타래가 닫혔거나 더이상 답글을 받지 않습니다. 오류라고 생각되면 스태프에게 연락 주세요.\n" email_reject_auto_generated: subject_template: "[%{site_name}] 이메일 문제 -- 자동 생성된 답글" - text_body_template: "죄송합니다, 이메일 메세지 %{destination} (titled %{former_title})가 안 됐습니다. \n\n이메일이 \"자동 생성\"으로 확인 되어 받을 수 없습니다. 오류라고 생각되면 스태프에게 연락주세요.\n" email_error_notification: subject_template: "[%{site_name}] 이메일 문제 -- POP 인증 오류" - text_body_template: | - POP서버에서 메일을 가져오는데 인증 오류가 발생했습니다. - - POP 인증정보를 제대로 입력했는지 확인해주세요. [사이트 설정](%{base_url}/admin/site_settings/category/email). too_many_spam_flags: subject_template: "새로운 계정은 블락되었습니다." text_body_template: | @@ -1323,7 +1357,6 @@ ko: %{base_url}%{url} 로 들어가서 메세지를 확인하기 user_invited_to_topic: - subject_template: "[%{site_name}] %{username} 회원님이 '%{topic_title}' 글타래에 초대했습니다." text_body_template: |2 %{username} 회원님이 토의에 초대하였습니다. @@ -1425,7 +1458,6 @@ ko: 만약 위의 링크를 클릭 할 수 없으면 주소를 복사하여 당신의 웹브라우저에 붙여넣으세요. page_not_found: - title: "당신이 요청한 페이지를 찾을 수 없습니다. 혹시 아래와 같은 글타래를 찾으신 것은 아닌가요?" popular_topics: "인기" recent_topics: "최근" see_more: "더" @@ -1495,6 +1527,8 @@ ko: performance_report: initial_post_raw: 이 글타래는 웹사이트의 일일 성능 보고를 포함하고 있습니다. initial_topic_title: 웹사이트 성능 보고 + time: + <<: *datetime_formats activemodel: errors: <<: *errors diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml index b1f0239457..99daac0732 100644 --- a/config/locales/server.nl.yml +++ b/config/locales/server.nl.yml @@ -10,8 +10,14 @@ nl: short_date_no_year: "D MMM" short_date: "D MMM YYYY" long_date: "D MMMM YYYY H:mm" + datetime_formats: &datetime_formats + formats: + short: "%m-%d-%Y" + short_no_year: "%-d %B" + date_only: "%B %-d, %Y" date: month_names: [null, januari, februari, maart, april, mei, juni, juli, augustus, september, oktober, november, december] + <<: *datetime_formats title: "Discourse" topics: "Topics" posts: "berichten" @@ -21,6 +27,22 @@ nl: purge_reason: "Automatisch verwijderd, account is nooit geactiveerd" disable_remote_images_download_reason: "Het downloaden van plaatjes is uitgeschakeld omdat er niet genoeg schijfruimte beschikbaar is." anonymous: "Anoniem" + emails: + incoming: + default_subject: "Inkomende email van %{email}" + errors: + empty_email_error: "Gebeurt wanneer de mail die wij ontvangen hebben leeg is." + no_message_id_error: "Gebeurt wanneer de mail geen 'Message-Id' header heeft." + auto_generated_email_error: "Gebeurt wanneer de 'voorrang' header is ingesteld op: lijst, ongewenst, bulk of automatisch auto_reply, of wanneer een andere header bevat: auto-submitted, auto-replied of auto-generated." + no_body_detected_error: "Gebeurt wanneer wij de body niet konden uitpakken en er geen bijlages zijn." + inactive_user_error: "Gebeurt wanneer de zender niet actief is." + blocked_user_error: "Gebeurt wanneer de zender is geblokkeerd." + bad_destination_address: "Gebeurt wanneer geen van de E-mail adressen in de To/Cc/Bcc velden gelijk zijn aan de geconfigureerde inkomende E-mail adressen." + strangers_not_allowed_error: "Gebeurt wanneer een gebruiker heeft geprobeerd een nieuw topic aan te maken in een categorie waar zijn geen lid van zijn." + insufficient_trust_level_error: "Gebeurt wanneer een gebruiker heeft geprobeerd een nieuw topic aan te maken in een categorie waar zijn niet het vereiste trust level voor hebben." + reply_user_not_matching_error: "Gebeurt wanneer een reactie kwam van een ander E-mail adres dan waar de notificatie was heen gestuurd. " + topic_not_found_error: "Gebeurt wanneer een reactie binnen kwam, maar het topic al is verwijdert." + topic_closed_error: "Gebeurt wanneer een reactie binnen kwam, maar het verwante topic is gesloten." errors: &errors format: '%{attribute} %{message}' messages: @@ -84,6 +106,8 @@ nl: not_found: "De opgevraagde URL of resource kan niet gevonden worden." invalid_access: "Je hebt geen permissie om de opgevraagde resource te bekijken." read_only_mode_enabled: "De site is in read only modus. Interactie is niet mogelijk." + reading_time: "leestijd" + likes: "'Vind ik leuks' " too_many_replies: one: "Sorry, nieuwe gebruikers mogen één reactie plaatsen in hetzelfde topic." other: "Sorry, nieuwe gebruikers mogen %{count} reacties plaatsen in hetzelfde topic." @@ -142,6 +166,7 @@ nl: rss_description: latest: "Nieuwste topics" hot: "Hot topics" + top: "Top topics" posts: "Nieuwste berichten" too_late_to_edit: "Dat bericht is lang geleden geschreven. Het kan niet meer gewijzigd of verwijderd worden." excerpt_image: "afbeelding" @@ -151,6 +176,8 @@ nl: errors: can_not_modify_automatic: "Je kunt automatische groepen niet wijzigen" member_already_exist: "'%{username}' is al lid van deze groep." + invalid_domain: "%{domain}' is geen geldig domein." + invalid_incoming_email: "%{incoming_email}' is geen geldig E-mail adres." default_names: everyone: "iedereen" admins: "admins" @@ -284,6 +311,7 @@ nl: self_parent: "Een categorie kan niet zijn eigen bovenliggende categorie zijn" depth: "Je kan een subcategorie niet onder een andere subcategorie plaatsen" email_in_already_exist: "Inkomend e-mailadres '%{email_in}' is al in gebruik voor '%{category_name}' categorie." + invalid_email_in: "%{email_in}' is geen geldig E-mail adres." cannot_delete: uncategorized: "De categorie Ongecategoriseerd kan niet verwijderd worden" has_subcategories: "Deze categorie kan niet verwijderd worden, omdat deze subcategorieën bevat" @@ -291,11 +319,18 @@ nl: one: "Categorie kan niet verwijderd worden omdat het 1 topic heeft. Het oudste topic is %{topic_link}." other: "Categorie kan niet verwijderd worden omdat het %{count} topics heeft. Het oudste topic is %{topic_link}." topic_exists_no_oldest: "Categorie kan niet verwijderd worden omdat het aantal topics %{count} is." + uncategorized_description: "Topics die geen categorie nodig hebben of niet in een andere bestaande categorie passen." trust_levels: newuser: title: "nieuw lid" basic: title: "lid" + member: + title: "lid" + regular: + title: "Normaal" + leader: + title: "leider" change_failed_explanation: "Je probeerde %{user_name} te degraderen naar '%{new_trust_level}'. Echter, het trustlevel is al '%{current_trust_level}'. %{user_name} blijft op trust level '%{current_trust_level}'. Als je de gebruiker wil degraderen, zet het trustlevel dan eerst vast." rate_limiter: slow_down: "je hebt deze actie te vaak uitgevoerd, probeer het later nog eens." @@ -428,11 +463,16 @@ nl: description: 'Dit bericht bevat inhoud dat iemand als beledigend, discriminerend of kwetsend kan ervaren. Ook kan het een overtreding van de regels zijn.' long_form: 'heeft dit als ongepast gemeld' notify_user: + title: 'Stuur @{{username}} een bericht' + description: 'I wil praten met deze persoon direct en privé over hun bericht.' long_form: 'bericht verstuurd aan gebruiker' email_title: 'Je bericht in ''%{title}''' email_body: "%{link}\n\n%{message}" notify_moderators: title: "Iets anders" + description: 'Dit bericht vereist actie van de moderator voor een reden die hier boven niet genoemd wordt.' + long_form: 'heeft dit gemarkeerd voor moderatie' + email_title: 'De topic "%{title}" moet door een moderator worden bekeken' email_body: "%{link}\n\n%{message}" bookmark: title: 'Favoriet' @@ -662,7 +702,6 @@ nl: min_private_message_title_length: "Minimale toegestane titel lengte in tekens voor berichten" min_search_term_length: "Minimum lengte van een zoekterm in tekens" allow_uncategorized_topics: "Topics zonder categorie toestaan. WAARSCHUWING: Alle topics moet weer aan een categorie zijn toegekend voor dit wordt uitgezet." - uncategorized_description: "De omschrijving voor de ongecategoriseerde categorie. Laat blanco voor geen omschrijving." allow_duplicate_topic_titles: "Sta topics met dezelfde titels toe" unique_posts_mins: "Hoeveel minuten iemand moet wachten voordat deze een bericht met dezelfde inhoud mag plaatsen" educate_until_posts: "Laat de popup voor nieuwe gebruikers zien als een gebruiker start met het typen van hun eerste (n) nieuwe berichten in de berichtopsteller." @@ -746,7 +785,6 @@ nl: suppress_reply_directly_above: "Verberg de uitklapbare 'in antwoord op' knop bij een bericht als er maar één reactie direct boven staat." suppress_reply_when_quoting: "Verberg de uitklapbare 'in antwoord op' knop bij een bericht als er er gequoteerd is." max_reply_history: "Maximaal aantal uit te klappen antwoorden als een 'in antwoord op' uitgeklapt wordt." - experimental_reply_expansion: "Verberg tussenliggende antwoorden als een antwoord uitgeklapt wordt (experimenteel)" topics_per_period_in_top_summary: "Aantal topics in het top-topics overzicht" topics_per_period_in_top_page: "Aantal topics in het uitgeklapte ´Meer...´ top-topics overzicht" redirect_users_to_top_page: "Stuur nieuwe en lang-niet-geziene gebruikers door naar de top-pagina" @@ -952,7 +990,6 @@ nl: automatically_download_gravatars: "Download Gravatars voor gebruikers bij account creatie of aanpassing van email." digest_topics: "Het maximum aantal topics dat in de e-maildigest opgenomen wordt." digest_min_excerpt_length: "Hoeveel karakters er per bericht getoond worden in de mail digest" - delete_digest_email_after_days: "Onderdruk e-mails met korte verslagen voor gebruikers die niet zijn gezien op de site voor meer dan (n) dagen." disable_digest_emails: "Uitschakelen e-mails met korte verslagen voor alle gebruikers." detect_custom_avatars: "Wel of niet te verifiëren of gebruikers eigen profielfoto's hebben geüpload. " max_daily_gravatar_crawls: "Maximaal aantal keren op een dag dat Discourse Gravatar zal controleren voor aangepaste avatars" @@ -1043,7 +1080,6 @@ nl: moved_post: "%{display_username} verplaatste je bericht naar %{link}" private_message: "%{display_username} heeft je een bericht gestuurd: %{link}" invited_to_private_message: "%{display_username} heeft je uitgenodigd voor een bericht: %{link}" - invited_to_topic: "%{display_username} heeft je uitgenodigd voor een topic: %{link}" invitee_accepted: "%{display_username} heeft je uitnodiging geaccepteerd" linked: "%{display_username} heeft je gelinkt in %{link}" granted_badge: "%{link} is aan jou toegekend" @@ -1140,8 +1176,6 @@ nl: characters: "mag alleen nummers, letters en underscores bevatten" unique: "moet uniek zijn" blank: "mag niet leeg zijn" - must_begin_with_alphanumeric: "moet beginnen met een letter, cijfer of underscore" - must_end_with_alphanumeric: "moet eindigen met een letter, cijfer of underscore" must_not_contain_two_special_chars_in_seq: "mag niet 2 of meer opvolgende speciale karakters bevatten (.-_)" email: not_allowed: "is niet toegestaan vanaf die e-mailprovider. Gebruik een ander e-mailadres." @@ -1149,6 +1183,10 @@ nl: ip_address: blocked: "Nieuwe registraties vanaf jouw IP-adres zijn niet toegestaan." max_new_accounts_per_registration_ip: "Nieuwe registraties vanaf jouw IP-adres zijn niet toegestaan (maximum limiet bereikt). Neem contact op met een staflid." + flags_reminder: + subject_template: + one: "Eén vlag af te handelen" + other: "%{count} vlaggen af te handelen" invite_mailer: subject_template: "%{invitee_name} nodigt je uit voor '%{topic_title}' op %{site_domain_name}" text_body_template: | @@ -1196,16 +1234,6 @@ nl: subject_template: "[%{site_name}] Nieuwe Discourse-versie, update beschikbaar" new_version_mailer_with_notes: subject_template: "[%{site_name}] Update beschikbaar" - flags_reminder: - flags_were_submitted: - one: "Deze vlag is meer dan één uur gelden gemaakt." - other: "Deze vlaggen zijn meer dan %{count} uur gelden gemaakt." - please_review: "Kijk hier even naar." - post_number: "bericht" - how_to_disable: 'Je kunt de frequentie van deze herinnering e-mails uitschakelen of wijzigen met de "Notificeer over vlaggen na" instelling.' - subject_template: - one: "Eén vlag af te handelen" - other: "%{count} vlaggen af te handelen" queued_posts_reminder: subject_template: one: "[%{site_name}] 1 bericht wacht op beoordeling" @@ -1306,8 +1334,6 @@ nl: posted_by: "Geplaatst door %{username} op %{post_date}" user_invited_to_private_message_pm: subject_template: "[%{site_name}] %{username} nodigt je uit voor een bericht '%{topic_title}'" - user_invited_to_topic: - subject_template: "[%{site_name}] %{username} nodigt je uit voor een topic '%{topic_title}'" user_replied: subject_template: "[%{site_name}] %{topic_title}" user_quoted: @@ -1390,7 +1416,6 @@ nl: Mocht je de bovenstaande link niet kunnen aanklikken, probeer deze dan te kopiëren en te plakken in de adresbalk van je web browser. page_not_found: - title: "De opgevraagde pagina bestaat niet op dit forum of is privé." popular_topics: "Populair" recent_topics: "Recent" see_more: "Meer" @@ -1479,6 +1504,8 @@ nl: performance_report: initial_post_raw: Deze topic bevat dagelijkse performance rapporten van je site initial_topic_title: Website performance rapporten + time: + <<: *datetime_formats activemodel: errors: <<: *errors diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml index 7df85a0dc3..fe7f69a181 100644 --- a/config/locales/server.pl_PL.yml +++ b/config/locales/server.pl_PL.yml @@ -27,6 +27,9 @@ pl_PL: 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}" errors: &errors format: '%{attribute} %{message}' messages: @@ -665,7 +668,6 @@ pl_PL: min_private_message_title_length: "Minimalna liczba znaków w temacie wiadomości " min_search_term_length: "Minimalna długość wyszukiwanego tekstu, w znakach" allow_uncategorized_topics: "Zezwól na tworzenie tematów bez kategorii. UWAGA: jeśli jest jakiś nieskategoryzowany temat, musisz go przypisać do kategorii, zanim wyłączysz tę opcję." - uncategorized_description: "Znajdują się tu wątki którym jeszcze nie przypisano odpowiedniej kategorii." allow_duplicate_topic_titles: "Pozwól na tworzenie tematów o identycznych tytułach." unique_posts_mins: "Ile minut musi upłynąć zanim użytkownik będzie mógł ponownie zrobić wpis z tą samą treścią" educate_until_posts: "Wyświetlaj okno edukacyjne po rozpoczęciu pisania dopóki nowy użytkownik nie napisze tylu wpisów." @@ -811,7 +813,6 @@ pl_PL: email_editable: "Allow users to change their e-mail address after registration." digest_topics: "Maksymalna liczba tematów w podsumowaniu e-mail." digest_min_excerpt_length: "Minimalny wycinek wpisu (liczba znaków) w podsumowaniu e-mail." - delete_digest_email_after_days: "Nie wysyłaj podsumowań e-mail użytkownikom, którzy nie odwiedzili serwisu dłużej niż (n) dni." disable_digest_emails: "Wyłącz wysyłanie podsumowania e-mail wszystkim uzytkownikom. " allow_anonymous_posting: "Zezwól użytkownikom na przechodzenie w tryb anonimowości." allow_profile_backgrounds: "Zezwól użytkownikom na przesyłanie obrazu tła dla profilu." @@ -849,7 +850,6 @@ pl_PL: moved_post: "%{display_username} przenosi twój wpis do %{link}" private_message: "%{display_username} wysłał ci wiadomość: %{link}" invited_to_private_message: "%{display_username} zaprosił cię do wiadomości: %{link}" - invited_to_topic: "%{display_username} zaprosił cię do tematu: %{link}" invitee_accepted: "%{display_username} przyjął(-ęła) Twoje zaproszenie" linked: "%{display_username} powiązał cię z %{link}" granted_badge: "Zdobywasz %{link}" @@ -940,8 +940,6 @@ pl_PL: characters: "może zawierać tylko litery, cyfry i podkreślenia" unique: "musi być unikalna" blank: "musi zostać podana" - must_begin_with_alphanumeric: "musi zaczynać się literą, liczbą lub podkreślnikiem" - must_end_with_alphanumeric: "musi kończyć się literą, liczbą bądź podkreślnikiem" must_not_contain_two_special_chars_in_seq: "nie może zawierać sekwencji 2 lub więcej znaków specjalnych (.-_)" email: not_allowed: "nie jest dopuszczany od tego dostawcy poczty. Użyj innego adresu email." @@ -949,6 +947,11 @@ pl_PL: ip_address: blocked: "Z twojego adresu IP nowe rejestracje nie są możliwe." max_new_accounts_per_registration_ip: "Z twojego adresu IP nowe rejestracje nie są możliwe (wyczerpany limit). Skonaktuj się z personelem." + flags_reminder: + subject_template: + one: "1 flaga oczekuje na reakcję" + few: "%{count} flagi oczekują na reakcję" + other: "%{count} flagi oczekują na reakcję" invite_mailer: subject_template: "%{invitee_name} zaprosił cię do '%{topic_title}' na %{site_domain_name}" invite_forum_mailer: @@ -984,48 +987,8 @@ pl_PL: subject_template: "[%{site_name}] Test dostarczania poczty" new_version_mailer: subject_template: "[%{site_name}] Aktualizacja do nowej wersji Discourse jest dostępna." - text_body_template: | - Nowa wersja [Discourse](http://www.discourse.org) jest dostępna. - - Obecnie zainstalowana: %{installed_version} - Nowa wersja: **%{new_version}** - - Prawdopodobnie chcesz: - - - Zobaczyć [listę zmian na GitHub](https://github.com/discourse/discourse/commits/master). - - - Zaktualizować z poziomu przeglądarki pod adresem [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). - - - Odwiedzić [meta.discourse.org](http://meta.discourse.org) i zapoznać się z wiadomościami i dyskusjami na temat Discourse. new_version_mailer_with_notes: subject_template: "[%{site_name}] dostępna aktualizacja" - text_body_template: | - Nowa wersja [Discourse](http://www.discourse.org) jest dostępna. - - Obecnie zainstalowana: %{installed_version} - Nowa wersja: **%{new_version}** - - Prawdopodobnie chcesz: - - - Zobaczyć [listę zmian na GitHub](https://github.com/discourse/discourse/commits/master). - - - Zaktualizować z poziomu przeglądarki pod adresem [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). - - - Odwiedzić [meta.discourse.org](http://meta.discourse.org) i zapoznać się z wiadomościami i dyskusjami na temat Discourse. - - ### Zmiany zmian - - %{notes} - flags_reminder: - flags_were_submitted: - one: "Flagi dodane godzinę temu." - few: "Flagi dodane ponad %{count} godziny temu." - other: "Flagi dodane ponad %{count} godzin temu." - post_number: "wpis" - subject_template: - one: "1 flaga oczekuje na reakcję" - few: "%{count} flagi oczekują na reakcję" - other: "%{count} flagi oczekują na reakcję" flag_reasons: inappropriate: "Twój wpis został oznaczony jako **nieodpowiedni**: społeczność uznała, że zbyt agresywny lub niezgodny z [jej wytycznymi](/guidelines)." spam: "Twój post został oznaczony jako **spam**: społeczność czuje, że jest to reklama, czyli coś nadmiernie promującego, a nie użytecznego czy odnoszącego się do tematu." @@ -1216,7 +1179,6 @@ pl_PL: Jeśli powyższy link nie jest klikalny, spróbuj skopiować i wkleić go do pasku adresu Twojej przeglądarki. page_not_found: - title: "Strona, którą chciałeś odwiedzić, nie istnieje lub jest prywatna." popular_topics: "Popularne" recent_topics: "Ostatnie" see_more: "Więcej" diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml index f90e504063..bcd2b1a06d 100644 --- a/config/locales/server.pt.yml +++ b/config/locales/server.pt.yml @@ -27,6 +27,22 @@ pt: purge_reason: "Automaticamente eliminado devido a abandono, conta inativada" disable_remote_images_download_reason: "O download remoto de imagens foi desativado por não haver espaço disponível no disco." anonymous: "Anónimo" + emails: + incoming: + default_subject: "Email de entrada de %{email}" + errors: + empty_email_error: "Acontece quando, a informação não processada, do correio recebido veio em branco." + no_message_id_error: "Acontece quando o correio recebido não tem identificador de mensagem no cabeçalho." + auto_generated_email_error: "Acontece quando a antecedência do cabeçalho é definida como: 'list', 'junk' ou 'auto_reply', ou quando algum cabeçalho contém: 'auto-submitted', 'auto-replied' ou 'auto-generated'." + no_body_detected_error: "Acontece quando não conseguimos extrair o corpo da mensagem e não existem anexos." + inactive_user_error: "Acontece quando o remetente não está activo." + blocked_user_error: "Acontece quando o remetente está bloqueado." + bad_destination_address: "Acontece quando nenhum dos endereços de email nos campos para/cc/bcc coincide com um endereço de email configurado." + strangers_not_allowed_error: "Acontece quando um utilizador tenta criar um tópico numa categoria em que não é membro." + insufficient_trust_level_error: "Acontece quando um utilizador tentar criar um tópico numa categoria para qual este não o nível de confiança necessário." + reply_user_not_matching_error: "Acontece quando uma resposta veio de um endereço de email diferente do destinatário da notificação." + topic_not_found_error: "Acontece quando a resposta veio de um tópico relacionado mas o tópico relacionado foi apagado." + topic_closed_error: "Acontece quando uma resposta chegou mas o tópico relacionado foi fechado." errors: &errors format: '%{attribute} %{message}' messages: @@ -150,6 +166,7 @@ pt: rss_description: latest: "Tópicos recentes" hot: "Tópicos quentes" + top: "Melhores tópicos" posts: "Últimas mensagens" too_late_to_edit: "Essa mensagem foi criada há muito tempo. Já não pode ser editada ou apagada." excerpt_image: "imagem" @@ -304,6 +321,7 @@ pt: self_parent: "Uma subcategoria não pode ser superior a ela própria" depth: "Não pode juntar uma subcategoria dentro de outra" email_in_already_exist: "Endereço de email de recepção %{email_in}' já está a ser utilizado pela categoria %{category_name}'." + invalid_email_in: "'%{email_in}' não é um endereço de email válido." cannot_delete: uncategorized: "Não é possível eliminar Sem Categoria" has_subcategories: "Não é possível eliminar esta categoria porque contém sub-categorias." @@ -311,6 +329,7 @@ pt: one: "Não é possível eliminar esta categoria porque contém 1 tópico. O tópico mais antigo é %{topic_link}." other: "Não é possível eliminar esta categoria porque contém %{count} tópicos. O tópico mais antigo é %{topic_link}." topic_exists_no_oldest: "Não é possível eliminar esta categoria porque a contagem de tópicos é de %{count}." + uncategorized_description: "Tópicos que não precisam de uma categoria ou que não se encaixam em nenhuma outra categoria existente." trust_levels: newuser: title: "novo utilizador" @@ -695,7 +714,6 @@ pt: min_search_term_length: "Tamanho mínimo válido para termos de pesquisa, em caracteres" search_tokenize_chinese_japanese_korean: "Forçar pesquisa para atomizar Chinês/Japonês/Coreano mesmo em sites que não sejam CJC" allow_uncategorized_topics: "Permitir a criação de tópicos sem categoria. AVISO: Se houver quaisquer tópicos não categorizados, tem que re-categorizá-los antes de desligar isto." - uncategorized_description: "Descrição da categoria sem classificação. Deixar em branco para nenhuma descrição." allow_duplicate_topic_titles: "Permitir tópicos com títulos idênticos e duplicados." unique_posts_mins: "Quantos minutos antes que um utilizador possa criar uma mensagem com o mesmo conteúdo outra vez?" educate_until_posts: "Quando um utilizador começar a escrever as primeiras (n) novas mensagens, mostrar o painel pop-up de educação do novo utilizador no editor." @@ -781,7 +799,6 @@ pt: suppress_reply_directly_above: "Não mostrar em-resposta-a expansível quando há apenas uma única resposta diretamente acima desta publicação." suppress_reply_when_quoting: "Não mostraR em-resposta-a expansível numa mensagem quando esta cita uma resposta." max_reply_history: "Número máximo de respostas a serem expandidas quando se expande em-resposta-a" - experimental_reply_expansion: "Esconder respostas intermédias ao expandir uma resposta-a (experimental)" topics_per_period_in_top_summary: "Número de tópicos principais mostrados no resumo padrão de tópicos principais." topics_per_period_in_top_page: "Número de tópicos principais mostrados em 'Mostrar Mais' tópicos principais expandido." redirect_users_to_top_page: "Redirecionar automaticamente os utilizadores novos e ausentes por períodos longos para o topo da página." @@ -845,6 +862,9 @@ pt: active_user_rate_limit_secs: "Qual a frequência de atualização do campo 'última vez visto em', em segundos." verbose_localization: "Mostrar extensas dicas de localização na IU" previous_visit_timeout_hours: "Quanto tempo dura uma visita antes de a considerarmos como 'visita anterior', em horas." + top_topics_formula_log_views_multiplier: "fórmula do multiplicador (n) de visualizações logarítmica nos melhores tópicos: `log(views_count) * (n) + op_likes_count * 0.5 + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`" + top_topics_formula_first_post_likes_multiplier: "fórmula do multiplicador (n) de primeiros gostos nos melhores tópicos: `log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`" + top_topics_formula_least_likes_per_post_multiplier: "fórmula do multiplicador (n) de menos gostos nos melhores tópicos: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`" rate_limit_create_topic: "Após a criação de um tópico, os utilizadores devem esperar (n) segundos antes de criarem um novo tópico." rate_limit_create_post: "Após a publicação, os utilizadores devem esperar (n) segundos antes de criarem outra mensagem." rate_limit_new_user_create_topic: "Após a criação de um tópico, os novos utilizadores devem esperar (n) segundos antes de criarem um novo tópico." @@ -874,6 +894,7 @@ pt: external_system_avatars_enabled: "Utilize o serviço do sistema externo de avatars." external_system_avatars_url: "URL do serviço do sistema externo de avatars. Substituições permitidas são {nome_de_utilizador} {primeira_letra} {cor} {tamanho}" default_opengraph_image_url: "URL da imagem opengraph por defeito." + allow_all_attachments_for_group_messages: "Permitir qualquer anexo de email nas mensagens de grupo." enable_flash_video_onebox: "Ativar a incorporação de hiperligações swf e flv (Adobe Flash) em caixas únicas. AVISO: pode introduzir riscos de segurança." default_invitee_trust_level: "Nível de Confiança padrão (0-4) para utilizadores convidados." default_trust_level: "Nível de Confiança padrão (0-4) para todos os novos utilizadores. AVISO! Alterar isto irá colocá-lo em sério risco de spam." @@ -901,6 +922,7 @@ pt: tl3_links_no_follow: "Não remover rel=nofollow das hiperligações publicadas por utilizadores com Nível de Confiança 3." min_trust_to_create_topic: "O Nível de Confiança mínimo necessário para criar um novo tópico." min_trust_to_edit_wiki_post: "O nível mínimo de confiança necessário para editar mensagens marcadas como wiki." + min_trust_to_allow_self_wiki: "O nível mínimo de confiança necessário para criar mensagens wiki próprias." min_trust_to_send_messages: "O nível de confiança mínimo necessário para criar mensagens privadas." newuser_max_links: "Quantas hiperligações um novo utilizador pode adicionar a uma mensagem." newuser_max_images: "Quantas imagens um novo utilizador pode adicionar a uma mensagem." @@ -911,6 +933,7 @@ pt: max_users_notified_per_group_mention: "Número máximo de utilizadores que podem receber uma notificação se um grupo é mencionado (se o limite é atingido, nenhuma notificação será levantada)" create_thumbnails: "Criar imagens miniatura e lightbox que são demasiado largas para caber numa mensagem." email_time_window_mins: "Esperar (n) minutos antes de enviar quaisquer emails de notificação, para dar aos utilizadores a hipótese de editarem e finalizarem as suas mensagens." + private_email_time_window_seconds: "Espere (n) segundos antes de enviar emails de notificação privados, para dar aos utilizadores a oportunidade de editar e finalizar as suas mensagens." email_posts_context: "Quantas respostas prévias a serem incluídas como contexto em emails de notificação." flush_timings_secs: "Com que frequência o servidor é alimentado com dados de sincronização, em segundos." title_max_word_length: "Tamanho máximo permitido de comprimento de palavras, em caracteres, no título de um tópico." @@ -965,6 +988,9 @@ pt: strip_images_from_short_emails: "Remover imagens de emails cujo tamanho seja inferior a 2800 Bytes" short_email_length: "Comprimento de email curto, em Bytes" display_name_on_email_from: "Exibir nomes completos em campos do formulário de email" + unsubscribe_via_email: "Permitir aos utilizadores cancelar a subscrição de emails enviando um email com \"unsubscribe\" no assunto ou no corpo do email" + unsubscribe_via_email_footer: "Adicionar uma hiperligação de cancelamento de subscrição ao rodapé de emails enviados" + delete_email_logs_after_days: "Apagar registos de email após (N) dias. 0 para os manter indefinidamente" pop3_polling_enabled: "Solicitação através de POP3 para respostas de emails" pop3_polling_ssl: "Utilize SSL ao ligar a um servidor POP3. (Recomendado)" pop3_polling_period_mins: "Período em minutos entre a verificação da conta POP3 para o email. NOTA: requer reinicialização." @@ -1051,6 +1077,8 @@ pt: default_email_direct: "Por defeito, enviar um email quando alguém cita/responde a/menciona ou convida o utilizador." default_email_mailing_list_mode: "Por defeito, enviar um email por cada nova mensagem." default_email_always: "Por defeito, enviar notificações por email mesmo quando o utilizador está ativo." + default_email_previous_replies: "Incluir respostas previas nos emails por defeito." + default_email_in_reply_to: "Por defeito Incluir excerto de mensagem de resposta nos email." default_other_new_topic_duration_minutes: "Condição global por defeito para o qual um tópico é considerado novo." default_other_auto_track_topics_after_msecs: "Tempo global por defeito antes de um tópico ser automaticamente acompanhado." default_other_external_links_in_new_tab: "Por defeito, abrir hiperligações externas num novo separador." @@ -1080,6 +1108,8 @@ pt: pop3_polling_username_is_empty: "Deve configurar um 'nome de utilizador de polling pop3' antes de ativar o polling POP3." pop3_polling_password_is_empty: "Deve configurar uma 'palavra-passe de polling pop3' antes de ativar o polling POP3." pop3_polling_authentication_failed: "Autenticação POP3 falhada. Por favor verifique as suas credenciais pop3." + reply_by_email_address_is_empty: "Tem que definir um 'respostas por endereço de email' antes de habilitar a reposta por email." + pop3_polling_disabled: "Tem de habilitar o polling POP3 antes de habilitar a reposta por email." notification_types: group_mentioned: "%{group_name} foi mencionado em %{link}" mentioned: "%{display_username} mencionou-o em %{link}" @@ -1091,7 +1121,7 @@ pt: moved_post: "%{display_username} moveu a sua mensagem para %{link}" private_message: "%{display_username} enviou-lhe uma mensagem: %{link}" invited_to_private_message: "%{display_username} convidou-o para uma mensagem: %{link}" - invited_to_topic: "%{display_username} convidou-o para um tópico: %{link}" + invited_to_topic: "%{display_username} convidou-o para %{link}" invitee_accepted: "%{display_username} aceitou o seu convite" linked: "%{display_username} hiperligou-o em %{link}" granted_badge: "Ganhou %{link}" @@ -1180,6 +1210,7 @@ pt: reserved_username: "Esse nome de utilizador não é permitido." missing_user_field: "Não completou todos os campos de utilizador." close_window: "A autenticação está completa. Feche esta janela para continuar." + already_logged_in: "Oops, parece que tentou aceitar um convite para outro utilizador. Se não é o %{current_user}, por favor saia e tente novamente." user: no_accounts_associated: "Sem contas associadas" username: @@ -1188,15 +1219,33 @@ pt: characters: "pode incluir apenas números, letras e sublinhados" unique: "tem que ser único" blank: "tem que estar preenchido" - must_begin_with_alphanumeric: "tem que começar com uma letra ou número ou um sublinhado" - must_end_with_alphanumeric: "tem que terminar com uma letra ou número ou um sublinhado" + must_begin_with_alphanumeric_or_underscore: "tem de começar por uma letra, um número ou o carácter sublinhado" + must_end_with_alphanumeric: "tem de terminar com uma letra ou um número" must_not_contain_two_special_chars_in_seq: "não deve conter uma sequência de 2 ou mais caracteres especiais (.-_)" + must_not_end_with_confusing_suffix: "não deve terminar com um sufixo confuso tal como .json ou .png etc." email: not_allowed: "este provedor de emails não é permitido. Por favor utilize outro endereço de email." blocked: "não é permitido." ip_address: blocked: "Novos registos não são permitidos a partir do seu endereço IP." max_new_accounts_per_registration_ip: "Novos registos não são permitidos a partir do seu endereço IP (limite máximo atingido).Contacte um membro do pessoal." + flags_reminder: + flags_were_submitted: + one: "Sinalizações foram submetidas há 1 hora atrás. Por favor analise-as. " + other: "Sinalizações foram submetidas há %{count} horas atrás. Por favor analise-as. " + subject_template: + one: "1 sinalização à espera de ser tratada" + other: "%{count} sinalizações à espera de serem tratadas" + unsubscribe_mailer: + subject_template: "Confirme que não quer receber emails com actualizações de %{site_title}" + text_body_template: | + Alguém (possivelmente você?) pediu para não receber mais emails com com actualizações de %{site_domain_name} neste endereço. + Se confirma este pedido por favor carregue nesta hiperligação: + + %{confirm_unsubscribe_link} + + + Se quiser continuar a receber emails com actualizações pode ignorar este email. invite_mailer: subject_template: "%{invitee_name} convidou-o a juntar-se a '%{topic_title}' em %{site_domain_name}" text_body_template: | @@ -1240,23 +1289,37 @@ pt: (Se a hiperligação acima tiver expirado, escolha "Esqueci a minha palavra-passe" ao iniciar sessão com o seu endereço de email.) test_mailer: subject_template: "[%{site_name}] Teste de entrega de email" - text_body_template: "Este é um email de teste de\n\n[**%{base_url}**][0]\n\nA entrega do email é complicada. Aqui estão alguns pontos importantes a verificar primeiro:\n\n - *Certifique-se* que configurou o `email de notificação` de: endereço correto nas configurações do seu sítio. **O domínio especificado no endereço “de” nos emails que envia é o domínio que será validado**. \n\n- Conhecer como observar o código fonte dos emails no seu email cliente, de modo a que possa examinar cabeçalhos de email à procura de pistas importantes. No Gmail, é a opção “mostrar original” no menu drop down no canto superior direito de cada email.\n\n- **IMPORTANTE:** O seu ISP tem um registo de DNS inverso inserido para associar os nomes de domínio aos endereços IP de onde envia o seu email? [Teste o seu registo de PTR Inverso][2] aqui. Se o seu ISP não inserir o DNS inverso apropriado, é muito improvável que qualquer um dos seus emails seja entregue.\n\n- Estará o seu domínio [registo SPF][8] correto? [Teste o seu registo SPF][1] aqui. Note que TXT é o tipo de registo oficial para SPF. \n\n- Estará o seu domínio [registo DKIM][3] correto? Isto irá melhorar significativamente a entrega de emails. [Teste o seu registo DKIM][7] aqui.\n\n- Se correr o seu próprio servidor de email, certifique-se que os IPs do seu servidor de email não [estão em nenhuma lista negra de email] [4]. Verifique também que é enviado um nome de servidor qualificado que resolve o DNS na sua mensagem HELO. Se não for, isto irá fazer com que o seu email seja rejeitado por muitos serviços de email.\n\n(A maneira *fácil* é criar uma conta gratuita em [Mandrill][md] ou [Mailgun][mg] ou [Mailjet][mj], que tem vários planos de email gratuitos e será bom para pequenas comunidades. Irá precisar na mesma de configurar os registos SPF e o DKIM no seu DNS!) \n\nEsperamos que tenha recebido este teste de entrega de email sem problemas! \n\nBoa sorte, \n\nOs seus amigos em [Discourse](http://www.discourse.org)\n\n[0]: %{base_url}\n[1]: http://www.kitterman.com/spf/validate.html\n[2]: http://mxtoolbox.com/ReverseLookup.aspx\n[3]: http://www.dkim.org/\n[4]: http://whatismyipaddress.com/blacklist-check\n[7]: http://dkimcore.org/tools/dkimrecordcheck.html\n[8]: http://www.openspf.org/SPF_Record_Syntax\n[md]: http://mandrill.com\n[mg]: http://www.mailgun.com/\n[mj]: https://www.mailjet.com/pricing\n" + text_body_template: "Este é um email de teste de\n\n[**%{base_url}**][0]\n\nA entrega do email é complicada. Aqui estão alguns pontos importantes a verificar primeiro:\n\n- *Certifique-se* que configurou o `email de notificação` de: endereço correto nas configurações do seu sítio. **O domínio especificado no endereço “de” nos emails que envia é o domínio que será validado**.\n\n- Conhecer como observar o código fonte dos emails no seu email cliente, de modo a que possa examinar cabeçalhos de email à procura de pistas importantes. No Gmail, é a opção “mostrar original” no menu drop down no canto superior direito de cada email.\n\n- **IMPORTANTE:** O seu ISP tem um registo de DNS inverso inserido para associar os nomes de domínio aos endereços IP de onde envia o seu email? [Teste o seu registo de PTR Inverso][2] aqui. Se o seu ISP não inserir o DNS inverso apropriado, é muito improvável que qualquer um dos seus emails seja entregue.\n\n- Estará o seu domínio [registo SPF][8] correto? [Teste o seu registo SPF][1] aqui. Note que TXT é o tipo de registo oficial para SPF.\n\n- Estará o seu domínio [registo DKIM][3] correto? Isto irá melhorar significativamente a entrega de emails. [Teste o seu registo DKIM][7] aqui.\n\n- Se correr o seu próprio servidor de email, certifique-se que os IPs do seu servidor de email não [estão em nenhuma lista negra de email] [4]. Verifique também que é enviado um nome de servidor qualificado que resolve o DNS na sua mensagem HELO. Se não for, isto irá fazer com que o seu email seja rejeitado por muitos serviços de email.\n\n- Recomendamos vivamente que **envie um email de teste para [mail-tester.com][mt]** para verificar que tudo mencionado em cima está a funcionar correctamente.\n\n(A maneira *fácil* é criar uma conta grátis em [SendGrid][sg], [SparkPost][sp], [Mailgun][mg] ou [Mailjet][mj], que fornecem grátis, generosamente grátis, pacotes de envio de emails e será suficiente para pequenas comunidades. Irá precisar na mesma de configurar os registos SPF e o DKIM no seu DNS!)\n\nEsperamos que tenha recebido este teste de entrega de email sem problemas!\n\nBoa sorte, \n\nDos seus amigos em [Discourse](http://www.discourse.org)\n\n[0]: %{base_url}\n[1]: http://www.kitterman.com/spf/validate.html\n[2]: http://mxtoolbox.com/ReverseLookup.aspx\n[3]: http://www.dkim.org/\n[4]: http://whatismyipaddress.com/blacklist-check\n[7]: http://dkimcore.org/tools/dkimrecordcheck.html\n[8]: http://www.openspf.org/SPF_Record_Syntax\n[sg]: https://sendgrid.com/\n[sp]: https://www.sparkpost.com/\n[mg]: http://www.mailgun.com/\n[mj]: https://www.mailjet.com/pricing\n[mt]: http://www.mail-tester.com/\n" new_version_mailer: subject_template: "[%{site_name}] Nova versão Discourse, atualização disponível" - text_body_template: "Uma nova versão de [Discourse](http://www.discourse.org) está disponível. \n\nA sua versão: %{installed_version}\nNova versão: **%{new_version}**\n\nPode desejar: \n\n- Ver o que há de novo em [GitHub changelog](https://github.com/discourse/discourse/commits/master).\n\n- Atualizar a partir do seu navegador em [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade).\n\n- Visitar [meta.discourse.org](http://meta.discourse.org) para notícias, debates, e suporte para o Discourse.\n" + text_body_template: | + Hurra, uma nova versão do [Discourse](http://www.discourse.org) está disponível :) + + A sua versão: %{installed_version} + A nova versão: **%{new_version}** + + - Ver o que há de novo em [GitHub changelog](https://github.com/discourse/discourse/commits/master). + + - Atualizar a partir do seu navegador em [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). + + - Visitar [meta.discourse.org](http://meta.discourse.org) para notícias, debates, e suporte para o Discourse. new_version_mailer_with_notes: subject_template: "[%{site_name}] atualização disponível" - text_body_template: "Uma nova versão de [Discourse](http://www.discourse.org) está disponível. \n\nA sua versão: %{installed_version}\nNova versão: **%{new_version}**\n\nPode desejar: \n\n- Ver o que há de novo em [GitHub changelog](https://github.com/discourse/discourse/commits/master).\n\n- Atualizar a partir do seu navegador em [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade).\n\n- Visitar [meta.discourse.org](http://meta.discourse.org) para notícias, debates, e suporte para o Discourse.\n\n### Release notes\n\n%{notes}\n" - flags_reminder: - flags_were_submitted: - one: "Estas sinalizações foram submetidas há 1 hora atrás." - other: "Estas sinalizações foram submetidas há %{count} horas atrás." - please_review: "Por favor examine-os." - post_number: "mensagem" - how_to_disable: 'Pode desativar ou mudar a frequência deste email notificativo através de "notify about flags after" nas configurações.' - subject_template: - one: "1 sinalização à espera de ser tratada" - other: "%{count} sinalizações à espera de serem tratadas" + text_body_template: | + Hurra, uma nova versão do [Discourse](http://www.discourse.org) está disponível :) + + A sua versão: %{installed_version} + A nova versão: **%{new_version}** + + - Ver o que há de novo em [GitHub changelog](https://github.com/discourse/discourse/commits/master). + + - Atualizar a partir do seu navegador em [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). + + - Visitar [meta.discourse.org](http://meta.discourse.org) para notícias, debates, e suporte para o Discourse. + + ### Notas da versão + + %{notes} queued_posts_reminder: subject_template: one: "[%{site_name}] 1 mensagem à espera de revisão" @@ -1281,6 +1344,8 @@ pt: post_hidden: subject_template: "Mensagem oculta devido a sinalizações da comunidade" text_body_template: "Olá,\n\nEsta é uma mensagem automática de %{site_name} para informá-lo que a sua mensagem foi oculta. \n\n%{base_url}%{url} \n\n%{flag_reason}\n\nMúltiplos membros da comunidade sinalizaram esta mensagem antes de ser escondida, por isso considere como poderá rever a sua mensagem para refletir o seu feedback. **Pode editar a sua mensagem após %{edit_delay} minutos, e esta será automaticamente exibida.**\n\nContudo, se a mensagem for escondida pela comunidade uma segunda vez, irá manter-se escondida até ser tratada pelo pessoal – e poderão ainda ocorrer ações, incluindo uma possível suspensão da sua conta.\n\nPara orientação adicional, por favor consulte as [diretrizes da comunidade](%{base_url}/guidelines).\n" + usage_tips: + text_body_template: "Aqui ficam algumas dicas para que possa começar:\n\n## Leitura \n\nPara ler mais, **simplesmente continue a arrastar para baixo!** \n\nÀ medida que novas mensagens ou novos tópicos surgem, estes irão surgir automaticamente – não é necessário actualizar a página.\n\n## Navegação\n\nPara pesquisar, a sua página de utilizador, ou o menu ☰, utilize **o ícone no canto superior direito**.\n\n- A selecção de um título do tópico leva-o sempre para a **próxima resposta não lida** no tópico. Para entrar na parte superior ou inferior, seleccione a contagem de resposta ou última data de resposta em seu lugar.\n\n \n\n- Ao ler um tópico, selecione a barra de progresso no canto inferior direito para controlos de navegação completos. Salte rapidamente para o topo ao selecionar o título do tópico. Pressione ? para uma lista rápida de atalhos do teclado.\n\n \n\n## Responder\n\n- Para responder ao **tópico em geral**, utilize no final de cada tópico.\n\n- Para responder a uma **pessoa específica**, utilize nas suas mensagens.\n\n- Para responder com um **novo tópico**, utilize à direita desta mensagem. Tanto os tópicos antigos como os novos serão ligados automaticamente.\n\nA sua resposta pode ser formatada com HTML simplificado, BBCode ou [Markdown](http://commonmark.org/help/):\n\n Isto é **negrito**.\n Isto é negrito.\n Isto é [b]negrito[/b].\n\nQuer aprender Markdown [Faça o nosso curso interactivo de 10 minutos!](http://commonmark.org/help/tutorial/)\n\nPara inserir uma citação, seleccione o texto que deseja citar e de seguida pressione qualquer botão de Resposta. Repetir para múltiplas citações.\n\n\n\nPara notificar alguém da sua resposta, mencione o seu nome. Digite `@` para começar a seleccionar um nome de utilizador.\n\n\n\nPara utilizar [Emoji padrão](http://www.emoji.codes/), simplesmente digite `:` para encontrar por nome, ou os tradicionais risonhos `;)`\n\n\n\nPara gerar um sumário para uma hiperligação, cole-o numa linha por si só:\n\n\n\n## Acções\n\nExistem botões de acção no final de cada mensagem:\n\n\n\nPara deixar alguém saber que gostou e apreciou as suas mensagens, utilize o botão **gosto**. Partilhe o amor!\n\nSe vir um problema com uma mensagem de alguém, avise a pessoa em privado, ou avise [o nosso pessoal](%{base_url}/about), sobre a mesma utilizando o botão **sinalizar**. Pode também **partilhar** uma hiperligação para uma mensagem, ou **marcá-la** para mais tarde ter a referência na sua página de utilizador.\n\n## Notificações\n\nQuando alguém lhe responde, cita a sua mensagem ou menciona o seu `@nome-de-utilizador`, um número irá aparecer imediatamente no canto superior direito na página. Utilize-o para aceder às suas **notificações**.\n\n\n\nNão se preocupe em falhar uma resposta – irá receber notificações por email que chegam quando está ausente.\n\n## As Suas Preferências\n\n - Todos os tópicos com menos de **dois dias** são considerados novos.\n\n - Qualquer tópico em que tenha **participado activamente** (respondido, criado, ou lido por um extenso período) será acompanhado automaticamente.\n\nVerá o indicador numérico e o indicador azul novo junto desses tópicos:\n\n\n\nPode alterar as suas notificações para qualquer tópico através do controlo de notificações no final do tópico.\n\n\n\nPode também configurar estados de notificação por categoria, se quer observar cada novo tópico numa categoria específica.\n\nTo change any of these settings, see [your user preferences](%{base_url}/my/preferences).\n\n## Confiança da Comunidade\n\nÀ medida que for participando aqui, irá ganhar confiança por parte da comunidade, tornar-se um cidadão completo e limitações de novos utilizadores serão automaticamente removidas. Com um [nível de confiança] suficientemente alto (https://meta.discourse.org/t/what-do-user-trust-levels-do/4924), irá ganhar novas capacidades para ajudar-nos a gerir a comunidade em conjunto.\n" welcome_user: subject_template: "Bem-vindo a %{site_name}!" text_body_template: | @@ -1365,12 +1430,45 @@ pt: csv_export_failed: subject_template: "A exportação dos dados falhou" text_body_template: "Pedimos desculpa mas a sua exportação de dados falhou. Por favor verifique os registos do log ou contacte um membro do pessoal." - email_reject_no_account: - subject_template: "[%{site_name}] Problema de email -- Conta Desconhecida" + email_reject_insufficient_trust_level: + subject_template: "[%{site_name}] Problema com Email -- Insuficiente nível de confiança" + text_body_template: | + Pedimos desculpa mas a sua mensagem de email para %{destination} (titled %{former_title}) falhou. + + A sua conta não possui o nível de confiança necessário para criar novos tópicos para este endereço de email. Se acredita que isto é um erro contacte alguém do pessoal. + email_reject_inactive_user: + subject_template: "[%{site_name}] Problema de email -- Utilizador inactivo" text_body_template: | Pedimos desculpa mas a sua mensagem de email %{destination} (titled %{former_title}) não funcionou. - Não há nenhuma conta de utilizador conhecida com este endereço de email. Tente enviar a partir de um endereço de email diferente, ou contacte um membro do pessoal. + A sua conta associada com este email não está activa. Por favor active a sua conta antes de enviar emails. + email_reject_blocked_user: + subject_template: "[%{site_name}] Problema de email -- Utilizador bloqueado" + text_body_template: |+ + Pedimos desculpa mas a sua mensagem de email %{destination} (titled %{former_title}) não funcionou. + + A sua conta associada com este endereço de email foi bloqueada. + + email_reject_reply_user_not_matching: + subject_template: "[%{site_name}] Problema de email -- Utilizador de resposta não encontrado" + text_body_template: |+ + Pedimos desculpa mas a sua mensagem de email %{destination} (titled %{former_title}) não funcionou. + + A sua resposta foi enviada de um email diferente daquele que esperávamos, por esta razão não temos a certeza que seja a mesma pessoa. Tente enviar de outro endereço de email ou contacte um membro do pessoal. + + email_reject_no_message_id: + subject_template: "[%{site_name}] Problema de email -- Sem identificador de mensagem" + text_body_template: | + Pedimos desculpa mas a sua mensagem de email %{destination} (titled %{former_title}) não funcionou. + + Não conseguimos encontrar o `Message-Id` nos cabeçalhos do email. Tente enviar através de outro endereço de email ou contacte um membro do pessoal. + email_reject_no_account: + subject_template: "[%{site_name}] Problema de email -- Conta Desconhecida" + text_body_template: |+ + Pedimos desculpa mas a sua mensagem de email %{destination} (titled %{former_title}) não funcionou. + + Não conseguimos encontrar nenhuma conta com combine com o seu endereço de email. Tente enviar de outro endereço de email ou contacte um membro do pessoal. + email_reject_empty: subject_template: "[%{site_name}] Problema de email -- Sem Conteúdo" text_body_template: | @@ -1391,18 +1489,53 @@ pt: Pedimos desculpa, mas a sua mensagem de email para %{destination} (título %{former_title}) não funcionou. A sua conta não tem privilégios para publicar novos tópicos nessa categoria. Se acredita que isto é um erro, contacte um membro do pessoal. - email_reject_reply_key: - subject_template: "[%{site_name}] Problema de email -- Chave de Resposta Desconhecida" + email_reject_strangers_not_allowed: + subject_template: "[%{site_name}] Problema de email -- Acesso Inválido" + text_body_template: |+ + Pedimos desculpa mas a sua mensagem de email para %{destination} (titled %{former_title}) não funcionou. + + A categoria que enviou neste email apenas permite respostas de utilizadores com contas validadas e endereços de email conhecidos. Se acredita ser um erro contacto um membro do pessoal. + + email_reject_invalid_post: + subject_template: "[%{site_name}] Problema de email -- Erro de publicação" text_body_template: | Pedimos desculpa mas a sua mensagem de email para %{destination} (titled %{former_title}) não funcionou. - A chave de resposta fornecida é inválida ou desconhecida, por isso não sabemos a que resposta corresponde este email. Contacte um membro do pessoal. + Algumas causas possíveis são: formatação complexa, mensagem demasiado grande, mensagem demasiado pequena. Por favor tente novamente, ou publique através do sítio se isto continuar. + email_reject_invalid_post_specified: + subject_template: "[%{site_name}] Problema de email -- Erro de publicação" + text_body_template: | + Pedimos desculpa mas a sua mensagem de email para %{destination} (titled %{former_title}) não funcionou. + + Motivo: + + %{post_error} + + Se conseguir corrigir o problema, tente novamente. + email_reject_invalid_post_action: + subject_template: "[%{site_name}] Problema de email -- Acção de Post inválida" + text_body_template: | + Pedimos desculpa mas a sua mensagem de email para %{destination} (titled %{former_title}) não funcionou. + + A acção Post não foi reconhecida. Por favor tente novamente, ou publique através do sítio se isto continuar. + email_reject_reply_key: + subject_template: "[%{site_name}] Problema de email -- Chave de Resposta Desconhecida" + text_body_template: | + Pedimos desculpa, mas a sua mensagem de email para %{destination} (título %{former_title}) não funcionou. + + A chave de resposta no email é inválida ou desconhecida e por isso não conseguimos determinar a que email estava a responder. Contacte um membro do pessoal. + email_reject_bad_destination_address: + subject_template: "[%{site_name}] Problema de email -- Endereço Para: Desconhecido" + text_body_template: | + Pedimos desculpa mas a sua mensagem de email para %{destination} (titled %{former_title}) não funcionou. + + Nenhum dos endereços de destino é reconhecido. Por favor, certifique-se que está a enviar o endereço de email correcto fornecido pelo pessoal. email_reject_topic_not_found: subject_template: "[%{site_name}] Problema de email -- Tópico Não Encontrado" text_body_template: | Pedimos desculpa, mas a sua mensagem de email para %{destination} (título %{former_title}) não funcionou. - O tópico ao qual está a responder já não existe, talvez tenha sido eliminado? Se acredita que isto é um erro, contacte um membro do pessoal. + O tópico ao qual está a responder já não existe -- talvez tenha sido apagado. Se acredita que isto é um erro, contacte um membro do pessoal. email_reject_topic_closed: subject_template: "[%{site_name}] Problema de email -- Tópico Encerrado" text_body_template: | @@ -1414,13 +1547,15 @@ pt: text_body_template: | Pedimos desculpa, mas a sua mensagem de email para %{destination} (título %{former_title}) não funcionou. - O seu email foi marcado como "auto gerado", o qual não podemos aceitar. Se acredita que isto é um erro, contacte um membro do pessoal. + O seu email foi marcado como "gerado automaticamente", o que quer dizer que foi automaticamente criado por um computador em vez de ser escrito por uma pessoa; não podemos aceitar esse tipo de emails. Se acredita que isto é um erro, contacte um membro do pessoal. email_error_notification: subject_template: "[%{site_name}] Problema de email -- Erro de autenticação POP" text_body_template: | - Ocorreu um erro de autenticação ao recuperar emails do servidor POP. + Ocorreu um erro de autenticação ao recuperar emails do servidor POP. - Por favor certifique-se que configurou corretamente as credenciais POP em [configurações do sítio](%{base_url}/admin/site_settings/category/email). + Por favor certifique-se que configurou correctamente as credenciais POP em [configurações do sítio](%{base_url}/admin/site_settings/category/email). + + Se existe uma interface web para a sua conta de POP de email pode necessitar se iniciar sessão na interface web e verificar a suas configurações aí. too_many_spam_flags: subject_template: "Nova conta bloqueada" text_body_template: | @@ -1471,13 +1606,23 @@ pt: download_remote_images_disabled: subject_template: "Descarregamento de imagens remotas desativado" text_body_template: "A configuração `download_remote_images_to_local` foi desativada porque o limite de espaço em disco em `download_remote_images_threshold` foi alcançado." + unsubscribe_link: | + Para parar de receber notificações para este tópico em particular, [clique aqui](%{unsubscribe_url}). Para cancelar a subscrição destes emails, altere as suas [preferências de utilizador](%{user_preferences_url}). + unsubscribe_via_email_link: | + ou, [carregue aqui](mailto:reply@%{hostname}?subject=unsubscribe) para cancelar a subscrição via email. subject_re: "Re:" subject_pm: "[MP]" user_notifications: previous_discussion: "Respostas Anteriores" + in_reply_to: "Em Resposta A" unsubscribe: title: "Cancelar a Subscrição" description: "Não está interessado em receber estes emails? Não há problema! Clique em baixo para cancelar a subscrição instantaneamente:" + reply_by_email: "[Consultar Tópico](%{base_url}%{url}) ou responda a este email para responder" + reply_by_email_pm: "[Consultar Mensagem](%{base_url}%{url}) ou responda a este email para responder" + only_reply_by_email: "Responda a este email para responder" + visit_link_to_respond: "[Consultar Tópico](%{base_url}%{url}) para responder" + visit_link_to_respond_pm: "[Consultar Mensagem](%{base_url}%{url}) para responder" posted_by: "Publicado por %{username} em %{post_date}" user_invited_to_private_message_pm: subject_template: "[%{site_name}] %{username} convidou-o para uma mensagem '%{topic_title}'" @@ -1511,7 +1656,7 @@ pt: Por favor visite esta hiperligação para ver a mensagem: %{base_url}%{url} user_invited_to_topic: - subject_template: "[%{site_name}] %{username} convidou-o para um tópico '%{topic_title}'" + subject_template: "[%{site_name}] %{username} convidou-o para '%{topic_title}'" text_body_template: |2 %{username} convidou-o para uma discussão @@ -1534,6 +1679,17 @@ pt: %{context} + --- + %{respond_instructions} + user_replied_pm: + subject_template: "[%{site_name}] [MP] %{topic_title}" + text_body_template: | + %{header_instructions} + + %{message} + + %{context} + --- %{respond_instructions} user_quoted: @@ -1547,6 +1703,17 @@ pt: --- %{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: | @@ -1680,7 +1847,7 @@ pt: Se a hiperligação não for clicável, tente copiá-la e colá-la na barra de endereço do seu navegador de internet. page_not_found: - title: "A página que solicitou não existe ou é privada." + title: "Oops! Essa página não existe or é privada." popular_topics: "Popular" recent_topics: "Recente" see_more: "Mais" diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml index fb549bbba8..e335373c0c 100644 --- a/config/locales/server.pt_BR.yml +++ b/config/locales/server.pt_BR.yml @@ -27,6 +27,22 @@ pt_BR: purge_reason: "A conta não verificada, foi excluída." disable_remote_images_download_reason: "Download de imagens remotas foi desativado porque não havia espaço suficiente em disco disponível." anonymous: "Anônimo" + emails: + incoming: + default_subject: "Email recebido de %{email}" + errors: + empty_email_error: "Ocorre quando o email bruto recebido estiver em branco." + no_message_id_error: "Ocorre quando o email não possui cabeçalho 'id-mensagem'." + auto_generated_email_error: "Ocorre quando o cabeçalho 'precedência' estiver definido como: lista, lixo eletrônico, lote ou resposta_automática, ou quando outro cabeçalho contiver: enviado_automaticamente, respondido_automaticamente ou gerado_automaticamente." + no_body_detected_error: "Ocorre quando não foi possível extrair o corpo de texto e não havia anexos." + inactive_user_error: "Ocorre quando o remetente não está ativo." + blocked_user_error: "Ocorre quando o remetente foi bloqueado." + bad_destination_address: "Ocorre quando nenhum dos endereços de email nos campos Para/Cc/Cco era correspondente ao endereço de email recebido." + strangers_not_allowed_error: "Ocorre quando um usuário tentou criar um novo tópico em uma categoria da qual não é membro." + insufficient_trust_level_error: "Ocorre quando um usuário tenta criar um novo tópico em uma categoria de que não possui o nível de confiança necessário." + reply_user_not_matching_error: "Ocorre quando uma resposta chega em um endereço de email diferente ao da notificação enviada." + topic_not_found_error: "Ocorre quando uma resposta foi enviada mas o tópico relacionado foi excluído." + topic_closed_error: "Ocorre quando uma resposta foi enviada mas o tópico relacionado foi fechado." errors: &errors format: '%{attribute} %{message}' messages: @@ -150,6 +166,7 @@ pt_BR: rss_description: latest: "Últimos tópicos" hot: "Tópicos quentes" + top: "Principais tópicos" posts: "Últimos tópicos" too_late_to_edit: "Essa mensagem foi criada há muito tempo. Ela não pode mais ser editada ou apagada." excerpt_image: "imagem" @@ -678,7 +695,6 @@ pt_BR: min_private_message_title_length: "Comprimento mínimo de caracteres permitido para o título de uma mensagem" min_search_term_length: "Comprimento mínimo válido para o termo de pesquisa em caracteres" allow_uncategorized_topics: "Permitir criação de tópicos sem uma categoria. NOTA: Se existe algum tópico sem nenhuma categoria, você deve movê-los para uma categoria antes de desabilitar esta opção." - uncategorized_description: "A descrição da categoria Sem categoria. Deixe em branco para nenhuma descrição." allow_duplicate_topic_titles: "Permitir tópicos com títulos duplicados, idênticos." unique_posts_mins: "Quantos minutos antes para um utilizador poder criar uma postagem com o mesmo conteúdo outra vez?" educate_until_posts: "Quando o usuário começa a digitar suas primeiras (n) novos posts, mostrar o novo painel pop-up de educação do usuário no compositor." @@ -754,7 +770,6 @@ pt_BR: suppress_reply_directly_above: "Não mostrar a em-resposta-à expansível em um post quando há apenas uma única resposta diretamente acima deste post." suppress_reply_when_quoting: "Não mostrar a em-resposta-à expansível em um post quando o post cita a resposta." max_reply_history: "Número máximo de respostas para expandir quando expandindo em-resposta-à" - experimental_reply_expansion: "Esconder respostas intermediárias quando expandindo uma resposta à (experimental)" topics_per_period_in_top_summary: "Número de melhores tópicos mostrados no sumário padrão de melhores tópicos." topics_per_period_in_top_page: "Número de melhores tópicos mostrados no 'Exibir Mais' melhores tópicos quando expandido." redirect_users_to_top_page: "Automaticamente redirecionar usuários novos e há muito ausentes para a página melhores." @@ -940,7 +955,6 @@ pt_BR: automatically_download_gravatars: "Fazer download de Gravatars dos usuários ao criar conta ou mudança de email." digest_topics: "O número máximo de tópicos a serem mostrados no resumo via email." digest_min_excerpt_length: "O excerto mínimo de post no resumo via email, em caracteres." - delete_digest_email_after_days: "Suprimir emails de resumo para usuários não vistos no site há mais do que (n) dias." disable_digest_emails: "Desabilitar emails de resumo para todos os usuários." max_daily_gravatar_crawls: "Número máximo de vezes que o Discourse irá checar o Gravatar por avatares personalizados em um dia" public_user_custom_fields: "Um conjunto de campos personalizados para um usuário que podem ser apresentados publicamente." @@ -1012,7 +1026,6 @@ pt_BR: moved_post: "%{display_username} moveu a sua postagem para %{link}" private_message: "%{display_username} enviou-te uma mensagem particular: %{link}" invited_to_private_message: "%{display_username} convidou-te para uma conversa privada: %{link}" - invited_to_topic: "%{display_username} convidou você para um tópico: %{link}" invitee_accepted: "%{display_username} aceitou o seu convite" linked: "%{display_username} linkou você em %{link}" granted_badge: "Você ganhou %{link}" @@ -1102,8 +1115,6 @@ pt_BR: characters: "deve incluir apenas números, letras e sublinhados" unique: "tem que ser único" blank: "tem que ser preenchido" - must_begin_with_alphanumeric: "deve começar com uma letra, número ou um underline" - must_end_with_alphanumeric: "deve terminar com uma letra, número ou um underline" must_not_contain_two_special_chars_in_seq: "não deve conter uma seqüência de 2 ou mais caracteres especiais (.-_)" email: not_allowed: "este provedor de emails não é permitido. Por favor utilize outro endereço de email." @@ -1111,6 +1122,10 @@ pt_BR: ip_address: blocked: "Novos registros não são permitidos a partir do seu endereço de IP." max_new_accounts_per_registration_ip: "Novos registros não são permitidos a partir do seu endereço de IP (quantidade máxima alcançada). Contate um membro da equipe." + flags_reminder: + subject_template: + one: "1 sinalização aguardando a ser controlada" + other: "%{count} sinalizações aguardando a ser controladas" invite_mailer: subject_template: "%{invitee_name} convidou você para '%{topic_title}' em %{site_domain_name}" text_body_template: | @@ -1154,87 +1169,10 @@ pt_BR: (Se o link acima expirou, escolha a opção "Esqueci minha senha" quando efetuar o login com o seu endereço de e-mail.) test_mailer: subject_template: "[%{site_name}] Teste de entrega de email" - text_body_template: | - Este é um email de teste de - - [**%{base_url}**][0] - - Entregabilidade de Email é complicada. Seguem algumas coisas importantes que você deve verificar primeiro: - - - Tenha *certeza* de definir o endereço de remetente `email de notificação` corretamente nas configurações do site. **O domínio especificado no endereço de remetente "from" dos emails enviados é o domínio que seus emails serão validados**. - - - Aprenda a verificar o conteúdo completo do email no seu cliente de email, para que possa examinar os cabeçalhos do email para pistas importantes. No Gmail, é a opção "mostrar original" no menu de seleção no canto superior direito de cada email. - - - **IMPORTANTE:** Seu provedor de internet (ISP) tem um registro de DNS reverso configurado para associar os nomes de domínio e os endereços de IP que você enviou os emails? [Testar seu registro reverso PTR][2] aqui. Se seu provedor (ISP) não entrou o registro de apontamento de DNS reverso apropriadamente, é muito improvável que qualquer email seja entregue. - - - O [registro SPF][8] de seu domínio está correto? [Teste seu registro SPF][1] aqui. Observe que TXT é o typo de registro correto para SPF. - - - O [registro DKIM][3] de seu domínio está correto? Isto irá melhorar significativamente a entregabilidade de email. [Teste seu registro DKIM][7] aqui. - - - Se você utiliza seu próprio servidor de email, verifique que os IPs de seu servidor de email [não estão em nenhuma lista negra][4]. Também verifique que está definitivamente enviando um nome de domínio totalmente qualificado resolvido por DNS em sua mensagem HELO. Se não estiver, irá fazer com que email seja rejeitado por muitos serviços de mail. - - (A maneira *fácil* é criar uma conta no [Mandrill][md] ou [Mailgun][mg] ou [Mailjet][mj], que tem generosos planos gratuitos e serão suficientes para comunidades pequenas. Entretanto você ainda terá que configurar os registros SPF e DKIM no seu DNS!) - - Esperamos que tenha recebido este email de verificação de entrega com sucesso! - - Boa sorte, - - Seus amigos do [Discourse](http://www.discourse.org) - - [0]: %{base_url} - [1]: http://www.kitterman.com/spf/validate.html - [2]: http://mxtoolbox.com/ReverseLookup.aspx - [3]: http://www.dkim.org/ - [4]: http://whatismyipaddress.com/blacklist-check - [7]: http://dkimcore.org/tools/dkimrecordcheck.html - [8]: http://www.openspf.org/SPF_Record_Syntax - [md]: http://mandrill.com - [mg]: http://www.mailgun.com/ - [mj]: https://www.mailjet.com/pricing new_version_mailer: subject_template: "[%{site_name}] Nova versão do Discourse, atualização disponível" - text_body_template: | - Uma nova versão do [Discourse](http://www.discourse.org) está disponível. - - Sua versão: %{installed_version} - Nova versão: **%{new_version}** - - Você pode querer: - - - Veja o que há de novo na [GitHub changelog](https://github.com/discourse/discourse/commits/master). - - - Atualização do seu navegador em [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). - - - Visita [meta.discourse.org](http://meta.discourse.org) para notícias, discussão e apoio para Discourse. new_version_mailer_with_notes: subject_template: "[%{site_name}] atualização disponível" - text_body_template: | - Uma nova versão do [Discourse](http://www.discourse.org) está disponível. - - Sua versão: %{installed_version} - Nova versão: **%{new_version}** - - Você pode querer: - - - Veja o que há de novo na [GitHub changelog](https://github.com/discourse/discourse/commits/master). - - - Atualização do seu navegador em [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). - - - Visita [meta.discourse.org](http://meta.discourse.org) para notícias, discussão e apoio para Discourse. - - ### Notas de lançamento - - %{notes} - flags_reminder: - flags_were_submitted: - one: "Essas sinalizações foram submetidos mais de 1 hora." - other: "Essas sinalizações foram submetidos mais de %{count} horas." - please_review: "Por favor, revise eles." - post_number: "mensagem" - how_to_disable: 'Você pode desabilitar ou modificar a frequência deste lembrete de email através da configuração "notificar sobre sinalizações após".' - subject_template: - one: "1 sinalização aguardando a ser controlada" - other: "%{count} sinalizações aguardando a ser controladas" queued_posts_reminder: subject_template: one: "[%{site_name}] 1 mensagem aguardando revisão" @@ -1344,8 +1282,6 @@ pt_BR: text_body_template: "Nos desculpamos, mas sua exportação de dados falhou. Por favor verifique os logs ou entre em contato com um membro da staff." email_reject_no_account: subject_template: "[%{site_name}] Problema com Email -- Conta Desconhecida" - text_body_template: | - Lamentamos, mas o seu e-mail para%{destination} (intutulado %{former_title}) não funcionou. Não há nenhum relato conhecido com este endereço de e-mail. Tente enviar a partir de um endereço de e-mail diferente, ou entre em contato com um membro da equipe. email_reject_empty: subject_template: "[%{site_name}] Problema com email -- Sem conteúdo" email_reject_parsing: @@ -1358,10 +1294,6 @@ pt_BR: Sua conta não possui privilégios para postar novos topicos nessa categoria. Se acredita que isso esteja errado, entre em contato com um dos membros responsáveis.. email_reject_reply_key: subject_template: "[%{site_name}] Problema com email -- Chave de Resposta Desconhecida" - text_body_template: | - Pedimos desculpas, mas seu email para %{destination} (titled %{former_title}) não foi enviado. - - O endereço de email do destinatário é desconhecido ou inválido, Contate um dos moderadores para relatar esse problema email_reject_topic_not_found: subject_template: "[%{site_name}] Problema com email -- Tópico Não Encontrado" email_reject_topic_closed: @@ -1370,10 +1302,6 @@ pt_BR: subject_template: "[%{site_name}] Problema com email -- Resposta Gerada Automaticamente" email_error_notification: subject_template: "[%{site_name}] Problema com email -- Erro de autenticação POP" - text_body_template: | - Erro de autenticação ao baixar e-mails através do servidor POP. - - Por favor verifique se você configurou corretamente suas credenciais de POP nos [ajustes](%{base_url}/admin_site_settings/category/email). too_many_spam_flags: subject_template: "Nova conta bloqueada" text_body_template: | @@ -1431,7 +1359,6 @@ pt_BR: Por favor visitar este link para visualizar a mensagem: %{base_url}%{url} user_invited_to_topic: - subject_template: "[%{site_name}] %{username} convidou você para um tópico '%{topic_title}'" text_body_template: |2 %{username} convidou você para uma discussão @@ -1525,7 +1452,6 @@ pt_BR: Se não conseguires clicar no link em cima, tenta copia-lo e cola-lo na barra de endereções do seu browser de internet. page_not_found: - title: "A página solicitada não existe ou é privativa." popular_topics: "Popular" recent_topics: "Recente" see_more: "Mais" diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml index a1b6008449..3e7c894916 100644 --- a/config/locales/server.ru.yml +++ b/config/locales/server.ru.yml @@ -25,6 +25,9 @@ ru: purge_reason: "Автоматически удален, как неактивная, неактивированная учетная запись" disable_remote_images_download_reason: "Загрузка картинок была отключена из-за недостаточности места на диске." anonymous: "Гость" + emails: + incoming: + default_subject: "Входящее письмо от %{email}" errors: &errors format: '%{attribute} %{message}' messages: @@ -41,8 +44,10 @@ ru: exclusion: зарезервировано greater_than: должно быть больше чем %{count} greater_than_or_equal_to: должно быть больше или равно %{count} + has_already_been_used: "уже было использовано" inclusion: не включен в список invalid: неверный + is_invalid: "- неверно; попробуйте описать подробнее." less_than: должен быть меньше %{count} less_than_or_equal_to: должен быть меньше или равен %{count} not_a_number: не число @@ -90,6 +95,7 @@ ru: not_found: "Запрашиваемая страница или ресурс не найден." invalid_access: "У вас нет прав для просмотра запрашиваемого ресурса." read_only_mode_enabled: "Сайт в режиме только для чтения. Взаимодействия отключены." + reading_time: "Время на прочтение" likes: "Лайков" too_many_replies: one: "Извините, новые пользователи могут оставлять только один ответ к теме." @@ -119,6 +125,30 @@ ru: few: "Извините, но вы можете упоминать только %{count} пользователей в сообщении." many: "Извините, но вы можете упоминать только %{count} пользователей в сообщении." other: "Извините, но вы можете упоминать только %{count} пользователей в сообщении." + no_mentions_allowed_newuser: "Извините, новые пользователи не могут упоминать других пользователей." + too_many_mentions_newuser: + one: "Извините, новые пользователи могут упоминать только одного пользователя в каждом сообщении." + few: "Извините, новые пользователи могут упоминать только %{count} пользователей в сообщении." + many: "Извините, новые пользователи могут упоминать только %{count} пользователей в сообщении." + other: "Извините, новые пользователи могут упоминать только %{count} пользователей в сообщении." + no_images_allowed: "Извините, новые пользователи не могут прикреплять изображения." + too_many_images: + one: "Извините, новые пользователи могут прикреплять только одно изображение к сообщению." + few: "Извините, новые пользователи могут прикреплять только %{count} изображений к сообщению." + many: "Извините, новые пользователи могут прикреплять только %{count} изображений к сообщению." + other: "Извините, новые пользователи могут прикреплять только %{count} изображений к сообщению." + no_attachments_allowed: "К сожалению, загрузка файлов недоступна новым пользователям." + too_many_attachments: + one: "К сожалению, новые пользователи могут добавить только одно вложение в сообщение." + few: "К сожалению, новые пользователи могут добавить только %{count} вложений в сообщение." + many: "К сожалению, новые пользователи могут добавить только %{count} вложений в сообщение." + other: "К сожалению, новые пользователи могут добавить только %{count} вложений в сообщение." + no_links_allowed: "Извините, новые пользователи не могут размещать ссылки." + too_many_links: + one: "Извините, новые пользователи могут размещать только одну ссылку в сообщении." + few: "Извините, новые пользователи могут размещать только %{count} ссылок в сообщении." + many: "Извините, новые пользователи могут размещать только %{count} ссылок в сообщении." + other: "Извините, новые пользователи могут размещать только %{count} ссылок в сообщении." spamming_host: "Извините, вы не можете разместить ссылку в этом сообщении." user_is_suspended: "Заблокированным пользователям запрещено писать." topic_not_found: "Что-то пошло не так. Возможно, эта тема была закрыта или заархивирована, пока вы ее читали?" @@ -150,6 +180,8 @@ ru: errors: can_not_modify_automatic: "Нельзя изменять автоматическую группу." member_already_exist: "'%{username}' уже является членом этой группы." + invalid_domain: "'%{domain}' является некорректным доменом." + invalid_incoming_email: "'%{incoming_email}' является некорректным адресом электронной почты." default_names: everyone: "все" admins: "администраторы" @@ -267,6 +299,8 @@ ru: body: "\nПоздравляем! :confetti_ball:\n\nЕсли вы видите данное сообщение, вы достигли уровня **regular** (уровень доверия 3).\n\nУвас появились новые возможности …\n\n* Вы можете редактировать заголовок любого обсуждения\n* Вы можете менять категорию обсуждения\n* С ваших ссылок снимается ограничения nofollow ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) is removed)\n* Вы получили доступ к закрытым категориям, которые доступны только для уровня доверия 3 и выше \n* Вы можете скрывать нежелательные сообщения в один клик\n\nС полным списком привелегий вы можете ознакомиться тут [current list of fellow regulars](/badges/3/regular). Пожалуйста прочитайте это.\n\nСпасибо Вам за то что являетесь важным членом нашего сообщества!\n\n(Для получения более детальной информации об уронях доверия посмотрите тут [see this topic][trust]. Напоминаем что данный уровень доверия сохраняется до тех пор пока вы придерживаетесь этих правил.)\n\n[trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924\n" category: topic_prefix: "Описание раздела %{category}" + replace_paragraph: "(Замените первый параграф лаконичным описанием новой категории. Данное описание будет отражено в области выбора категории, поэтому желательно ограничиться 200 символами. ** Пока вы не измените данное описание или создадите темы, данная категория не появится на странице категорий.**)" + post_template: "%{replace_paragraph}\n\nИспользуйте следующий текст для подробного описания или для определения правил раздела:\n\n- Почему нужно использовать этот раздел? Зачем он?\n\n- Насколько раздел отличается от ранее созданных?\n\n- Что должны содержать темы в этом разделе?\n\n- Действительно ли нужен этот раздел? Можем ли мы объединить его с другой категорией или подкатегорией?\n\n" errors: uncategorized_parent: "Разделу для тем вне разделов нельзя назначать родительский раздел." self_parent: "Подраздел не может быть родительским для самого себя." @@ -701,7 +735,6 @@ ru: max_topic_title_length: "Максимально допустимое количество символов в названии темы." min_private_message_title_length: "Минимально допустимое количество символов в заголовке сообщения в беседе." min_search_term_length: "Минимальное количество символов в поисковом запросе." - uncategorized_description: "Описание раздела для тем \"без раздела\". Будет скрыто есть оставить пустым." allow_duplicate_topic_titles: "Разрешить создание тем с одинаковыми названиями." unique_posts_mins: "Количество минут до того, как пользователь сможет разместить сообщение с тем же содержанием." educate_until_posts: "Количество первых сообщений новых пользователей, для которых необходимо показывать всплывающую подсказку с советами для новичков." @@ -775,7 +808,6 @@ ru: suppress_reply_directly_above: "Не показывать разворачивемый блок \"в ответ на\" для сообщения, если есть всего лишь одно сообщение непосредственно выше." suppress_reply_when_quoting: "Не показывать разворачивемый блок \"в ответ на\", если сообщение уже содержит цитату." max_reply_history: "Максимальное число разворачивающихся ответов в блоке \"в ответ на\"" - experimental_reply_expansion: "Скрыть промежуточные ответы, когда раскрывается все ответы (эксперементальная функция)" topics_per_period_in_top_summary: "Количество рекомендованных тем, отображаемых внизу текущей темы." topics_per_period_in_top_page: "Количество рекомендованных тем, отображаемых при нажатии 'Показать больше' в низу текущей темы." redirect_users_to_top_page: "Автоматически перенаправлять новых и давно отсутствующих пользователей к началу страницы." @@ -956,7 +988,6 @@ ru: automatically_download_gravatars: "Скачивать аватарку Gravatar пользователя во время создания учетной записи или изменения e-mail." digest_topics: "Максимальное количество тем в письме - сводке новостей." digest_min_excerpt_length: "Минимальная длина (в символах) вытяжки из сообщения в письме - сводке новостей." - delete_digest_email_after_days: "Не рассылать новости для пользователей, которые не заходили на сайт в течении (n) дней." disable_digest_emails: "Отключить рассылку новостей для всех пользователей." detect_custom_avatars: "Проверять ли, что пользователи загрузили свои собственные картинки профиля (аватарки)." max_daily_gravatar_crawls: "Максимальное количество загрузок аватаорок с Gravatar за один день" @@ -1026,7 +1057,6 @@ ru: moved_post: "%{display_username} перенес ваш пост в тему %{link}" private_message: "%{display_username} написал вам сообщение: %{link}" invited_to_private_message: "%{display_username} пригласил вас обсудить сообщение: %{link}" - invited_to_topic: "%{display_username} пригласил вас поучаствовать в беседе: %{link}" invitee_accepted: "%{display_username} принял ваше приглашение" linked: "пользователь %{display_username} упомянул вас в %{link}" granted_badge: "Вы награждены: %{link}" @@ -1144,6 +1174,12 @@ ru: ip_address: blocked: "Новые регистрации запрещены с вашего IP-адреса." max_new_accounts_per_registration_ip: "Новые регистрации запрещены с вашего IP-адреса (достигнут лимит регистраций). Свяжитесь с администрацией." + flags_reminder: + subject_template: + one: "1 жалоба ожидает рассмотрения" + few: "%{count} жалобы ожидают рассмотрения" + many: "%{count} жалоб ожидают рассмотрения" + other: "%{count} жалоб ожидают рассмотрения" invite_mailer: subject_template: "%{invitee_name} приглашает вас присоединиться к '%{topic_title}' на сайте %{site_domain_name}" text_body_template: | @@ -1187,88 +1223,10 @@ ru: Если срок действия этой ссылки истек, нажмите на кнопку "Войти", а затем "Я забыл свой пароль" и введите ваш e-mail. test_mailer: subject_template: "[%{site_name}] Проверка доставки писем" - text_body_template: | - Это тестовое письмо - - [**%{base_url}**][0] - - Доставка почты это комплексная задача. Вот некоторые вещи которые необходимо проверить: - - - *Убедитесь* в том что в поле От: указан домен, который указан в настройках сайта `email для уведомлений`. ** Проверьте так же что домен указанный в поле "От" вашего письма это тот же домен на котором расположен сайт**. - - - Для этого вам необходимо знать, как посмотреть заголовки письма в почтовом клиенте. в Gmail, это вариант "показать оригинал" в выпадающем меню в правом верхнем углу каждого сообщения. - - - **ВАЖНО:** Проверьте настроена ли reverse DNS запись для связи IP c деменным именем у вашего провайдера. [проверьте Reverse PTR record][2] тут. - Если ваш провайдер не правильно указывает reverse DNS запись то скорее всего доставка почты не будет работать. - - - Указана ли для вашего домена [SPF запись][8] правильно? [Протестировать вашу SPF запись][1] вы можете тут. Помните что TXT это правильный официальный тип для записи SPF. - - - Указанна ли для вашего домена [DKIM запись][3] правильно? Это невероятно увеличивает шансы на доставку вашей почты. [Протестировать DKIM запись][7] пожно тут. - - - Если вы используете для рассылки собственный почтовый сервер, проверьте и убедитесь в том что IP вашего почтового сервера не попал в [черные списки][4]. Также проверьте что корректно отправляется полное имя хоста, который разрешен в DNS в поле HELO сообщения. В противном случае многие почтовые сервисы откажутся принимать ваши письма. - - (Самый *простой* путь это создать бесплатный аккаунт на [Mandrill][md] или [Mailgun][mg] или [Mailjet][mj], и выбрать бесплатный план, который отлично подойдет для малиньких сообществ. Вам также придется указать SPF и DKIM запись в настройках вашего DNS!) - - Мы надеимся что Вы получили данное тестовое сообщение! - - Удачи вам во всем, хорошего настроения, - - Ваши друзья на [Discourse](http://www.discourse.org) - - [0]: %{base_url} - [1]: http://www.kitterman.com/spf/validate.html - [2]: http://mxtoolbox.com/ReverseLookup.aspx - [3]: http://www.dkim.org/ - [4]: http://whatismyipaddress.com/blacklist-check - [7]: http://dkimcore.org/tools/dkimrecordcheck.html - [8]: http://www.openspf.org/SPF_Record_Syntax - [md]: http://mandrill.com - [mg]: http://www.mailgun.com/ - [mj]: https://www.mailjet.com/pricing new_version_mailer: subject_template: "[%{site_name}] Ихууу, доступна новая версия Discourse!" - text_body_template: | - Доступна новая версия [движка вашего форума](http://www.discourse.org). - - Ваша версия: %{installed_version} - Новая версия: **%{new_version}** - - - Узнать, что нового (на английском) - на сайте [GitHub changelog](https://github.com/discourse/discourse/commits/master). - - - Обновить движок прямо из браузера - по ссылке [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). - - - Посетить сайт [англоязычного сообщества Discourse](http://meta.discourse.org), где можно почитать новости и задать вопросы. new_version_mailer_with_notes: subject_template: "[%{site_name}] новые обновления" - text_body_template: | - Доступна новая версия [движка вашего форума](http://www.discourse.org). - - Ваша версия: %{installed_version} - Новая версия: **%{new_version}** - - - Узнать, что нового (на английском) - на сайте [GitHub changelog](https://github.com/discourse/discourse/commits/master). - - - Обновить движок прямо из браузера - по ссылке [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). - - - Посетить сайт [англоязычного сообщества Discourse](http://meta.discourse.org), где можно почитать новости и задать вопросы. - - ### Что новенького - - %{notes} - flags_reminder: - flags_were_submitted: - one: "Эти жалобы были отправлены более 1 час назад." - few: "Эти жалобы были отправлены более %{count} часов назад." - many: "Эти жалобы были отправлены более %{count} часов назад." - other: "Эти жалобы были отправлены более %{count} часов назад." - please_review: "Пожалуйста, рассмотрите их" - post_number: "сообщение" - how_to_disable: 'Вы можете отключить или изменить частоту получения данных писем в настройках "уведомлений"' - subject_template: - one: "1 жалоба ожидает рассмотрения" - few: "%{count} жалобы ожидают рассмотрения" - many: "%{count} жалоб ожидают рассмотрения" - other: "%{count} жалоб ожидают рассмотрения" queued_posts_reminder: subject_template: one: "[%{site_name}] 1 сообщение ожидает проверки" @@ -1398,12 +1356,6 @@ ru: text_body_template: "Мы сожалеем, но возникли неполадки с экспортом ваших данных. Свяжитесь с администратором сайта." email_reject_no_account: subject_template: "[%{site_name}] Неполадки с письмом - не найдена учетная запись" - text_body_template: | - К сожалению, ваше письмо к %{destination} (под названием %{former_title}) не может быть обработано. - - Мы не смогли найти учетную запись с электронным адресом, с которого пришло ваше письмо. - - Попробуйте отправить с другого почтового ящика, или, если вы считаете, что произошла ошибка, свяжитесь с персоналом - модератором или администратором. email_reject_empty: subject_template: "[%{site_name}] Неполадки с письмом - отсутствует текст" email_reject_parsing: @@ -1424,16 +1376,8 @@ ru: Если вы считаете, что произошла ошибка, свяжитесь администратором сайта. email_reject_reply_key: subject_template: "[%{site_name}] Системное сообщение -- Неизвестный ключ для ответа" - text_body_template: | - К сожалению, ваше письмо к %{destination} (под названием %{former_title}) не может быть обработано. - - Ключ ответа неверный, поэтому мы не можем определить, кому адресован ваш ответ. Пожалуйста, свяжитесь с персоналом (модератором или администратором). email_reject_topic_not_found: subject_template: "[%{site_name}] Системное сообщение -- Тема не найдена" - text_body_template: | - К сожалению, ваше письмо к %{destination} с заголовком %{former_title} не может быть обработано. - - Тема, в которую вы пишите, не существует. Возможно, она была удалена. Если вы считаете, что произошла ошибка при обработке письма, обратитесь к модератору или администратору. email_reject_topic_closed: subject_template: "[%{site_name}] Неполадки с письмом - Топик закрыт" text_body_template: | @@ -1442,18 +1386,8 @@ ru: Тема, в которую вы пишите, была закрыта, и поэтому новые сообщения не разрешены. Если вы считаете, что произошла ошибка при обработке письма, обратитесь к модератору или администратору. email_reject_auto_generated: subject_template: "[%{site_name}] системное сообщение - Автоматически сгенерирован ответ" - text_body_template: | - К сожалению, ваше письмо к %{destination} с заголовком %{former_title} не может быть обработано. - - Система обнаружила, что оно было сгенерировано автоматически, а такие письма не допустимы для автоматической отправки сообщений в форуме через электронную почту. - - Если вы считаете, что произошла ошибка при обработке письма, обратитесь к модератору или администратору. email_error_notification: subject_template: "[%{site_name}] Системное сообщение -- ошибка POP аутентификации" - text_body_template: | - При получении почты с почтового POP сервера, была обнаружена ошибка. - - Убедитесь в том что аутентификация для POP сервера настроена правильно в [the site settings](%{base_url}/admin/site_settings/category/email). too_many_spam_flags: subject_template: "Новый аккаунт заблокирован" text_body_template: | @@ -1519,7 +1453,6 @@ ru: Просмотреть сообщение вы можете по ссылке: %{base_url}%{url} user_invited_to_topic: - subject_template: "[%{site_name}] %{username} Приглашает вас к обсуждению темы: '%{topic_title}'" text_body_template: |2 %{username} приглашает вас к обсуждению @@ -1625,7 +1558,6 @@ ru: Если данная ссылка не работает, попробуйте скопировать её и вставить в строку адреса вашего браузера. page_not_found: - title: "Запрашиваемая страница не существует или необщедоступна." popular_topics: "Популярные" recent_topics: "Недавние" see_more: "Еще" diff --git a/config/locales/server.sk.yml b/config/locales/server.sk.yml index 5ad1ce158b..6cc8e3a3b4 100644 --- a/config/locales/server.sk.yml +++ b/config/locales/server.sk.yml @@ -735,7 +735,6 @@ sk: min_search_term_length: "Minimálny povolený počet znakov vo vyhľadávaní" search_tokenize_chinese_japanese_korean: "Prinúť vyhľádávanie rozložiť Čínštinu/Japončinu/Kórejčinu dokonca i pre nie CJK stránky" allow_uncategorized_topics: "Pvoliť vytváranie tém bez kategórií. UPOZORNENIE: Pokiaľ existujú nekategorizované témy, musíte ich zaradiť do kategórii skôr než túto možnosť vypnete." - uncategorized_description: "Popis nekategorizovanej kategórie. Nechajte prázdne pre žiadny popis.." allow_duplicate_topic_titles: "Povoliť témy s rovnakými, duplikovanými názvami" unique_posts_mins: "Koľko minút musí byť medzi dvomi rovnakými príspevkami od jedného užívateľa." educate_until_posts: "Ked užívateľ začne písať svojich prvých (n) príspevkov, zobraz sprievodcu vzdelávania pre nového užívateľa. " @@ -1414,6 +1413,20 @@ sk: system_messages: post_hidden: subject_template: "Príspevok skrytý z dôvodu konumitného označenia vlajkou" + text_body_template: | + Dobrý deň, + + toto je automaticky generovaná správa od %{site_name}, aby ste boli informovaní, že váš príspevok bol skrytý. + + %{base_url}%{url} + + %{flag_reason} + + Viacero členov komunity označilo tento príspevok predtým, ako bol skrytý, takže skúste, prosím, zvážiť, ako by ste mohli príspevok upraviť, aby odrážal ich spätnú väzbu. **Váš príspevok môžete upraviť po %{edit_delay} minútach a bude automaticky opäť zobrazený.** + + Avšak pokiaľ bude príspevok skrytý komunitou druhýkrát, ostane skrytý dovtedy, pokiaľ sa o to nepostarajú moderátori – a tam môže dôjsť k ďalším akciám, ako napr. možné pozastavenie vášho účtu. + + Ohľadom ďalšieho poradenstva si, prosím, pozrite naše [community guidelines](%{base_url}/pokyny). usage_tips: text_body_template: | Tu je niekoľko rád, ako začať: @@ -1554,6 +1567,8 @@ sk: subject_template: "Export dát kompletný" csv_export_failed: subject_template: "Export dát zlyhal" + email_reject_insufficient_trust_level: + subject_template: "[%{site_name}] Problém s emailom -- Nízka úroveň dôvery" email_reject_inactive_user: subject_template: "[%{site_name}] Problém s emailom -- Neaktívny užívateľ" email_reject_no_account: @@ -1584,6 +1599,8 @@ sk: subject_template: "[%{site_name}] Problém s emailom -- Chyba pri uverejnení" email_reject_invalid_post_specified: subject_template: "[%{site_name}] Problém s emailom -- Chyba pri uverejnení" + email_reject_invalid_post_action: + subject_template: "[%{site_name}] Problém s emailom -- Neplatná akcia k príspevku" email_reject_reply_key: subject_template: "[%{site_name}] Problém s emailom -- Neznámy kľúč odpovede" email_reject_bad_destination_address: @@ -1598,20 +1615,16 @@ sk: Téma, na ktorú odpovedáte je s súčasnosti uzavretá a ďalelšie odpovede nie sú akceptované. Ak si myslíte, že ide o chybu, kontaktujte zamestnanca stránok. email_reject_auto_generated: subject_template: "[%{site_name}] Problém s emailom -- Automaticky generovaná odpoveď" - text_body_template: | - Prepáčte, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala. - - Váš email bol označený ako "automaticky generovaný", čo neakceptujeme. Ak si myslíte, že ide o problém, kontaktujte zamestnanca stránok. email_error_notification: subject_template: "[%{site_name}] Problém s emailom -- Chyba pri POP autentifikácií" - text_body_template: | - V priebehu načítania emailov z POP serveru nastala autintifikačná chyba. - - Prosíme, uistite sa, že ste v [the site settings](%{base_url}/admin/site_settings/category/email) správne nastavili POP parametre. too_many_spam_flags: subject_template: "Nový účet je zablokovaný" blocked_by_staff: subject_template: "Účet je zablokovaný" + user_automatically_blocked: + subject_template: "Nový uživateľ %{username} je zablokovaný kôli označeniu komunitou" + spam_post_blocked: + subject_template: "Nový uživateľ %{username} je zablokovaný kôli opakovaným odkazom" unblocked: subject_template: "Učet je odblokovaný" text_body_template: | @@ -1625,13 +1638,29 @@ sk: one: "1 užívateľ čaká na schválenie" few: "%{count} užívateľia čakajú na schválenie" other: "%{count} užívateľov čaká na schválenie" + download_remote_images_disabled: + subject_template: "Sťahovanie vzdialených obrázkov je zablokované." + unsubscribe_via_email_link: |+ + alebo, [kliknite sem](mailto:reply@%{hostname}?subject=unsubscribe) pre odhlásenie prostredníctvom emailu. + subject_re: "Re:" subject_pm: "[PM]" user_notifications: previous_discussion: "Prechádzajúce odpovede" unsubscribe: title: "Odhlásiť" + description: "Nezaujímajú Vás už tieto emaily? Žiadny problém! Pre okamžité odhlásenie kliknite nižšie: " + reply_by_email: "[Pozrite tému](%{base_url}%{url}), alebo zareagujte odpoveďou na tento email" + visit_link_to_respond: "[Pozrite tému](%{base_url}%{url}) pre reakciu" + reply_by_email_pm: "[Pozrite správu](%{base_url}%{url}), alebo zareagujte odpoveďou na tento email" + visit_link_to_respond_pm: "[Pozrite správu](%{base_url}%{url}) pre reakciu" + posted_by: "Príspevok od %{username} dňa %{post_date}" + user_invited_to_private_message_pm: + subject_template: "[%{site_name}] %{username} Vás pozval k správe '%{topic_title}'" + user_invited_to_private_message_pm_staged: + subject_template: "[%{site_name}] %{username} Vás pozval k správe '%{topic_title}'" user_invited_to_topic: + subject_template: "[%{site_name}] %{username} Vás pozval k téme '%{topic_title}'" text_body_template: |2 %{username} Vás pozval do diskusie @@ -1654,6 +1683,17 @@ sk: %{context} + --- + %{respond_instructions} + user_replied_pm: + subject_template: "[%{site_name}] [PM] %{topic_title}" + text_body_template: | + %{header_instructions} + + %{message} + + %{context} + --- %{respond_instructions} user_quoted: @@ -1728,15 +1768,28 @@ sk: click_here: "kliknite tu" from: "%{site_name} výber" read_more: "Čítať viac" + more_topics: "Boli vytvorené %{new_topics_since_seen} ďalšie nové témy." more_topics_category: "Viac nových tém:" forgot_password: subject_template: "[%{site_name}] Obnovenie hesla" + text_body_template: | + Niekto si vyžiadal reset Vášho hesla na [%{site_name}](%{base_url}). + + Ak ste to neboli Vy, môžte ignorovať tento email. + + Pre zmenu hesl kliknite na nasledujúci odkaz + %{base_url}/users/password-reset/%{email_token} set_password: subject_template: "[%{site_name}] Nastaviť heslo" admin_login: subject_template: "[%{site_name}] Prihlásenie" account_created: subject_template: "[%{site_name}] Váš nový účet" + text_body_template: | + Nový účet bol pre Vás vytvorený na %{site_name} + + Kliknite na nasledujúci odkaz pre nastavenie hesla k Vášmu novému účtu: + %{base_url}/users/password-reset/%{email_token} authorize_email: subject_template: "[%{site_name}] Potvrďte Vašu novú email adresu" text_body_template: | diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml index 63eb1ece99..a2c0e78469 100644 --- a/config/locales/server.sq.yml +++ b/config/locales/server.sq.yml @@ -698,7 +698,6 @@ sq: suppress_reply_directly_above: "Don't show the expandable in-reply-to on a post when there is only a single reply directly above this post." suppress_reply_when_quoting: "Don't show the expandable in-reply-to on a post when post quotes reply." max_reply_history: "Maximum number of replies to expand when expanding in-reply-to" - experimental_reply_expansion: "Hide intermediate replies when expanding a reply to (experimental)" topics_per_period_in_top_summary: "Number of top topics shown in the default top topics summary." topics_per_period_in_top_page: "Number of top topics shown on the expanded 'Show More' top topics." redirect_users_to_top_page: "Automatically redirect new and long absent users to the top page." diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml index c56bf44e29..0f044e9a0c 100644 --- a/config/locales/server.tr_TR.yml +++ b/config/locales/server.tr_TR.yml @@ -713,7 +713,6 @@ tr_TR: suppress_reply_directly_above: "Bu gönderinin direk üstünde sadece tek bir cevap varsa, gönderideki açılabilir hangi-cevaba-istinaden-cevapla bölümünü gösterme." suppress_reply_when_quoting: "Gönderi cevabı alıntılarsa, gönderideki açılabilir hangi-cevaba-istinaden-cevapla bölümünü gösterme." max_reply_history: "Hangi-cevaba-istinaden-cevapla bölümü açılınca gösterilecek en fazla cevap sayısı" - experimental_reply_expansion: "Hangi-cevaba-istinaden-cevapla bölümü açılınca ara cevapları gizle (deneysel)" topics_per_period_in_top_summary: "Popüler konular özetinde gösterilen popüler konu sayısı." topics_per_period_in_top_page: "'Daha Fazla Göster' ile genişletilen popüler konular bölümünde gösterilecek popüler konu sayısı. " redirect_users_to_top_page: "Yeni ve uzun süredir giriş yapmamış kullanıcıları otomatik olarak Popüler sayfasına yönlendir." diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml index 094d7b1162..15dc847ba8 100644 --- a/config/locales/server.vi.yml +++ b/config/locales/server.vi.yml @@ -734,9 +734,14 @@ vi: max_reply_history: "Số tối đa trả lời được mở rộng khi trả lời mở rộng" experimental_reply_expansion: "Ẩn các trả lời trung gian khi mở rộng trả lời (thử nghiệm)" topics_per_period_in_top_summary: "Số lượng chủ đề top hiển thị trong tóm tắt các chủ đề top theo mặc định." + topics_per_period_in_top_page: "Số lượng chủ đề top hiển thị khi click 'Xem thêm'." + redirect_users_to_top_page: "Tự động chuyển thành viên mới và vắng mặt lâu ngày lên trên cùng trang." + top_page_default_timeframe: "Khung thời gian mặc định cho trang xem trên cùng." + show_email_on_profile: "Hiển thị email thành viên trên trang hồ hơ (chỉ cho họ và quản trị viên)" email_token_valid_hours: "Token quyên mật khẩu / kích hoạt tài khoản có giá trị trong (n) giờ." email_token_grace_period_hours: "Token quyên mật khẩu / kích hoạt tài khoản vẫn còn giá trị (n) giờ sau khi được gia hạn" enable_badges: "Kích hoạt hệ thống huy hiệu" + enable_whispers: "Cho phép quản trị viên giao tiếp riêng trong chủ đề. (thực nghiệm)" allow_index_in_robots_txt: "Chỉ rõ trong robots.txt trang web này cho phép tạo chỉ mục bởi web search engines." email_domains_blacklist: "Một danh sách đuôi email mà người dùng không được phép dùng để đăng ký tài khoản. Ví dụ: maillinator.com|trashmail.net. Lưu ý mỗi tên miền cách nhau bởi dấu \"|\"." email_domains_whitelist: "Danh sách tên miền người dùng ĐƯỢC PHÉP đăng ký tài khoản. CẢNH BÁO: người dùng với tên miền email khác trong danh sách sẽ không được phép đăng ký!" @@ -747,6 +752,7 @@ vi: port: "DEVELOPER ONLY! WARNING! Sử dụng HTTP port thay vì mặc định port 80. Để trống mặc định port 80." force_hostname: "DEVELOPER ONLY! LƯU Ý! Chỉ rõ hostname trong URL. Để trống là mặc định." invite_expiry_days: "Key mời người dùng có giới hạn bao lâu? tính theo ngày" + invite_passthrough_hours: "Bao lâu người dùng có thể sử dụng mã lời mời trước đó để đăng nhập, theo giờ" invite_only: "Đăng ký tự do đã khóa, tất cả người dùng phải được mời bởi những thành viên khác hoặc nhân viên." login_required: "Yêu cầu chứng thực để đọc nội dung trên trang web, không cho phép người dùng nặc danh truy cập." min_username_length: "Chiều dài username tối thiểu." @@ -755,10 +761,17 @@ vi: min_password_length: "Chiều dài mật khẩu tối thiểu." block_common_passwords: "Không cho phép mật khẩu trong danh sách 10.000 mật khẩu phổ biến." enable_sso: "Cho phép dùng single sign on bằng trang ngoài (CẢNH BÁO: ĐỊA CHỈ EMAIL CỦA NGƯỜI DÙNG PHẢI ĐƯỢC CHỨNG THỰC BỞI TRANG NGOÀI!)" + enable_sso_provider: "Thực hiện giao thức cung cấp Discourse SSO tại điểm cuối /session/sso_provider, yêu cầu phải thiết lập sso_secret" sso_url: "URL của single sign on enpoint" sso_secret: "Chuỗi bảo mật đã được sử dụng để chứng thực thông tin SSO, chắc chắn nó có ít nhất 10 ký tự." + sso_overrides_email: "Ghi đè email cục bộ với email trang ngoài từ SSO cho tất cả các lần đăng nhập, và ngăn chặn những thay đổi cục bộ. (LƯU Ý: sự khác biệt có thể xảy ra do sự bình thường hóa các email cục bộ)" + sso_overrides_username: "Ghi đè tên tài khoản cục bộ với tài khoản trang ngoài từ SSO cho tất cả các lần đăng nhập, và ngăn chặn những thay đổi cục bộ. (LƯU Ý: sự khác biệt có thể xảy ra do yêu cầu độ dài tên tài khoản khác nhau)" + sso_overrides_name: "Ghi đè tên thành viên cục bộ với tên thành viên trang ngoài từ SSO cho tất cả các lần đăng nhập, và ngăn chặn những thay đổi cục bộ." + sso_overrides_avatar: "Ghi đè avatar thành viên cục bộ với avatar thành viên trang ngoài từ SSO. Nếu bật, bạn nên vô hiệu hóa allow_uploaded_avatars" sso_not_approved_url: "Chuyển những tài khoản SSO chưa duyệt tới URL này" + enable_local_logins: "Bật tên tài khoản và mật khẩu đăng nhập cục bộ dựa trên tài khoản. (Chú ý: bật thiết lập này để kích hoạt chức năng gửi lời mời)" allow_new_registrations: "Cho phép đăng ký người dùng mới. Bỏ chọn để bất cứ ai cũng có thể tạo tài khoản mới." + enable_signup_cta: "Hiện thông báo với thành viên ẩn danh khi họ quay lại để yêu cầu họ đăng ký tài khoản." enable_yahoo_logins: "Cho phé chứng thực qua Yahoo" enable_google_oauth2_logins: "Cho phép chứng thực qua Google Oauth2. Nó là cách chứng thực mà Google hỗ trợ. Yêu cầu key và secret." google_oauth2_client_id: "Client ID ứng dụng Google của bạn." @@ -777,7 +790,15 @@ vi: automatic_backups_enabled: "Chạy sao lưu tự động như cấu hình trong tần số sao lưu" backup_frequency: "Tần số sao lưu trang web, trong ngày." enable_s3_backups: "Tải bản sao lưu lên S3 khi hoàn tất. QUAN TRỌNG: yêu cầu chứng thực S3 đã được nhập trong cấu hình File." + s3_backup_bucket: "Địa chỉ tách biệt lưu trữ backup. LƯU Ý: đây phải là địa chỉ được giành riêng." + backup_time_of_day: "Thời gian theo ngày UTC khi backup." + backup_with_uploads: "Kèm theo cả thư mục uploads theo lịch trình backup. Tắt tính năng này sẽ chỉ backup csdl." active_user_rate_limit_secs: "Tần số cập nhật trường 'last_seen_at, tính theo giây" + verbose_localization: "Hiển thị các mẹo trong giao diện người dùng" + previous_visit_timeout_hours: "Bao lâu lần ghé thăm cuối cùng được coi như lần ghé thăm 'trước', theo giờ" + top_topics_formula_log_views_multiplier: "giá trị nhật ký lượt xem nhân với (n) trong công thức chủ đề top: `log(views_count) * (n) + op_likes_count * 0.5 + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`" + top_topics_formula_first_post_likes_multiplier: "giá trị của lượt like bài viết đầu tiên nhân với (n) trong công thức chủ đề top: `log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`" + top_topics_formula_least_likes_per_post_multiplier: "giá trị số lượt like tối thiểu của mỗi bài viết nhân với (n) trong công thức chủ đề top: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`" rate_limit_create_topic: "Sau khi tạo một chủ đề, người dùng phải chờ (n) giây trước khi tạo một chủ đề khác." rate_limit_create_post: "Sau khi đăn bài, người dùng phải chờ (n) giây trước khi đăng bài khác." rate_limit_new_user_create_topic: "Sau khi tạo một chủ đề, người dùng mới phải chờ (n) giây trước khi tạo chủ đề khác." @@ -789,31 +810,69 @@ vi: max_topics_per_day: "Số chủ đề tối đa người dùng có thể tạo mỗi ngày." max_private_messages_per_day: "Số tin nhắn tối đa người dùng có thể tạo mỗi ngày." max_invites_per_day: "Số tối đa người dùng có thể gửi lời mời mỗi ngày." + max_topic_invitations_per_day: "Số tối đa lời mời chủ đề thành viên có thể gửi mỗi ngày." suggested_topics: "Số chủ đề gợi ý hiện ở cuối một chủ đề" limit_suggested_to_category: "Chỉ hiện thị những chủ đề từ danh mục hiện tại trong chủ đề gợi ý." + clean_up_uploads: "Loại bỏ không triệt các dòng mồ côi khi upload để ngăn chặn hosting bất hợp pháp. LƯU Ý: bạn cần phải backup thư mục /uploads trước khi bật thiết lập này." + clean_orphan_uploads_grace_period_hours: "Thời gian gia hạn (theo giờ) trước khi dòng mồ côi upload được loại bỏ." + purge_deleted_uploads_grace_period_days: "Thời gian gia hạn (theo ngày) trước khi upload cần xóa được xóa." + purge_unactivated_users_grace_period_days: "Thời gian gia hạn (theo ngày) trước khi người dùng chưa kích hoạt tài khoản sẽ được xóa." + enable_s3_uploads: "Đặt thư mục upload trên Amazon S3. QUAN TRỌNG: yêu cầu chứng thực S3 (cả ID khóa truy cập & khóa bảo mật)." + s3_use_iam_profile: 'Sử dụng AWS EC2 IAM để lấy khóa. LƯU Ý: bật thiết lập này sẽ ghi đè thiết lập "s3 access key id" và "s3 secret access key".' + s3_upload_bucket: "Tên Amazon S3 để lưu trữ các file sẽ được upload. CHÚ Ý: phải là chữ thường, không cách và không gạch dưới." s3_access_key_id: "Amazon S3 access key id này sẽ được sử dụng để tải lên ảnh." s3_secret_access_key: "Amazon S3 secret access key này sẽ được sử dụng để tải lên ảnh." s3_region: "Amazon S3 region name sẽ được sử dụng để tải lên ảnh." + s3_cdn_url: "CDN URL được sử dụng cho tất cả các tài nguyên S3 (vd: https://cdn.somewhere.com). CHÚ Ý: sau khi thay đổi thiết lập này bạn phải tạo lại các bài viết cũ." avatar_sizes: "Danh sách những kích thước hình đại diện tự động khởi tạo." external_system_avatars_enabled: "Sử dụng dịch vụ ảnh đại diện bên ngoài." + external_system_avatars_url: "URL của dịch vụ avatar ngoài, cho phép thay thế {username} {first_letter} {color} {size}" + default_opengraph_image_url: "URL của ảnh opengraph mặc định." + enable_flash_video_onebox: "Cho phép nhúng liên kết swf và flv (Adobe Flash). CHÚ Ý: có thể chứa đựng các rủi ro bảo mật." default_invitee_trust_level: "Bậc tin tưởng mặc định (0-4) cho thành viên được mời." + default_trust_level: "Cấp độ tin cậy mặc định (0-4) cho tất cả các thành viên mới. CHÚ Ý! Thay đổi thiết lập này sẽ đặt bạn vào nguy cơ spam cao." tl1_requires_topics_entered: "Số chủ đề một thành viên mới phải truy cập trước khi được lên bậc tin tưởng 1" tl1_requires_read_posts: "Số chủ đề một thành viên mới phải đọc trước khi được lên bậc tin tưởng 1" tl1_requires_time_spent_mins: "Số phút một thành viên mới phải đọc trước khi được lên bậc tin tưởng 1" tl2_requires_topics_entered: "Số chủ đề một thành viên mới phải truy cập trước khi được lên bậc tin tưởng 2" tl2_requires_read_posts: "Số chủ đề một thành viên mới phải đọc trước khi được lên bậc tin tưởng 2" tl2_requires_time_spent_mins: "Số phút một thành viên mới phải đọc trước khi được lên bậc tin tưởng 2" + tl2_requires_days_visited: "Số ngày một thành viên phải ghé thăm site trước khi được thăng lên bậc tin cậy cấp 2." + tl2_requires_likes_received: "Số like một thành viên phải nhận được trước khi được thăng lên bậc tin cậy cấp 2." + tl2_requires_likes_given: "Số like một thành viên phải thực hiện trước khi được thăng lên bậc tin cậy cấp 2." + tl2_requires_topic_reply_count: "Số chủ đề thành viên phải trả lời trước khi được thăng lên bậc tin cậy cấp 2." + tl3_time_period: "Khoảng thời gian độ tin cậy cấp 3 yêu cầu" + tl3_requires_days_visited: "Số ngày tối thiểu thành viên cần phải ghé thăm site trong khoảng 100 ngày gần đây trước khi được thăng lên độ tin cậy cấp 3. Đặt cao hơn khoảng thời gian tl3 để vô hiệu hóa thăng hạng tl3. (0 hoặc cao hơn)" + tl3_requires_topics_replied_to: "Số tối thiểu chủ đề thành viên phải trả lời trong 100 ngày gần đây trước khi được thăng lên bậc tin cậy cấp 3. (0 hoặc cao hơn)" + tl3_requires_topics_viewed: "Số phần trăm chủ đề được tạo trong khoảng 100 ngày gần đây mà thành viên cần phải xem trước khi được thăng lên độ tin cậy cấp 3. (từ 0 đến 100)" + tl3_requires_posts_read: "Phần trăm số bài viết được tạo trong khoảng 100 ngày gần đây mà thành viên cần xem để được thăng lên độ tin cậy cấp 3. (từ 0 tới 100)" + tl3_requires_topics_viewed_all_time: "Số lượng chủ đề tối thiểu mà thành viên phải xem trước khi được thăng lên độ tin cậy cấp 3." + tl3_requires_posts_read_all_time: "Tổng số bài viết tối thiểu mà thành viên phải đọc trước khi được thăng lên độ tin cậy cấp 3." + tl3_requires_max_flagged: "Thành viên phải không có nhiều hơn x bài viết bị đánh dấu bởi x thành viên khác trong khoảng 100 ngày gần đây để được thăng lên độ tin cậy cấp 3, với x là giá trị thiết lập. (0 hoặc cao hơn)" + tl3_promotion_min_duration: "Số ngày tối thiểu chương trình thăng hạng cấp 3 kéo dài trước khi thành viên có thể bị giáng cấp xuống độ tin cậy cấp 2." + tl3_requires_likes_given: "Số like tối thiểu mà thành viên phải thực hiện trong khoảng 100 ngày gần đây để được thăng lên độ tin cậy cấp 3." + tl3_requires_likes_received: "Số like tối thiểu mà thành viên phải nhận được trong khoảng 100 ngày gần đây để được thăng lên độ tin cậy cấp 3." + tl3_links_no_follow: "Không loại bỏ rel=nofollow khỏi các liên kết trong bài viết của thành viên có độ tin cậy cấp 3." min_trust_to_create_topic: "Bậc tin tưởng tối thiểu để tạo một chủ đề mới." + min_trust_to_edit_wiki_post: "Bậc tin cậy tối thiểu cần thiết để có thể sửa bài viết được đánh dấu là wiki." + min_trust_to_allow_self_wiki: "Bậc tin cậy tối thiểu cần thiết để người dùng có thể đánh dấu bài viết của họ là wiki." + min_trust_to_send_messages: "Bậc tin cậy tối thiểu cần thiết để có thể tạo hội thoại riêng." newuser_max_links: "Bao nhiêu liên kết tài khoản mới có thể thêm vào bài viết." newuser_max_images: "Bao nhiêu hình tài khoản mới có thể thêm vào bài viết." newuser_max_attachments: "Bao nhiêu đính kèm tài khoản mới có thể thêm vào bài viết" + newuser_max_mentions_per_post: "Số tối đa thông báo @name mà thành viên mới có thể sử dụng trong bài viết." + newuser_max_replies_per_topic: "Số lượng tối đa trả lời mà thành viên có thể thực hiện trong một chủ đề cho đến khi có ai đó gửi trả lời." + max_mentions_per_post: "Số tối đa thông báo @name mà tất cả mọi người có thể sử dụng trong bài viết." email_time_window_mins: "Chờ (n) phút trước khi gửi bất kỳ một email thông báo nào, để cung cấp cho người dùng cơ hội để chỉnh sửa và hoàn tất bài viết của họ." title_max_word_length: "Chiều dài tối đa chữ cho phép, tính theo ký tự, trong một tiêu đề chủ đề." + allow_uppercase_posts: "Cho phép viết hoa tất cả các chữ trong tên chủ đề hoặc nội dung bài viết." + title_fancy_entities: "Chuyển đổi các ký tự ASCII thành các đối tượng HTML trong tên chủ đề, http://daringfireball.net/projects/smartypants/" min_title_similar_length: "Chiều dài tối thiểu của tiêu đề trước khi kiểm tra trùng chủ đề." min_body_similar_length: "Chiều dài tối thiểu của nội dung bài viết trước khi kiểm trang chủ đề tương tự." category_colors: "Danh sách mã màu hexa cho phép cho danh mục." max_attachment_size_kb: "Kích thước file tải lên tối đa tính theo kB. đã cấu hình trong nginx (client_max_body_size) / apache hoặc proxy." authorized_extensions: "Danh sách định dạng file cho phép tải lên (sử dụng '*' để cho phép tất cả loại tập tin)" + max_similar_results: "Số lượng chủ đề tương tự hiển thị phía trên bộ soạn thảo khi soạn chủ đề mới, so sánh dựa trên tiêu đề và nội dung." reply_by_email_enabled: "Cho phép trả lời chủ đề qua email." pop3_polling_ssl: "Sử dụng SSL khi kết nối tới POP3 server. (Đề nghị sử dụng)" email_in_min_trust: "Bậc tin tưởng tối thiểu cho phép một thành viên gửi chủ đề mới qua email." @@ -916,7 +975,6 @@ vi: blank: "phải hiện hành" must_begin_with_alphanumeric: "phải bắt đầu bằng ký tự hoặc số hoặc gạch dưới" must_end_with_alphanumeric: "phải kết thúc bằng ký tự hoặc số hoặc gạch dưới" - must_not_contain_confusing_suffix: "không chứ từ gây hiểu lầm như .json hoặc .png v.v..." email: not_allowed: "không được chấp nhận từ nhà cung cấp email đó. Vui long sử dụng địa chỉ email khác." blocked: "không được chấp nhận." @@ -993,14 +1051,8 @@ vi: subject_template: "[%{site_name}] Vấn đề Email-- Không nhận dạng được nội dung" email_reject_invalid_access: subject_template: "[%{site_name}] Vấn đề Email -- truy cập không phù hợp" - email_reject_post_error: - subject_template: "[%{site_name}] Vấn đề Email -- Lỗi đăng bài" - email_reject_post_error_specified: - subject_template: "[%{site_name}] Vấn đề Email -- Lỗi đăng bài" email_reject_reply_key: subject_template: "[%{site_name}] Vấn đề Email -- Không xác định được key trả lời" - email_reject_destination: - subject_template: "[%{site_name}] Vấn đề Email -- Không xác định địa chỉ Đến:" email_reject_topic_not_found: subject_template: "[%{site_name}] Vấn đề Email -- Không tìm thấy chủ đề" email_reject_topic_closed: diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml index 08abef9992..1a9b11270f 100644 --- a/config/locales/server.zh_CN.yml +++ b/config/locales/server.zh_CN.yml @@ -27,6 +27,9 @@ zh_CN: purge_reason: "自动删除被遗弃、未激活账户" disable_remote_images_download_reason: "磁盘空间不足，远程图像下载已经被禁用。" anonymous: "匿名" + emails: + incoming: + default_subject: "来自%{email}的邮件" errors: &errors format: '%{attribute} %{message}' messages: @@ -153,7 +156,7 @@ zh_CN: everyone: "任何人" admins: "管理面板" moderators: "版主" - staff: "员工" + staff: "管理人员" trust_level_0: "trust_level_0" trust_level_1: "trust_level_1" trust_level_2: "trust_level_2" @@ -253,9 +256,9 @@ zh_CN: vip_category_description: "高于信任等级3的用户参与讨论的分类。" meta_category_name: "页面反馈" meta_category_description: "讨论该站点的站务、组织、如何运作和如何改善它。" - staff_category_name: "职员" - staff_category_description: "职员私有的分类。只有管理员和版主才能阅览主题。" - assets_topic_body: "这是一个永久主题，仅对职员可见，用于存储论坛设计使用的图像和文件。不要删除它！\n\n\n详细教程：\n\n\n1. 回复到这个主题。\n2. 上传你想用作站点标志、图标和其他所有图片到这儿。（使用帖子编辑器工具栏中的上传图标，或者拖拽或者粘贴图像。）\n3. 提交你的回复添加帖子。\n4. 在你的新帖子里右键点击图片获得这些已上传图片的链接，或者点击编辑按钮来编辑帖子，获得到图片的相对地址。复制这些相对地址。\n5. 粘贴这些图像的路径到[基础设置](/admin/site_settings/category/required)。\n\n\n如果你需要运行额外的上传文件类型，在[文件设置](/admin/site_settings/category/files)中编辑 `authorized_extensions`。" + staff_category_name: "管理人员" + staff_category_description: "管理人员私有的分类。只有管理员和版主才能阅览主题。" + assets_topic_body: "这是一个永久主题，仅对管理人员可见，用于存储论坛设计使用的图像和文件。不要删除它！\n\n\n详细教程：\n\n\n1. 回复到这个主题。\n2. 上传你想用作站点标志、图标和其他所有图片到这儿。（使用帖子编辑器工具栏中的上传图标，或者拖拽或者粘贴图像。）\n3. 提交你的回复添加帖子。\n4. 在你的新帖子里右键点击图片获得这些已上传图片的链接，或者点击编辑按钮来编辑帖子，获得到图片的相对地址。复制这些相对地址。\n5. 粘贴这些图像的路径到[基础设置](/admin/site_settings/category/required)。\n\n\n如果你需要运行额外的上传文件类型，在[文件设置](/admin/site_settings/category/files)中编辑 `authorized_extensions`。" lounge_welcome: title: "欢迎来到贵宾室" body: |2 @@ -281,6 +284,8 @@ zh_CN: [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924 category: topic_prefix: "关于分类：%{category}" + replace_paragraph: "（将第一段话修改成你的新分类的简述。这段文字将出现在用户选择分类的地方，所以尝试保持在 200 个字符内。 **除非你编辑了这段文字或者在这分类中创建了主题，这个分类不会出现在分类页面中。**）" + post_template: "%{replace_paragraph}\n\n在接下来的这段话中多写一些分类的用途，或者设定一个该分类的规则：\n\n- 为什么我们要用这个分类？它用来做什么？\n\n- 这个分类和我们已经有的分类究竟有什么不同？\n\n- 这个分类中一般会包含哪些主题？\n\n- 我们需要这个分类么？我们可以把它和别的分类、或者子分类合并吗？\n\n" errors: uncategorized_parent: "未分类不能有一个父分类" self_parent: "一个子分类不能属于它自己。" @@ -292,6 +297,7 @@ zh_CN: topic_exists: other: "不能删除该分类，因为它有 %{count} 个主题。最老的主题是 %{topic_link}。" topic_exists_no_oldest: "不能删除该分类，因为主题数量为 %{count}。" + uncategorized_description: "不需要分类或者不适合放在现在的任何分类中的主题。" trust_levels: newuser: title: "新用户" @@ -302,7 +308,7 @@ zh_CN: regular: title: "活跃用户" leader: - title: "领导" + title: "资深" change_failed_explanation: "你尝试将 %{user_name} 降至 '%{new_trust_level}'。然而他们的信任等级已经是 '%{current_trust_level}'。%{user_name} 将仍是 '%{current_trust_level}' —— 如果你想要降级用户，先锁定信任等级" rate_limiter: slow_down: "你执行这个操作太多次了，请稍后再试。" @@ -633,7 +639,7 @@ zh_CN: title_nag: "为站点指定一个名字。在站点设置中更新标题。" site_description_missing: "输入一句话作为你站点的简介，将出现在搜索结果中。在站点设置中更新 site_description。" consumer_email_warning: "你的站点被设置为使用 Gmail 或者其他客户邮箱服务发送邮件。Gmail 限制每日邮件发送数量。请考虑使用其他邮件服务商来保证邮件的成功发送，例如 mandrill.com。" - site_contact_username_warning: "输入一个友善的职员账户名，并以他的名义发送重要的自动消息。在站点设置中更新 site_contact_username。" + site_contact_username_warning: "输入一个友善的管理人员账户名，并以他的名义发送重要的自动消息。在站点设置中更新 site_contact_username。" notification_email_warning: "通知邮件不是从你域名的一个有效地址发出的；邮件分发将会变得危险和不可靠。请在站点设置中将 notification_email 设置为一个有效的本地邮件地址。" subfolder_ends_in_slash: "你的子目录设置不正确；DISCOURSE_RELATIVE_URL_ROOT以斜杠结尾。" site_settings: @@ -651,7 +657,6 @@ zh_CN: min_search_term_length: "搜索条件允许的最少字符数" search_tokenize_chinese_japanese_korean: "在非中/日/韩语站点强制切割中/日/韩语搜索分词" allow_uncategorized_topics: "允许发表没有分类的帖子。警告：如果又任何未分类的帖子，你必须给他们重新分类后才能关闭该选项。" - uncategorized_description: "未分类分类的描述。留空则无描述。" allow_duplicate_topic_titles: "允许主题有相同，重复的标题" unique_posts_mins: "多少分钟之后才允许一个用户再次发表包含相同内容的帖子" educate_until_posts: "当用户开始键入他们的前几个（n）新帖子时，在编辑器上显示教育面板弹窗。" @@ -666,7 +671,7 @@ zh_CN: disabled_image_download_domains: "域名列表，链接到这些站点的图片不会被下载。用 | 分割。" editing_grace_period: "在 (n) 秒之内，对帖子的编辑不生成帖子历史。" post_edit_time_limit: "作者可以在发布帖子后的(n)分钟内编辑或删除他们的帖子。设置 0 为永远。" - edit_history_visible_to_public: "允许任何人查看编辑过的帖子的老版本。当禁用时，只有职员才能查看浏览。" + edit_history_visible_to_public: "允许任何人查看编辑过的帖子的老版本。当禁用时，只有管理人员才能查看浏览。" delete_removed_posts_after: "帖子被作者删除，将在(n)小时后被自动删除。" max_image_width: "帖子中图片允许的最大缩略图宽度" max_image_height: "帖子中图片允许的最大缩略图宽度" @@ -707,14 +712,15 @@ zh_CN: max_replies_in_first_day: "新用户在第一天内最大可以创建的回复数" tl2_additional_likes_per_day_multiplier: "增加信任等级 2（成员）的赞限制，可提供一个乘数与原始值相乘" tl3_additional_likes_per_day_multiplier: "增加信任等级 3（常规）的赞限制，可提供一个乘数与原始值相乘" - tl4_additional_likes_per_day_multiplier: "增加信任等级 4（领导）的赞限制，可提供一个乘数与原始值相乘" + tl4_additional_likes_per_day_multiplier: "增加信任等级 4（资深）的赞限制，可提供一个乘数与原始值相乘" num_flags_to_block_new_user: "如果一个新用户的帖子被其他 num_users_to_block_new_user 个用户标记为垃圾，隐藏他们的所有帖子并阻止其之后的发帖。0 表示禁用这个特性。" num_users_to_block_new_user: "如果一个新用户的帖子被许多其他用户 num_flags_to_block_new_user 标记为垃圾，隐藏他们的所有帖子并阻止其之后发帖。0 表示禁用这个特性。" notify_mods_when_user_blocked: "如果一个用户被自动封禁了，发送一个消息给所有管理员。" flag_sockpuppets: "如果一个新用户开始了一个主题，并且同时另一个新用户以同一个 IP 在该主题回复，他们所有的帖子都将被自动标记为垃圾。" traditional_markdown_linebreaks: "在 Markdown 中使用传统换行符，即用两个尾随空格来换行" + allow_html_tables: "允许在输入 Markdown 文本时使用表格 HTML 标签。标签 TABLE、THEAD、TD、TR、TH 将被允许使用，即白名单这些标签（需要重置所有包含表格的老帖子的 HTML）" post_undo_action_window_mins: "允许用户在帖子上进行撤销操作（赞、标记等）所需等待的间隔分钟数" - must_approve_users: "新用户在被允许访问站点前需要由职员批准。警告：在运行的站点中启用将解除所有非职员用户的访问权限！" + must_approve_users: "新用户在被允许访问站点前需要由管理人员批准。警告：在运行的站点中启用将解除所有非管理人员用户的访问权限！" pending_users_reminder_delay: "如果新用户等待批准时间超过此小时设置则通知版主。设置-1关闭通知。" ga_tracking_code: "Google 分析追踪代码（ga.js），例如：UA-12345678-9。参考 http://google.com/analytics" ga_domain_name: "Google 分析域名（ga.js），例如：mysite.com；参考 http://google.com/analytics" @@ -741,11 +747,11 @@ zh_CN: topics_per_period_in_top_page: "在展开“显示更多”推荐主题列表显示的主题数量。" redirect_users_to_top_page: "自动重定向至新用户或者长时间未登入的用户至热门页面。" top_page_default_timeframe: "顶部查看页面的默认时间表" - show_email_on_profile: "在用户页面显示用户的邮件地址（只有用户和职员可见）" + show_email_on_profile: "在用户页面显示用户的邮件地址（只有用户和管理人员可见）" email_token_valid_hours: "“忘记密码”/“激活账户” token 有效的小时数(n)。" email_token_grace_period_hours: "“忘记密码”/“激活账户” token 在使用后仍旧有效的小时数(n)。" enable_badges: "启用徽章系统" - enable_whispers: "允许在主题中给职员密频。(experimental)" + enable_whispers: "允许在主题中给管理人员密频。(experimental)" allow_index_in_robots_txt: "在 robots.txt 中详细指出这个站点允许被网页搜索引擎检索。" email_domains_blacklist: "用管道符“|”分隔的邮箱域名黑名单列表，其中的域名将不能用来注册账户，例如：mailinator.com|trashmail.net" email_domains_whitelist: "用管道符“|”分隔的电子邮箱域名的列表，用户必须使用这些邮箱域名注册。警告：用户使用不包含在这个列表里的邮箱域名，将无法成功注册。" @@ -757,7 +763,7 @@ zh_CN: force_hostname: "仅限开发者设定！警告！指定 URL 里的主机名。留空为默认" invite_expiry_days: "多少天以内用户的邀请码是有效的" invite_passthrough_hours: "用户多久才能使用一个已经使用过的邀请代码，以小时计" - invite_only: "公开注册已禁用，新用户必须被其他成员或职员邀请。" + invite_only: "公开注册已禁用，新用户必须被其他成员或管理人员邀请。" login_required: "需要验证才能继续在该站阅读，不允许匿名访问。" min_username_length: "最小用户名长度。" max_username_length: "最大用户名长度。" @@ -800,6 +806,9 @@ zh_CN: active_user_rate_limit_secs: "更新'最后一次见到'数据的间隔，单位为秒" verbose_localization: "在界面上显示详细的本地化提示" previous_visit_timeout_hours: "系统判断一次访问之后多少小时后为'上一次'访问" + top_topics_formula_log_views_multiplier: "热门主题公式中访问次数因子的值（n）：`log(views_count) * (n) + op_likes_count * 0.5 + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`" + top_topics_formula_first_post_likes_multiplier: "热门主题公式中首贴赞的数量的因子的值（n）：`log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`" + top_topics_formula_least_likes_per_post_multiplier: "热门主题公式中赞和帖子数量的比例的最小值（n）：`log(views_count) * (n) + op_likes_count * 0.5 + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`" rate_limit_create_topic: "在创建一个主题之后，用户必须间隔多少秒（n）才能创建另一个主题" rate_limit_create_post: "在创建一个帖子之后，用户必须间隔多少秒（n）才能创建另一个帖子" rate_limit_new_user_create_topic: "在创建一个主题后，新用户必须等待(n)秒才能创建另一个主题。" @@ -843,11 +852,12 @@ zh_CN: tl2_requires_likes_given: "一个初级用户升级到信任等级2所需要给出的赞数。" tl2_requires_topic_reply_count: "一个初级用户升级到信任等级2所需要回复的主题数量。" tl3_time_period: "3级信任等级时间期" + tl3_requires_days_visited: "要维持信任等级 3 升级的用户，需要在最近 100 天内访问的最低次数。将其设置为高于信任等级 3 的评估时间来禁用升级至信任等级 3 功能。（设置为 0 或比那个值更高）" tl3_requires_topics_replied_to: "在最近 100 天内升至信任等级3所需的回复主题的最小数量。（0或更高）" - tl3_requires_topics_viewed: "在最近 100 天内升至信任等级3所需的创建主题的百分比。（0到100）" - tl3_requires_posts_read: "在最近 100 天内升信任等级3所需的创建帖子的百分比。（0到100）" - tl3_requires_topics_viewed_all_time: "用户升至领导信任等级3所需查看的最小主题数量。" - tl3_requires_posts_read_all_time: "用户升至领导信任等级3所需查看的最小帖子数量。" + tl3_requires_topics_viewed: "升至信任等级 3 所需阅读的最近 100 天内新创建主题的百分比。（0到100）" + tl3_requires_posts_read: "升至信任等级 3 所需阅读的最近 100 天内新创建帖子的百分比。（0到100）" + tl3_requires_topics_viewed_all_time: "用户升至信任等级 3 所需查看的最小主题数量。" + tl3_requires_posts_read_all_time: "用户升至信任等级 3 所需查看的最小帖子数量。" tl3_requires_max_flagged: "用户在最近 100 天内升至信任等级3所需的必须没有超过 x 个帖子被 x 个不同的用户标记数量，x为数量。（0或更高）" tl3_promotion_min_duration: "信任等级3的用户可被降级至信任等级2前最小持续天数。" tl3_requires_likes_given: "在最近 100 天内升至信任等级3所需给出的赞。" @@ -855,6 +865,7 @@ zh_CN: tl3_links_no_follow: "不移除信任等级3用户帖子中的链接中的 rel=nofollow 属性。" min_trust_to_create_topic: "创建主题所需的最低信任等级。" min_trust_to_edit_wiki_post: "能编辑维基模式帖子的最小信任等级" + min_trust_to_allow_self_wiki: "用户将自己的帖子设置为维基模式的最低信任等级。" min_trust_to_send_messages: "发送消息所需的最低信任等级。" newuser_max_links: "一个访问者可以添加到一个帖子里的链接数量。" newuser_max_images: "一个访问者可以加入到一个帖子里的图片数量。" @@ -862,8 +873,10 @@ zh_CN: newuser_max_mentions_per_post: "一个访问者可以在一个帖子里使用 @name 提及的最大数量。" newuser_max_replies_per_topic: "直至有人回复他们前，新用户在一个帖子里的最大回复数量。" max_mentions_per_post: "你可以在一个帖子里使用 @name 提及的最大数量。" + max_users_notified_per_group_mention: "当整个群组被提及，用户可能收到的最多提醒数量（超过阈值后将不会有更多新提醒）" create_thumbnails: "为太大而无法恰当地显示在帖子里的图片创建 lightbox 缩略图。" email_time_window_mins: "等待多少（n）分钟才给用户发送通知电子邮件，好让他们有机会自己来编辑和完善他们的帖子。" + private_email_time_window_seconds: "等待多少（n）秒后再给用户发送通知私人通知邮件，这让用户有机会编辑和完善他们的帖子。" email_posts_context: "在通知邮件中包含的作为上下文的回复数量。" flush_timings_secs: "向服务器刷新时间数据的频率，以秒为单位。" title_max_word_length: "在主题的标题中，允许的词语长度的最大字符数。" @@ -897,11 +910,11 @@ zh_CN: privacy_policy_url: "如果你的隐私政策文档在外部，那么请在此填写其完整 URL 地址。" newuser_spam_host_threshold: "用户在一篇帖子中能添加多少此指向同一主机的链接，取决于之前该用户有`newuser_spam_host_threshold`篇帖子被认为是垃圾帖。" white_listed_spam_host_domains: "广告主机白名单域名列表。新用户可以任意链接至这些域名。" - staff_like_weight: "职员赞时的额外权重。" + staff_like_weight: "管理人员赞时的额外权重。" topic_view_duration_hours: "按照每 IP/用户每 N 小时来记录一次新的主题访问" user_profile_view_duration_hours: "按照每 IP/用户每 N 小时来记录用户资料访问数" levenshtein_distance_spammer_emails: "当匹配广告邮件时，模糊匹配判断差异的字符数。" - max_new_accounts_per_registration_ip: "如果已经有了从这个 IP 创建的(n)个信任等级0的账户（并且没有一个是职员或者是信任等级2以上的用户），不再允许来自该 IP 地址的注册请求。" + max_new_accounts_per_registration_ip: "如果已经有了从这个 IP 创建的(n)个信任等级0的账户（并且没有一个是管理人员或者是信任等级2以上的用户），不再允许来自该 IP 地址的注册请求。" min_ban_entries_for_roll_up: "当点击折叠按钮时，且至少 (N) 条记录时，将会创建一个子网封禁记录" max_age_unmatched_emails: "在 (N) 天后删除不匹配的邮件地址。" max_age_unmatched_ips: "在 (N) 天后删除不匹配的 IP 记录。" @@ -918,6 +931,9 @@ zh_CN: strip_images_from_short_emails: "从邮件中除去小于 2800 比特的图片" short_email_length: "短邮件地址长度（以比特作为单位）" display_name_on_email_from: "在Email栏显示全名" + unsubscribe_via_email: "允许用户在发送的邮件的主题或正文中包含“unsubscribe”（未知中文版用什么）来退订邮件" + unsubscribe_via_email_footer: "在发出的邮件底部包含退订链接" + delete_email_logs_after_days: "在（N）天后删除邮件日志。设置为 0 无限期保留" pop3_polling_enabled: "轮询 POP3 收取邮件回复。" pop3_polling_ssl: "连接至 POP3 服务器时使用 SSL。（推荐）" pop3_polling_period_mins: "查询用于邮件的 POP3 账户的间隔（以分钟计）。注意：需要重新启动。" @@ -944,26 +960,29 @@ zh_CN: automatically_download_gravatars: "为注册或更改邮箱的用户下载 Gravatar 头像。" digest_topics: "邮件摘要中显示的最大主题数目。" digest_min_excerpt_length: "在邮件摘要中每个帖子最少显示的字符数量。" - delete_digest_email_after_days: "不发送摘要邮件给超过 (n) 天未出现的用户。" + delete_digest_email_after_days: "不发送摘要邮件给超过（n）天没访问的用户" disable_digest_emails: "为所有用户禁用摘要邮件。" detect_custom_avatars: "检测用户是否上传了自定义个人头像。" max_daily_gravatar_crawls: "一天内 Discourse 将自动检查 gravatar 自定义头像的次数" public_user_custom_fields: "可公开显示的用户自定义属性白名单" - staff_user_custom_fields: "可给职员公开显示的用户自定义属性白名单。" + staff_user_custom_fields: "可给管理人员公开显示的用户自定义属性白名单。" enable_user_directory: "提供可供浏览的用户目录" allow_anonymous_posting: "允许用户切换至匿名模式" anonymous_posting_min_trust_level: "启用匿名发帖所需的最小信任等级" anonymous_account_duration_minutes: "为了匿名性，为每个用户每 N 分钟创建一个匿名账户。例如：如果设置为 600，只要发帖后 600 分钟到了，并且用户切换至了匿名模式，就会创建一个新的匿名账户。" hide_user_profiles_from_public: "对来访用户关闭关闭用户信息卡，用户资料和用户目录。" allow_profile_backgrounds: "允许用户上传个人资料背景图片。" + sequential_replies_threshold: "在被提醒回复了太多连续的回复前，用户在主题中可以连续回复的帖子的数量。" enable_mobile_theme: "为移动设备启用移动友好的主题，但也能切换回完整站点。如果你想要使用自定义的响应式主题请禁用它。" dominating_topic_minimum_percent: "用户在主题中的帖子占到多少百分比时使得用户主导话题。" - daily_performance_report: "每日分析 NGINX 日志并且发布详情主题到职员才能看到的主题" + disable_avatar_education_message: "禁用更改头像操作的教育消息。" + daily_performance_report: "每日分析 NGINX 日志并且发布详情主题到管理人员才能看到的主题" suppress_uncategorized_badge: "不要为主题列表中的未分类主题显示徽章。" permalink_normalizations: "在匹配永久链接之前应用如下正则表达式，例如：/(\\/topic.*)\\?.*/\\1 将去掉所有主题路径的参数字符串。格式为使用正则表达式，以及在字符串使用 \\1 等等来访问捕获内容" global_notice: "为所有访客显示“紧急的”全局横幅，留空隐藏它（可以使用 HTML）" disable_edit_notifications: "当 'download_remote_images_to_local' 启用时禁用系统编辑提醒。" automatically_unpin_topics: "当用户到达底部时自动解除主题置顶。" + read_time_word_count: "一分钟阅读的词的数量，用于估计阅读时间。" full_name_required: "全名是用户个人信息的必填项。" enable_names: "在用户的个人信息、用户卡片和邮件中显示全名。禁用将在所有地方隐藏全名。" display_name_on_posts: "在用户的帖子中显示他们的全名以及他们的 @username。" @@ -1001,7 +1020,7 @@ zh_CN: default_email_direct: "默认在有人引用、回复、提及或者邀请用户时发送一封邮件通知。" default_email_mailing_list_mode: "默认为每一个新帖子发送一封邮件通知。" default_email_always: "即使用户活跃时，仍默认发送邮件通知。" - default_other_new_topic_duration_minutes: "一个主题在多少分钟之内被系统判断为新主题的全局缺省设置" + default_other_new_topic_duration_minutes: "新主题条件的全局缺省设置" default_other_auto_track_topics_after_msecs: "经过多少毫秒之后一个主题就被自动追踪的全局缺省设置" default_other_external_links_in_new_tab: "默认在新的标签页打开外部链接" default_other_enable_quoting: "默认在高亮选择文字时启用引用回复" @@ -1026,6 +1045,10 @@ zh_CN: invalid_string_min: "必须超过 %{min} 个字符。" invalid_string_max: "必须不超过 %{max} 个字符。" invalid_reply_by_email_address: "值必须包含 '%{reply_key' 并且要与通知邮件不同。" + pop3_polling_host_is_empty: "在启用 POP3 轮询前，你必须设置 'pop3 polling host'。" + pop3_polling_username_is_empty: "在启用 POP3 轮询前，你必须设置 'pop3 polling username'。" + pop3_polling_password_is_empty: "在启用 POP3 轮询前，你必须设置 'pop3 polling password'。" + pop3_polling_authentication_failed: "POP3 验证失败。请验证你的 pop3 账户信息。" notification_types: group_mentioned: "%{group_name} 在 %{link} @ 了你" mentioned: "%{display_username} 在 %{link} @ 了你" @@ -1090,9 +1113,9 @@ zh_CN: other: "本主题在最后一个回复创建后 %{count} 分钟后自动关闭。不再允许添加新回复。" autoclosed_disabled: "本主题是开放的，可以添加新的回复。" autoclosed_disabled_lastpost: "本主题现在开放了。可以添加新的回复。" - pinned_enabled: "本主题已置顶，它将始终显示在它所属分类的顶部。可由职员对所有人解除置顶，或者由用户自己取消置顶。" + pinned_enabled: "本主题已置顶，它将始终显示在它所属分类的顶部。可由管理人员对所有人解除置顶，或者由用户自己取消置顶。" pinned_disabled: "本主题已被解除置顶，它将不再显示在它所属分类的顶部。" - pinned_globally_enabled: "本主题已全局置顶，它将始终显示在它所属分类的顶部。可由职员对所有人解除置顶，或者由用户自己取消置顶。" + pinned_globally_enabled: "本主题已全局置顶，它将始终显示在它所属分类的顶部。可由管理人员对所有人解除置顶，或者由用户自己取消置顶。" pinned_globally_disabled: "本主题已被解除置顶，它将不再显示在它所属分类的顶部。" visible_enabled: "本主题已设置为显示在主题列表中。" visible_disabled: "本主题设置为不显示在主题列表中。只能通过直达链接来访问。" @@ -1129,12 +1152,23 @@ zh_CN: must_begin_with_alphanumeric: "必须以一个字母或数字或下划线开头" must_end_with_alphanumeric: "必须以字母或数字结尾或是下划线" must_not_contain_two_special_chars_in_seq: "必须不包括连续的 2 个或更多的特殊字符（.-_）" + must_not_end_with_confusing_suffix: "不能以难以分辨的后缀结尾，比如 .json 或者 .png 等" email: not_allowed: "本站不允许使用该邮箱服务商提供的电子邮箱，请使用其它邮箱地址。" blocked: "不被允许。" ip_address: blocked: "不允许从你的 IP 地址注册新用户。" - max_new_accounts_per_registration_ip: "不允许从你的 IP 地址注册新用户（达到上限）。联系一个职员。" + max_new_accounts_per_registration_ip: "不允许从你的 IP 地址注册新用户（达到上限）。联系一个管理人员。" + unsubscribe_mailer: + subject_template: "确认你不想要收到%{site_title}的电子邮件更新" + text_body_template: | + 有人（可能是你？）请求不再接受来自%{site_domain_name}的邮件更新。 + 点击链接以确认退订： + + %{confirm_unsubscribe_link} + + + 如果你想要继续接受邮件更新，你可以忽略这封邮件。 invite_mailer: subject_template: "%{invitee_name} 邀请你参与 %{site_domain_name} 主题 '%{topic_title}' " text_body_template: | @@ -1269,7 +1303,7 @@ zh_CN: off_topic: "你的帖子被标记为 **偏离主题**：鉴于当前的主题标题和第一个帖子，社群成员们感觉它不适合处于这个主题中。" inappropriate: "你的帖子被标记为 **不恰当**：社群成员感觉它有冒犯或者侮辱的意味，亦或是它违反了[社群准则](/guidelines)。" spam: "你的帖子被标记为 **广告**：社群成员觉得它是广告，像是在过度地推广着什么，而不是预期中与主题有关的内容。" - notify_moderators: "你的帖子被标记为 **需要版主关注**：社群成员认为帖子需要职员介入。" + notify_moderators: "你的帖子被标记为 **需要版主关注**：社群成员认为帖子需要管理人员介入。" flags_dispositions: agreed: "感谢通知我们。我们认为这是一个问题，并且我们正在了解情况。" agreed_and_deleted: "感谢通知我们。我们认为这是一个问题，并且我们已经删除了帖子。" @@ -1294,6 +1328,99 @@ zh_CN: 然而，如果帖子再次被社群标记并隐藏，它将被隐藏并等待版主处理——并且可能导致进一步的措施，包括禁止你的用户帐号的可能。 想了解更多，请查看我们的[社群指引](%{base_url}/guidelines)。 + usage_tips: + text_body_template: | + 这一条消息是一些使用的小技巧： + + ## 阅读 + + 要阅读更多，**只需要继续向下滚动页面！** + + 当有新的回复或者新主题时，他们将自动出现 —— 不用刷新页面。 + + ## 导航 + + - 想要搜索，用你的用户页面，或者点☰菜单，这个在页面**右上角的图标**。 + + - 点击主题标题会跳转至至这个主题中**你还没有读的**那个帖子。要找主题顶部或底部，分别点击回复数量或者最后一次回复时间。 + + + + - 当在阅读主题时，点击右下角的进度条打开导航控制。点击帖子标题可回到顶部。按键盘上的 ? 键获取快速键盘快捷键列表。 + + + + ## 回复 + + - 要泛泛地回复**整个主题**，使用主题最底下的 。 + + - 要回复**特定的人**，使用他们帖子里的 。 + + - 要用**一个新主题**回复，使用帖子右边的 。老的和新的主题将自动关联至一起。 + + 你可以用简单的 HTML 标签、BBCode 或者 [Markdown](http://commonmark.cn/help/) 来格式化： + + 这是**加粗**。 + 这是加粗。 + 这是[b]加粗[b]。 + + 想学习 Markdown？[试试我们有趣的 10 分钟交互教程！](http://commonmark.cn/help/tutorial/) + + 要插入引用，先选择想要引用的文字，然后点击任意地方的回复按钮。重复以上步骤创建多个引用！ + + + + 要提醒某人关注你的回复，你需要提及他们的名字。键入 `@` 开始选择一个用户名。 + + + + 想使用[标准绘文字（Emoji）](http://www.emoji.codes/)，只要键入 `:`，然后用名字匹配，或使用传统表情符 `;)` + + + + 要生成链接概要，直接将链接粘贴至单独的一行： + + + + ## 操作 + + 每一个帖子底部有几个操作按钮： + + + + 要让别人知道你喜欢并且感谢他们的帖子，使用**赞**按钮。分享爱！ + + 如果你觉得某人的帖子有问题，使用**标记**按钮私下告诉他，或者找[我们的管理人员](%{base_url}/about)。你还可以**分享**至该帖子的链接，或者标记**书签**，这样你之后可以在你的用户页查看。 + + ## 通知 + + 当有人回复你、引用你的帖子或者提到`@你`的时候，一个数字将会立即出现在页面右上角。使用它查看**通知**。 + + + + 不用担心错过别人的回复 —— 当你不怎么逛的时后，你会收到邮件提醒。 + + ## 你的设置 + + - 所有小于**两天**的主题算新主题。 + + - 任何你**积极参与**（指你创建、回复或者阅读较长时间）的主题将被自动追踪。 + + 你将会在主题名字后见到蓝色的新主题提示和未读帖子数字指示： + + + + 你可以通过主题下方的通知控制改变通知设置。 + + + + 你也可以为每个分类设置通知状态，比如你可以监控某分类中的每个新主题。 + + 要修改以上任何设置，见[你的用户设置页面](%{base_url}/my/preferences)。 + + ## 社群信任 + + 只要你参与社群，随着时间推移你会慢慢获得社群信任，成为一个真正的公民，那些针对新用户的限制将被移除。当达到了一个足够的[信任等级](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924)时，你将会得到适当的能力一起帮助管理社群。 welcome_user: subject_template: "欢迎来到 %{site_name}！" text_body_template: | @@ -1305,10 +1432,10 @@ zh_CN: 好好享受你在论坛的时光吧！ - （如果你在新用户级别需要和[职员](%{base_url}/about)沟通的话，直接回复这个消息。） + （如果你在新用户级别需要和[管理人员](%{base_url}/about)沟通的话，直接回复这个消息。） welcome_invite: subject_template: "欢迎来到 %{site_name}！" - text_body_template: "感谢你接受邀请加入%{site_name} —— 欢迎！\n\n我们为你创建了账号：**%{username}**，同时你已经登录了。你可以在任何时候访问[你的用户设置][prefs]来修改它。\n\n要再次登入，或者：\n\n1. 永远 **使用收到邀请的邮箱地址**登录，。否则我们就无法分辨是不是你本人！\n\n2. 在 %{site_name} 的[用户设置][prefs]页面创建一个密码，然后使用该密码来登入。 \n\n%{new_user_tips}\n\n我们始终相信[讨论应该文明](%{base_url}/guidelines)。\n\n好好享受你在论坛的时光吧！\n\n（如果你在新用户级别需要和[职员](%{base_url}/about)沟通的话，直接回复这个消息。）\n\n[prefs]: %{user_preferences_url}\n" + text_body_template: "感谢你接受邀请加入%{site_name} —— 欢迎！\n\n我们为你创建了账号：**%{username}**，同时你已经登录了。你可以在任何时候访问[你的用户设置][prefs]来修改它。\n\n要再次登入，或者：\n\n1. 永远 **使用收到邀请的邮箱地址**登录，。否则我们就无法分辨是不是你本人！\n\n2. 在 %{site_name} 的[用户设置][prefs]页面创建一个密码，然后使用该密码来登入。 \n\n%{new_user_tips}\n\n我们始终相信[讨论应该文明](%{base_url}/guidelines)。\n\n好好享受你在论坛的时光吧！\n\n（如果你在新用户级别需要和[管理人员](%{base_url}/about)沟通的话，直接回复这个消息。）\n\n[prefs]: %{user_preferences_url}\n" backup_succeeded: subject_template: "备份成功完成" text_body_template: "备份成功。\n\n访问[管理 > 备份](%{base_url}/admin/backups)下载你的新备份文件。" @@ -1358,13 +1485,37 @@ zh_CN: 以上的下载链接将在 48 小时后失效。 csv_export_failed: subject_template: "数据导出失败" - text_body_template: "我们很抱歉，但是你的数据导出请求失败了。请检查日志或联系一位职员。" + text_body_template: "我们很抱歉，但是你的数据导出请求失败了。请检查日志或联系一位管理人员。" + email_reject_insufficient_trust_level: + subject_template: "[%{site_name}] 电子邮件错误 -- 信任等级不足" + text_body_template: | + 我们非常抱歉，你发送至 %{destination}（名为 %{former_title}）的邮件出问题了。 + + 你的账户没有足够的信任等级向该邮件地址发布新主题。如果你坚信这是错误，联系管理人员。 + email_reject_inactive_user: + subject_template: "[%{site_name}] 电子邮件错误 -- 未激活用户" + text_body_template: | + 我们非常抱歉，但是你发送至 %{destination}（名为%{former_title}） 的邮件出问题了。 + + 与你账户管理的邮件地址没有激活，请先激活你的账号再发送邮件。 + email_reject_reply_user_not_matching: + subject_template: "[%{site_name}] 电子邮件错误 -- 回复用户不符" + text_body_template: | + 我们非常抱歉，但是你发送至 %{destination}（名为%{former_title}） 的邮件出问题了。 + + 你发送回复的邮件地址与我们等待的地址不同，所以我们不确定你是不是同一个人。试试从另外一个邮件地址发送，或者联系管理人员。 + email_reject_no_message_id: + subject_template: "[%{site_name}] 电子邮件错误 -- 无信息ID" + text_body_template: | + 我们非常抱歉，但是你发送至 %{destination}（名为%{former_title}） 的邮件出问题了。 + + 我们没法在邮件里找到 `Message-Id`。试试从另外一个邮件地址发送，或者联系管理人员。 email_reject_no_account: subject_template: "[%{site_name}] 电子邮件错误 -- 未知账户" text_body_template: | - 我们很抱歉，但是你发送至 %{destination}（名为%{former_title}） 的邮件无法发送。 + 我们非常抱歉，但是你发送至 %{destination}（名为%{former_title}） 的邮件出问题了。 - 该邮件没有与已知的账户关联。试试从不同的邮件地址发送或联系一个职员。 + 我们找不到匹配你邮件地址的账号。试试从另外一个邮件地址发送，或者联系管理人员。 email_reject_empty: subject_template: "[%{site_name}] 电子邮件错误 -- 无内容" text_body_template: | @@ -1384,37 +1535,73 @@ zh_CN: text_body_template: | 我们很抱歉，但是您发送至 %{destination}（名为 %{former_title}）的邮件无法发送。 - 您的账户没有足够的权限在该分类发布一个新主题。如果您坚信这是一个错误，联系一个职员。 + 您的账户没有足够的权限在该分类发布一个新主题。如果您坚信这是一个错误，联系一个管理人员。 + email_reject_strangers_not_allowed: + subject_template: "[%{site_name}] 电子邮件错误 -- 无权限" + text_body_template: | + 我们非常抱歉，但是你发送至 %{destination}（名为%{former_title}） 的邮件出问题了。 + + 你发邮件到的分类只接受已知邮件的合法账户。如果你坚信这是错误，联系管理人员。 + email_reject_invalid_post: + subject_template: "[%{site_name}] 邮件问题 -- 发表错误" + text_body_template: | + 我们非常抱歉，但是你发送至 %{destination}（名为%{former_title}） 的邮件出问题了。 + + 可能的原因是：复杂的格式、消息超长、消息太短。请再试一次，如果还不行，使用网站发表。 + email_reject_invalid_post_specified: + subject_template: "[%{site_name}] 邮件问题 -- 发表错误" + text_body_template: | + 我们非常抱歉，但是你发送至 %{destination}（名为%{former_title}） 的邮件出问题了。 + + 原因： + + %{post_error} + + 如果你能解决错误，请再试一次。 + email_reject_invalid_post_action: + subject_template: "[%{site_name}] 电子邮件错误 -- 无发表权限" + text_body_template: | + 我们非常抱歉，但是你发送至 %{destination}（名为%{former_title}） 的邮件出问题了。 + + 发送的命令无法被识别。请再试一次，如果还有问题，使用网站发表。 email_reject_reply_key: subject_template: "[%{site_name}] 电子邮件错误 -- 未知回复指纹" text_body_template: | - 我们很抱歉，但是你发送至 %{destination}（名为%{former_title}） 的邮件无法发送。 + 我们非常抱歉，但是你发送至 %{destination}（名为%{former_title}） 的邮件出问题了。 - 提供的回复 key 是无效或者未知的，所以我们不知道邮件是回复给谁的。联系一个职员。 + 邮件中的回复信令是无效或者未知的，所以我们不知道这封邮件回复给谁了。请联系管理人员。 + email_reject_bad_destination_address: + subject_template: "[%{site_name}] 电子邮件错误 -- 未知的回复至地址" + text_body_template: | + 我们非常抱歉，但是你发送至 %{destination}（名为%{former_title}） 的邮件出问题了。 + + 目标邮件地址无法识别。请确保你是向管理人员提供的邮件地址发信。 email_reject_topic_not_found: subject_template: "[%{site_name}] 邮件问题 -- 主题未找到" text_body_template: | - 十分抱歉，无法将你的信息发表到 %{destination} (titled %{former_title}) 。 + 我们非常抱歉，但是你发送至 %{destination}（名为%{former_title}） 的邮件出问题了。 - 你回复的主题不存在了，可能它已被删除？如果你确定这是个错误，联系职员。 + 你回复的主题已经不存在了 —— 可能已经被深处了？如果你确定这是错误，请联系管理人员。 email_reject_topic_closed: subject_template: "[%{site_name}] 邮件问题 -- 主题已关闭" text_body_template: | 我们很抱歉，但是你发送至 %{destination}（名为 %{former_title}）的邮件无法发送。 - 你回复的主题现在已经被关闭并不再接受回复。如果你确定这是个错误，联系职员。 + 你回复的主题现在已经被关闭并不再接受回复。如果你确定这是个错误，联系管理人员。 email_reject_auto_generated: subject_template: "[%{site_name}] 邮件问题 -- 自动生成的回复" text_body_template: | - 我们很抱歉，但是你发送至 %{destination}（名为 %{former_title}）的邮件无法发送。 + 我们非常抱歉，但是你发送至 %{destination}（名为%{former_title}） 的邮件出问题了。 - 你的邮件回复被标记为“自动生成的”，我们不接受这种内容。如果你确定这是个错误，联系职员。 + 你的邮件被标记为“自动生成”的，即邮件是由电脑生成而不是人类所写；我们不接受这样的邮件。如果你确信这是错误，请联系管理人员。 email_error_notification: subject_template: "[%{site_name}] 电子邮件错误 -- POP 验证错误" text_body_template: | - 在从 POP 服务器查询邮件时遇到了一个验证错误。 + 不幸的是，从 POP 服务器查询邮件时遇到了验证错误。 请确认你在[站点设置](%{base_url}/admin/site_settings/category/email)中已经正确配置了 POP 验证信息。 + + 如果 POP 邮件账号有图形界面，你可以登录后查看邮箱设置。 too_many_spam_flags: subject_template: "新账号被封禁" text_body_template: | @@ -1422,7 +1609,7 @@ zh_CN: 这是一封自 %{site_name} 自动发出的邮件，以告知你的帖子已因被社群多次标记而被自动隐藏。 - 处于谨慎的考虑，你的新账户被禁止创建新回复或主题。除非一个职员能复核你的账户。 + 处于谨慎的考虑，你的新账户被禁止创建新回复或主题。除非一个管理人员能复核你的账户。 欲查看额外的指导，请查看我们的[社群指引](%{base_url}/guidelines)。 blocked_by_staff: @@ -1430,19 +1617,35 @@ zh_CN: text_body_template: | 你好， - 这是一封自 %{site_name} 自动发出的邮件，以告知你的账户被职员封禁。 + 这是一封自 %{site_name} 自动发出的邮件，以告知你的账户被管理人员封禁。 欲查看额外的指导，请查看我们的[社群指引](%{base_url}/guidelines)。 user_automatically_blocked: subject_template: "因标记而被封禁的新用户 %{username}" + text_body_template: | + 这是一封自动发出的邮件。 + + 因多位用户标记%{username}的帖子，新用户[%{username}](%{base_url}%{user_url})已被自动封禁。 + + 请[查看这些标记](%{base_url}/admin/flags)。如果%{username}被意外禁用了编辑功能，点击[该用户管理页面](%{base_url}%{user_url})内的解封按钮。 + + 该阈值可以通过站点设置中的 `block_new_user` 更改。 spam_post_blocked: subject_template: "新用户 %{username} 因重复发布链接而被禁止发表相关帖子" + text_body_template: | + 这是一封自动发出的邮件。 + + 新用户[%{username}](%{base_url}%{user_url})试图创建多个链接至 %{domains} 的帖子，但这些帖子因为反垃圾策略而被阻挡了。用户仍能够发表不包含到 %{domains} 的帖子。 + + 请[审核该用户](%{base_url}%{user_url})。 + + 该阈值可以通过站点设置中的 `newuser_spam_host_threshold` 和 `white_listed_spam_host_domains` 更改。 unblocked: subject_template: "账户解封 unblocked" text_body_template: | 你好， - 这是一封自 %{site_name} 自动发出的邮件，以告知你的账户已经在职员审核后被解封。 + 这是一封自 %{site_name} 自动发出的邮件，以告知你的账户已经在管理人员审核后被解封。 你现在又可以创建新的回复和主题了。 pending_users_reminder: @@ -1455,6 +1658,10 @@ zh_CN: download_remote_images_disabled: subject_template: "远程图片下载已禁用。" text_body_template: "`download_remote_images_to_local` 设定已被禁用，因为已经达到 ``download_remote_images_threshold` 设定中的磁盘空间限制。" + unsubscribe_link: | + 不想再接受该主题的通知，[点击这里](%{unsubscribe_url})。要退订这些邮件，修改你的[用户设置](%{user_preferences_url}) + unsubscribe_via_email_link: | + 或者，[点击这儿](mailto:reply@%{hostname}?subject=unsubscribe)发邮件退订。 subject_re: "回复：" subject_pm: "[私信]" user_notifications: @@ -1462,6 +1669,10 @@ zh_CN: unsubscribe: title: "取消订阅" description: "不再对这些邮件感兴趣？没问题！点击下面按钮来立即取消订阅：" + reply_by_email: "访问[visit the topic](%{base_url}%{url})或回复邮件以回复" + visit_link_to_respond: "访问[Visit Topic](%{base_url}%{url})以回复" + reply_by_email_pm: "[访问消息](%{base_url}%{url})或者用邮件回复" + visit_link_to_respond_pm: "访问[Visit Message](%{base_url}%{url})以回复" posted_by: "%{username}发表于%{post_date}" user_invited_to_private_message_pm: subject_template: "[%{site_name}] %{username} 邀请你加入消息交流：'%{topic_title}'" @@ -1480,6 +1691,19 @@ zh_CN: 请访问 %{base_url}%{url} 来查看该主题。 user_invited_to_private_message_pm_staged: subject_template: "[%{site_name}] %{username} 邀请你加入消息交流：'%{topic_title}'" + text_body_template: |2 + + %{username} 邀请你至消息交流： + + > **%{topic_title}** + > + > %{topic_excerpt} + + 论坛： + + > %{site_title} -- %{site_description} + + 请访问 %{base_url}%{url} 来查看该主题。 user_invited_to_topic: subject_template: "[%{site_name}] %{username} 邀请你至主题：'%{topic_title}'" text_body_template: |2 @@ -1504,6 +1728,17 @@ zh_CN: %{context} + --- + %{respond_instructions} + user_replied_pm: + subject_template: "[%{site_name}] [PM] %{topic_title}" + text_body_template: | + %{header_instructions} + + %{message} + + %{context} + --- %{respond_instructions} user_quoted: @@ -1626,7 +1861,7 @@ zh_CN: text_body_template: | 欢迎加入%{site_name}！ - 一个职员批准了你在%{site_name}的账户。 + 一个管理人员批准了你在%{site_name}的账户。 点击下面的链接来确认并激活你在 %{site_name} 上的新账号： %{base_url}/users/activate-account/%{email_token} @@ -1639,7 +1874,7 @@ zh_CN: 好好享受你在论坛的时光吧！ - （如果你在新用户级别需要和[职员](%{base_url/about)沟通的话，直接回复这个消息。） + （如果你在新用户级别需要和[管理人员](%{base_url/about)沟通的话，直接回复这个消息。） signup: subject_template: "[%{site_name}] 确认你的新账户" text_body_template: | @@ -1708,7 +1943,7 @@ zh_CN: 编辑本主题的第一帖以改变 %{page_name} 页面的内容。 guidelines_topic: title: "FAQ/指引" - body: "\n\n## [这是一个文明讨论的地方](#civilized)\n\n在论坛上请表现得像在公共公园一样得体。我们一群人共享着一个公共社群资源 — 一个通过不断进行讨论以分享我们技能、知识和兴趣的地方。\n\n这些都不是死规矩或者是草率决定，只是一些帮助社群的人们来判断的规定。试用这些指引来保持干净和充满灵感的文明的公开论坛。 \n\n\n\n## [改善讨论](#improve)\n\n帮助我们让这个地方变成一个讨论的好地方。你可以总是一致的做一些帮助改善讨论的事，即使是小事也行。如果你不确定你的帖子有益于讨论，认真想一想你要说什么再发布。\n\n这里讨论的主题对我们很重要，并且我们希望你也觉得这些内容对你很重要。尊重这些讨论的主题，以及讨论他们的人们，特别是当你不同意他们所说的时候。\n\n改善讨论的一种方法是找一找已经发生过的事。请在发帖或创建你自己的主题前，花一些时间浏览这些主题，这样你更有机会遇见和你有共同爱好的人。 \n\n\n\n## [即使你不同意他人时，尊重他人](#agreeable)\n\n你可能想表达你的不同意。这没问题。但是，记住_批评观点，而不是人_。请避免：\n\n* 指名道姓。\n* 人生攻击。\n* 回复帖子无关于帖子的内容。\n* 下意识的反驳。\n\n相反，提供合理的观点改善讨论。 \n\n\n\n## [你的参与有意义](#participate)\n\n我们在这儿的讨论为大家树立了榜样。通过选择参与有意义的讨论，帮助我们将论坛变成一个有意思的地方 — 并且避免那些没有帮助的行为。\n\nDiscourse 提供了让社群共同鉴别最棒（或最差）的贡献的工具：收藏、书签、赞、标记、回复和编辑等等。使用这些工具不仅能改善你自己的体验，也能改善其他人的体验。\n\n让我们创造一个更美好的社群。\n\n\n\n## [如果你发现问题了，标记它](#flag-problems)\n版主有特别的权力；他们对论坛负责。但是你也是。有了你的帮助，版主能成为社群监察者，而不仅是守卫或者警察。\n\n当你见到不合适的行为，不要回复。这种承认变相鼓励了这种不合适的行为，浪费了你的精力，并且浪费了每一个人的时间。_只要标记它。_如果收到了足够的标记，将会有相应的处理，这个处理可能是自动地，也可能由版主介入。\n\n为了维护我们的社群，版主保留了任何情况下删除任何内容和任何用户的权力。版主没有预先审核任何新帖子；版主和站点维护人员对社群里发表的任何言论均不负责任。 \n\n\n\n## [永远保持文明](#be-civil)\n\n粗鲁这样的行为会破坏健康的讨论：\n\n* 文明。不要发表任何理智的人会认为冒犯的、过分的或招致怨恨的言论。\n* 拒绝色情。不要发表任何淫秽或性暗示的东西。\n* 尊重每一个人。不要骚扰或者让别人难过，检视别人，或暴露他们的个人信息。\n* 尊重我们的论坛。不要发表广告或者其他垃圾信息。\n\n这些条款不是法律条文，并且没有准确的定义 — 避免任何做关于他们的_可能擦边_的事。如果你不确定，问问自己的帖子是否能出现在纽约时报的头版头条上。\n\n这是一个公共论坛，并且搜索引擎会索引这些讨论。注意发表的语言、链接和图片，不要在其中包含你的家庭和朋友。 \n\n\n\n## [保持整洁](#keep-tidy)\n\n花一点时间让东西出现在正确的位置，这样我们能花更多的时间在讨论上而非清理格式。所以：\n\n* 不要在错误的分类发表新主题。\n* 不要在多个主题中回复同样的内容。\n* 不要发布没有内容的回复。\n* 不要在中途改变主题。\n* 不要在你的帖子中签名 — 每一贴都附有你的个人信息。\n\n比起发表“+1”或者“同意”，使用赞按钮。比起将帖子带向一个决然不同的方向，使用“回复为关联主题”。\n\n\n\n## [只发表你自己的东西](#stealing)\n\n你不能在没有他人授权的情况下发表任何属于他人的数字资产。你可能不能发表关于窃据他人知识产权（软件、视频、音频和图像）的任何简介、链接或方法，或其他任何违反法律的内容。 \n\n\n\n## [有你参与](#power)\n\n这个站点由[一群友善的职员](/about)、你和社群一起运营。如果你对这里的事情仍有疑问，在[站点反馈](/c/site-feedback)分类新建一个主题并且开始讨论！如果遇到了重要或紧急的事情，并且不能用站务分类的主题或标记解决，通过[职员页面](/about)联系我们。\n\n\n\n## [使用条款](#tos)\n\n是的，法律很无聊，但是我们必须保护我们自己 – 引申开来，你和你的数据 – 用于针对不友好的家伙们。我们有一个[使用条款](/tos)描述你的（以及我们）关于内容、隐私和法律的行为和权力。要使用我们的服务，你必须同意遵守[使用条款](/tos)。\n" + body: "\n\n## [这是一个文明讨论的地方](#civilized)\n\n在论坛上请表现得像在公共公园一样得体。我们一群人共享着一个公共社群资源 — 一个通过不断进行讨论以分享我们技能、知识和兴趣的地方。\n\n这些都不是死规矩或者是草率决定，只是一些帮助社群的人们来判断的规定。试用这些指引来保持干净和充满灵感的文明的公开论坛。 \n\n\n\n## [改善讨论](#improve)\n\n帮助我们让这个地方变成一个讨论的好地方。你可以总是一致的做一些帮助改善讨论的事，即使是小事也行。如果你不确定你的帖子有益于讨论，认真想一想你要说什么再发布。\n\n这里讨论的主题对我们很重要，并且我们希望你也觉得这些内容对你很重要。尊重这些讨论的主题，以及讨论他们的人们，特别是当你不同意他们所说的时候。\n\n改善讨论的一种方法是找一找已经发生过的事。请在发帖或创建你自己的主题前，花一些时间浏览这些主题，这样你更有机会遇见和你有共同爱好的人。 \n\n\n\n## [即使你不同意他人时，尊重他人](#agreeable)\n\n你可能想表达你的不同意。这没问题。但是，记住_批评观点，而不是人_。请避免：\n\n* 指名道姓。\n* 人生攻击。\n* 回复帖子无关于帖子的内容。\n* 下意识的反驳。\n\n相反，提供合理的观点改善讨论。 \n\n\n\n## [你的参与有意义](#participate)\n\n我们在这儿的讨论为大家树立了榜样。通过选择参与有意义的讨论，帮助我们将论坛变成一个有意思的地方 — 并且避免那些没有帮助的行为。\n\nDiscourse 提供了让社群共同鉴别最棒（或最差）的贡献的工具：收藏、书签、赞、标记、回复和编辑等等。使用这些工具不仅能改善你自己的体验，也能改善其他人的体验。\n\n让我们创造一个更美好的社群。\n\n\n\n## [如果你发现问题了，标记它](#flag-problems)\n版主有特别的权力；他们对论坛负责。但是你也是。有了你的帮助，版主能成为社群监察者，而不仅是守卫或者警察。\n\n当你见到不合适的行为，不要回复。这种承认变相鼓励了这种不合适的行为，浪费了你的精力，并且浪费了每一个人的时间。_只要标记它。_如果收到了足够的标记，将会有相应的处理，这个处理可能是自动地，也可能由版主介入。\n\n为了维护我们的社群，版主保留了任何情况下删除任何内容和任何用户的权力。版主没有预先审核任何新帖子；版主和站点维护人员对社群里发表的任何言论均不负责任。 \n\n\n\n## [永远保持文明](#be-civil)\n\n粗鲁这样的行为会破坏健康的讨论：\n\n* 文明。不要发表任何理智的人会认为冒犯的、过分的或招致怨恨的言论。\n* 拒绝色情。不要发表任何淫秽或性暗示的东西。\n* 尊重每一个人。不要骚扰或者让别人难过，检视别人，或暴露他们的个人信息。\n* 尊重我们的论坛。不要发表广告或者其他垃圾信息。\n\n这些条款不是法律条文，并且没有准确的定义 — 避免任何做关于他们的_可能擦边_的事。如果你不确定，问问自己的帖子是否能出现在纽约时报的头版头条上。\n\n这是一个公共论坛，并且搜索引擎会索引这些讨论。注意发表的语言、链接和图片，不要在其中包含你的家庭和朋友。 \n\n\n\n## [保持整洁](#keep-tidy)\n\n花一点时间让东西出现在正确的位置，这样我们能花更多的时间在讨论上而非清理格式。所以：\n\n* 不要在错误的分类发表新主题。\n* 不要在多个主题中回复同样的内容。\n* 不要发布没有内容的回复。\n* 不要在中途改变主题。\n* 不要在你的帖子中签名 — 每一贴都附有你的个人信息。\n\n比起发表“+1”或者“同意”，使用赞按钮。比起将帖子带向一个决然不同的方向，使用“回复为关联主题”。\n\n\n\n## [只发表你自己的东西](#stealing)\n\n你不能在没有他人授权的情况下发表任何属于他人的数字资产。你可能不能发表关于窃据他人知识产权（软件、视频、音频和图像）的任何简介、链接或方法，或其他任何违反法律的内容。 \n\n\n\n## [有你参与](#power)\n\n这个站点由[一群友善的管理人员](/about)、你和社群一起运营。如果你对这里的事情仍有疑问，在[站点反馈](/c/site-feedback)分类新建一个主题并且开始讨论！如果遇到了重要或紧急的事情，并且不能用站务分类的主题或标记解决，通过[管理人员页面](/about)联系我们。\n\n\n\n## [使用条款](#tos)\n\n是的，法律很无聊，但是我们必须保护我们自己 – 引申开来，你和你的数据 – 用于针对不友好的家伙们。我们有一个[使用条款](/tos)描述你的（以及我们）关于内容、隐私和法律的行为和权力。要使用我们的服务，你必须同意遵守[使用条款](/tos)。\n" tos_topic: title: "服务条款" body: | @@ -1909,7 +2144,7 @@ zh_CN: ## [儿童在线隐私保护法案合规](#coppa) - 我们的站点、产品和服务提供给 13 岁以上的人们。如果服务器位于美国，并且你小于 13 岁，根据 COPPA（[儿童在线隐私保护法案合规](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)），不要使用这个站点。 + 我们的站点、产品和服务提供给 13 岁以上的人们。如果服务器位于美国，并且你小于 13 岁，根据[儿童在线隐私保护法案合规](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)，不要使用这个站点。 @@ -1985,7 +2220,7 @@ zh_CN: regular: | 该徽章授予给用户等级达到 3 的成员。感谢你在社群的这几月的活跃参与，并且是我们最活跃的读者质疑，也是社群中的可靠贡献者。你现在可以重新分类和重命名主题、访问隐藏的贵宾分类、使用更多强大的防骚扰标记功能，以及每天可以赞更多次了。 leader: | - 该徽章授予给用户等级达到 4 的成员。你是由职员选择的社群领袖，鉴于你在社群的话语和贡献，你为社群树立了一个正面的例子。你有权限编辑所有的帖子，使用主题管理操作，例如置顶、关闭、不在列表中显示、存档、分割和合并，并且可以每天点赞非常多次。 + 该徽章授予给用户等级达到 4 的成员。你是由管理人员选择的社群领袖，鉴于你在社群的话语和贡献，你为社群树立了一个正面的例子。你有权限编辑所有的帖子，使用主题管理操作，例如置顶、关闭、不在列表中显示、存档、分割和合并，并且可以每天点赞非常多次。 admin_login: success: "邮件已发送" error: "错误！" diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml index 04ee6a797f..2a93ce0121 100644 --- a/config/locales/server.zh_TW.yml +++ b/config/locales/server.zh_TW.yml @@ -588,7 +588,6 @@ zh_TW: suppress_reply_directly_above: "當帖子只有一個回覆時，不顯示回覆到該帖的回覆。" suppress_reply_when_quoting: "當帖子引用回覆時，不顯示可展開的回覆到某帖的標記。" max_reply_history: "擴展回覆到某帖時顯示的最大回覆數量" - experimental_reply_expansion: "當展開回覆到某帖時隱藏直接回覆（實驗性）" topics_per_period_in_top_summary: "預設推薦話題的顯示數量" topics_per_period_in_top_page: "在展開 \"顯示更多\" 推薦話題列表的顯示數量" redirect_users_to_top_page: "將新用戶或長時間未使用的用戶自動重新導向至熱門頁面" diff --git a/config/puma.rb b/config/puma.rb index 265960d992..d472c7278f 100644 --- a/config/puma.rb +++ b/config/puma.rb @@ -1,15 +1,19 @@ -# First, you need to change these below to your situation. -APP_ROOT = '/home/discourse/discourse' -num_workers = ENV["NUM_WEBS"].to_i > 0 ? ENV["NUM_WEBS"].to_i : 4 +if ENV['RAILS_ENV']=='production' -# Second, you can choose how many threads that you are going to run at same time. -workers "#{num_workers}" -threads 8,32 + # First, you need to change these below to your situation. + APP_ROOT = '/home/discourse/discourse' + num_workers = ENV["NUM_WEBS"].to_i > 0 ? ENV["NUM_WEBS"].to_i : 4 -# Unless you know what you are changing, do not change them. -bind "unix://#{APP_ROOT}/tmp/sockets/puma.sock" -stdout_redirect "#{APP_ROOT}/log/puma.log","#{APP_ROOT}/log/puma.err.log" -pidfile "#{APP_ROOT}/tmp/pids/puma.pid" -state_path "#{APP_ROOT}/tmp/pids/puma.state" -daemonize true -preload_app! + # Second, you can choose how many threads that you are going to run at same time. + workers "#{num_workers}" + threads 8,32 + + # Unless you know what you are changing, do not change them. + bind "unix://#{APP_ROOT}/tmp/sockets/puma.sock" + stdout_redirect "#{APP_ROOT}/log/puma.log","#{APP_ROOT}/log/puma.err.log" + pidfile "#{APP_ROOT}/tmp/pids/puma.pid" + state_path "#{APP_ROOT}/tmp/pids/puma.state" + daemonize true + preload_app! + +end diff --git a/config/routes.rb b/config/routes.rb index 8b77b6fc91..f324bca3ae 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,9 +7,9 @@ require_dependency "permalink_constraint" # This used to be User#username_format, but that causes a preload of the User object # and makes Guard not work properly. -USERNAME_ROUTE_FORMAT = /[A-Za-z0-9\_.\-]+/ unless defined? USERNAME_ROUTE_FORMAT +USERNAME_ROUTE_FORMAT = /[\w.\-]+/ unless defined? USERNAME_ROUTE_FORMAT -BACKUP_ROUTE_FORMAT = /[a-zA-Z0-9\-_]*\d{4}(-\d{2}){2}-\d{6}\.(tar\.gz|t?gz)/i unless defined? BACKUP_ROUTE_FORMAT +BACKUP_ROUTE_FORMAT = /[\w.\-]+\.(tar\.gz|tgz)/i unless defined? BACKUP_ROUTE_FORMAT Discourse::Application.routes.draw do diff --git a/config/site_settings.yml b/config/site_settings.yml index 275dedf24e..142090e414 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -234,6 +234,15 @@ login: twitter_consumer_secret: default: '' regex: "^[a-zA-Z0-9_+-]+$" + enable_instagram_logins: + client: true + default: false + instagram_consumer_key: + default: '' + regex: "^[a-z0-9]+$" + instagram_consumer_secret: + default: '' + regex: "^[a-z0-9]+$" enable_facebook_logins: client: true default: false @@ -292,7 +301,11 @@ users: default: "admin|moderator|administrator|mod|sys|system|community|info|you|name|username|user|nickname|discourse|discourseorg|discourseforum|support" min_password_length: client: true - default: 8 + default: 10 + min: 1 + min_admin_password_length: + client: true + default: 15 min: 1 block_common_passwords: true enforce_global_nicknames: @@ -430,9 +443,6 @@ posting: max_reply_history: default: 1 client: true - experimental_reply_expansion: - default: false - client: true post_undo_action_window_mins: 10 max_mentions_per_post: 10 max_users_notified_per_group_mention: 100 @@ -620,8 +630,8 @@ files: client: true regex: '^((https?:)?\/)?\/.+[^\/]' shadowed_by_global: true - default_opengraph_image_url: '' + allow_all_attachments_for_group_messages: false trust: default_trust_level: @@ -764,6 +774,14 @@ rate_limits: tl2_additional_likes_per_day_multiplier: 1.5 tl3_additional_likes_per_day_multiplier: 2 tl4_additional_likes_per_day_multiplier: 3 + alert_admins_if_errors_per_minute: + client: true + shadowed_by_global: true + default: 0 + alert_admins_if_errors_per_hour: + client: true + shadowed_by_global: true + default: 0 developer: force_hostname: @@ -888,6 +906,8 @@ backups: default: '' regex: "^[^A-Z_.]+$" # can't use '.' when using HTTPS shadowed_by_global: true + s3_disable_cleanup: + default: false backup_time_of_day: default: '3:30' regex: "^((0?(0|1|2|3|4|5|6|7|8|9)|(10|11|12|13|14|15|16|17|18|19|20|21|22|23))):\\d\\d$" @@ -1059,14 +1079,16 @@ uncategorized: user_preferences: default_email_digest_frequency: enum: 'DigestEmailSiteSetting' - default: 7 + default: 10080 default_email_private_messages: true default_email_direct: true default_email_mailing_list_mode: false default_email_always: false default_email_previous_replies: enum: 'PreviousRepliesSiteSetting' - default: 1 + default: 2 + default_email_in_reply_to: + default: true default_other_new_topic_duration_minutes: enum: 'NewTopicDurationSiteSetting' @@ -1079,6 +1101,9 @@ user_preferences: default_other_dynamic_favicon: false default_other_disable_jump_reply: false default_other_edit_history_public: false + default_other_like_notification_frequency: + enum: 'LikeNotificationFrequencySiteSetting' + default: 1 default_topics_automatic_unpin: default: true diff --git a/db/migrate/20160224033122_create_instagram_user_infos.rb b/db/migrate/20160224033122_create_instagram_user_infos.rb new file mode 100644 index 0000000000..ef3633f892 --- /dev/null +++ b/db/migrate/20160224033122_create_instagram_user_infos.rb @@ -0,0 +1,11 @@ +class CreateInstagramUserInfos < ActiveRecord::Migration + def change + create_table :instagram_user_infos do |t| + t.integer :user_id + t.string :screen_name + t.integer :instagram_user_id + + t.timestamps null: false + end + end +end diff --git a/db/migrate/20160225050317_add_user_options.rb b/db/migrate/20160225050317_add_user_options.rb index 13df057cda..965865197d 100644 --- a/db/migrate/20160225050317_add_user_options.rb +++ b/db/migrate/20160225050317_add_user_options.rb @@ -40,7 +40,7 @@ class AddUserOptions < ActiveRecord::Migration mailing_list_mode, email_digests, email_direct, - email_private_messages, + COALESCE(email_private_messages,true), external_links_in_new_tab, enable_quoting, dynamic_favicon, diff --git a/db/migrate/20160225095306_add_email_in_reply_to_to_user_options.rb b/db/migrate/20160225095306_add_email_in_reply_to_to_user_options.rb new file mode 100644 index 0000000000..3f85333580 --- /dev/null +++ b/db/migrate/20160225095306_add_email_in_reply_to_to_user_options.rb @@ -0,0 +1,11 @@ +class AddEmailInReplyToToUserOptions < ActiveRecord::Migration + def up + add_column :user_options, :email_in_reply_to, :boolean, null: false, default: true + change_column :user_options, :email_previous_replies, :integer, default: 2, null: false + execute 'UPDATE user_options SET email_previous_replies = 2' + end + + def down + remove_column :user_options, :email_in_reply_to + end +end diff --git a/db/migrate/20160302063432_rebuild_directory_item_with_index.rb b/db/migrate/20160302063432_rebuild_directory_item_with_index.rb new file mode 100644 index 0000000000..9cf131f470 --- /dev/null +++ b/db/migrate/20160302063432_rebuild_directory_item_with_index.rb @@ -0,0 +1,12 @@ +class RebuildDirectoryItemWithIndex < ActiveRecord::Migration + def up + remove_index :directory_items, [:period_type] + execute "TRUNCATE TABLE directory_items RESTART IDENTITY" + add_index :directory_items, [:period_type, :user_id], unique: true + end + + def down + remove_index :directory_items, [:period_type, :user_id] + add_index :directory_items, [:period_type] + end +end diff --git a/db/migrate/20160302104253_add_like_notification_frequency_to_user_options.rb b/db/migrate/20160302104253_add_like_notification_frequency_to_user_options.rb new file mode 100644 index 0000000000..d5c00d7305 --- /dev/null +++ b/db/migrate/20160302104253_add_like_notification_frequency_to_user_options.rb @@ -0,0 +1,5 @@ +class AddLikeNotificationFrequencyToUserOptions < ActiveRecord::Migration + def change + add_column :user_options, :like_notification_frequency, :integer, null: false, default: 1 + end +end diff --git a/db/migrate/20160302170230_rename_digest_after_days_to_digest_after_minutes.rb b/db/migrate/20160302170230_rename_digest_after_days_to_digest_after_minutes.rb new file mode 100644 index 0000000000..9c9cfdd0cc --- /dev/null +++ b/db/migrate/20160302170230_rename_digest_after_days_to_digest_after_minutes.rb @@ -0,0 +1,13 @@ +class RenameDigestAfterDaysToDigestAfterMinutes < ActiveRecord::Migration + def up + rename_column :user_options, :digest_after_days, :digest_after_minutes + execute "UPDATE user_options SET digest_after_minutes = digest_after_minutes * 1440 WHERE digest_after_minutes IS NOT NULL" + execute "UPDATE site_settings SET value = value::integer * 1440 WHERE name = 'default_email_digest_frequency' AND value IS NOT NULL" + end + + def down + rename_column :user_options, :digest_after_minutes, :digest_after_days + execute "UPDATE user_options SET digest_after_days = digest_after_days / 1440 WHERE digest_after_days IS NOT NULL" + execute "UPDATE site_settings SET value = value::integer / 1440 WHERE name = 'default_email_digest_frequency' AND value IS NOT NULL" + end +end diff --git a/db/migrate/20160303183607_clear_common_passwords_cache.rb b/db/migrate/20160303183607_clear_common_passwords_cache.rb new file mode 100644 index 0000000000..c4ba8042a4 --- /dev/null +++ b/db/migrate/20160303183607_clear_common_passwords_cache.rb @@ -0,0 +1,7 @@ +require "common_passwords/common_passwords" + +class ClearCommonPasswordsCache < ActiveRecord::Migration + def change + $redis.without_namespace.del CommonPasswords::LIST_KEY + end +end diff --git a/docs/ADMIN-QUICK-START-GUIDE.md b/docs/ADMIN-QUICK-START-GUIDE.md index 2a0965077e..b955c7e17a 100644 --- a/docs/ADMIN-QUICK-START-GUIDE.md +++ b/docs/ADMIN-QUICK-START-GUIDE.md @@ -74,7 +74,7 @@ Email is required for new account signups and notifications. **Test your email t - You got the test email? Great! **Read that email closely**, it has important email deliverability tips. - You didn't get the test email? This means your users probably aren't getting any signup or notification emails either. -Email deliverability can be hard. We strongly recommend using dedicated email services like [Mandrill](http://mandrill.com), [MailGun](http://www.mailgun.com/), or [MailJet](https://www.mailjet.com/), which offer generous free plans that work fine for most communities. +Email deliverability can be hard. We strongly recommend using dedicated email services like [SendGrid](https://sendgrid.com/), [SparkPost](https://www.sparkpost.com/), [MailGun](http://www.mailgun.com/), or [MailJet](https://www.mailjet.com/), which offer generous free plans that work fine for most communities. If you'd like to enable *replying* to topics via email, [see this howto](https://meta.discourse.org/t/set-up-reply-via-email-support/14003). diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md index 0aa946fa93..2dbc0d7d14 100644 --- a/docs/INSTALL-cloud.md +++ b/docs/INSTALL-cloud.md @@ -72,9 +72,9 @@ After completing your edits, press CtrlO then Enter e + if e.message.include?("could not connect to server") + logger.warn "#{log_prefix}: Connection to master PostgreSQL server failed with '#{e.message}'" + else + raise e + end + ensure + @mutex[namespace].synchronize do + @last_check[namespace] = Time.zone.now + @running[namespace] = false + end end - rescue => e - if e.message.include?("could not connect to server") - logger.warn "#{self.class}: Connection to master PostgreSQL server failed with '#{e.message}'" - else - raise e - end - ensure - @last_check = Time.zone.now - @running = false end end end + def master + @master[namespace] + end + + def master=(args) + @master[namespace] = args + end + + def running + @running[namespace] + end + + def setup! + RailsMultisite::ConnectionManagement.all_dbs.each do |db| + @master[db] = true + @running[db] = false + @mutex[db] = Mutex.new + end + end + private def config - ActiveRecord::Base.configurations[Rails.env] + ActiveRecord::Base.connection_config end def logger Rails.logger end + def log_prefix + "#{self.class} [#{namespace}]" + end + def recently_checked? - if @last_check - Time.zone.now <= (@last_check + 5.seconds) + if @last_check[namespace] + Time.zone.now <= (@last_check[namespace] + 5.seconds) else false end end + + def namespace + RailsMultisite::ConnectionManagement.current_db + end end module ActiveRecord diff --git a/lib/auth.rb b/lib/auth.rb index a218c43f28..f94ba5cf43 100644 --- a/lib/auth.rb +++ b/lib/auth.rb @@ -7,3 +7,4 @@ require_dependency 'auth/open_id_authenticator' require_dependency 'auth/github_authenticator' require_dependency 'auth/twitter_authenticator' require_dependency 'auth/google_oauth2_authenticator' +require_dependency 'auth/instagram_authenticator' diff --git a/lib/auth/instagram_authenticator.rb b/lib/auth/instagram_authenticator.rb new file mode 100644 index 0000000000..ba2dd7f1bb --- /dev/null +++ b/lib/auth/instagram_authenticator.rb @@ -0,0 +1,49 @@ +class Auth::InstagramAuthenticator < Auth::Authenticator + + def name + "instagram" + end + + # TODO twitter provides all sorts of extra info, like website/bio etc. + # it may be worth considering pulling some of it in. + def after_authenticate(auth_token) + + result = Auth::Result.new + + data = auth_token[:info] + + result.username = screen_name = data["nickname"] + result.name = name = data["name"].slice!(0) + instagram_user_id = auth_token["uid"] + + result.extra_data = { + instagram_user_id: instagram_user_id, + instagram_screen_name: screen_name + } + + user_info = InstagramUserInfo.find_by(instagram_user_id: instagram_user_id) + + result.user = user_info.try(:user) + + result + end + + def after_create_account(user, auth) + data = auth[:extra_data] + InstagramUserInfo.create( + user_id: user.id, + screen_name: data[:instagram_screen_name], + instagram_user_id: data[:instagram_user_id] + ) + end + + def register_middleware(omniauth) + omniauth.provider :instagram, + :setup => lambda { |env| + strategy = env["omniauth.strategy"] + strategy.options[:client_id] = SiteSetting.instagram_consumer_key + strategy.options[:client_secret] = SiteSetting.instagram_consumer_secret + } + end + +end diff --git a/lib/common_passwords/10-char-common-passwords.txt b/lib/common_passwords/10-char-common-passwords.txt new file mode 100644 index 0000000000..e1c2542faf --- /dev/null +++ b/lib/common_passwords/10-char-common-passwords.txt @@ -0,0 +1,2344 @@ +0000000000 +000000000000 +0000000000d +0000000000o +000777fffa +0102030405 +010203040506 +0123456789 +01234567890 +012345678910 +0123654789 +0123698745 +014702580369 +0147258369 +0147852369 +0147896325 +0192837465 +01telemike01 +02987654321 +050605rostik +0528325452mr +070793monolit +0987612345 +0987654321 +0987654321a +0987654321q +0995359291 +0cDh0v99uE +0o9i8u7y6t +100894olol +1010101010 +1010810108 +1020304050 +102030405060 +1029384756 +1029384756q +10293847qp +10987654321 +1111111111 +11111111111 +111111111111 +1111111111111 +111111111111111 +11111111111111111111 +1111111111a +1111111111q +1111111111zz +1111122222 +11111aaaaa +1112131415 +111222333000 +111222333444 +111222333444555 +111222333a +111222333q +1122112211 +1122334455 +112233445566 +1123581321 +112358132134 +1133557799 +1212121212 +1212312121 +1213141516 +1213141516171819 +1223334444 +122333444455555 +1223505sayana +123123123123 +123123123123123 +1231231234 +123123123a +123123123q +123123123z +123123qweqwe +123321123321 +123321456654 +123321qweewq +123412341234 +1234509876 +1234512345 +123451234512345 +1234554321 +1234554321a +1234554321q +123456123456 +1234562000 +12345654321 +123456654321 +123456654321a +12345672000 +12345677654321 +1234567812345678 +123456782000 +1234567887654321 +123456789. +123456789* +1234567890- +1234567890 +12345678900 +123456789000 +12345678900987654321 +12345678901 +123456789012 +1234567890123 +12345678901234567890 +1234567890987654321 +1234567890a +1234567890d +1234567890g +1234567890l +1234567890m +1234567890o +1234567890p +1234567890q +1234567890qaz +1234567890qw +1234567890qwe +1234567890qwerty +1234567890qwertyuiop +1234567890s +1234567890v +1234567890w +1234567890z +1234567890zzz +1234567891 +12345678910 +123456789101 +1234567891011 +123456789101112 +12345678912 +123456789123 +123456789123456 +123456789123456789 +1234567892000 +12345678987654321 +1234567899 +123456789987 +1234567899876543 +123456789987654321 +12345678999 +123456789a +123456789A +123456789aa +123456789aaa +123456789abc +123456789as +123456789asd +123456789azat +123456789b +123456789c +123456789d +123456789e +123456789f +123456789g +123456789i +123456789j +123456789k +123456789l +123456789m +123456789n +123456789o +123456789p +123456789q +123456789Q +123456789qaz +123456789qq +123456789qqq +123456789qw +123456789qwe +123456789qwer +123456789qwerty +123456789r +123456789s +123456789t +123456789v +123456789w +123456789x +123456789y +123456789z +123456789Z +123456789zx +123456789zxc +123456789zz +12345678qwe +12345678qwertyu +1234567qwerty +1234567qwertyu +123456qwer +123456qwert +123456qwerty +123456zxcvbn +12345abcde +12345asdfg +12345q12345 +12345qazwsx +12345qwert +12345qwert7 +12345qwerty +12345trewq +12345zxcvb +1234qw1234qw +1234qwerasdf +1234qwerasdfzxcv +1234qwerty +1236547890 +123654789a +1236987005 +12369874123 +123698745a +123ewqasdcxz +123hfjdk147 +123qazwsxedc +123qwe123qwe +123qwe456rty +123qweasdzx +123qweasdzxc +123qwerty123 +123qwerty456 +123qwertyuiop +123sas4758 +125712571257d +12andriy14 +12qw34er56ty +1302alex1994 +1313131313 +131313131313 +1324354657 +1324354657687980 +132Forever +1346798520 +1357908642 +1357913579 +1357924680 +1357997531 +141312190296q +1472583690 +147258369a +147258369q +1478963215 +1488ss1488 +14bestlist +159357159357 +159753159753 +1597532486 +159753258456 +159753456852 +17171717aa +1928374650 +1928374655 +192837465q +193570356033 +193711101994a +1958proman +1986irachka +198719871987 +198919891989 +1994200414 +19952009sa +19960610ilja +19mtpgam19 +1a2a3a4a5a +1a2a3a4a5a6a +1a2b3c4d5e +1a2s3d4f5g +1a2s3d4f5g6h +1pass1page +1q2q3q4q5q +1q2w3e4r5t +1q2w3e4r5t6y +1q3e5t7u9o +1qa2ws3ed4rf +1qa2ws3ed4rf5tg +1qaz1qaz1qaz +1qaz2wsx3ed +1qaz2wsx3edc +1qaz2wsx3edc4rfv +1qazwsxedc +1qazxsw23edc +1qazxsw23edcvfr4 +1qwertyuiop +1rus27540102 +1z2x3c4v5b +20102010ss +20162016up +2143658709 +2222222222 +2222333344445555 +2244668800 +2267137151 +23176djivanfros +2347172123 +23WKoa0FP78dk +2468013579 +2507905048 +2606642yra +26429vadim +277rte87hryloitru +2dumb2live +2pacshakur +3012292113 +30secondstomars +31217221027711 +31321dj51982 +3141592654 +3216732167 +3240500777 +32615948worms +3322607093 +3333333333 +3454051maksim +3478526129 +38gjgeuftd +3f3fphT7oP +3rJs1la7qE +3sYqo15hiL +413276191q +41d8cd98f00b +420842084208555 +4294967296 +42qwerty42 +4444444444 +4465134444 +456456456q +4648246482 +4815162342 +4815162342a +4815162342lf +4815162342lost +4815162342q +4815162342s +4815162342z +4904s677075 +4rdf_king7 +51051051051 +5152535455 +541233432442 +5432112345 +5432167890 +54322q22345 +5544332211 +5555555555 +5566778899 +5647382910 +5858855abc +59382113kevinp +5hsU75kpoT +5t4r3e2w1q +6215mila6215 +6666666666 +671fsa75yt +675675675a +68iypNeg6U +6969696969 +70780070780 +7410258963 +7410852963 +7418529630 +741852963q +742617000027 +7777755102q +7777777777 +777777777777 +787898mich +7894561230 +789456123a +789456123q +7elephants +7jokx7b9DU +7uGd5HIp2J +80070633pc +80361665abc +80633459472qw +80637852730 +80663635606 +80672091913 +80679047880 +8096468644q +80966095182z +80969260620 +80972694711 +80988218126 +80990606390 +87654321vv +87e5nclizry +88002000600 +8888888888 +89015173454 +89023346574 +89032073168 +89055521933 +89057003343 +89063032220m +89128830153 +89132664230 +89172735872 +89181502334 +89211375759 +89231243658s +89600506779 +89614774181 +89876065093rax +89semtsriuty +8PHroWZ622 +8PHroWZ624 +9021090210 +9085084232 +9085603566 +9105425888 +9293709b13 +92k2cizCdP +951753852456 +9638527410 +9731553197 +9874563210 +9876543210 +987654321a +987654321d +987654321g +987654321q +987654321w +987654321z +989244342a +9988776655 +999111999q +9999999999 +99999999999 +999999999999 +99strenght +9Z5ve9rrcZ +a123456789 +A123456789 +a1234567890 +a123456789a +a1a2a3a4a5 +a1b2c3d4e5 +a1s2d3f4g5 +a1s2d3f4g5h6 +a3eilm2s2y +A514527514 +a550777954 +a58Wtjuz4U +a789456123 +a987654321 +aaaaaaaaaa +aaaaaaaaaaa +aaaaaaaaaaaa +ababagalamaga +abc123456789 +abc123abc123 +abcd123456 +abcde12345 +abcdefghij +abcdefghijk +abcdefghijkl +abdullayev +abercrombie +abracadabr +abracadabra +abrakadabra +absolutely +Accessibilit +accountant +accountbloc +accounting +activation +Ad12345678 +admin18533362 +administrato +administrator +adoxreadme +adrenaline +aezakmi123 +afghanistan +afireinside +afrika2002 +agnieszka1 +aionrusian +AjcuiVd289 +ajnjuhfabz +aksjdlasdakj89879 +alabama123 +alejandro1 +aleksandar +aleksander +aleksandra +Aleksandra +aleksandrov +aleksandrova +aleksey1986 +alertemailms +alertpaydoubl +alessandra +alessandro +alexander1 +Alexander1 +alexandra1 +alexandria +alexsander +alinaalina +alisaalisa +alisokskok +alkanaft123 +allahakbar +allahuakbar +alpha135792468 +alphabravo +alphaomega +alteclansing +alternativ +alternativa +alternative +am4h39d8nh +amadeusptfcor +ambassador +amsterdam1 +an83546921an13 +anastasija +anastasiya +Anastasiya +anderlecht +andrewjackie +andrey1234 +andrey1992 +andrey2010 +angelangel +angelochek +angelofwar +animal2000 +anniversary +antananarivu +antichrist +antihero77 +antikiller +antoshenechka +anytimetoday +apocalipsis +apocalypse +apokalipsis +applejuice +applesauce +armageddon +arsenal123 +artemartem +asasasasas +asd123asd123 +asdasdasdasd +asdf123456 +asdfdsasdf +asdfg12345 +asdfgh123456 +asdfghjkl; +asdfghjkl1 +asdfghjkl123 +ashleigh69 +asshole123 +astalavista +astonmartin +astonvilla +astra334566 +auckland2010 +australia1 +automobile +avadakedavra +avrillavigne +awdqseawdssa +awdrgyjilp +awesome123 +awo8rx3wa8t +azerbaijan +azerbaycan +azertyuiop +azsxdcfvgb +azsxdcfvgbhn +azwebitalia +BaBeMaGnEt +badiman28200 +badnaamhere +badreligion +bangladesh +barabashka +barbariska +barbarossa +barcelona1 +bartsimpson +baseball10 +baseball11 +baseball12 +baseball123 +baseball14 +baseball17 +baseball21 +basketball +Basketball +basketball1 +bassmaster +battlefield +battlestar +bbbbbbbbbb +bbbbbbbbbbbb +beautiful1 +belladonna +berezuckiy +bernadette +bestfriend +bestpker09 +bezparolya +BhRh0h2Oof6XbqJEH +biblioteka +bigbrother +billionaire +birmingham +birthday10 +birthday100 +birthday133 +birthday21 +birthday26 +birthday27 +birthday28 +birthday299 +birthday36 +birthday52 +birthday54 +blackadder +blackangel +blackberry +blackdragon +blackhawks +blackheart +blackhorse +blacklabel +blackmagic +blackmetal +blackshadow +blacksheep +blacksonblon +blackstone +blackwhite +bladerunner +blahblahblah +blingbling +blitzkrieg +bltynbabrfwbz +blueberry1 +bluedevils +bluedragon +bluemonkey +bmvm3e46gtr +bobmarley1 +bondarenko +bonneville +boredboi4u +bossyak123 +bot_schokk +boy1cool23 +Boy4u2OwnNYC +bpgjldsgjldthnf +braveheart +breakdance +brotherhood +brucewayne +bruteforce +buccaneers +bujhmbujhm +bulletproof +bullnuts2003 +bullwinkle +burgerking +bushmaster +businessbabe +butterbean +butterfly1 +bvncnbnvvbn +byajhvfnbrf +byyjrtynbq +c123456789 +c43dae874d +c43qpul5RZ +c7e4f8EzqH +cagliostro +calculator +california +California +callofduty +callofduty4 +CallSceSetup +candyeater +candyfinger +cannondale +casablanca +caterpillar +cbvtycbyjrbz +cccccccccc +cegthgegth +cegthgfhjkm +celtic1888 +cfifvfif211 +cfkfvfylhf +cfvfzcxfcnkbdfz +cfvfzkexifz +cfvfzrhfcbdfz +cgfhnfrvjcrdf +cgfhnfrxtvgbjy +cghfdjxybr +cgtkcbyuth +cgtwbfkbcn +challenger +ChangeLangMs +characters +charleston +charlie111 +charlie123 +charliedog +charlotte1 +charmander +cheaphornybastard +cheburashka +checkitout +cheerleader +cheerleaers +cheeseburger +cheesecake +chessmaster +chester123 +chesterfield +chicken123 +chickenwing101 +chinchilla +chocolate1 +chocolate2 +chrisbrown +christiaan +christian1 +christophe +christopher +Christopher +christopher1 +chucknorris +chupakabra +cincinnati +cinderella +cippalippa +civilization +cjcfnmdctv +cjdthitycndj +cjybthbrcjy +ckfltymrfz +clementine +clubpenguin +cnfc35762209 +cnfdhjgjkm +cnfhjghfvty +cnfnbcnbrf +cnhjbntkmcndj +cnjvfnjkju +coccinella +cockgobbler +cocksucker +colchester +collection +combat123654 +comedyclub +comicbookdb +comicbooks +commercial +compatible +compliance +computador +computadora +computer12 +computer123 +confidence +connection +constantin +constantine +constitution +construction +consultant +consulting +contortionist +contrasena +controller +coolbugi2000 +coorslight +copenhagen +corinthians +CORPerfMonSy +cosanostra +cosmopolitan +counterstrike +cranberries +crazyhorse +crepusculo +cristopher +ctdfcnjgjkm +cthnbabrfn +ctrnjhufpf +cumberland +cuntfinger +cuntlicker +cvzefh1gkc +cxfcnkbdfz +cxfcnkbdxbr +cxfcnmttcnm +cyberonline +cyecvevhbr +cyjdsvujljv +cytuehjxrf +CzPS5NYNDWCkSC +daddysgirl +dance4life +dancedance +danildanil +dantheman123 +darjeeling +darkknight +darthvader +dashadasha +daugavpils1 +dazdraperma +dbrnjhjdbx +dbrnjhjdyf +dctvcjcfnm +dctvghbdtn +dddddddddd +december12 +deeppurple +deepthroat +deerhunter +degenerationx +deltaforce +demolition +den1020834880 +denis12345 +denisdenis +department +depechemode +Description +desperados +destination +destruction +deutschland +devastator +DeviceClass +devildriver +devilmaycry +devilmaycry4 +dfcbkmtdyf +dfgdrb5se4 +dfktynbyrf +dhjnvytyjub +dictionary +difference +DigitalProdu +dirtysouth +dirtywhore +disneyland +diunilaobu8* +djljghjdjl +dkflbdjcnjr +dkflbvbhjdbx +dkflbvbhjdyf +dmiller12as +dodgeviper +doggystyle +dogphil3650 +dollarbill +domainlock2005 +domination +domodedovo +donaldduck +donkeykong +dontforget +dragonball +dragonballz +dragonfire +dragonforce +dragonlord +dragonslayer +dreamonline +dreamworks +drumandbass +dtynbkznjh +dunnowho89 +duranduran +dvtcntyfdctulf +e1l2e3n4a5 +e6pz84qfCJ +earthquake +edwardcullen +EFBCAPA201 +Efwe5tgwa5twhgd +eghfdktybt +ejaculation +ekaterina20 +ekx1x3k9BS +electrical +electronic +electronics +elizabeth1 +elsalvador +engineering +enterprise +Enterprise +entertainment +eqeS606898 +ereyes4269 +escaflowne +EulaComplete +evanescence +evangeline +evangelion +everything +excellence +expedition +experience +experienced +eybdthcbntn +F64579820f +fallenangel +falloutboy +fartripper +fatima753357 +fcbarcelona +fcnfkfdbcnf +fdnjhbpfwbz +felicidade +fenerbahce +ferrari360 +ffffffffff +fggjkbyfhbz +fgjkbyfhbz +fgjrfkbgcbc +fgtkmcbyrf +fgtkmcbyxbr +fighting54 +finalfantasy +Findaupair007 +fiorentina +firefighter +firestarter +firstone123 +fishfinger +fitzgerald +fkg7h4f3v6 +fkmnthyfnbdf +fktrcfylh1 +fktrcfylhf +Fktrcfylhf +fktrcfylhjd +fktrcfylhjdbx +fktrcfylhjdf +fktrcfylhjdyf +fktrcfylth +flashlight +flashpoint +flintstone +flvbybcnhfnjh +flvbybcnhfwbz +flyfishing +football10 +football11 +football12 +football123 +football22 +football24 +foreverlove +foreveryoung +forgetmenot +Formatters +forzainter +forzamilan +foundation +frankenstein +frankzappa +frederiksberg +freeaccess +freedom123 +freelancer +freelander +freetraffic +freyfvfnfnf +friendship +friendster +FROINLAVEN +FromVermine +frozenfish +fuckfuckfuck +fuckinglove +fuckingshit +fuck_inside +fuckinside +FUCK_INSIDE +fuckintits +fuckmehard +fuckmylife +fuckoff123 +fuckoff666 +fuckthemall +fucktheworld +fuckthroat +fuckyou123 +fuckyoubitch +fuckyouguys +fufnfrhbcnb +funnybunny +fyfnjkmtdbx +fyfnjkmtdyf +fynfyfyfhbde +g00dPa$$w0rD +galatasara +galatasaray +gamemaster +gangbanged +Gankutsuou1989 +gatekeeper +gblfhfcbyf +gearsofwar +general007 +generation +geniusgenius +GenuineIntel +georgetown +gerasimova +gettysburg +gfhfcjkmrf +gfhfktkjuhfv +gfhfvgfvgfv +gfhjkm1234 +gfhjkm123456 +gfhjkm2011 +gfhjkmgfhjkm +gggggggggg +ghbdtn12345 +ghbdtncerf +ghbdtndctv +ghbdtnghbdtn +ghbdtngjrf +ghbdtnrfrltkf +ghhh47hj764 +ghhh47hj7649 +ghjatccbjyfk +ghjbpdjlcndj +ghjcnbnenrf +ghjcnbnewbz +ghjcnbvtyz +ghjcnhfycndj +ghjcnjabkz +ghjcnjdkfl +ghjcnjgbpltw +ghjcnjgfhjkm +ghjcnjghjcnj +ghjcnjnfr1 +ghjcnjqgfhjkm +ghjcnjrdfibyj +ghjcnjrdfif +ghjgfufylf +ghjnbdjcnjzybt +ghjnbdjufp +ghjrehfnehf +ghjrjgtyrj +ghjuhfvbcn +ghjuhfvvbcn +ghostrecon +ghostrider +ghtdtlvtldtl +ghtpthdfnbd +gianfranco +gilbert2707 +gillingham +girlfriend +gjdtkbntkm +gjhjlfcjqrb +gjikbdctyf +gjkbnjkjubz +gjkyjkeybt +gjkysqgbpltw +gjyjvfhtdf +gjyjvfhtyrj +gjytltkmybr +gladiator5 +godisgreat +godzils4s7 +goldfinger +goldhill25 +Good123654 +goodfellas +goodmorning +googlecheckou +gordolee85 +gossipgirl +grandmaster +grandorgue +grasshopper +greatwhite +greedisgood +greenapple +greenfield +greengrass +greengreen +greenhouse +greenlantern +grimreaper +Groupd2013 +gtasanandreas +gthcgtrnbdf +gthgtylbrekzh +gthtcnhjqrf +gthtrfnbgjkt +gthtrhtcnjr +gtnhj328903 +gtnhjpfdjlcr +guadalajara +guitarhero +gunayka1995 +gundamwing +gunslinger +gunsnroses +gxLMXBeWYm +Gy3Yt2RGLs +H1Y4dUa229 +H2Tmc4g358 +h72sfibbnl +hakunamatata +hallelujah +hammerfall +hammerhead +hammertime +handkerchief +hannover96 +happyhappy +HardwareId +harekrishna +harrypotte +harrypotter +Hd764nW5d7E1vb1 +Hd764nW5d7E1vbv +headhunter +heartagram +heartbreaker +heavymetal +hedimaptfcor +heidelberg +heisenberg +helicopter +hellohello +hellokitty +hellothere +helloworld +hellraiser +hesoyam123 +h_froeschl7 +hhhhhhhhhh +hhhhhhhhhhh +highlander +highschool +hijodeputa +hilaryduff +hjpjxrf23062007 +hocuspocus +hollister1 +hollywood1 +holyspirit +hondacivic +hondas2000 +hondastars +horsepower +housemusic +housewifes +HshFD4n279 +htubcnhfwbz +huangjin1987 +hubbabubba +hubbahubba +hunnybunny +hurricanes +HypnoDanny +iaapptfcor +iamawesome +iampurehaha2 +ibpjahtybz +ibragimova +iddqdiddqd +iddqdidkfa +IdeDeviceP0T +idontknow1 +idspispopd +igeldcheat +ihateniggers +iiiiiiiiii +ilikecheese +ilikepussy +illuminati +iloveboobies +ilovegirls +iloveindia +ilovejesus +ilovemusic +ilovemyfamily +ilovemylife +ilovemyself +ilovepussy +iloveyou11 +iloveyou12 +iloveyou123 +iloveyou143 +iloveyou22 +iloveyoubaby +imagination +imjakie123 +impossible +includecatal +incredible +independent +Infalicall +informatic +information +Information +ingodwetrust +insertions +INSTALLDEVIC +InstallSqlSt +InstallUtil +intelinside +intelligence +interacial +interceptor +intercourse +interfaces +intermilan +internacional +international +intervention +investment +invincible +ipo54tj45uy856 +ironmaiden +iseedeadpeople +isvipebaby +Itachi1995 +itsasecret +ivanivanov +j123456789 +j3qq4h7h2v +jackdaniels +jackhammer +jacksparrow +jacqueline +jamesbond007 +jamesjames +jameslewis +jamiroquai +jasmine123 +jediknight +jedimaster +jeffgordon +jessejames +jesuschris +jesuschrist +jesuscristo +jesusfreak +jesusislord +jesuslives +jesuslovesme +jesussaves +jetbalance +Jhon@ta2011 +jigei743ks +Jimandanne +jjjjjjjjjj +jjjjjjjjjjjj +jkh4545jhk +jlbyjxtcndj +jmhj5464dcx +jNe990pQ23 +jobshop200 +jokerjoker +josephphone7 +juancarlos +juggernaut +juicyfruit +jumpmaster +justforfun +justinbiebe +justinbieber +JwHw6N1742 +jxfhjdfirf +k123456789 +kalashnikov +kalifornia +kaliningrad +kamehameha +kamelia2011 +kanmax1994 +karapetyan +kasablanka +katastrofa +katyakatya +kazakhstan +kbndbytyrj +kbnthfnehf +kbytqrfpkj +kd189nLciH +kensington +keraskeras +keysersoze +kickboxing +kilimanjaro +killer1234 +killkillkill +kingfisher +kirill1995 +kirill1996 +kirill1999 +kirill2002 +kirill2010 +kittykitty +kkkkkkkkkk +klapaucius +KL?benhavn +klubnichka +kmh12025476 +knickerless +knightrider +knucklehead +kobebryant +kolesnikov +kolesnikova +komltptfcor +konovalova +konstantin +kournikova +kozanostra +krasavchik +kravchenko +kriginegor +kristina123 +kristopher +kryptonite +Krzysiek12 +ktjynsq40147 +ktutjyth333 +Kudos4Ever +kurtcobain +kwiatuszek +l0sk2e8S7a +ladyffesta +lalalalala +lamborghini +lamborgini +LarterLarter +lastchance +leadership +leavemealone +Leavemealone +ledzeppelin +leedsunited +left4dead2 +leprechaun +letmein123 +letmeinnow +lfplhfgthvf +lhbjkjubz2957704 +lifeisgood +lighthouse +lightsaber +limon32988 +limpbizkit +lineage123 +linkinpark +lissalissa +littlebear +littlebitch +littlecunt +littlefuck +littlefucker +littlegirl +littlehole +littleminge +littleslut +littlewhore +liverpool1 +Liverpool1 +liverpoolfc +livestrong +lizardsquad +ljcnjtdcrbq +lk9slwGh3x +lkjhgfdsaz +lkjhgfdsazx +llllllllll +lockerroom +LockingServi +lololyo123 +loneranger +lonestar44 +loploprock +losangeles +lost4815162342 +LOST4815162342 +lothlorien +lotrfotr34 +louisvuitton +love777321777 +loveforever +lovehurts1 +loveislife +lovelovelove +loveplanet +lovezp1314 +LP2568cskt +l.qvjdjxrf +lsIA9Dnb9y +luansantana +lucifer666 +luckycharm +luckycharm3 +ludicgirls +lumberjack +luojianhua +lytdybrbdfvgbhf +lytghjgtnhjdcr +Lzhan16889 +m123456789 +m6cJy69u35 +ma123123123 +madagascar +madagaskar +made40media +magical123 +Mailcreated5240 +maintenance +maisuradze +management +manchester +Manchester +manchester1 +manchesterunited +mandarinka +mandragora +mangust6403 +mapet123456 +mapleleafs +marcuseckos +margherita +mariamaria +marinamarina +marinochka +markhegarty +marmeladka +mashamasha +masseffect +massimiliano +master1234 +masterbaiting +masterbate +masterbating +mastercard +masterchief +mastermind +masturbate +masturbation +matchbox20 +matematica +matematika +mathematics +matheus123 +mattylad10 +maurolarastefy +maximilian +maximiliano +maxmotives +mechanical +meditation +metallica1 +metropolis +MeveFalkcakk +michael123 +michaeljackson +michelangelo +mickeymouse +microphone +miguelange +milesdavis +milfhunter +millennium +millerlite +millertime +millionaire +minecraft1 +minecraft123 +minhasenha +minicooper +minnesota_hp +minniemouse +mishaoooyeah +misiaczek1 +mississipp +mississippi +mitsubishi +mmmmmmmmmm +mogwai1976 +momsanaladventure +moneymaker +moneymoney +monkeybutt +monkeynuts +monster123 +monsterkill +montecarlo +montenegro +montgom240 +montgomery +morganstanley +mortalkombat +mostwanted +motdepasse +motherfuck +motherfucker +motherlode +motorcycle +mountaindew +mousemouse +msoracle32re +multimedia +multiplelo +multiplelog +murcielago +musiclover +myjdxtcxks +mypassword +n123456789 +nakedteens +naruto2010 +narutouzumaki +nastya1995 +nastya1996 +nastya1997 +nastya1999 +nastya2010 +nastyanastya +natasha123 +naughtyboy +navigation +nccpl25282 +necromancer +necronomicon +need4speed +needforspeed +ne_e_pod_chehyl +nEMvXyHeqDd5OQxyXYZI +nesterenko +Networkingpe +NetworkingPe +neveragain +nevergiveup +neversaymypassword +neversaynever +neversmile +neverwinter +neworleans +newpassword +newproject2004 +newt7899onrs +newzealand +neznakomka +nhbujyjvtnhbz +nhbybnhjnjkejk +nhecsyfujkjdt +nhfdvfnjkju123 +nhfrnjhbcn +nhfycajhvth +nhfycajhvths +NICK1234-rem936 +Nicrasow212 +nightcrawler +nightmare1 +nightrider +nightshade +nikiforova +nikita1994 +nikita1996 +nikita1997 +nikita1998 +nikita2000 +nikita2002 +nikita2010 +nikita2011 +nikolaevna +ninjamonkey +nintendo64 +nintendods +nissan350z +Nloq_010101 +nnnnnnnnnn +nochnik104 +nokia6230i +nokiadermo +nokianokia +nomeacuerdo +nondriversig +noonehackme +nopassword +nostradamus +nottingham +novosibirsk +nthvbyfnjh +nthvbyfnjh2 +ntktdbpjh1994 +nUADdN9561 +nuttertools +nwctrinity +Oap9UTO293 +oc247ngUcZ +oduvanchik +OlCRackMaster +oldsmobile +olegnaruto +omgkremidia +onetwothree +ontheoutside +ontherocks +oooooooooo +opensesame +operations +ordinateur +orochimaru +P030710P$E4O +p0o9i8u7y6 +p51mustang +p9uJkuf36D +packardbell +painkiller +paintball1 +pandemonium +parabellum +Paraklast1974 +parliament +parolparol +pashademon +passionate +passmaster +passtrader +password00 +password01 +Password01 +password10 +password101 +password11 +password12 +Password12 +password123 +Password123 +password1234 +password13 +password21 +password22 +password23 +password33 +password69 +password88 +password99 +PASSWoRDassword +passwordpassword +passwordstandard +pathfinder +peacemaker +peanutbutter +penetrating +penetration +peppermint +perasperaadastra +percussion +perfectexploiter +perfection +performance +Performing +persephone +peternorth +peterpeter +peugeot406 +pfhfnecnhf +pflhjncndj +pfqwtd27121988 +Phezc419hV +philadelphia +philippines +philosophy +phoenix123 +photography +piggy15708 +pineapple1 +pittsburgh +pjsheridan +playground +playstatio +playstation +playstation2 +playstation3 +plextsofttm +plhfdcndeq +pocahontas +pointblank +pointbreak +poiuytrewq +pokemon123 +polina2005 +polina2008 +polina2009 +polniypizdec0211 +PolniyPizdec0211 +PolniyPizdec1102 +polniypizdec110211 +PolniyPizdec110211 +polopolo09 +ponomarenko +pornografia +pornographic +pornography +pornoporno +porovoz123 +porsche911 +portishead +portsmouth +postov1000 +powerlifting +powerpower +powerrangers +pppppppppp +praetorian +pratap1245 +premiumcash +presidente +prettygirl +primetime21 +princess12 +prisonbreak +ProductId20F +production +professional +programmer +progressive +prokopenko +prometheus +properties +prosperity +protection +providence +psychnaut1 +ptybnxtvgbjy +puertorico +pufunga7782 +pulpfiction +punksnotdead +purplehaze +pussybitch +pussyeater +pussylicker +pussylover +pussypussy +pyfrjvcndf +pyfrjvcndj +q1205199333 +q123123123 +q123456789 +q1234567890 +q1q2q3q4q5 +q1q2q3q4q5q6 +q1w2e3r4t5 +Q1w2e3r4t5 +q1w2e3r4t5y +q1w2e3r4t5y6 +q1w2e3r4t5y6u7 +q1w2e3r4t5y6u7i8 +q1w2e3r4t5y6u7i8o9p0 +q2w3e4r5t6 +q2w3e4r5t6y7 +q80661658441 +qawsedrftg +qawsedrftgyh +qaz123wsx456 +qaz1wsx2edc3 +qaz26101778 +qazwsx1234 +qazwsx12345 +qazwsx123456 +qazwsxedc1 +qazwsxedc12 +qazWSXedc12 +qazwsxedc123 +qazwsxedcrf +qazwsxedcrfv +qazwsxedcrfvtgb +qazwsxqazwsx +qazxswedc123 +qazxswedcvfr +..qlVVcvDeeRo +qpwoeiruty +qq123456789 +qqqqqqqqqq +qrg7t8rhqy +quant4307s +quarantine +queenas8151 +quicksilver +quiksilver +qw12er34ty56 +qwaszxerdfcv +qwaszxqwaszx +Qwe1234567 +qwe123qwe123 +qweasdzxc1 +qweasdzxc12 +qweasdzxc123 +qwerasdfzxcv +qwert12345 +qwert54321 +qwertasdfg +qwertasdfgzxcvb +qwertgfdsa +qwertqwert +qwerttrewq +qwerty123321 +qwerty1234 +qwerty12345 +Qwerty12345 +qwerty123456 +qwerty123456789 +qwerty1992 +qwerty1993 +qwerty2000 +qwerty2010 +qwerty54321 +qwertyasdf +qwertyasdfg +qwertyasdfgh +qwertyqwerty +qwertyu123 +qwertyuiop +QWERTYUIOP +qwertyuiop1 +qwertyuiop10 +qwertyuiop12 +qwertyuiop123 +qwertyuiop12345 +qwertyuiop123456789 +qwertyuiopasdfg +qwertyuiopasdfgh +qwertyuiopasdfghjkl +qwertyytrewq +qwertzuiop +qwqwqwqwqw +r3r3vi3wacc3ss +R3Vi3Wpass +rainbowsix +rainforest +rammstein1 +rangerover +rashley198 +rattlesnake +razorblade +realmadrid +reanimator +redemption +registration +relentless +rendezvous +rerhsybrcs +residentevil +resistance +respublika +retribution +revelation +reviewpass +revolution +reymisterio +reymysterio +rfcgthcrbq +rfgecnfcerf +rfhfrfnbwf +rfhfvtkmrf +rfkbajhybz +rfkbybyuhfl +rfkfiybrjd +rfkmrekznjh +rfnfcnhjaf +rfnfgekmnf +Rfnthbyf1988 +rfnthbyjxrf +rfrfirf123 +rhbcnbyf123 +rhbcnbyjxrf +rhfcyjzhcr +rhfvfnjhcr +richardson +rikitikitavi +riverplate +rjcvtnbxrf +rjhjkmbien +rjirfrgbde +rjkjrjkmxbr +rjycnbnewbz +rjycnfynby +Rjycnfynby +rjyjdfkjdf +rjytwcdtnf +rkfdbfnehf +roadrunner +rockandroll +rockbottom +rockhopper +rockohamster +roflcopter +romanroman +ronaldinho +ronaldinho10 +ronaldo123 +rottweiler +rrrrrrrrrr +rubberduck +ruffryders +runescape1 +runescape123 +s123456789 +s456123789 +sacramento +sagitarius +sagittarius +sailormoon +salamander +salamandra +salmankhan +salocaluimsg +samsung123 +samsungs5230 +sanandreas +sanfrancisco +santaclaus +santaklaus +santamaria +saqartvelo +sasa123321 +sasasasasa +sasha12345 +sashasasha +Sataniv1993 +satisfaction +SaUn24865709 +scandinavian +schoolgirlie +schumacher +scoubidou2 +scoubidou6 +scratchman +scubadiver +sdh686drth +sdicmt7seytn +sebastian1 +seemnemaailm +sektorgaza +selfok2013 +seniseviyor +seo21SAAfd23 +serendipity +serg123111 +sergeevich +sergey2010 +serggalant +sersolution +service321 +sevastopol +sexmachine +sexpistols +sfhj5484fgh +shadow1212 +shakespeare +shamanking +shevchenko +shithappens +showmethemoney +sidewinder +silenthill +silmarillion +silvermoon +silverstar +silverstone +simferopol +simpleplan +skateboard +skateboarding +skateordie +skorpion39 +skylinegtr +skyliner34 +skywalker1 +sleepyhollow +slipknot123 +slipknot66 +slipknot666 +slonopotam +slushslush +sm4llville +smallville +smeshariki +Smokie1994 +snusmumrik +Sojdlg123aljg +solidsnake +something1 +sonnenschein +sonyericsson +Soso123aljg +Soso123bbb +southampton +spam967888 +spartak1922 +spartan117 +SpecialInsta +specialist +specialized +spiderman1 +spiderman2 +spiderman3 +splurgeola +spongebob1 +springfield +sS6z2sw6lU +ssssssssss +stabilmente +stalingrad +stalker123 +stalker2010 +stalker777 +starcraft1 +starcraft2 +stargatesg1 +starscream +starwars12 +starwars123 +statistika +steamforums +stefanescu +stensten12 +stephanie1 +stevesmojo +stickdaddy77 +stinkyfinger +stomatolog +stonehenge +stratocaster +strawberry +streetball +stronghold +studioworks +studmuffin +subhanallah +submission +subscriber +successful +suckmyballs +suckmycock +suckmydick +summer2010 +summertime +sundaypunch +sunderland +sunflower1 +sunglasses +sunshine69 +superduper +superman12 +superman123 +superman69 +SuperManBoy +supermario +supermodel +supernatural +superpower +superpuper +supersonic +supersport +supersuper +supervisor +sutherland +sutvsc5ysaa +svensps820 +svetasveta +sweepstakes +sweetdream +sweetdreams +sweetheart +sweetiepie +sweetpussy +sweetsweet +sylviahans +syncmaster +SyncMaster +syncmaster740n +systemofadown +t123456789 +t34vfrc1991 +t5r4e3w2q1 +table54781 +tadmichaels +tAMwsN3sja +taser334455 +taylormade +tdfyutkbjy +technician +techniques +technology +telecaster +television +TempPassWord +terminator +testing123 +tfjunwptzsjp +thebeatles +thecakeisalie +thegreatone +thesimpsons +thiaguinho +thirteen13 +throatfuck +thugstools +thunder123 +thunderbird +thunderbolt +thundercat +ticketmaster +tigertiger +tigerwoods +tihomirova +timberlake +timberland +timberwolf +tinkerbell +Tojiik85521133 +tokiohotel +TokioHotel +tombraider +tottenham1 +trafficracer +traktorist +transexual +transformer +transformers +transistor +Translator +transporter +travelmate +trustnoone +tttttttttt +tumbleweed +tupacshakur +tylerca310 +ublhjgjybrf +ubnkthrfgen +ubvyfcnbrf +uehby92pac +ufdyfrecjr +ufhhbgjnnth +ujkjdjkjvrf +unbelievable +uncencored +undercover +undergroun +underground +understand +undertaker +underwater +underworld +unforgiven +UninstallSql +uniqueness +universidad +university +userexecute +Usuckballz1 +utyyflmtdyf +uuuuuuuuuu +v123456789 +vaffanculo +valentinka +vanderbilt +vanyarespekt +vbhjndjhtw +vbybcnthcndj +vbyfcnbhbn +vEf6g55frZ +velocidade +venom121293 +verygoodbot +vesy7csae64 +vfhbyfvfhbyf +vfhufhbnrf +vfhvtkflrf +vflfufcrfh +vfntvfnbrf +vfrcbvtyrj +vfrcbvvfrcbv +vfuybnjajy +vfvfgfgf123 +vfvfvskfhfve +vfylfhbyrf +vfylhfujhf +viktorovich +villeneuve +vinogradov +vinogradova +virtuagirl +vitalik123 +vladimirovna +vladislava +vladivostok +volkswagen +volkswagon +volleyball +voxstrange +vp3whbjvp8 +VQsaBLPzLa +Vsavb7rtUI +vSjasnel12 +vtkmybrjdf +vtnhjgjkbnty +vvvvvvvvvv +vyjujltytu +vyjujnjxbt +w123456789w +w1w2w3w4w5 +w2dlWw3v5P +wachtwoord +walkman555 +wallstreet +warhammer40k +washington +waterfalls +watermelon +wazzkaprivet +wcrfxtvgbjy +weaknesspays +webhompass +websolutions +websolutionssu +WebUIValidat +weihnachte +weihnachten +weihnachtsbau +welcome123 +wellington +wenef45313 +werty12345 +westminster +wethepeople +whatthefuck +whatthehell +whitehouse +whitepower +whiterabbit +whosyourdaddy +widescreen +widespread +wildflower +winchester +winnipeg261 +winstonone +wishmaster +witchblade +wolfenstein +wolverines +wonderland +wonderwall +wonderwoman +wrestling1 +writerspace +wsx22wsx22 +wutangclan +wwwooo1234 +wwwwwwwwww +xiaoyuA123 +xpressmusic +xtkjdtrgfer +xxPa33bq.aDNA +xxxp455w0rd5 +xxxxxxxxxx +yanshi1982 +ybrjkftdbx +ybrjkftdyf +yfcnhjtybt +yfcnzyfcnz +yflz13041976 +yfnfif2010 +yfnfitymrf +yjdjrepytwr +yjdjvjcrjdcr +yjdsqgfhjkm +yK66o2kzpZ +yoshimitsu +youngmoney +yourmother +ytdpkjvfti +ytpfdbcbvjcnm +ytpyfrjvrf +ytrhjvfycth +ytrhjvfyn10 +yurkamaliy +z123456789 +z1234567890 +z1x2c3v4b5 +z1x2c3v4b5n6 +z1x2c3v4b5n6m7 +z1z2z3z4z5 +zaq12wsxcde3 +zaq1xsw2cde3 +zaqwsxcderfv +zaqxswcde123 +zaratustra +zcfvfzkexifz +zcfvfzrhfcbdfz +zcxfcnkbdf +zcxfcnkbdfz +zelenograd +zexts364325 +zghjcnjcegth +zjses9evpa +zn87x54mxma +zobrdjlrb1 +zQjphsyf6ctifgu +zsxmr7sztmr +zx123456789 +zxcasdqwe123 +zxcvasdfqwer +zxcvb09876 +zxcvb12345 +Zxcvb12345 +zxcvbasdfg +zxcvbn123456 +zxcvbn3215 +zxcvbnm123 +zxcvbnm123456789 +zxcvbnmmnbvcxz +zxcvbnmzxcvbnm +zxcvbzxcvb +zzzzzzzzzz \ No newline at end of file diff --git a/lib/common_passwords/common_passwords.rb b/lib/common_passwords/common_passwords.rb index 9925b60827..0045cc8a36 100644 --- a/lib/common_passwords/common_passwords.rb +++ b/lib/common_passwords/common_passwords.rb @@ -1,5 +1,7 @@ # CommonPasswords will check a given password against a list of the most commonly used passwords. -# The list comes from https://xato.net/passwords/more-top-worst-passwords/#.UrR1AHmpxs4 +# The list comes from https://github.com/danielmiessler/SecLists/tree/master/Passwords +# specifically the list of 10 million passwords, top 100k, filtered by length +# # The list is stored in Redis at a key that is shared by all sites in a multisite config. # # If the password file is changed, you need to add a migration that deletes the list from redis @@ -9,7 +11,7 @@ class CommonPasswords - PASSWORD_FILE = File.join(Rails.root, 'lib', 'common_passwords', 'long-common-passwords.txt') + PASSWORD_FILE = File.join(Rails.root, 'lib', 'common_passwords', '10-char-common-passwords.txt') LIST_KEY = 'discourse-common-passwords' @mutex = Mutex.new @@ -19,7 +21,6 @@ class CommonPasswords password_list.include?(password) end - private class RedisPasswordList diff --git a/lib/common_passwords/long-common-passwords.txt b/lib/common_passwords/long-common-passwords.txt deleted file mode 100755 index 72e120360c..0000000000 --- a/lib/common_passwords/long-common-passwords.txt +++ /dev/null @@ -1,2086 +0,0 @@ -password -12345678 -baseball -football -jennifer -superman -trustno1 -michelle -sunshine -123456789 -starwars -computer -corvette -princess -iloveyou -maverick -samantha -steelers -whatever -hardcore -internet -mercedes -bigdaddy -midnight -11111111 -marlboro -victoria -butthead -startrek -liverpoo -danielle -redskins -mountain -shithead -xxxxxxxx -88888888 -nicholas -metallic -qwertyui -dolphins -cocacola -rush2112 -jonathan -scorpion -asdfasdf -godzilla -williams -lifehack -platinum -garfield -69696969 -jordan23 -bullshit -airborne -elephant -explorer -christin -december -benjamin -dickhead -brooklyn -redwings -michigan -87654321 -guinness -einstein -snowball -alexande -passw0rd -lasvegas -slipknot -kimberly -1q2w3e4r -carolina -colorado -creative -bollocks -darkness -asdfghjk -poohbear -nintendo -november -password1 -lacrosse -paradise -maryjane -spitfire -anderson -cherokee -drowssap -marshall -1qaz2wsx -caroline -franklin -snickers -courtney -westside -patricia -semperfi -freeuser -babygirl -champion -softball -security -wildcats -veronica -abcd1234 -wolverin -remember -freepass -pearljam -mistress -peekaboo -budlight -electric -stargate -brittany -swimming -scotland -swordfis -blink182 -virginia -passport -aaaaaaaa -rolltide -bulldogs -liverpool -chevelle -mitchell -spiderma -patriots -cardinal -kawasaki -ncc1701d -airplane -scarface -elizabet -wolfpack -lawrence -american -stingray -simpsons -srinivas -panthers -pussycat -loverboy -tarheels -wolfgang -testtest -michael1 -pakistan -infinity -letmein1 -hercules -billybob -pavilion -changeme -darkside -zeppelin -darkstar -charlie1 -wrangler -qwerty12 -bobafett -business -sterling -babydoll -cheyenne -longhorn -presario -mustang1 -21122112 -q1w2e3r4 -12341234 -devildog -bluebird -metallica -access14 -enterpri -blizzard -asdf1234 -harrison -thailand -1234567890 -cadillac -hellfire -lonewolf -12121212 -fireball -precious -engineer -basketba -valentin -wetpussy -morpheus -hotstuff -fuck_inside -goldberg -wrinkle1 -consumer -serenity -99999999 -bigboobs -chocolat -christia -birthday -stephani -1234qwer -98765432 -77777777 -highland -seminole -airforce -hamilton -buckeyes -abcdefgh -goldfish -deftones -icecream -pleasure -juventus -ncc1701e -51505150 -cavalier -aardvark -babylon5 -savannah -yankees1 -fredfred -concrete -shamrock -atlantis -wordpass -predator -marathon -montreal -kathleen -jessica1 -diamonds -stallion -letmein2 -clitoris -sundance -renegade -hollywoo -hello123 -sweetpea -stocking -campbell -christop -rockstar -geronimo -chandler -lovelove -greenday -987654321 -creampie -trombone -55555555 -mongoose -tottenha -butterfl -clifford -fuckyou2 -infantry -skywalke -raistlin -vanhalen -sherlock -dietcoke -ultimate -superfly -freedom1 -drpepper -lesbians -musicman -warcraft -microsoft -morrison -isabelle -thuglife -stonecol -logitech -florence -1passwor -bluemoon -22222222 -stardust -margaret -66666666 -charlott -waterloo -11223344 -standard -alexandr -hannibal -frontier -welcome1 -spanking -japanese -kristina -deepthroat -bonehead -showtime -squirrel -mustangs -septembe -leonardo -makaveli -vacation -passwor1 -columbia -napoleon -motorola -william1 -matthew1 -robinson -penguins -8j4ye3uz -californ -qwertyuiop -portland -asdfghjkl -overlord -stranger -socrates -spiderman -13131313 -national -intrepid -megadeth -bigballs -chargers -discover -isabella -megapass -grateful -mushroom -cristina -hongkong -basketball -satan666 -kingkong -penelope -thompson -anything -knickers -playtime -lightnin -slapshot -titleist -werewolf -fernando -blackcat -tacobell -kittycat -thunder1 -thankyou -scoobydo -coltrane -lonestar -heather1 -beefcake -zzzzzzzz -personal -anthony1 -fuckface -lowrider -punkrock -dodgeram -dingdong -qqqqqqqq -johnjohn -asshole1 -crusader -syracuse -meridian -turkey50 -keyboard -ilovesex -blackman -richmond -sandiego -cooldude -mariners -caliente -fletcher -porsche9 -kangaroo -springer -goodtime -chelsea1 -freckles -nebraska -webmaster -blueeyes -director -monopoly -blackjac -southern -peterpan -fuckyou1 -a1b2c3d4 -sentinel -richard1 -1234abcd -guardian -candyman -mandingo -munchkin -billyboy -rootbeer -assassin -frederic -giovanni -scarlett -achilles -warriors -plymouth -cameltoe -fuckfuck -sithlord -backdoor -chevrole -lorraine -cosworth -eternity -verbatim -chocolate -deadhead -pineappl -rosemary -porkchop -blackdog -alexander -valhalla -santiago -portugal -1qazxsw2 -stripper -sebastia -hurrican -1x2zkg8w -atlantic -hyperion -44444444 -skittles -hastings -gangbang -sailboat -immortal -maryland -columbus -beautiful -swordfish -ncc1701a -spartans -threesom -dilligaf -pinkfloy -catalina -formula1 -scooter1 -colombia -lancelot -angelica -rockhard -poontang -starship -starbuck -catherin -kentucky -33333333 -12344321 -sapphire -raiders1 -excalibu -imperial -phillips -golfball -front242 -macdaddy -qwer1234 -cowboys1 -dannyboy -martinez -aquarius -pppppppp -clarence -eatpussy -beatrice -phillies -research -gggggggg -doughboy -lollipop -qazwsxed -crazybab -brothers -butthole -rightnow -greatone -gateway1 -wildfire -jackson1 -0.0.0.000 -snuggles -phoenix1 -technics -gesperrt -brucelee -woofwoof -theodore -richards -punisher -username -bunghole -elizabeth -lifetime -masterbate -diamond1 -abnormal -davidson -starfish -penetration -michaela -caligula -railroad -bradford -military -bearbear -patrick1 -christine -swinging -labrador -justdoit -meatball -saturday -defender -piercing -microsof -mechanic -robotech -universe -newpass6 -hellyeah -zaq12wsx -spectrum -jjjjjjjj -oklahoma -mmmmmmmm -blueblue -wolverine -sniffing -keystone -bbbbbbbb -handsome -tttttttt -ssssssss -somethin -melissa1 -marcius2 -godsmack -rangers1 -deeznuts -kingston -yosemite -tommyboy -masterbating -marianne -happyday -manchest -unbelievable -aberdeen -nathalie -intercourse -supersta -bcfields -hardrock -children -commando -sinclair -squerting -jeanette -meathead -gandalf1 -magnolia -kenworth -redalert -homemade -webmaste -insertion -temptress -gretchen -celebrity -ragnarok -trinidad -kingfish -blackhaw -thursday -meatloaf -interacial -streaming -pertinant -pool6123 -animated -gordon24 -fantasies -touching -homepage -ejaculation -whocares -jamesbon -amsterda -february -luckydog -businessbabe -brandon1 -experience -software -thirteen -rasputin -greenbay -pa55word -contortionist -sneakers -sonyfuck -test1234 -roadkill -cheerleaers -madeline -christian -brighton -housewifes -emmanuel -bigmoney -seductive -sexygirl -canadian -gangbanged -crawford -hotpussy -implants -intruder -andyod22 -barcelon -chainsaw -chickens -downtown -magicman -clevelan -designer -budweise -experienced -pitchers -passwords -jeremiah -alliance -halflife -saratoga -positive -transexual -close-up -sunnyday -starfire -pictuers -testing1 -tiberius -lisalisa -golfgolf -flounder -majestic -trailers -mikemike -whitesox -angelina -goodluck -charlton -fingerig -gallaries -lockerroom -treasure -absolutely -homepage- -beerbeer -testerer -fordf150 -pa55w0rd -kamikaze -japanees -masterbaiting -callaway -panasoni -housewife -18436572 -sullivan -terrapin -masturbation -hardcock -freeporn -pornographic -traveler -moneyman -shopping -thumbnils -amateurs -apollo13 -goldwing -doghouse -pounding -truelove -underdog -wrestlin -sherwood -johannes -balloons -happy123 -flamingo -paintbal -llllllll -twilight -christie -bullseye -knickerless -binladen -peterson -thanatos -albatros -getsdown -nwo4life -underwear -dddddddd -deeznutz -enterprise -misfit99 -solution -meredith -barefoot -50spanks -scandinavian -original -shannon1 -techniques -chemical -salvador -manchester -buckshot -thegreat -goldstar -triangle -kristine -snowboar -penetrating -roadking -rockford -chicago1 -ferrari1 -galeries -godfathe -gargoyle -gangster -pussyman -pooppoop -newcastl -mortgage -snoopdog -assholes -property -broadway -butterfly -earthlink -westwood -blackbir -slippery -pianoman -tomorrow -roadrunn -attitude -seahawks -tunafish -cinnamon -northern -23232323 -zerocool -limewire -films+pic+galeries -francois -fuckthis -girfriend -uncencored -chrisbln -netscape -hhhhhhhh -knockers -tazmania -pharmacy -arsenal1 -anaconda -australi -gotohell -bulldog1 -monalisa -whiteout -james007 -bitchass -southpar -lionking -megatron -hawaiian -gymnastic -panther1 -wp2003wp -passwort -friendly -oooooooo -bullfrog -holyshit -jasmine1 -sergeant -babyblue -pass1234 -poseidon -confused -hollywood -insertions -juliette -hayabusa -hawkeyes -geoffrey -chuckles -hounddog -philippe -thunderb -marino13 -handyman -cerberus -gamecock -magician -preacher -chrysler -contains -hedgehog -hoosiers -dutchess -wareagle -ihateyou -sunflowe -senators -terminal -laurence -maradona -america1 -chicken1 -passpass -r2d2c3po -myxworld -missouri -wishbone -infiniti -wonderboy -stanford -smeghead -titanium -charlene -fishing1 -fullmoon -absolute -seinfeld -pingpong -matthews -recovery -babyface -gladiato -paranoid -packers1 -longjohn -clarinet -mortimer -modelsne -vladimir -together -avalanch -55bgates -cccccccc -paradigm -operator -valencia -cocksuck -creature -borussia -browning -heritage -millions -starcraf -spaceman -chester1 -rrrrrrrr -sandwich -magazine -buttfuck -yeahbaby -11235813 -bangbang -charles1 -ffffffff -doberman -overkill -claymore -brewster -electron -eastside -minimoni -wildbill -wildcard -yyyyyyyy -sweetnes -skywalker -alphabet -babybaby -graphics -florida1 -flexible -fuckinside -ursitesux -christma -wwwwwwww -just4fun -rebecca1 -adrienne -19691969 -silverad -rhiannon -10101010 -ashleigh -qwerasdf -presiden -newyork1 -brigitte -buddyboy -heineken -millwall -beautifu -sinister -smashing -teddybea -ticklish -lipstick -reynolds -applepie -digital1 -dinosaur -icehouse -insanity -bluefish -strength -sentnece -temppass -medicine -hahahaha -casanova -fountain -dolphin1 -porsche1 -vampires -highheel -kkkkkkkk -illinois -21212121 -stonecold -testpass -jiggaman -federico -scorpio1 -rt6ytere -madison1 -coolness -christina -coldbeer -brittney -washingt -stephanie -shepherd -tiffany1 -mephisto -dragonba -nygiants -password2 -corleone -kittykat -vikings1 -splinter -pipeline -meowmeow -chestnut -longdong -quant4307s -eastwood -moonligh -illusion -jayhawks -swingers -stefanie -jefferso -michael2 -fastball -scrabble -dirtbike -customer -nemrac58 -bobdylan -hopeless -kcj9wx5n -killbill -volkswag -windmill -iloveyou1 -starligh -soulmate -mcdonald -rochelle -oblivion -valkyrie -concorde -costello -delaware -nocturne -herewego -earnhard -eeeeeeee -mobydick -reddevil -reckless -radiohea -coolcool -classics -choochoo -wireless -bigblock -summer99 -sexysexy -platypus -telephon -12qwaszx -fishhead -paramedi -lonesome -katherin -moonbeam -monster1 -monkeybo -windsurf -31415926 -sebastian -smoothie -snowflak -playstat -playboy1 -roadster -hardware -captain1 -undertak -uuuuuuuu -criminal -1a2b3c4d -thedoors -annabell -catwoman -faithful -farscape -genesis1 -pumpkins -training -islander -jamesbond -19841984 -shitface -maxwell1 -armstron -alejandr -augustus -care1839 -fantasia -freefall -sandrine -qwerqwer -crystal1 -nineinch -broncos1 -winston1 -warrior1 -iiiiiiii -iloveyou2 -straight -specialk -tinkerbe -jellybea -cbr900rr -gabriell -gertrude -glennwei -sausages -vanguard -trinitro -eldorado -whiskers -wildwood -istheman -interest -25802580 -woodland -strawber -amsterdam -catherine -football1 -vancouve -vauxhall -acidburn -myspace1 -buttercu -minemine -bigpoppa -blackout -blowfish -talisman -sundevil -shanghai -spencer1 -slowhand -jonathon -michaels -resident -redbaron -andromed -harddick -5wr2i7h8 -charlotte -fredrick -francesc -ferguson -fairlane -dogpound -pornporn -clippers -daylight -nnnnnnnn -budapest -whistler -whatwhat -wanderer -idontkno -thisisit -robotics -gonzalez -drummer1 -private1 -cornwall -christopher -corvet07 -iverson3 -bluesman -terminat -johnson1 -bastards -fuckoff1 -doomsday -pornking -bookworm -highbury -mischief -ministry -bigbooty -yogibear -september -lkjhgfds -123123123 -carpedie -foxylady -gatorade -valdepen -deadpool -hotmail1 -kordell1 -vvvvvvvv -jackson5 -bergkamp -zanzibar -services -sheridan -checkers -luv2epus -rainbow6 -qwerty123 -commande -nightwin -hotmail0 -enternow -viewsoni -berkeley -woodstoc -starstar -patience -hawaii50 -gorgeous -challeng -callisto -firewall -firefire -passmast -transfer -clarissa -moonshin -jakejake -bluejays -southpark -tomahawk -leedsutd -jermaine -jeepster -josephin -matthias -marriage -antelope -cabernet -cheshire -california -fuckhead -dominion -trucking -nostromo -honolulu -dynamite -mollydog -windows1 -washburn -vincent1 -irishman -bearcats -sylveste -marijuan -reddwarf -12312312 -hardball -goldfing -chambers -fandango -festival -scrapper -cromwell -entrance -klondike -mohammed -insomnia -24682468 -24242424 -billbill -blessing -solitude -pimpdadd -johndeer -babylove -barbados -carpente -fishbone -fireblad -scissors -screamer -obsidian -progress -tottenham -comanche -monsters -veronika -20202020 -blueball -yankees2 -wrestler -sealteam -sidekick -smackdow -sporting -remingto -arkansas -andersen -barcelona -baltimor -fortress -fishfish -firefigh -rsalinas -dontknow -universa -heinrich -enforcer -katherine -waterboy -23skidoo -zildjian -stoppedby -sexybabe -speakers -polopolo -perfect1 -thrasher -lakeside -masamune -cherries -chipmunk -cezer121 -carnival -fearless -funstuff -salasana -pantera1 -qwert123 -creation -nascar24 -estrella -erection -ericsson -internal -1michael -19781978 -25252525 -sheepdog -snowbird -toriamos -tennesse -mazdarx7 -revolver -babycake -hallowee -cannabis -dolemite -dodgers1 -painting -coventry -christmas -cocksucker -hotgirls -eggplant -mustang6 -monkey12 -wapapapa -volleyba -birthday4 -stephen1 -suburban -soccer10 -something -starcraft -soccer12 -plastics -penthous -peterbil -lakewood -reginald -goodgirl -gotyoass -capricor -getmoney -godfather -gilligan -dudedude -pasadena -opendoor -magellan -printing -pressure -killkill -whiteboy -voyager1 -jackjack -success1 -spongebo -phialpha -password9 -tickling -lexingky -redheads -apple123 -backbone -aviation -green123 -carlitos -cartman1 -camaross -favorite6 -ginscoot -sabrina1 -devil666 -doughnut -paintball -rainbow1 -umbrella -abc12345 -complete -deerhunt -darklord -holidays -hetfield -hillbill -hugetits -evolutio -whiplash -wg8e3wjf -istanbul -bluebell -wrestling -superior -suckdick -stephane -playball -marcello -marjorie -rockwell -baritone -gladiator -cricket1 -clemente -exchange -kisskiss -kristian -montecar -mississi -washington -20012001 -bigdick1 -penguin1 -pathfind -testibil -lightning -lighting -republic -anthony7 -goldeney -cameron1 -freefree -screwyou -passthie -postov1000 -puppydog -a1234567 -cleopatr -contract -buffalo1 -bordeaux -sunlight -sprinter -peaches1 -pinetree -theforce -jupiter1 -mckenzie -annmarie -austin31 -78945612 -calimero -chevrolet -favorite -fellatio -f00tball -francine -gateway2 -gamecube -giovanna -scheisse -offshore -macaroni -pringles -trouble1 -coolhand -colonial -darthvad -cygnusx1 -natalie1 -eighteen -elcamino -blueberr -yamahar1 -stafford -snowboard -speedway -playboy2 -toonarmy -mariposa -baberuth -gonzales -chiquita -charisma -capslock -cashmone -gizmodo1 -dragonfl -rachelle -tropical -crescent -nathanie -espresso -kikimora -20002000 -birthday1 -beatles1 -bigdicks -beethove -blacklab -woodwork -survivor -pinnacle -lemonade -lalakers -lebowski -lalalala -mercury1 -rocknrol -riversid -11112222 -alleycat -ambrosia -australia -hattrick -cassandr -charlie123 -fighting -gabriela -outoutout -pussy123 -randolph -coldplay -novifarm -notredam -honeybee -wednesda -waterfal -billabon -zachary1 -01234567 -superstar -stiletto -sigmachi -somerset -smithers -playmate -pinkfloyd -laetitia -revoluti -archange -handball -chewbacc -fullback -dominiqu -mandrake -vagabond -csfbr5yy -deadspin -ncc74656 -houston1 -hurricane -horseman -virginie -idontknow -151nxjmt -bendover -surprise -supernov -phantom1 -playoffs -johngalt -maserati -riffraff -architec -cambridg -foreplay -sanity72 -salesman -dreaming -palmtree -luckyone -treefrog -usmarine -darkange -cyclones -bubba123 -building -eclipse1 -kayleigh -mustang2 -bigtruck -yeahyeah -stickman -skipper1 -singapor -southpaw -slamdunk -therock1 -tiger123 -mccarthy -13576479 -greywolf -candyass -catfight -frankie1 -qazwsxedc -pregnant -death666 -negative -hooligan -everlast -mulligan -motocros -waterman -inspiron -bigblack -zaq1xsw2 -yy5rbfsc -takehana -skydiver -special1 -slimshad -sopranos -patches1 -thething -mash4077 -matchbox -14789632 -amethyst -baseball1 -greenman -goofball -castillo -capitals -favorite2 -forsaken -feelgood -gfxqx686 -dilbert1 -dukeduke -downhill -longhair -lockdown -mamacita -rainyday -pumpkin1 -prospect -rainbows -trinity1 -trooper1 -citation -bukowski -bubbles1 -humphrey -kcchiefs -morticia -montrose -154ugeiu -year2005 -wonderfu -tampabay -slapnuts -spartan1 -sprocket -sometime -stanley1 -thinking -lavalamp -laserjet -jediknig -mazda626 -alexandra -hairball -graduate -cartoons -cashflow -outsider -mallrats -primetime21 -valleywa -abcdefg1 -natedogg -nineball -normandy -nicetits -buddy123 -highlife -earthlin -eatmenow -kirkland -money123 -warhamme -instinct -jackass1 -20spanks -blackjack -085tzzqi -383pdjvl -sparhawk -pavement -johnston -material -melanie1 -redlight -aolsucks -alexalex -b929ezzh -goodyear -griffith -863abgsg -carebear -checkmat -forgetit -rushmore -question -ptfe3xxp -prophecy -aircraft -access99 -cocktail -civilwar -cleveland -claudia1 -dapzu455 -daisydog -eldiablo -kingrich -mudvayne -vipergts -italiano -innocent -yqlgr667 -zxcvbnm1 -suckcock -stephens -380zliki -sexylady -sixtynin -sleeping -sparkles -letsdoit -landmark -marauder -register -basebal1 -azertyui -hawkwind -capetown -flathead -fisherma -flipmode -gabriel1 -dreamcas -dirtydog -dickdick -destiny1 -trumpet1 -aaaaaaa1 -conquest -creepers -constant -cornhole -nirvana1 -elisabet -musician -milamber -isacs155 -1million -1letmein -stonewal -sexsexsex -sonysony -smirnoff -pentagon -paulpaul -lighthou -letmein22 -letmesee -merchant -redstorm -14141414 -allison1 -basement -hartford -hardwood -fatluvr69 -fidelity -feathers -gogators -general1 -dragon69 -dragonball -papillon -optimist -longshot -undertow -copenhag -delldell -culinary -ibilltes -hihje863 -envelope -express1 -mustang5 -wellingt -waterski -infinite -iloveyou! -063dyjuy -survival -stockton -softtail -slimed123 -pizzaman -pathetic -tigercat -jennings -rootedit -riverrat -atreides -happines -chadwick -ffvdj474 -foreskin -gameover -scoobydoo -saxophon -macintos -lollypop -qwertzui -adelaide -acapulco -cybersex -davecole -davedave -nineteen -highlander -kristin1 -knuckles -katarina -montana1 -wingchun -watching -illmatic -bigpenis -blue1234 -xxxxxxx1 -svetlana -368ejhih -playstation -pescator -jo9k2jw2 -jupiter2 -jurassic -marines1 -14725836 -12345679 -alessand -angelika -alpha123 -barefeet -badabing -gsxr1000 -gregory1 -766rglqy -69camaro -calendar -fishcake -giuseppe -gnasher23 -fuzzball -save13tx -russell1 -dripping -dragon12 -dragster -mainland -poophead -porn4life -producer -rapunzel -velocity -vanessa1 -trueblue -vampire1 -navyseal -nightowl -nonenone -nightmar -bulletin -hillside -hzze929b -hellohel -edgewise -embalmer -excalibur -mounta1n -muffdive -vivitron -winfield -wednesday -17171717 -17011701 -tangerin -stewart1 -summer69 -sweetness -surveyor -stirling -ssptx452 -thriller -master12 -anastasi -almighty -argentin -flanders -flyers88 -firehawk -flashman -godspeed -giveitup -funtimes -frenchie -disaster -lovelife -qcmfd454 -undertaker -911turbo -cristian -daughter -notebook -borabora -brisbane -mohammad -bettyboo -blackice -yvtte545 -tailgate -shitshit -sooners1 -smartass -pennywis -thetruth -reindeer -allstate -greatest -caldwell -fussball -geneviev -samadams -dipstick -losangel -loverman -pussy4me -university -troubles -churchil -crazyman -cutiepie -bullwink -bulldawg -horsemen -escalade -minnesot -moonlight -mwq6qlzo -verygood -bellagio -sickness -skeeter1 -phaedrus -thumper1 -tmjxn151 -thematri -letmeinn -jeffjeff -johnmish -11001001 -allnight -amatuers -attorney -happyman -graywolf -474jdvff -551scasi -fishtank -freewill -glendale -frogfrog -gerhardt -scirocco -devilman -pallmall -lunchbox -manhatta -mandarin -pxx3eftp -president -chris123 -daedalus -natasha1 -nancy123 -nevermin -newcastle -edmonton -monterey -violator -wildstar -winter99 -iqzzt580 -19741974 -1q2w3e4r5t -bigbucks -blackcoc -yesterda -skinhead -shadow12 -snapshot -soccer11 -pleasant -pimpdaddy -lionhear -littlema -lincoln1 -laughing -redshift -12locked -arizona1 -alfarome -hawthorn -goodfell -554uzpad -flipflop -garrison -rustydog -sandberg -samsung1 -dreamer1 -detectiv -dominick -paladin1 -papabear -panasonic -nyyankee -pussyeat -princeto -climbing -dad2ownu -daredevi -necklace -huskers1 -hornyman -england1 -motherfucker -ilovegod -201jedlz -wrinkle5 -zoomzoom -09876543 -starlite -peternorth -jeepjeep -joystick -junkmail -jojojojo -rockrock -rasta220 -andyandy -auckland -gooseman -happydog -charlie2 -cardinals -fortune12 -generals -division -ozlq6qwm -macgyver -mallorca -prelude1 -trousers -aerosmit -clueless -delpiero -nounours -buckaroo -honeydew -hooters1 -hugohugo -evangeli \ No newline at end of file diff --git a/lib/common_passwords/short-common-passwords.txt b/lib/common_passwords/short-common-passwords.txt deleted file mode 100644 index d6f602362c..0000000000 --- a/lib/common_passwords/short-common-passwords.txt +++ /dev/null @@ -1,7914 +0,0 @@ -123456 -1234 -qwerty -12345 -dragon -pussy -letmein -monkey -696969 -abc123 -mustang -michael -shadow -master -111111 -2000 -jordan -harley -1234567 -fuckme -hunter -fuckyou -ranger -buster -thomas -tigger -robert -soccer -fuck -batman -test -pass -killer -hockey -george -charlie -andrew -love -jessica -asshole -6969 -pepper -daniel -access -654321 -joshua -maggie -silver -william -dallas -yankees -123123 -ashley -666666 -hello -amanda -orange -biteme -freedom -sexy -thunder -nicole -ginger -heather -hammer -summer -taylor -fucker -austin -1111 -merlin -matthew -121212 -golfer -cheese -martin -chelsea -patrick -richard -diamond -yellow -bigdog -secret -asdfgh -sparky -cowboy -camaro -anthony -matrix -falcon -bailey -guitar -jackson -purple -scooter -phoenix -aaaaaa -morgan -tigers -porsche -mickey -cookie -nascar -peanut -justin -131313 -money -horny -panties -joseph -snoopy -boomer -iceman -smokey -gateway -dakota -cowboys -eagles -chicken -dick -black -zxcvbn -please -andrea -ferrari -knight -melissa -compaq -coffee -booboo -bitch -johnny -bulldog -xxxxxx -welcome -james -player -ncc1701 -wizard -scooby -charles -junior -bigdick -mike -brandy -tennis -blowjob -banana -monster -spider -lakers -miller -rabbit -enter -brandon -steven -fender -john -yamaha -diablo -chris -boston -tiger -marine -chicago -rangers -gandalf -winter -bigtits -barney -edward -raiders -porn -badboy -blowme -spanky -johnson -chester -london -blue -fishing -000000 -hannah -slayer -rachel -sexsex -redsox -thx1138 -asdf -panther -zxcvbnm -arsenal -oliver -qazwsx -mother -7777777 -jasper -angel -david -winner -crystal -golden -viking -jack -iwantu -shannon -murphy -angels -prince -cameron -girls -madison -wilson -carlos -hooters -willie -captain -maddog -jasmine -butter -booger -angela -golf -lauren -rocket -tiffany -theman -dennis -flower -forever -green -jackie -muffin -turtle -sophie -toyota -jason -sierra -winston -debbie -giants -packers -newyork -jeremy -casper -bubba -112233 -sandra -lovers -united -cooper -driver -tucker -helpme -fucking -pookie -lucky -maxwell -8675309 -bear -suckit -gators -5150 -222222 -fuckoff -jaguar -monica -fred -happy -hotdog -tits -gemini -lover -777777 -canada -nathan -victor -florida -rosebud -doctor -trouble -success -stupid -tomcat -warrior -peaches -apples -fish -magic -buddy -rainbow -gunner -987654 -freddy -alexis -braves -cock -2112 -1212 -xavier -dolphin -testing -bond007 -member -calvin -voodoo -7777 -samson -alex -apollo -fire -tester -walter -beavis -voyager -peter -porno -bonnie -beer -apple -scorpio -skippy -sydney -scott -red123 -power -gordon -travis -beaver -star -jackass -flyers -boobs -232323 -zzzzzz -steve -rebecca -doggie -legend -ou812 -yankee -blazer -bill -runner -birdie -bitches -555555 -parker -topgun -heaven -viper -animal -2222 -bigboy -4444 -arthur -baby -private -donald -phantom -dave -rock -august -sammy -cool -brian -jake -bronco -paul -mark -frank -heka6w2 -copper -billy -cumshot -willow -cunt -little -carter -slut -albert -kitten -super -eagle1 -shelby -america -11111 -jessie -house -free -123321 -chevy -white -broncos -horney -surfer -nissan -999999 -saturn -marvin -shit -action -adidas -qwert -kevin -1313 -walker -police -wolf -sweet -therock -king -online -teresa -cricket -sharon -dexter -racing -penis -gregory -0000 -teens -dreams -hentai -magnum -nothing -donkey -trinity -digital -333333 -stella -cartman -123abc -speedy -buffalo -kitty -pimpin -eagle -kelly -nelson -nirvana -vampire -xxxx -playboy -louise -pumpkin -test123 -girl -sucker -mexico -beatles -fantasy -ford -gibson -celtic -marcus -cherry -cassie -888888 -natasha -sniper -chance -genesis -hotrod -reddog -college -jester -bigcock -smith -carmen -3333 -death -1q2w3e -eclipse -stanley -samuel -drummer -homer -montana -music -aaaa -spencer -jimmy -hello1 -rocky -goober -friday -scotty -abcdef -bubbles -hawaii -fluffy -mine -stephen -horses -thumper -5555 -pussies -pamela -boobies -buddha -vanessa -sandman -naughty -douglas -honda -matt -azerty -6666 -shorty -money1 -beach -loveme -4321 -simple -444444 -badass -destiny -sarah -denise -vikings -lizard -melanie -assman -sabrina -water -good -howard -time -123qwe -xxxxx -october -leather -bastard -young -101010 -extreme -hard -vincent -pussy1 -hotmail -spooky -amateur -alaska -badger -poop -crazy -mozart -video -russell -vagina -norman -eric -cougar -barbara -long -420420 -family -horse -enigma -allison -raider -brazil -blonde -jones -55555 -dude -jeff -school -lovely -jeffrey -booty -molly -leslie -nipples -diesel -rocks -eminem -suzuki -daddy -passion -hummer -ladies -zachary -frankie -elvis -reggie -alpha -suckme -simpson -147147 -pirate -tommy -jupiter -redrum -wanker -stinky -ducati -paris -natalie -bishop -windows -spirit -pantera -monday -patches -brutus -houston -smooth -penguin -marley -forest -cream -212121 -flash -maximus -nipple -bobby -bradley -vision -pokemon -fireman -indian -picard -system -clinton -cobra -enjoy -lucky1 -claire -claudia -boogie -timothy -marines -dirty -admin -pimp -dancer -hardon -fucked -abcdefg -ironman -great -bigred -squirt -justice -francis -hobbes -kermit -mercury -domino -9999 -denver -brooke -rascal -hitman -simon -tony -bbbbbb -friend -naked -sluts -saints -bondage -bigman -zombie -duke -qwerty1 -babes -disney -rooster -brenda -mookie -candy -duncan -olivia -hunting -alicia -8888 -samsung -bubba1 -whore -general -erotic -liberty -arizona -jesus -abcd -newport -skipper -balls -happy1 -galore -christ -weasel -242424 -wombat -digger -classic -poopoo -accord -popcorn -turkey -jenny -amber -bunny -mouse -007007 -titanic -dreamer -everton -friends -carrie -gabriel -psycho -nemesis -burton -pontiac -connor -eatme -lickme -roland -cumming -ireland -lincoln -arnold -goblue -devils -eugene -empire -asdfg -brown -shaggy -froggy -qwer -kodiak -people -phpbb -light -54321 -kramer -chopper -hooker -honey -whynot -lesbian -lisa -baxter -adam -snake -teen -qqqqqq -britney -avalon -sandy -sugar -sublime -stewart -wildcat -raven -123654 -trucks -pervert -raymond -redhead -alyssa -bambam -movie -woody -shaved -snowman -tiger1 -chicks -raptor -1969 -shooter -france -stars -madmax -kristen -sports -jerry -789456 -garcia -lights -ryan -looking -chronic -alison -hahaha -packard -hendrix -perfect -service -spring -spike -katie -252525 -oscar -brother -bigmac -suck -single -cannon -georgia -popeye -tattoo -texas -party -bullet -taurus -sailor -wolves -japan -strike -flowers -chris1 -berlin -sticky -marina -fisher -russia -connie -mature -bass -catch22 -juice -nigger -159753 -women -alpha1 -trooper -hawkeye -head -freaky -dodgers -machine -pyramid -vegeta -katana -moose -tinker -coyote -inside -pepsi -bang -control -morris -james1 -tickle -outlaw -browns -pickle -test1 -michele -antonio -sucks -caesar -prelude -tanner -adrian -bowling -wutang -sunset -robbie -alabama -danger -juan -rusty -pppppp -nick -2001 -ping -madonna -qwe123 -bigone -casino -cheryl -mmmmmm -integra -apache -tweety -simone -none -trevor -transam -dustin -harvey -england -2323 -seattle -ssssss -rose -harry -openup -pandora -pussys -trucker -wallace -indigo -storm -malibu -weed -review -doggy -dilbert -pegasus -joker -catfish -flipper -valerie -herman -fuckit -detroit -kenneth -bruins -stacey -smoke -joey -seven -marino -fetish -xfiles -wonder -stinger -pizza -babe -pretty -stealth -manutd -gracie -gundam -cessna -mnbvcxz -wicked -victory -shelly -awesome -athena -help -holiday -knicks -street -redneck -casey -gizmo -scully -dragon1 -triumph -eddie -shotgun -peewee -ronnie -angel1 -daisy -special -madman -country -impala -lennon -roscoe -omega -miranda -search -smitty -unicorn -tight -rick -ronald -trigger -truck -danny -home -winnie -beauty -castle -tyler -bobcat -buddy1 -sunny -stones -asian -freddie -chuck -butt -loveyou -norton -hotsex -indiana -short -panzer -trumpet -colors -blaster -logan -aaron -elaine -jungle -atlanta -gold -corona -curtis -nikki -polaris -timber -theone -baller -chipper -orlando -island -skyline -dragons -dogs -benson -licker -goldie -kong -pencil -open -hornet -world -linda -barbie -chan -farmer -indians -larry -redman -foobar -travel -bernie -target -141414 -photos -laura -savage -holly -rocky1 -dollar -turbo -design -newton -hottie -moon -202020 -blondes -4128 -lestat -avatar -future -goforit -random -abgrtyu -jjjjjj -cancer -q1w2e3 -smiley -express -virgin -zipper -stone -andy -babylon -dong -powers -dudley -monkey1 -samurai -skeeter -lindsay -joejoe -master1 -aaaaa -tang -alfred -ball -maria -sexual -maxima -sampson -buckeye -kristin -reaper -bassman -nugget -lucifer -nasty -watson -warlock -2121 -philip -always -dodge -chrissy -burger -bird -snatch -missy -pink -gang -maddie -holmes -huskers -piglet -photo -joanne -dodger -paladin -christy -chubby -hamlet -bigfoot -sunday -manson -garden -blondie -spartan -julie -harold -charger -brandi -stormy -sherry -rodney -galaxy -holland -escort -zxcvb -planet -jerome -wesley -blues -song -peace -david1 -1966 -gambit -karen -sidney -ripper -oicu812 -jamie -sister -marie -martha -nylons -nadine -minnie -whiskey -bing -plastic -anal -chang -loser -racecar -insane -mememe -hansolo -chiefs -freak -frog -salmon -yvonne -zxcv -warren -julian -mariah -rommel -1010 -harris -sylvia -massive -cats -sammy1 -mister -stud -rubber -ding -trunks -desire -justme -faster -irish -1999 -bertha -alpine -sammie -tristan -00000 -swinger -shan -pitbull -roberto -ready -april -palmer -ming -shadow1 -audrey -chong -wang -shirley -fuckers -jackoff -bluesky -151515 -bernard -wolfman -soldier -picture -pierre -ling -goddess -manager -nikita -sweety -titans -hang -fang -ficken -niners -bottom -bubble -ibanez -webster -323232 -tornado -lindsey -content -bruce -buck -aragorn -griffin -chen -trojan -newman -wayne -tina -father -pascal -crimson -brooks -hector -penny -anna -google -camera -fatcat -cody -cunts -waters -stimpy -finger -cindy -wheels -viper1 -latin -robin -brendan -hiphop -willy -snapper -funtime -duck -adult -cotton -cookies -kaiser -mulder -westham -latino -jeep -ravens -aurora -drizzt -madness -energy -kinky -314159 -sophia -stefan -slick -rocker -freeman -french -speed -dddddd -hong -henry -hungry -yang -catdog -cheng -ghost -gogogo -randy -curious -mission -january -singer -sherman -shark -techno -lancer -lalala -autumn -chichi -orion -trixie -delta -bobbob -bomber -holden -kang -kiss -1968 -spunky -liquid -mary -beagle -granny -network -bond -kkkkkk -millie -1973 -biggie -beetle -teacher -susan -toronto -anakin -genius -dream -cocks -dang -bush -karate -snakes -bangkok -callie -pacific -daytona -kelsey -foster -felix -sailing -huang -herbert -jacob -blackie -tarzan -strider -lang -gong -sang -tree -shai -sprite -ting -artist -chai -chao -devil -python -ninja -misty -ytrewq -sweetie -456789 -tian -jing -jesus1 -dian -potter -chou -darren -hobbit -violet -yong -shen -phillip -maurice -gloria -nolimit -mylove -biscuit -yahoo -shasta -sex4me -smoker -smile -pebbles -pics -philly -tong -tintin -marlin -cactus -frank1 -tttttt -chun -danni -emerald -showme -pirates -lian -dogg -colleen -xiao -xian -tazman -tanker -patton -toshiba -richie -alberto -gotcha -graham -dillon -rang -emily -keng -jazz -bigguy -yuan -woman -tomtom -marion -greg -chaos -fossil -flight -racerx -tuan -creamy -boss -bobo -window -blade -shuang -sheila -shun -lick -jian -rong -allen -feng -getsome -sally -quality -kennedy -1977 -beng -wwwwww -yoyoyo -zhang -seng -teddy -joanna -andreas -harder -luke -qazxsw -qian -cong -chuan -deng -nang -boeing -keeper -western -1963 -subaru -sheng -teng -jiong -miao -martina -mang -maniac -pussie -tracey -a1b2c3 -clayton -zhou -zhuang -xing -snow -spyder -liang -jiang -memphis -regina -ceng -magic1 -chuang -dark -million -blow -sesame -shao -poison -titty -terry -kuan -kuai -kyle -mian -guan -hamster -guai -ferret -geng -duan -pang -maiden -quan -velvet -nong -neng -nookie -buttons -bian -bingo -biao -zhong -zeng -xiong -zhun -ying -zong -xuan -zang -0.0.000 -suan -shei -shui -sharks -shang -shua -small -peng -pian -piao -liao -meng -miami -reng -guang -cang -change -ruan -diao -luan -lucas -qing -chui -chuo -cuan -nuan -ning -heng -huan -kansas -muscle -monroe -weng -whitney -zhui -zhua -xiang -zheng -zhen -zhei -zhao -zhan -yomama -zhai -zhuo -zuan -tarheel -shou -shuo -tiao -lady -leonard -leng -kuang -jiao -13579 -basket -qiao -qiong -qiang -chuai -nian -niao -niang -huai -bianca -zhuan -zhuai -shuan -shuai -jumper -archie -forget -qwertz -bones -history -milton -2002 -stuff -office -oldman -preston -trains -murray -vertigo -246810 -black1 -swallow -smiles -parrot -luther -user -nicolas -1976 -surfing -pioneer -pete -masters -apple1 -asdasd -auburn -panama -lucy -buffy -brianna -vette -blue22 -shemale -111222 -baggins -groovy -global -turner -181818 -1979 -blades -life -byteme -lobster -collins -dawg -hilton -1970 -1964 -2424 -polo -markus -coco -deedee -mikey -1972 -171717 -1701 -strip -jersey -green1 -capital -sasha -sadie -putter -vader -seven7 -lester -marcel -banshee -grendel -gilbert -dicks -dead -hidden -iloveu -1980 -sound -ledzep -michel -147258 -female -bugger -buffett -bryan -hell -molson -2020 -wookie -sprint -thanks -jericho -102030 -grace -fuckin -mandy -ranger1 -trebor -molly1 -mirage -models -1984 -2468 -stuart -pentium -mario -anime -gator -powder -twister -connect -neptune -bruno -butts -engine -eatshit -woody1 -shogun -pooh -jimbo -roger -annie -bacon -center -russian -sabine -damien -mollie -voyeur -2525 -363636 -camel -chair -germany -giant -qqqq -nudist -bone -sleepy -tequila -megan -fighter -garrett -dominic -obiwan -walnut -1974 -ladybug -cantona -ccbill -satan -rusty1 -dusty -kissme -1967 -zzzz -skater -smut -play -valley -coolio -dagger -boner -bull -horndog -jason1 -blake -rescue -griffey -champs -queen -colt45 -boat -xxxxxxx -xanadu -tacoma -mason -carpet -gggggg -safety -palace -italia -stevie -picturs -picasso -thongs -tempest -ricardo -roberts -asd123 -hairy -foxtrot -gary -nimrod -hotboy -343434 -1111111 -goose -blood -wood -454545 -shaolin -sooners -peanuts -maxine -rogers -andrew1 -filthy -donnie -ohyeah -africa -kenny -keith -monique -jasmin -pickles -assass -fright -potato -darwin -hhhhhh -kingdom -weezer -424242 -pepsi1 -throat -romeo -gerard -looker -puppy -butch -monika -suzanne -sweets -temple -laurie -josh -analsex -nymets -ddddddd -support -stick -today -down -oakland -oooooo -qweasd -chucky -bridge -carrot -dookie -condor -night -butler -hoover -horny1 -sunrise -sinner -jojo -martini -assfuck -ffffff -abigail -esther -janice -jamaica -wright -sims -space -there -timmy -7654321 -77777 -cccccc -gizmodo -roxanne -ralph -tractor -dance -mypass -helena -1975 -blue123 -pissing -thomas1 -redred -rich -attack -cash -drunk -dixie -dublin -bollox -katrina -miles -1971 -22222 -272727 -sexx -bbbb -battle -grizzly -passat -porter -tracy -defiant -bowler -monitor -wisdom -wild -slappy -thor -letsgo -robert1 -feet -rush -brownie -hudson -098765 -playing -melvin -atomic -bart -hawk -goku -glory -llllll -qwaszx -cosmos -bosco -knights -bentley -beast -lewis -assword -frosty -gillian -sara -dumbass -mallard -dddd -deanna -elwood -wally -159357 -angelo -aussie -guest -golfing -doobie -loveit -chloe -elliott -vipers -janine -1965 -blabla -surf -sucking -tardis -serena -shelley -thegame -legion -rebels -fast -gerald -sarah1 -double -onelove -loulou -toto -crash -0007 -soccer1 -jedi -manuel -method -river -chase -ludwig -poopie -derrick -boob -breast -isabel -belly -pikachu -jose -celeste -celtics -frances -frogger -sabbath -budman -willis -jackal -bigger -zzzzz -silvia -sooner -licking -gopher -geheim -primus -pooper -newpass -brasil -husker -element -moomoo -tammy -shitty -smokin -jjjj -anubis -backup -gorilla -painter -traffic -claude -daniela -dale -delta1 -nancy -boys -easy -kissing -kelley -wendy -theresa -amazon -alan -fatass -malcolm -breasts -boots -honda1 -spidey -poker -temp -miguel -147852 -archer -dogdog -tricky -weather -spankme -speaker -amadeus -back -harley1 -falcons -dorothy -kenwood -1978 -shazam -shalom -lickit -jimbob -roller -carson -check -fatman -funny -garbage -loving -magnus -clover -mobile -bell -payton -plumber -texas1 -tool -topper -jenna -rebel -harmony -celica -german -diana -oxford -osiris -orgasm -punkin -tuesday -close -breeze -bossman -billie -latinas -judith -astros -scruffy -donna -qwertyu -davis -hearts -kathy -jammer -java -rhonda -ricky -1122 -flyboy -doodle -city -bootie -kicker -vulcan -iverson -191919 -stoner -321321 -farside -rugby -pussy69 -power1 -bobbie -hershey -hermes -west -birdman -blessed -thumbs -lawyer -melinda -fingers -rrrrrr -coke -nicola -bohica -heart -elvis1 -kids -blacky -stories -snake1 -phoebe -jesse -fisting -scarlet -dildo -pancho -lucky7 -condom -summer1 -student -sword -skiing -sergio -site -sony -thong -cassidy -fffff -fitness -durango -postal -dawn -dylan -kisses -imagine -topdog -asterix -hallo -bridget -eeeeee -mouth -weird -will -sommer -toby -theking -juliet -avenger -goodbye -faith -trance -brad -houses -homers -kingpin -incubus -1961 -blond -zaphod -shiloh -spurs -station -jennie -maynard -mighty -aliens -hank -charly -running -dogman -omega1 -printer -aggies -hope -javier -bitch1 -stone55 -thekid -lizzie -rockets -ashton -camels -formula -forrest -oracle -rain -pussey -abcde -clancy -nellie -mystic -inferno -steve1 -pauline -alice -alfa -grumpy -flames -scream -lonely -puffy -proxy -unreal -cynthia -herbie -engage -yyyyyy -010101 -solomon -pistol -melody -celeb -flying -gggg -scottie -oakley -a12345 -newbie -mmmm -venus -beverly -zorro -work -writer -spread -phil -tobias -links -members -metal -1221 -andre -565656 -funfun -trojans -again -cyber -moneys -zeus -thing -tomato -lion -celine -usa123 -trans -account -aaaaaaa -homerun -kevin1 -blacks -sean -fart -fubar -older -oilers -craig -conrad -church -damian -dean -broken -buster1 -hithere -sticks -pilot -peters -lexmark -jerkoff -anders -cheers -possum -cutter -muppet -stolen -sport -sonic -peter1 -jethro -rockon -asdfghj -pass123 -paper -pornos -bootys -buttman -bonjour -escape -1960 -becky -bears -362436 -tinman -lemons -maxmax -1414 -bbbbb -camelot -chad -chewie -gogo -fusion -saint -nopass -myself -hustler -hunter1 -whitey -beast1 -yesyes -spank -smudge -patriot -lespaul -annette -hammers -finish -sausage -orioles -oscar1 -over -cramps -natural -eating -exotic -iguana -bella -suckers -strong -sheena -start -slave -pearl -topcat -magelan -racer -ramona -crunch -british -button -eileen -steph -456123 -skinny -seeking -chief -filter -first -freaks -sakura -pacman -dalton -newlife -homer1 -klingon -watcher -walleye -tasha -tasty -sinatra -steel -poncho -amber1 -gonzo -grover -carol -candle -firefly -goblin -scotch -diver -usmc -huskies -eleven -kitkat -israel -beckham -bicycle -yourmom -studio -tara -shane -splash -jimmy1 -reality -caitlin -focus -mailman -clark -ddddd -hopper -more -wilbur -illini -lansing -maxx -gothic -carlton -camille -facial -vectra -crazy1 -jane -betty -benny -bennett -leader -barkley -hayden -caught -franky -ffff -floyd -sassy -pppp -prodigy -noodle -vortex -wanking -billy1 -siemens -pedro -groups -carolyn -chevy1 -cccc -fritz -dracula -nurses -loco -madrid -trout -utopia -chrono -cooler -conner -nevada -wibble -werner -summit -marco -marilyn -1225 -babies -capone -fugazi -panda -mama -puppies -triton -9876 -command -nnnnnn -ernest -momoney -iforgot -wolfie -studly -shawn -renee -alien -hamburg -81fukkc -741852 -catman -china -forgot -gagging -scott1 -drew -oregon -qweqwe -train -daniel1 -cutlass -holes -heidi -mothers -music1 -what -walrus -1957 -bigtime -bike -xtreme -simba -ssss -rookie -angie -bathing -fresh -sanchez -rotten -maestro -luis -look -turbo1 -99999 -hhhh -elijah -monty -bender -yoda -shania -shock -phish -thecat -reagan -baddog -asia -randall -abstr -napster -brian1 -bogart -high -hitler -emma -kill -weaver -isaiah -1981 -belinda -beaner -yoyo -super1 -select -slutty -some -toon -raven1 -rayray -123789 -1066 -albion -greens -fashion -santana -paint -powell -credit -darling -mystery -bowser -bottle -hehehe -kelly1 -mojo -1998 -bikini -yyyy -strap -sites -spears -julius -amelia -central -f**k -nyjets -vanilla -twisted -bryant -brent -here -erica -kimber -viagra -veritas -pony -pool -titts -labtec -jenny1 -mayhem -redbull -govols -gremlin -505050 -gmoney -rupert -rovers -lorenzo -trident -deskjet -cuddles -nice -bristol -karina -milano -vh5150 -jarhead -1982 -bigbird -bizkit -sixers -slider -star69 -tommy1 -john316 -meghan -market -grant -carl -flicks -films -madden -cosmo -cthulhu -br0d3r -swedish -spawn -polly -these -todd -reds -anarchy -groove -franco -fuckher -oooo -tyrone -vegas -airbus -cobra1 -clips -delete -duster -kitty1 -mouse1 -monkeys -jazzman -1919 -262626 -stroke -stocks -sting -pippen -jordan1 -females -park -vector -cooter -desert -demon -nike -bubbas -bonkers -english -kahuna -wildman -4121 -sirius -static -terror -teenage -leelee -marissa -rated -hailey -chaser -sanders -salsero -nuts -macross -quantum -rachael -tsunami -daddy1 -cruise -nguyen -nudes -vernon -1959 -striker -sixty -steele -spice -smegma -thumb -mellow -astrid -cancun -cartoon -sabres -samiam -pants -oranges -lust -coleman -denali -nude -noodles -buzz -brest -hooter -warthog -bloody -zappa -lance -jean -jjjjj -harper -calico -freee -rover -door -pooter -closeup -bonsai -evelyn -emily1 -kathryn -iiii -1955 -yzerman -theboss -tolkien -jill -megaman -rasta -bean -hal9000 -goofy -gringo -gofish -gizmo1 -samsam -scuba -onlyme -corrado -clown -clapton -deborah -boris -bulls -vivian -jayhawk -bethany -wwww -sharky -seeker -pillow -thesims -lighter -lkjhgf -barry -guiness -gymnast -casey1 -goalie -doug -lolo -poppy -abby -clemson -clipper -nobody -holly1 -elliot -eeee -miriam -belle -sucked -sex123 -sexy69 -pic\'s -lamont -meat -marc -gretzky -frisco -scratch -orchid -orange1 -quincy -dawson -ne1469 -boxing -hill -korn -161616 -1985 -ziggy -stoney -senior -amature -barber -babyboy -goliath -hack -frodo -scout -scrappy -rosie -qazqaz -tracker -active -craving -cohiba -deep -cyclone -dana -bubba69 -katie1 -mpegs -vsegda -jade -irish1 -better -sexy1 -smelly -lions -jokers -julia -jojojo -ashley1 -groucho -cheetah -champ -firefox -packer -love69 -tyler1 -typhoon -tundra -bobby1 -village -volley -beth -wolf359 -0420 -000007 -swimmer -skydive -smokes -patty -peugeot -pompey -legolas -kristy -redhot -rodman -having -grapes -4runner -carrera -floppy -dollars -ou8122 -quattro -adams -cloud9 -davids -nofear -busty -mmmmm -whisper -vermont -wives -jayjay -philips -phone -topher -tongue -midget -ripken -havefun -canon -five -getting -ghetto -direct -otto -usnavy -conover -cruiser -dalshe -nicole1 -buzzard -hottest -misfit -moore -milfnew -warlord -wassup -bigsexy -zippy -shearer -tights -kungfu -labia -journey -marlene -rider -area51 -batman1 -bananas -636363 -cancel -ggggg -paradox -mack -lynn -queens -adults -aikido -cigars -nova -hoosier -eeyore -moose1 -warez -313131 -mayday -rivers -revenge -banker -baddest -ccccc -fortune -aisan -deadman -iscool -1956 -1pussy -womam -sweden -skidoo -spock -sssss -petra -pepper1 -pinhead -micron -allsop -army -aside -gunnar -666999 -chip -foot -fowler -face -fletch -george1 -sapper -science -sasha1 -lover1 -magick -popopo -public -ultima -derek -cypress -booker -edwards -vulva -vvvv -jabroni -bigbear -yummy -010203 -searay -secret1 -showing -sinbad -sexxxx -soleil -piccolo -leopard -legacy -jensen -justine -memorex -marisa -mathew -redwing -134679 -anfield -gore -catcat -feather -scanner -danzig -daisy1 -hores -erik -exodus -vinnie -iiiiii -zero -1001 -subway -tank -second -snapple -picks -poodle -their -llll -junebug -june -marker -mellon -ronaldo -amanda1 -asdfjkl -beaches -greene -great1 -force -doitnow -ozzy -radio -tyson -daphne -boxster -emerson -kkkk -mnbvcx -moocow -vides -wagner -janet -1717 -blonds -1000 -storys -stereo -4545 -420247 -lesbean -live -justin1 -124578 -animals -balance -hansen -cabbage -dodge1 -dimas -lori -loud -malaka -puss -probes -adriana -coolman -dante -nacked -erotica -kool -mirror -wearing -bigass -zenith -woohoo -womans -tanya -tango -stacy -pisces -laguna -krystal -maxell -flash1 -orgasms -profit -pusyy -pothead -coconut -chuckie -contact -builder -hotshot -horizon -hole -mondeo -wifes -1962 -strange -stumpy -smiths -sparks -slacker -piper -laptop -allmine -bbbbbbb -asscock -grandma -hayley -88888 -cecilia -chacha -sandy1 -santos -doogie -number -qwert40 -crow -darrell -bonita -ib6ub9 -volvo -jacob1 -iiiii -beastie -stoned -sonics -snapon -pepe -lesbain -litle -retard -ripple -austin1 -badgirl -garage -royals -dragoon -dickie -passwor -ocean -poppop -dammit -nokia -bobobo -br549 -emmitt -knock -minime -1954 -3232 -353535 -seamus -solo -sparkle -sluttey -pictere -titten -lback -1024 -goat -ruby -passme -oasis -logan1 -rainman -twins -club -custom -cyclops -nipper -bucket -hhhhh -momsuck -indain -2345 -bimmer -susanne -stunner -stevens -456456 -shell -sheba -tootsie -tiny -reefer -really -1012 -harcore -gollum -545454 -chico -caveman -carole -fishes -gaymen -saleen -doodoo -looney -presto -qqqqq -cigar -bogey -brewer -helloo -dutch -monte -wasser -vietnam -visa -0123 -swords -slapper -peach -jump -marvel -march -redwood -rolling -1005 -ametuer -chiks -cathy -fucing -sadie1 -mamas -race -rambo -unknown -absolut -deacon -dallas1 -kristi -keywest -kirsten -kipper -morning -wings -idiot -1515 -beating -zxczxc -303030 -shaman -sparrow -jeffery -mick -redfish -1492 -angus -barrett -goirish -felicia -forfun -galary -duchess -olivier -lotus -ramses -purdue -crave -brando -enter1 -killme -welder -windsor -wifey -indon -yyyyy -stretch -taylor1 -4417 -picher -pickup -johnboy -jets -jess -maureen -anne -ameteur -hambone -5050 -charley -sally1 -padres -quest -trader -crack -climber -bolitas -bravo -hohoho -model -italian -beanie -beretta -stroker -tabitha -sexyman -jewels -mets -marcos -rhino -bdsm -goodman -grils -games -route66 -devo -dino -outkast -magpie -critter -cupcake -nickel -krista -mimi -murder -videoes -xerxes -slim -slinky -pinky -meister -menace -ripley -retired -balloon -bank -goten -5551212 -donuts -divorce -lord -lost -tttt -comet -deer -damnit -nasty1 -nonono -nina -eeeee -milkman -vvvvvv -isaac -1818 -blueboy -beans -bigbutt -wyatt -tech -poetry -toolman -laurel -juggalo -jetski -gobears -truman -cubbies -nitram -briana -ebony -kings -warner -bilbo -yumyum -zzzzzzz -stylus -321654 -server -secure -silly -squash -starman -steeler -staples -phrases -laser -135790 -allan -barker -athens -cbr600 -fester -gangsta -fucku2 -freeze -game -droopy -objects -passwd -lllll -loaded -louis -losers -vedder -clit -chunky -darkman -damage -buddah -boobed -henti -hillary -webber -winter1 -ingrid -bigmike -beta -zidane -talon -slave1 -pissoff -person -living -lexus -matador -readers -riley -roberta -armani -ashlee -5656 -cards -fmale -ferris -fuking -gaston -fucku -ggggggg -sauron -diggler -pacers -looser -pounded -premier -pulled -town -trisha -cornell -collin -cosmic -deeper -depeche -norway -bright -helmet -kendall -mustard -misty1 -watch -jagger -bertie -berger -word -3x7pxr -silver1 -smoking -sonny -paula -photoes -lesbens -lambert -lindros -lillian -1357 -143143 -asasas -goodboy -898989 -card -gawker -rubble -rrrr -onetime -trapper -twenty -abraham -cinder -company -boricua -bunny1 -boxer -hotred -hockey1 -hooper -edward1 -evan -kris -misery -moscow -milk -bigtit -show -three -lionel -leanne -joshua1 -july -1230 -cedric -fallen -farley -gene -frisky -sanity -script -divine -dharma -lucky13 -tricia -akira -desiree -hunt -hotbox -hootie -heat -howdy -karma -kiteboy -motley -1988 -bert -biggles -wrench -working -wrestle -pheonix -penny1 -thedude -jenn -jonjon -jones1 -mattie -memory -micheal -arrow -azzer -diehard -dotcom -lola -chivas -clouds -deluxe -nuclear -north -boom -boobie -hurley -krishna -momomo -modles -volume -bluedog -wwwwwww -yousuck -pluto -link -joung -marcia -awnyce -gonavy -haha -fabian -girsl -rufus -drive -a123456 -airport -clay -combat -cygnus -cupoi -never -brett -eagles1 -elite -kendra -mommy -1958 -shonuf -piano -thedog -lips -jillian -jenkins -midway -gromit -787878 -66666 -carmex2 -camber -gator1 -ginger1 -fuzzy -seadoo -dorian -lovesex -rancid -uuuuuu -911911 -nature -helen -health -heater -higgins -kirk -mmmmmmm -virtual -ventura -jamie1 -japanes -2727 -2469 -blam -believe -zephyr -stiffy -sweet1 -silent -spectre -tigger1 -tekken -lenny -lakota -jjjjjjj -medical -1369 -golfer1 -gunners -7779311 -515151 -famous -glass -screen -rudy -royal -sanfran -drake -optimus -love1 -mail -maggie1 -pudding -venice -aaron1 -delphi -niceass -bounce -busted -house1 -killer1 -miracle -momo -musashi -jammin -2003 -234567 -submit -silence -sssssss -state -spikes -sleeper -toledo -kume -media -meme -medusa -mantis -remote -reading -reebok -1017 -artemis -hampton -harry1 -cafc91 -fettish -oceans -mango -ppppp -trainer -troy -uuuu -909090 -cross -death1 -news -hokies -eeeeeee -mitch -& -& -spinner -leon -jockey -records -right -hans -gooner -474747 -cheeks -cars -candice -fight -glow -parola -okokok -pablo -magical -major -ramsey -989898 -circle -crusher -cubswin -nnnn -erin -kotaku -milo -mittens -whatsup -vvvvv -iomega -bengals -bermuda -biit -yellow1 -012345 -spike1 -south -sowhat -pitures -peacock -pecker -theend -jimmie -romance -augusta -castro -florian -dolly -lulu -qaz123 -usarmy -twinkle -cloud -cold -hover -hothot -europa -ernie -kenshin -kojak -mikey1 -water1 -196969 -because -wraith -zebra -wwwww -33333 -simon1 -spider1 -snuffy -teddy1 -lesley -maria1 -redline -renault -aloha -antoine -gobucks -freesex -duffman -ooooo -papa -nuggets -longbow -porno1 -county -dalejr -darius -darlene -dell -navy -buffy1 -honey1 -hott -heyhey -europe -everest -3434 -shag -spoon -sonoma -stalker -poochie -terefon -maryann -marty -roman -1007 -142536 -alibaba -bartman -astro -goth -century -cheater -four -ghost1 -oral -civic -cicero -kkkkk -jameson -1a2b3c -1qwerty -skip -shojou -sparky1 -poiuy -torres -lantern -jelly -jeanne -meier -1213 -bayern -basset -gsxr750 -cattle -gilles -dima -obelix -popo -prissy -ramrod -unique -bummer -hotone -dynasty -entry -konyor -missy1 -moses -282828 -yeah -xyz123 -stop -426hemi -404040 -simmons -lazarus -marine1 -manning -12345a -beamer -greece -gustav -7007 -charity -camilla -ccccccc -faggot -foxy -frozen -duckie -dogfood -radical -tuna -claudio -circus -danny1 -novell -nights -bonbon -kashmir -kiki -moondog -monaco -insert -1953 -zxc123 -supreme -3131 -sexxx -selena -softail -poipoi -pong -mars -martin1 -rogue -alone -audia4 -chick -came11 -figaro -geneva -dogboy -dnsadm -dipshit -othello -officer -malone -post -rafael -tripod -choice -chopin -coucou -coach -common -book -hiziad -homerj -eight -earth -mullet -whisky -jacques -store -4242 -speedo -skylar -piggy -pierce -tiger2 -legos -lala -jezebel -judy -joker1 -mazda -barton -baker -727272 -fishman -food -dundee -lumber -radar -ppppppp -tranny -aaliyah -admiral -comics -cleo -delight -homeboy -eternal -kilroy -kellie -khan -violin -wingman -walmart -bigblue -blaze -beemer -beowulf -bigfish -yyyyyyy -woodie -0123456 -tbone -style -syzygy -starter -lemon -linda1 -merlot -mexican -anita -banner -badman -barfly -grease -carla -screw -diane -dogshit -counter -coolguy -demons -demo -nomore -normal -hhhhhhh -hondas -iamgod -enterme -everett -kayla -mybaby -ipswich -200000 -bearcat -zigzag -xander -369369 -skyler -pigeon -peyton -tipper -lilly -asdf123 -asdzxc -banane -barnes -guyver -grand -chinook -otis -tototo -trust -tower -adam12 -corey -chrome -buddie -bombers -bunker -hippie -keegan -misfits -vickie -292929 -woofer -stubby -sheep -secrets -sparta -stang -spud -sporty -pinball -jorge -johanna -maxxxx -gunther -fatima -fffffff -freeway -garion -score -rrrrr -sancho -outback -maggot -puddin -trial -987456 -colton -clyde -brain -brains -hoops -eleanor -dwayne -kirby -mydick -villa -bigcat -becker -shiner -spanish -templar -lamer -juicy -marsha -mike1 -maximum -real -1223 -arrows -andres -alucard -baldwin -baron -avenue -haggis -channel -cheech -safari -ross -dog123 -orion1 -paloma -vegitto -trees -969696 -adonis -colonel -cookie1 -hellos -dwight -eraser -kerstin -motion -moritz -visual -jaybird -1983 -bitter -yvette -zodiac -steven1 -slammer -slick1 -sponge -theater -this -jonny -massage -mann -ring -1211 -amazing -aptiva -bailey1 -guitar1 -chanel -canyon -gagged -fuckme1 -rough -punk -98765 -90210 -clowns -cubs -daniels -deejay -nigga -naruto -boxcar -hotties -electra -kent -widget -india -1986 -2004 -best -bingo1 -***** -stratus -sultan -storm1 -44444 -4200 -season -sexyboy -sigma -smokie -spam -point -pippo -ticket -joel -manman -1022 -anton -almond -bacchus -aztnm -axio -awful -bamboo -hakr -gregor -5678 -caprice -camero1 -fellow -dupont -dianne -paddle -magnet -qwert1 -pyon -tripper -coming -noway -burrito -bozo -hughes -hookem -eddie1 -ellie -entropy -kkkkkkk -jacobs -1945 -1951 -24680 -100000 -taco -subzero -sharp -sexxxy -skolko -shanna -skyhawk -spurs1 -sputnik -piazza -letter -lane -kurt -matilda -1224 -harvard -hannah1 -525252 -4ever -carbon -chef -ghosts -gina -loki -raquel -promise -citadel -highway -evil -monarch -morgan1 -1997 -bella1 -berry -yaya -yolanda -superb -taxman -studman -3636 -sherri -sheriff -poland -pizzas -toilet -latina -lassie -larry1 -joseph1 -meagan -marian -reptile -rico -razor -1013 -barron -hammer1 -gypsy -grande -carroll -camper -chippy -cat123 -call -chimera -fiesta -glock -glenn -domain -dieter -onetwo -odessa -louie -quartz -prowler -prophet -towers -ultra -cocker -dakota1 -cumm -nnnnnnn -natalia -boxers -hugo -heynow -hollow -iceberg -elvira -kate -kitchen -wasabi -impact -beerman -string -sleep -snoopy1 -pocket -legs -maple -mickey1 -manuela -mermaid -micro -redbird -alisha -baura -battery -grass -chevys -caravan -carina -charmed -fraser -frogman -diving -dogger -draven -drifter -oatmeal -paris1 -rachel1 -vegitta -cole -cobras -corsair -dadada -noelle -mylife -nine -bowwow -body -hotrats -modena -wave -iiiiiii -birgit -zone -sutton -susana -shocker -shrimp -sexgod -squall -squeeze -soul -patrice -poiu -players -tigers1 -toejam -tickler -line -julie1 -jimbo1 -juanita -rodeo -robot -1023 -annie1 -bball -guess -happy2 -charter -farm -flasher -falcon1 -fiction -gadget -diaper -dinner -oliver1 -partner -paco -lucille -macman -poopy -popper -postman -ttttttt -ursula -acura -cowboy1 -conan -daewoo -cyrus -nation -nnnnn -nextel -bolton -eureka -extra -kimmie -musica -wage -wert -vintage -itsme -bessie -zippo -311311 -smokey1 -spot -snappy -plasma -thelma -tonight -krusty -just4me -marius -rebel1 -1123 -alfredo -aubrey -audi -chantal -fick -goaway -roses -sales -rusty2 -dirt -dogbone -doofus -ooooooo -mankind -luck -mahler -lllllll -pumper -puck -pulsar -tupac -compass -cougars -niceguy -bob123 -boating -bronze -hopkins -hewlett -houhou -hubert -keller -mingus -venture -verizon -imation -1950 -1948 -1949 -223344 -bigbig -blossom -zack -wowwow -sissy -skinner -spiker -square -snooker -sluggo -player1 -junk -jeannie -jsbach -jumbo -jewel -medic -robins -123456a -1125 -1031 -beacon -astra -gumby -hammond -hassan -757575 -585858 -chillin -fuck1 -sander -lowell -upyours -trek -courage -darryl -nikki1 -nitro -bugs -boytoy -ellen -excite -kirsty -kane -wingnut -icu812 -1master -beatle -blanca -wolfen -sugar1 -tartar -senna -sexman -sick -someone -soprano -pippin -pixies -land -laura1 -laurent -rimmer -road -report -1020 -arturo -around -hamish -halifax -forum -dododo -doit -outside -mandy1 -twist -uuuuu -uranus -ttttt -butcher -bruce1 -helper -hopeful -eduard -dusty1 -kathy1 -muscles -morton -vvvvvvv -vivid -install -1947 -187187 -1941 -1952 -tatiana -susan1 -sinned -sexxy -senator -shadows -playa -toaster -jerry1 -marie1 -mason1 -merlin1 -roger1 -112358 -1121 -andrea1 -bacardi -auto -hardy -789789 -5555555 -flores -fergus -sascha -rrrrrrr -dome -onion -nutter -lololo -qqqqqqq -quick -uuuuuuu -cobain -cindy1 -coors -dani -descent -nimbus -nomad -nanook -norwich -bomb -bombay -broker -hookup -kiwi -winners -jackpot -1776 -beardog -bighead -blast -bird33 -0987 -stress -shot -spooge -pelican -peepee -perry -pointer -titan -jeremy1 -altima -baba -hallie -hate -hardone -5454 -candace -flip -finance -farmboy -salomon -destroy -papers -option -page -loser1 -lopez -r2d2 -chriss -cumcum -ninjas -ninja1 -hung -erika -eduardo -killers -miller1 -intel -jarvis -2626 -bizzare -blue12 -biker -yoyoma -sushi -styles -series -shanti -spanker -steffi -smart -sphinx -please1 -paulie -pistons -tiburon -limited -mdogg -rockies -alexia -arlene -arctic -banger -audio -asimov -grandpa -753951 -4you -chilly -chapman -flyfish -santa -oreo -ohshit -macbeth -madcat -loveya -mallory -rage -quentin -project -ramirez -colnago -citizen -chocha -cobalt -dabears -nevets -helene -huge -edgar -epsilon -easter -kestrel -moron -virgil -1616 -beat -bettina -woowoo -zander -shower -sloppy -reader -romero -redsox1 -ride -1215 -1112 -annika -arcadia -answer -baggio -base -guido -555666 -carmel -cayman -chips -roxy -disco -pass1 -luna -lovebug -macmac -queenie -puffin -trip -airwolf -abbott -aaa111 -cocaine -cisco -cottage -dayton -deadly -datsun -bricks -bumper -kidrock -wizard1 -wind -italy -benoit -bigones -wolfpac -suicide -3030 -sheba1 -sixpack -peace1 -physics -pearson -tigger2 -toad -megan1 -meow -ringo -roll -717171 -686868 -5424 -canuck -footjob -fulham -seagull -orgy -lobo -mancity -truth -trace -derf -boozer -howell -hola -easton -munch -jared -1dragon -biology -bestbuy -bmw325 -bigbob -stream -tazz -3333333 -skate -shutup -shop -polish -pinky1 -tootie -thecrow -leroy -jubilee -jingle -martine -matrix1 -manowar -messiah -mclaren -reilly -rollins -romans -return -rivera -athlon -beach1 -badgers -guitars -harald -gotribe -6996 -7grout -635241 -chase1 -carver -fallout -fiddle -fenris -fortuna -felipe -felix1 -forward -gasman -frost -fucks -sahara -sassy1 -dogbert -divx1 -manila -loretta -priest -quasar -venom -987987 -access1 -decker -daman -data -dentist -crusty -nathan1 -bruno1 -bucks -brodie -kittens -kerouac -mother1 -waldo1 -wedding -1942 -1946 -bigdawg -bigpimp -zaqwsx -414141 -3000gt -434343 -shoes -serpent -starr -smurf -pasword -tommie -lake -john1 -redeye -rebelz -1011 -alatam -asses -asians -bama -banzai -harvest -hair -hanson -575757 -5329 -cascade -chinese -fatty -fender1 -flower2 -funky -sambo -dogcat -dottie -oedipus -osama -macleod -prozac -rampage -punch -presley -concord -cook -cinema -cleaner -ciccio -corinne -clutch -daemon -bruiser -boiler -hjkl -eyes -egghead -expert -ethan -kasper -mordor -wasted -jamess -zouzou -090909 -1002 -switch -stone1 -4040 -sisters -sexo -shawna -smith1 -sperma -sneaky -polska -thewho -krypton -lawson -library -lekker -jules -johann -justus -rockie -romano -aspire -goodie -cheese1 -fenway -fishon -fishin -girls1 -sawyer -dolores -desmond -duane -ramones -rabbits -transit -aaaaa1 -clock -delilah -noel -boyz -bongo -bunnies -brady -buceta -henry1 -heels -eastern -krissy -mopar -vienna -weston -wildone -vodka -jayson -beavis1 -betsy -xxxxxx1 -000001 -0815 -zulu -420000 -sigmar -sprout -stalin -peggy -patch -lagnaf -rolex -redfox -referee -1231 -angus1 -ariana -ballin -attila -hall -greedy -grunt -747474 -cecile -caramel -field -gidget -futbol -frosch -saiyan -schmidt -drums -donner -doggy1 -drum -doudou -pack -pain -nutmeg -quebec -trash -triple -tosser -tuscl -track -comfort -choke -comein -cola -deputy -bremen -borders -bronson -break -hotass -eskimo -eggman -koko -kieran -katrin -komodo -mone -munich -winger -jaeger -ivan -2222222 -bennie -bigben -worm -xxx123 -sunny1 -373737 -slater -slayer1 -snoop -stacie -peachy -thecure -times -little1 -jennaj -marquis -middle -rasta69 -1114 -aries -havana -gratis -calgary -flanker -salope -dirty1 -draco -dogface -umpire -turnip -vbnm -tucson -troll -aileen -codered -damon -nana -neon -nico -neil -boomer1 -bushido -horace -kaitlyn -keepout -karen1 -mindy -mnbv -volcom -wizards -wine -1995 -bite -zach -tarpon -shinobi -phat -patrol -toolbox -julien -johnny1 -joebob -marble -riders -reflex -120676 -1235 -angelus -anthrax -atlas -hawks -grandam -harlem -655321 -cabron -fischer -flyer -flower1 -factory -federal -gambler -frodo1 -funk -sand -sam123 -scania -dingo -papito -olive -palermo -ou8123 -lock -ranch -pride -randy1 -twiggy -travis1 -treetop -addict -admin1 -963852 -aceace -cliff -cirrus -clifton -colin -bobdole -bonner -bogus -bonjovi -bootsy -boater -elway7 -edison -kelvin -kenny1 -montag -moreno -wayne1 -white1 -jazzy -1994 -1991 -2828 -blunt -beau -belmont -worthy -systems -sensei -stan -peeper -pharao -pigpen -teensex -larkin -jimjim -melons -marlon -robocop -1003 -1027 -azsxdc -gordo -hazard -granada -8989 -7894 -ceasar -chelle -candy1 -fergie -fanny -fidelio -giorgio -ruth -sanford -diego -devon -panic -longer -mackie -qawsed -twelve -chloe1 -coral -daddyo -boyboy -booster -bucky -esquire -motor -wilder -waffle -wallet -warning -virus -wealth -jabber -jaguars -javelin -idefix -bigdog1 -blue42 -blanked -blue32 -biteme1 -blaine -yessir -team -stephan -sunfire -tbird -stryker -3ip76k2 -sevens -sheldon -pilgrim -tenchi -titman -leeds -lithium -lander -linkin -landon -mariner -markie -midnite -1129 -123asd -allstar -albany -asdf12 -antonia -aspen -7734 -49ers -carlo -cable -carnage -callum -carlos1 -fitter -flame -gofast -gamma -fucmy69 -dogwood -django -magneto -loose -premium -addison -9999999 -abc1234 -newyear -nichole -bookie -burns -bounty -brown1 -bologna -earl -elway -killjoy -kerry -keenan -kick -mini -mouser -wayer -impreza -irene -2580 -bellaco -blues1 -bedford -blanco -blunts -stinks -teaser -streets -sf49ers -shovel -spikey -sonia -timeout -toffee -lefty -johndoe -mega -manolo -mentor -margie -ratman -ridge -record -rhodes -robin1 -1124 -1210 -1028 -1226 -another -harbor -gramma -646464 -chaos1 -glasgow -frogs -salem -scuba1 -ducks -driven -doggies -dicky -donovan -rams -aikman -corolla -clarke -conway -cumslut -cyborg -dancing -boston1 -bong -houdini -helmut -elvisp -edge -keksa12 -misha -monty1 -wetter -watford -wiseguy -visitor -janelle -1989 -1987 -biatch -beezer -bigguns -bitchy -wyoming -stupid1 -simple1 -spiral -smeller -sperm -plato -tophat -test2 -theatre -thick -toomuch -leigh -jello -jewish -junkie -maxim -maxime -meadow -roofer -124038 -1018 -1269 -1227 -123457 -alberta -aramis -beaker -googoo -goochi -852456 -4711 -catcher -carman -champ1 -chess -geezer -samuel1 -saigon -scooby1 -doors -dick1 -devin -doom -dirk -doris -load -magpies -manfred -raleigh -vader1 -tulips -defense -mygirl -burn -bowtie -bowman -holycow -honeys -minerva -wheeler -witch -jaime -irving -1992 -bimbo -blue11 -birddog -woodman -womble -030303 -stinker -slugger -spotty -smoke1 -things -torpedo -tender -lilith -jimmys -jerk -junior1 -marsh -rice -root -1214 -april1 -allgood -bambi -grinch -767676 -5252 -capecod -finder -flint -goats -gideon -savior -seabee -sandro -schalke -disney1 -duckman -options -pancake -malice -lookin -love123 -lloyd -puppet -prayers -union -tracer -crap -cwoui -hookers -hollie -hewitt -ernesto -edthom -kaylee -kokoko -kokomo -kimball -morales -mooses -monk -walton -weekend -inter -1993 -worker -summers -surgery -shibby -shamus -skibum -sex69 -spliff -slipper -spoons -spanner -slow -temp123 -lakers1 -jomama -julio -rosario -recon -riddle -room -1025 -1101 -barney1 -baylor -gotham -gravity -hancock -616161 -515000 -caca -castor -chilli -fdsa -getout -fuck69 -gators1 -sail -sable -rumble -dork -dickens -duffer -onions -logger -lorena -lookout -magic32 -port -poon -prime -twat -citroen -civicsi -coochie -compaq1 -nancy1 -buzzer -boulder -butkus -bungle -hogtied -honor -hero -hilary -heidi1 -mortal -wendy1 -vibrate -vicky -bledsoe -blink -woof -xxxxx1 -talk -stock -tabatha -sheeba -start1 -peanut1 -tools -tetsuo -torino -tennis1 -termite -ladder -last -lemmein -jughead -melrose -megane -redone -request -angela1 -alive -alissa -gonzo1 -golden1 -656565 -626262 -chains -calvin1 -foolish -fallon -gabber -runaway -salami -dummy -dungeon -dumb -dope -opus -paragon -oxygen -panhead -odyssey -lottie -prince1 -trustme -christa -court -davies -neville -nono -bread -buffet -hound -kajak -mona -moto -mildred -winner1 -vixen -versace -winona -instant -indy -bigal -beech -biggun -blake1 -blue99 -big1 -woods -synergy -336699 -sixty9 -shark1 -skin -simba1 -sharpe -sebring -spunk -springs -sliver -pizza1 -plane -perkins -pookey -lawman -joe123 -jolly -mike123 -romeo1 -reserve -alanis -ariane -antony -band -hand -haley -byebye -camden -chewy -forumwp -franks -fruity -pantie -oldone -lumina -prosper -total -true -ajax -951753 -achtung -compact -color -corn -christi -closer -corndog -dank -nimitz -brandy1 -bowl -breanna -holein1 -east -kenobi -waldo -wing -invis -1996 -benton -bigjohn -beef -beater -benji -bluejay -xyzzy -storage -taichi -stellar -shaker -skirt -seymour -semper -splurge -squeak -pearls -pitch -phyllis -pooky -piss -tomas -titfuck -joemama -johnny5 -married -maxi -rhubarb -ratboy -reload -rooney -redd -1029 -1030 -1220 -anchor -bbking -gryphon -gone -57chevy -494949 -celeron -fishy -fucker1 -roswell -dougie -downer -dicker -diva -domingo -donjuan -nympho -omar -praise -racers -trick -trauma -truck1 -trample -acer -corwin -climax -denmark -cuervo -notnow -nittany -neutron -native -bosco1 -buffa -breaker -hello2 -hydro -estelle -explore -kittys -modem -mooney -weiner -bibi -benfica -yahoo1 -striper -tabasco -supra -383838 -456654 -seneca -serious -shuttle -socks -stanton -thethe -listen -jeter2 -marma -mark1 -metoo -rollin -redleg -redbone -redskin -rocco -1245 -armand -altoids -andrews -barley -away -asswipe -bauhaus -bbbbbb1 -gohome -harrier -golfpro -818181 -6666666 -5000 -5rxypn -calling -checker -calibra -fields -faith1 -fist -fdm7ed -finally -giraffe -glasses -giggles -fringe -gate -georgie -scamper -rrpass1 -duffy -deville -dimples -pacino -ontario -oberon -quest1 -puffer -raining -protect -qwerty7 -trey -tribe -ulysses -tribal -adam25 -compton -collie -davide -norris -namaste -myrtle -bonovox -buckley -bukkake -burning -burner -burly -hun999 -emilie -elmo -enters -enrique -keisha -mohawk -willard -vgirl -whale -vince -jayden -jarrett -1812 -1943 -222333 -bigjim -bigd -zoom -wordup -ziggy1 -yahooo -workout -young1 -written -xmas -zzzzzz1 -surfer1 -strife -tasha1 -skunk -shauna -seth -soft -planes -plum -pimping -thedon -toocool -leeann -laddie -list -lkjh -lara -joke -matty -rene -redrose -1200 -102938 -alexa -antares -ground -goose1 -737373 -789987 -6464 -caster -casper1 -cement -chessie -caddy -chill -child -canucks -feeling -gigi -rugby1 -dshade -dudes -dixie1 -owen -olympia -lucas1 -manga -puff -tribble -ussy -core -clint -colt -debra -dealer -newark -husband -hiking -errors -emmett -emilia -koolaid -knight1 -murphy1 -volcano -idunno -2005 -2233 -block -benito -biguns -zapper -zorro1 -0911 -3006 -sixsix -shopper -siobhan -sextoy -sounds -pokey -peabody -titi -think -toast -lister -lambda -joecool -jonas -joyce -juniper -mercer -max123 -manny -massimo -met2002 -reggae -ricky1 -1236 -1228 -1016 -all4one -arianna -asgard -484848 -5683 -6669 -catnip -chat -figure -galant -frenchy -girlies -gabby -garner -screwy -doubled -divers -dte4uw -done -maker -locks -treble -twinkie -trailer -acid -cooking -cococo -cory -dabomb -daffy -dandfa -cyrano -briggs -boners -helium -horton -hoffman -hellas -emperor -killa -wanda -w4g8at -verona -ilikeit -iforget -1944 -blue1 -blazers -benny1 -0069 -0101 -taffy -susie -swim -stokes -4567 -shodan -spoiled -steffen -pissed -pavlov -place -petunia -terrell -thirty -toni -tito -teenie -lily -lillie -ladyboy -jeeper -joyjoy -mantle -mannn -reeves -123aaa -121314 -1021 -1004 -1120 -allen1 -ambers -amstel -ambrose -alice1 -allegro -alley -hatred -gspot -graves -goodsex -harpoon -878787 -8inches -4wwvte -case -chavez -gatsby -fudge -gerry -generic -gareth -fuckme2 -samm -sage -seadog -satchmo -scxakv -santafe -dipper -dingle -dizzy -madmad -london1 -qbg26i -vaughn -tzpvaw -vamp -comedy -comp -cowgirl -dawgs -delaney -nt5d27 -needles -newness -mykids -bryan1 -bouncer -hihihi -iceman1 -herring -horn -hook -hotlips -dynamo -klaus -kittie -kappa -kahlua -muffy -mizzou -mohamed -musical -wannabe -whatup -weller -willy1 -invest -blanche -bear1 -youknow -zelda -yyyyyy1 -070462 -zurich -storms -tail -strat -427900 -shelter -shells -sexy123 -smile1 -sophie1 -stefano -stayout -phish1 -payday -thebear -telefon -kswbdu -larson -jetta -jerky -melina -metro -retire -respect -1216 -1201 -1204 -1222 -1115 -barry1 -676767 -chandra -flesh -furball -gocubs -fruit -gman -gentle -dunbar -dewalt -diver1 -dhip6a -olemiss -ollie -mangos -pretzel -pusssy -tripleh -valdez -clean -comment -crew -clovis -deaths -dandan -darrel -ninguna -noah -bootsie -bp2002 -bourbon -brennan -bumble -books -hose -heyyou -hemlock -hippo -hornets -hogan -excess -extensa -muffin1 -werdna -info -iron -jack1 -1bitch -bmwbmw -bills -zaq123 -wxcvbn -tahoe -talbot -simona -shakur -sexyone -seviyi -sonja -smart1 -speed1 -pepito -terry1 -terrier -laser1 -lite -lancia -jenjen -jolene -midori -message -matteo -mental -miami1 -ronald1 -reason -rhythm -1218 -1026 -123987 -1015 -1103 -armada -austria -gotmilk -hawkins -gray -camila -camp -charge -camero -flex -getoff -glacier -glotest -froggie -gerbil -rugger -donna1 -deutsch -orchard -oyster -ophelia -pajero -m5wkqf -magenta -vantage -tyvugq -uptown -abacab -aaaaaa1 -advance -chuck1 -delmar -nate -navajo -nope -border -iawgk2 -hrfzlz -dylan1 -enrico -encore -emilio -killian -mutant -mizuno -video1 -viewer -weed420 -whales -jaguar1 -insight -1990 -159159 -1love -bliss -bears1 -binder -bigboss -blitz -xqgann -zeke -zardoz -table -3825 -signal -sentra -side -shiva -sonora -squid -slimjim -placid -photon -placebo -pearl1 -test12 -leinad -legman -jeepers -joeblow -mike23 -redcar -rhinos -rjw7x4 -1102 -112211 -alcohol -gwju3g -7bgiqk -7878 -535353 -4snz9g -cccccc1 -carola -cali -fister -fosters -finland -gizzmo -fuller -royalty -rugrat -sandie -rudolf -dooley -dive -doreen -dodo -drop -oemdlg -out3xf -paddy -opennow -puppy1 -quinn -ramjet -under -uncle -abraxas -corner -creed -cocoa -crown -cows -cn42qj -dancer1 -damned -nudity -nimda2k -buick -bobb -braves1 -brook -henrik -higher -dust -karachi -mortis -monies -wally1 -weapon -view -willie1 -vicki -1test -2929 -xytfu7 -yackwin -100100 -0660 -tahiti -talks -332211 -3535 -sedona -seawolf -shine -spleen -slash -spjfet -spooner -spock1 -penis1 -terri -thierry -toohot -large -limpone -johnnie -masterp -maxdog -ribbit -reed -rita -rockin -redhat -rising -1113 -1331 -allday -aladin -andrey -ariel -anytime -athome -basil -goofy1 -gustavo -ha8fyp -goodday -778899 -charon -chappy -caracas -cardiff -canada1 -cajun -catter -freddy1 -frazier -forme -follow -gavin -garlic -sarge -saskia -sanjose -russ -salsa -loop -locutus -malachi -lolipop -punker -rambo1 -quake -twin -aimee -coolcat -crappy -default -dental -deniro -d9ungl -daddys -napoli -nautica -nermal -brick -bogota -board -branch -breath -buds -hulk -hitachi -evans -ender -export -kikiki -kram -mongo -waqw3p -wizzard -visited -whdbtp -whkzyc -image -1fuck -binky -blind -bigred1 -blubber -benz -becky1 -wooden -xrated -0001 -survey -tammy1 -stuffer -3mpz4r -3000 -3some -selina -sierra1 -shampoo -silk -shyshy -standby -poker1 -plus -thought -theshit -torture -light1 -jjjjj1 -jocelyn -menthol -maximo -margaux -medic1 -release -richter -rhino1 -roach -renate -repair -reveal -1209 -1234321 -amigos -apricot -asdfgh1 -hatter -grimace -7xm5rq -6789 -capcom -cheesy -carrots -camping -fanatic -fool -format -fleming -girlie -glover -gilmore -gardner -safeway -ruthie -dogfart -dondon -diapers -odin -opiate -lollol -love12 -loomis -prague -pugsley -program -r29hqq -touch -airman -darkone -cummer -dempsey -damn -nadia -ndeyl5 -natchez -newone -buddys -homely -husky -iceland -hr3ytm -holla -exeter -kimkim -karine -k2trix -kernel -moonman -miles1 -mufasa -mousey -wilma -wilhelm -whites -2277 -blobby -blair -blinky -bikers -becca -blue23 -xman -wyvern -zxzxzx -zsmj2v -suede -t26gn4 -sugars -sylvie -tantra -swoosh -swiss -4226 -4271 -321123 -shoe -shane1 -shelby1 -spades -spain -smother -soup -pisser -photo1 -pebble -phones -peavey -picnic -terra -thistle -tokyo -therapy -lives -linden -kronos -lilbit -linux -marbles -reno -recall -1208 -1138 -1008 -alchemy -atticus -auditt -ballet -hanna -gubber -7474 -797979 -464646 -543210 -4zqauf -4949 -ch5nmk -carlito -chewey -caleb -cheddar -chachi -fever -fine -forlife -giants1 -gates -getit -gamble -gerhard -galileo -g3ujwg -ganja -rufus1 -scouts -discus -dudeman -olympus -oscars -osprey -madcow -locust -loyola -mammoth -proton -rabbit1 -pwxd5x -purple1 -punkass -uyxnyd -tyson1 -abcabc -colts -contour -clement -dddddd1 -cypher -denied -dagmar -name -noles -butters -buford -hoochie -hotel -hoser -eddy -ellis -motown -mp8o6d -wife -2055 -2211 -beavers -bloke -blade1 -yamato -zooropa -050505 -zw6syj -tango1 -swing -stern -swampy -susanna -tammie -445566 -333666 -sexpot -sickboy -spiffy -skylark -slam -pintail -phreak -places -teller -timtim -tires -thighs -left -latex -llamas -lkjhg -letters -lizzard -marlins -metal1 -manu -righton -1127 -alain -alcat -amigo -attract -azrael -hamper -gotenks -golfgti -gutter -h2slca -harman -grace1 -6chid8 -789654 -canine -casio -cazzo -chamber -cbr900 -cabrio -calypso -feline -fungus -goal -g9zns4 -full -giggle -fuck123 -saffron -dogmeat -dunlop -douche -dresden -pappy -oaktree -lydia -luft4 -puta -prayer -ramada -vcradq -tulip -tracy71 -tycoon -click -chitown -corps -couples -code -danman -dada -density -d9ebk7 -cummins -darth -cute -nash -nixon -norbert -nestle -brenda1 -bonanza -bundy -buddies -hotspur -heavy -horror -hufmqw -electro -erasure -enough -etvww4 -ewyuza -eric1 -kinder -kenken -kismet -klaatu -willi -waiting -igor -x35v8l -yogi -ywvxpz -xngwoj -zippy1 -020202 -**** -sweeney -story -sentry -spence -star12 -solace -sledge -states -snyder -star1 -paxton -pkxe62 -pilot1 -pommes -plants -tical -tictac -toes -lemans -kubrick -jys6wz -jonesy -jjjjjj1 -jigga -joelle -mate -riley1 -rosa -relief -1126 -badboy1 -asthma -auggie -hartley -gumbo -616913 -57np39 -56qhxs -4mnveh -cake -forbes -fqkw5m -fresno -godiva -gecko -gladys -gibson1 -fridge -saxman -rowing -sammys -scotts -scout1 -sasasa -samoht -ducky -driller -p3wqaw -nurse -oneone -openit -portia -rapier -pussy2 -ralphie -tuxedo -ulrike -trenton -come -deltas -mytime -nicky -nickie -noname -noles1 -bucker -bopper -bullock -burnout -bryce -hedges -hitter -ekim -espana -eatme69 -elpaso -eeeeee1 -eatme1 -karaoke -kara -misses -willem -webcam -jasons -jakarta -belair -bigdad -beerme -yoshi -yinyang -zimmer -x24ik3 -0000007 -ztmfcq -stopit -stooges -symow8 -strato -2hot4u -ship -simons -skins -shakes -sex1 -shield -snacks -pipe -pitt -pinto -tonton -lager -lizzy -juju -john123 -josiah -jesse1 -jordon -jingles -martian -mario1 -rochard -redwine -requiem -rats -1117 -1014 -1205 -althea -allie -amor -amiga -alpina -alert -banana1 -bahamut -hart -golfman -7uftyx -5432 -5353 -5151 -4747 -byron -chatham -cherie -foxfire -freaked -gayboy -gggggg1 -glenda -glitter -funny1 -scroll -rudolph -saddle -dingbat -digimon -omicron -parsons -ohio -panda1 -loloxx -lululu -racer1 -queen1 -prick -upnfmc -tyrant -trout1 -9skw5g -aceman -acls2h -aaabbb -aggie -comcast -craft -crissy -cloudy -cq2kph -custer -d6o8pm -darian -crumbs -daisey -dasani -needle -mzepab -myporn -narnia -booger1 -bravo1 -budgie -btnjey -hotel6 -humbug -edwin -ewtosi -kobe -keith1 -muff -muschi -wiggle -whatthe -walking -vette1 -vols -virago -intj3a -ishmael -intern -jachin -199999 -2010 -beck -blender -bengal -your -zaqxsw -xray -zebras -yanks -worlds -tadpole -stripes -3737 -4343 -3728 -4444444 -solar -sonne -smalls -sniffer -sonata -squirts -pitcher -pktmxr -points -texaco -lesbos -lilian -l8v53x -jimbeam -josie -jimi -maya -rocket1 -ringer -1219 -123098 -1233 -althor -arch -armando -basher -balboa -bbbbb1 -banks -harriet -gopack -golfnut -8520 -753159 -8dihc6 -666777 -cheeba -chino -cheeky -camel1 -falling -flubber -gianni -gloves -frisbee -fuzzy1 -sauce -schatz -sandra1 -scrotum -scumbag -sabre -samdog -paige -orwell -lunatic -lonnie -lotion -maine -maddux -qn632o -rapper -tracks -ulrich -abacus -902100 -crispy -corky -crane -chooch -d6wnro -cutie -deal -dabulls -dehpye -njqcw4 -nownow -nigger1 -bustle -buddy2 -boingo -bugman -bosshog -bowie -hybrid -hilltop -hotlegs -honesty -hhhhh1 -eloise -evilone -e5pftu -eded -elefant -kenzie -karl -karin -killah -kleenex -mouses -motors -mutley -w00t88 -iloveit -jarjar -incest -indycar -1664 -222777 -2663 -beelch -benben -yitbos -yyyyy1 -yasmin -zapata -zzzzz1 -stooge -taztaz -system1 -3qvqod -3way -456321 -sizzle -simhrq -shrink -shawnee -someday -sparty -sphere -spark -slammed -sober -persian -peppers -ploppy -pn5jvw -poobear -pianos -plaster -testme -tiff -larissa -lennox -jewell -messier -rockey -1229 -1217 -1478 -1009 -amonra -aragon -albino -azazel -grinder -6uldv8 -83y6pv -8888888 -4tlved -515051 -carsten -changes -ffffff1 -foreman -firedog -ggggg1 -gerber -galway -gohan -giveme -geryfe -sayang -rudeboy -savanna -sandals -devine -dougal -drag0n -dga9la -desktop -only -onlyone -otter -pandas -mafia -lombard -luckys -lovejoy -manders -product -qqh92r -pork -radar1 -punani -ptbdhw -turtles -trs8f7 -tramp -ugejvp -abba -acdc -abcd123 -clever -corina -create -crash1 -colony -crosby -delboy -daniele -davinci -niki -nitrox -bonzai -budd -hotter -heeled -heroes -hooyah -hotgirl -i62gbq -horse1 -hills -hpk2qc -epvjb6 -echo -korean -kristie -mnbvc -mind -mommy1 -munster -wade -wiccan -wanted -jacket -2369 -blondy -bismark -beanbag -bjhgfi -ynot -yess -zlzfrh -wolvie -007bond -****** -tanya1 -sxhq65 -stinky1 -3234412 -3ki42x -seville -shimmer -sheryl -sienna -skillet -seaman -solaris -pastor -pasta -pedros -pfloyd -tobydog -lethal -letme1n -leland -jenifer -mario66 -micky -rocky2 -rewq -ripped -1128 -1207 -1104 -1432 -aprilia -alyson -bagels -basic -baggies -barb -barrage -gomez -guru -guard -72d5tn -606060 -4wcqjn -chance1 -catalog -faust -film -flange -fran -fartman -geil -gbhcf2 -glen -fuaqz4 -gameboy -garnet -rotary -seahawk -russel -saab -seal -devlt4 -ditto -drevil -drinker -deuce -donut -octopus -ottawa -porky -q9umoz -rapture -pump -triplex -ue8fpw -trent -trophy -turbos -agent -aaa340 -consult -creepy -craven -class -ddddd1 -dejavu -cuxldv -nettie -nbvibt -nikon -niko -norwood -nascar1 -nolan -bubba2 -boobear -boogers -buff -bully -editor -eagle2 -dynamic -ella -efyreg -edition -kidney -mogwai -morrow -msnxbi -wars -werder -voodoo1 -wheel -iiiiii1 -159951 -1624 -1911a1 -2244 -bedlam -belkin -bill1 -woodrow -xirt2k -worship -?????? -tanaka -swift -susieq -sundown -sukebe -tales -swifty -2fast4u -senate -sexe -shroom -shaun -seaweed -status -snicker -sorrow -spanky1 -spook -patti -pilots -pinch -peddler -theo -tessie -tiger7 -l2g7k3 -lazy -joan -mantra -mariana -mike69 -marshal -mart -mazda6 -riptide -robots -rental -1107 -1130 -142857 -1134 -armored -alvin -alec -alright -bartok -astral -baboon -bahamas -balls1 -bassoon -hcleeb -granite -golf1 -gomets -8vjzus -7890 -789123 -8uiazp -5757 -50cent -camaro1 -cherry1 -chemist -final -firenze -farrell -ganesh -same -doodles -dinger -okinawa -olympic -nursing -orpheus -ohmygod -paisley -null -lounge -mahalo -qwqwqw -qguvyt -rambler -puzzle -poppy1 -turk182 -trotter -vdlxuc -trish -tugboat -valiant -tracie -uwrl7c -coaster -cmfnpu -decimal -debbie1 -dandy -dede -nissan1 -napalm -boats -branden -britt -bonghit -hester -ibxnsm -hhhhhh1 -holger -durham -erwin -equinox -dvader -kimmy -knulla -mustafa -monsoon -mistral -morgana -monica1 -mojave -month -mrbill -vkaxcs -victor1 -wacker -wendell -vfdhif -wilson1 -wavpzt -verena -jarrod -imback -1914 -1monkey -2500 -2255 -blank -bigshow -zoomer -wtcacq -wobble -xmen -xjznq5 -yhwnqc -zzzxxx -streak -393939 -2fchbg -skilled -shakira -shaft -seaside -sigrid -sinful -silicon -smk7366 -sniper1 -staff -slap -smutty -peepers -plokij -pdiddy -thrust -terran -topaz -today1 -lauren1 -lgnu9d -juneau -methos -medina -merlyn -rogue1 -romulus -1202 -1469 -al9agd -aol123 -altec -apollo1 -arse -baker1 -bbb747 -bach -axeman -astro1 -hawks1 -gstring -hannes -8543852 -868686 -4ng62t -5401 -567890 -5232 -catfood -frame -flow -fire1 -fffff1 -fozzie -fluff -fzappa -furious -round -scarab -satin -ruger -destin -diablo2 -doqvq3 -drywall -offroad -luetdi -qcfmtz -pyf8ah -puddles -privacy -rainer -ralph1 -trivia -trewq -tri5a3 -advent -9898 -agyvorc -clarkie -coach1 -courier -contest -christo -corinna -chowder -concept -cyzkhw -davidb -days -de7mdf -nose -nazgul -booboo1 -broad -bonzo -brenna -boot -butch1 -hgfdsa -elmer -elektra -elodie -kermit1 -knife -kaboom -minute -modern -morten -mocha -monday1 -morgoth -ward -weewee -weenie -walters -vorlon -website -wahoo -insider -jayman -1911 -1dallas -1900 -1ranger -2501 -1qaz -bertram -bignuts -bigbad -beebee -billows -belize -bebe -wvj5np -wu4etd -yamaha1 -zebra1 -yankee1 -0311 -????? -stjabn -tainted -3tmnej -shoot -skooter -skelter -sixteen -smack -spice1 -stacey1 -smithy -perrin -pollux -pixie -paulina -piston -pick -poets -pine -toons -tooth -topspin -kugm7b -legends -juliana -jonboy -judge -midland -meteor -mccabe -matter -mayfair -meeting -merrill -raul -riches -reznor -reboot -reject -robyn -renee1 -roadway -1411 -1478963 -1019 -archery -allman -barks -bagpuss -hazmat -gucci -guns -grammy -greek -7kbe9d -7676 -6bjvpe -5lyedn -5858 -5291 -chas -c7lrwu -candys -chateau -ccccc1 -fear -fihdfv -gocats -gaelic -fwsadn -godboy -gldmeo -fx3tuo -fubar1 -garland -gforce -rxmtkp -rulz -sairam -dunhill -dogggg -detect -details -doll -drinks -ov3ajy -lockout -makayla -loves -prima -pvjegu -qhxbij -raphael -totoro -tusymo -tunnel -valeria -tulane -turtle1 -tracy1 -abbey1 -address -clticic -cooper1 -comets -collect -corbin -derick -cyprus -dante1 -dave1 -neal -nexus6 -nero -nogard -norfolk -brent1 -booyah -bootleg -bulls23 -bulls1 -booper -heretic -icecube -hellno -hounds -hoes -howie -hevnm4 -eighty -epson -eeeee1 -eyphed \ No newline at end of file diff --git a/lib/discourse.rb b/lib/discourse.rb index 3e6f4a57a3..8252b5da76 100644 --- a/lib/discourse.rb +++ b/lib/discourse.rb @@ -112,17 +112,22 @@ module Discourse end end + def self.last_read_only + @last_read_only ||= {} + end + def self.recently_readonly? - return false unless @last_read_only - @last_read_only > 15.seconds.ago + read_only = last_read_only[$redis.namespace] + return false unless read_only + read_only > 15.seconds.ago end def self.received_readonly! - @last_read_only = Time.now + last_read_only[$redis.namespace] = Time.zone.now end def self.clear_readonly! - @last_read_only = nil + last_read_only[$redis.namespace] = nil end def self.disabled_plugin_names diff --git a/lib/discourse_hub.rb b/lib/discourse_hub.rb index 4309647b02..e174cf065a 100644 --- a/lib/discourse_hub.rb +++ b/lib/discourse_hub.rb @@ -42,7 +42,7 @@ module DiscourseHub def self.hub_base_url if Rails.env.production? - 'http://api.discourse.org/api' + 'https://api.discourse.org/api' else ENV['HUB_BASE_URL'] || 'http://local.hub:3000/api' end diff --git a/lib/email/message_builder.rb b/lib/email/message_builder.rb index 76754654ce..991620e3ad 100644 --- a/lib/email/message_builder.rb +++ b/lib/email/message_builder.rb @@ -28,16 +28,18 @@ module Email }.merge!(@opts) if @template_args[:url].present? - @template_args[:header_instructions] = I18n.t('user_notifications.header_instructions') + @template_args[:header_instructions] = I18n.t('user_notifications.header_instructions', locale: @opts[:locale]) if @opts[:include_respond_instructions] == false @template_args[:respond_instructions] = '' else - @template_args[:respond_instructions] = if allow_reply_by_email? - @opts[:private_reply] ? I18n.t('user_notifications.reply_by_email_pm', @template_args) : I18n.t('user_notifications.reply_by_email', @template_args) + if @opts[:only_reply_by_email] + string = "user_notifications.only_reply_by_email" else - @opts[:private_reply] ? I18n.t('user_notifications.visit_link_to_respond_pm', @template_args) : I18n.t('user_notifications.visit_link_to_respond', @template_args) + string = allow_reply_by_email? ? "user_notifications.reply_by_email" : "user_notifications.visit_link_to_respond" + string << "_pm" if @opts[:private_reply] end + @template_args[:respond_instructions] = I18n.t(string, @template_args) end end end @@ -65,7 +67,7 @@ module Email html_override.gsub!("%{unsubscribe_link}", unsubscribe_link) if SiteSetting.unsubscribe_via_email_footer && @opts[:add_unsubscribe_via_email_link] - unsubscribe_via_email_link = PrettyText.cook(I18n.t('unsubscribe_via_email_link', hostname: Discourse.current_hostname), sanitize: false).html_safe + unsubscribe_via_email_link = PrettyText.cook(I18n.t('unsubscribe_via_email_link', hostname: Discourse.current_hostname, locale: @opts[:locale]), sanitize: false).html_safe html_override.gsub!("%{unsubscribe_via_email_link}", unsubscribe_via_email_link) else html_override.gsub!("%{unsubscribe_via_email_link}", "") @@ -112,7 +114,7 @@ module Email body << "\n" body << I18n.t('unsubscribe_link', template_args) if SiteSetting.unsubscribe_via_email_footer && @opts[:add_unsubscribe_via_email_link] - body << I18n.t('unsubscribe_via_email_link', hostname: Discourse.current_hostname) + body << I18n.t('unsubscribe_via_email_link', hostname: Discourse.current_hostname, locale: @opts[:locale]) end end diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb index cb45b7d8ba..fa7f81b912 100644 --- a/lib/email/receiver.rb +++ b/lib/email/receiver.rb @@ -31,6 +31,7 @@ module Email end def process + @from_email, @from_display_name = parse_from_field @incoming_email = find_or_create_incoming_email process_internal rescue => e @@ -42,14 +43,14 @@ module Email IncomingEmail.find_or_create_by(message_id: @mail.message_id) do |incoming_email| incoming_email.raw = @raw_email incoming_email.subject = subject - incoming_email.from_address = @mail.from.first.downcase + incoming_email.from_address = @from_email incoming_email.to_addresses = @mail.to.map(&:downcase).join(";") if @mail.to.present? incoming_email.cc_addresses = @mail.cc.map(&:downcase).join(";") if @mail.cc.present? end end def process_internal - user = find_or_create_user(from) + user = find_or_create_user(@from_email, @from_display_name) @incoming_email.update_columns(user_id: user.id) body = select_body || "" @@ -71,20 +72,35 @@ module Email case destination[:type] when :group group = destination[:obj] - create_topic(user: user, raw: body, title: subject, archetype: Archetype.private_message, target_group_names: [group.name], skip_validations: true) + create_topic(user: user, + raw: body, + title: subject, + archetype: Archetype.private_message, + target_group_names: [group.name], + is_group_message: true, + skip_validations: true) + when :category category = destination[:obj] raise StrangersNotAllowedError if user.staged? && !category.email_in_allow_strangers raise InsufficientTrustLevelError if !user.has_trust_level?(SiteSetting.email_in_min_trust) - create_topic(user: user, raw: body, title: subject, category: category.id) + create_topic(user: user, + raw: body, + title: subject, + category: category.id, + skip_validations: user.staged?) + when :reply email_log = destination[:obj] raise ReplyUserNotMatchingError if email_log.user_id != user.id - create_reply(user: user, raw: body, post: email_log.post, topic: email_log.post.topic) + create_reply(user: user, + raw: body, + post: email_log.post, + topic: email_log.post.topic) end end end @@ -150,25 +166,29 @@ module Email reply.split(previous_replies_regex)[0] end - def from - @from ||= @mail[:from].address_list.addresses.first + def parse_from_field + if @mail[:from].errors.blank? + address_field = @mail[:from].address_list.addresses.first + address_field.decoded + from_address = address_field.address + from_display_name = address_field.display_name.try(:to_s) + else + from_address = @mail.from[/<([^>]+)>/, 1] + from_display_name = @mail.from[/^([^<]+)/, 1] + end + [from_address.downcase, from_display_name] end def subject - @suject ||= @mail.subject.presence || I18n.t("emails.incoming.default_subject", email: @mail.from.first.downcase) + @suject ||= @mail.subject.presence || I18n.t("emails.incoming.default_subject", email: @from_email) end - def find_or_create_user(address_field) - # decode the address field - address_field.decoded - # extract email and name - email = address_field.address.downcase - name = address_field.display_name.try(:to_s) - username = UserNameSuggester.sanitize_username(name) if name.present? + def find_or_create_user(email, display_name) + username = UserNameSuggester.sanitize_username(display_name) if display_name.present? User.find_or_create_by(email: email) do |user| user.username = UserNameSuggester.suggest(username.presence || email) - user.name = name.presence || User.suggest_name(email) + user.name = display_name.presence || User.suggest_name(email) user.staged = true end end @@ -209,11 +229,11 @@ module Email end def group_incoming_emails_regex - @group_incoming_emails_regex ||= Regexp.union Group.pluck(:incoming_email).select(&:present?).uniq + @group_incoming_emails_regex ||= Regexp.union Group.pluck(:incoming_email).select(&:present?).map { |e| e.split("|") }.flatten.uniq end def category_email_in_regex - @category_email_in_regex ||= Regexp.union Category.pluck(:email_in).select(&:present?).uniq + @category_email_in_regex ||= Regexp.union Category.pluck(:email_in).select(&:present?).map { |e| e.split("|") }.flatten.uniq end def find_related_post @@ -266,6 +286,7 @@ module Email else options[:topic_id] = options[:post].try(:topic_id) options[:reply_to_post_number] = options[:post].try(:post_number) + options[:is_group_message] = options[:topic].private_message? && options[:topic].allowed_groups.exists? create_post_with_attachments(options) end end @@ -286,13 +307,14 @@ module Email # read attachment File.open(tmp.path, "w+b") { |f| f.write attachment.body.decoded } # create the upload for the user - upload = Upload.create_for(options[:user].id, tmp, attachment.filename, tmp.size) + opts = { is_attachment_for_group_message: options[:is_group_message] } + upload = Upload.create_for(options[:user].id, tmp, attachment.filename, tmp.size, opts) if upload && upload.errors.empty? # try to inline images if attachment.content_type.start_with?("image/") && options[:raw][/\[image: .+ \d+\]/] options[:raw].sub!(/\[image: .+ \d+\]/, attachment_markdown(upload)) else - options[:raw] << "\n#{attachment_markdown(upload)}\n" + options[:raw] << "\n\n#{attachment_markdown(upload)}\n\n" end end ensure @@ -300,11 +322,7 @@ module Email end end - post_options = { - cooking_options: { traditional_markdown_linebreaks: true }, - }.merge(options) - - create_post(post_options) + create_post(options) end def attachment_markdown(upload) @@ -340,9 +358,11 @@ module Email if @mail[d] && @mail[d].address_list && @mail[d].address_list.addresses @mail[d].address_list.addresses.each do |address_field| begin + address_field.decoded email = address_field.address.downcase + display_name = address_field.display_name.try(:to_s) if should_invite?(email) - user = find_or_create_user(address_field) + user = find_or_create_user(email, display_name) if can_invite?(topic, user) topic.topic_allowed_users.create!(user_id: user.id) topic.add_small_action(sender, "invited_user", user.username) diff --git a/lib/email/styles.rb b/lib/email/styles.rb index 67447a10a0..a82c8459f3 100644 --- a/lib/email/styles.rb +++ b/lib/email/styles.rb @@ -137,6 +137,7 @@ module Email end def format_html + style('h4', 'color: #222;') style('h3', 'margin: 15px 0 20px 0;') style('hr', 'background-color: #ddd; height: 1px; border: 1px;') style('a', 'text-decoration: none; font-weight: bold; color: #006699;') diff --git a/lib/emoji/db.json b/lib/emoji/db.json index 92c985e7d1..a0b396bcf3 100644 --- a/lib/emoji/db.json +++ b/lib/emoji/db.json @@ -1,8134 +1,4467 @@ -[ - { - "emoji": "🙂" - , "description": "slightly smiling face with closed mouth and smiling eyes" - , "aliases": [ - "slightly_smiling" - ] - , "tags": [ - "happy" - , "joy" - , "pleased" - ] - } -, { - "emoji": "😄" - , "description": "smiling face with open mouth and smiling eyes" - , "aliases": [ - "smile" - ] - , "tags": [ - "happy" - , "joy" - , "pleased" - ] - } -, { - "emoji": "😃" - , "description": "smiling face with open mouth" - , "aliases": [ - "smiley" - ] - , "tags": [ - "happy" - , "joy" - , "haha" - ] - } -, { - "emoji": "😀" - , "description": "grinning face" - , "aliases": [ - "grinning" - ] - , "tags": [ - "smile" - , "happy" - ] - } -, { - "emoji": "😊" - , "description": "smiling face with smiling eyes" - , "aliases": [ - "blush" - ] - , "tags": [ - "proud" - ] - } -, { - "emoji": "☺️" - , "description": "white smiling face" - , "aliases": [ - "relaxed" - ] - , "tags": [ - "blush" - , "pleased" - ] - } -, { - "emoji": "😉" - , "description": "winking face" - , "aliases": [ - "wink" - ] - , "tags": [ - "flirt" - ] - } -, { - "emoji": "😍" - , "description": "smiling face with heart-shaped eyes" - , "aliases": [ - "heart_eyes" - ] - , "tags": [ - "love" - , "crush" - ] - } -, { - "emoji": "😘" - , "description": "face throwing a kiss" - , "aliases": [ - "kissing_heart" - ] - , "tags": [ - "flirt" - ] - } -, { - "emoji": "😚" - , "description": "kissing face with closed eyes" - , "aliases": [ - "kissing_closed_eyes" - ] - , "tags": [ - ] - } -, { - "emoji": "😗" - , "description": "kissing face" - , "aliases": [ - "kissing" - ] - , "tags": [ - ] - } -, { - "emoji": "😙" - , "description": "kissing face with smiling eyes" - , "aliases": [ - "kissing_smiling_eyes" - ] - , "tags": [ - ] - } -, { - "emoji": "😜" - , "description": "face with stuck-out tongue and winking eye" - , "aliases": [ - "stuck_out_tongue_winking_eye" - ] - , "tags": [ - "prank" - , "silly" - ] - } -, { - "emoji": "😝" - , "description": "face with stuck-out tongue and tightly-closed eyes" - , "aliases": [ - "stuck_out_tongue_closed_eyes" - ] - , "tags": [ - "prank" - ] - } -, { - "emoji": "😛" - , "description": "face with stuck-out tongue" - , "aliases": [ - "stuck_out_tongue" - ] - , "tags": [ - ] - } -, { - "emoji": "😳" - , "description": "flushed face" - , "aliases": [ - "flushed" - ] - , "tags": [ - ] - } -, { - "emoji": "😁" - , "description": "grinning face with smiling eyes" - , "aliases": [ - "grin" - ] - , "tags": [ - ] - } -, { - "emoji": "😔" - , "description": "pensive face" - , "aliases": [ - "pensive" - ] - , "tags": [ - ] - } -, { - "emoji": "😌" - , "description": "relieved face" - , "aliases": [ - "relieved" - ] - , "tags": [ - "whew" - ] - } -, { - "emoji": "😒" - , "description": "unamused face" - , "aliases": [ - "unamused" - ] - , "tags": [ - "meh" - ] - } -, { - "emoji": "😞" - , "description": "disappointed face" - , "aliases": [ - "disappointed" - ] - , "tags": [ - "sad" - ] - } -, { - "emoji": "😣" - , "description": "persevering face" - , "aliases": [ - "persevere" - ] - , "tags": [ - "struggling" - ] - } -, { - "emoji": "😢" - , "description": "crying face" - , "aliases": [ - "cry" - ] - , "tags": [ - "sad" - , "tear" - ] - } -, { - "emoji": "😂" - , "description": "face with tears of joy" - , "aliases": [ - "joy" - ] - , "tags": [ - "tears" - ] - } -, { - "emoji": "😭" - , "description": "loudly crying face" - , "aliases": [ - "sob" - ] - , "tags": [ - "sad" - , "cry" - , "bawling" - ] - } -, { - "emoji": "😪" - , "description": "sleepy face" - , "aliases": [ - "sleepy" - ] - , "tags": [ - "tired" - ] - } -, { - "emoji": "😥" - , "description": "disappointed but relieved face" - , "aliases": [ - "disappointed_relieved" - ] - , "tags": [ - "phew" - , "sweat" - , "nervous" - ] - } -, { - "emoji": "😰" - , "description": "face with open mouth and cold sweat" - , "aliases": [ - "cold_sweat" - ] - , "tags": [ - "nervous" - ] - } -, { - "emoji": "😅" - , "description": "smiling face with open mouth and cold sweat" - , "aliases": [ - "sweat_smile" - ] - , "tags": [ - "hot" - ] - } -, { - "emoji": "😓" - , "description": "face with cold sweat" - , "aliases": [ - "sweat" - ] - , "tags": [ - ] - } -, { - "emoji": "😩" - , "description": "weary face" - , "aliases": [ - "weary" - ] - , "tags": [ - "tired" - ] - } -, { - "emoji": "😫" - , "description": "tired face" - , "aliases": [ - "tired_face" - ] - , "tags": [ - "upset" - , "whine" - ] - } -, { - "emoji": "😨" - , "description": "fearful face" - , "aliases": [ - "fearful" - ] - , "tags": [ - "scared" - , "shocked" - , "oops" - ] - } -, { - "emoji": "😱" - , "description": "face screaming in fear" - , "aliases": [ - "scream" - ] - , "tags": [ - "horror" - , "shocked" - ] - } -, { - "emoji": "😠" - , "description": "angry face" - , "aliases": [ - "angry" - ] - , "tags": [ - "mad" - , "annoyed" - ] - } -, { - "emoji": "😡" - , "description": "pouting face" - , "aliases": [ - "rage" - ] - , "tags": [ - "angry" - ] - } -, { - "emoji": "😤" - , "description": "face with look of triumph" - , "aliases": [ - "triumph" - ] - , "tags": [ - "smug" - ] - } -, { - "emoji": "😖" - , "description": "confounded face" - , "aliases": [ - "confounded" - ] - , "tags": [ - ] - } -, { - "emoji": "😆" - , "description": "smiling face with open mouth and tightly-closed eyes" - , "aliases": [ - "laughing" - , "satisfied" - ] - , "tags": [ - "happy" - , "haha" - ] - } -, { - "emoji": "😋" - , "description": "face savouring delicious food" - , "aliases": [ - "yum" - ] - , "tags": [ - "tongue" - , "lick" - ] - } -, { - "emoji": "😷" - , "description": "face with medical mask" - , "aliases": [ - "mask" - ] - , "tags": [ - "sick" - , "ill" - ] - } -, { - "emoji": "😎" - , "description": "smiling face with sunglasses" - , "aliases": [ - "sunglasses" - ] - , "tags": [ - "cool" - ] - } -, { - "emoji": "😴" - , "description": "sleeping face" - , "aliases": [ - "sleeping" - ] - , "tags": [ - "zzz" - ] - } -, { - "emoji": "😵" - , "description": "dizzy face" - , "aliases": [ - "dizzy_face" - ] - , "tags": [ - ] - } -, { - "emoji": "😲" - , "description": "astonished face" - , "aliases": [ - "astonished" - ] - , "tags": [ - "amazed" - , "gasp" - ] - } -, { - "emoji": "😟" - , "description": "worried face" - , "aliases": [ - "worried" - ] - , "tags": [ - "nervous" - ] - } -, { - "emoji": "😦" - , "description": "frowning face with open mouth" - , "aliases": [ - "frowning" - ] - , "tags": [ - ] - } -, { - "emoji": "😧" - , "description": "anguished face" - , "aliases": [ - "anguished" - ] - , "tags": [ - "stunned" - ] - } -, { - "emoji": "😈" - , "description": "smiling face with horns" - , "aliases": [ - "smiling_imp" - ] - , "tags": [ - "devil" - , "evil" - , "horns" - ] - } -, { - "emoji": "👿" - , "description": "imp" - , "aliases": [ - "imp" - ] - , "tags": [ - "angry" - , "devil" - , "evil" - , "horns" - ] - } -, { - "emoji": "😮" - , "description": "face with open mouth" - , "aliases": [ - "open_mouth" - ] - , "tags": [ - "surprise" - , "impressed" - , "wow" - ] - } -, { - "emoji": "😬" - , "description": "grimacing face" - , "aliases": [ - "grimacing" - ] - , "tags": [ - ] - } -, { - "emoji": "😐" - , "description": "neutral face" - , "aliases": [ - "neutral_face" - ] - , "tags": [ - "meh" - ] - } -, { - "emoji": "😕" - , "description": "confused face" - , "aliases": [ - "confused" - ] - , "tags": [ - ] - } -, { - "emoji": "😯" - , "description": "hushed face" - , "aliases": [ - "hushed" - ] - , "tags": [ - "silence" - , "speechless" - ] - } -, { - "emoji": "😶" - , "description": "face without mouth" - , "aliases": [ - "no_mouth" - ] - , "tags": [ - "mute" - , "silence" - ] - } -, { - "emoji": "😇" - , "description": "smiling face with halo" - , "aliases": [ - "innocent" - ] - , "tags": [ - "angel" - ] - } -, { - "emoji": "😏" - , "description": "smirking face" - , "aliases": [ - "smirk" - ] - , "tags": [ - "smug" - ] - } -, { - "emoji": "😑" - , "description": "expressionless face" - , "aliases": [ - "expressionless" - ] - , "tags": [ - ] - } -, { - "emoji": "👲" - , "description": "man with gua pi mao" - , "aliases": [ - "man_with_gua_pi_mao" - ] - , "tags": [ - ] - } -, { - "emoji": "👳" - , "description": "man with turban" - , "aliases": [ - "man_with_turban" - ] - , "tags": [ - ] - } -, { - "emoji": "👮" - , "description": "police officer" - , "aliases": [ - "cop" - ] - , "tags": [ - "police" - , "law" - ] - } -, { - "emoji": "👷" - , "description": "construction worker" - , "aliases": [ - "construction_worker" - ] - , "tags": [ - "helmet" - ] - } -, { - "emoji": "💂" - , "description": "guardsman" - , "aliases": [ - "guardsman" - ] - , "tags": [ - ] - } -, { - "emoji": "👶" - , "description": "baby" - , "aliases": [ - "baby" - ] - , "tags": [ - "child" - , "newborn" - ] - } -, { - "emoji": "👦" - , "description": "boy" - , "aliases": [ - "boy" - ] - , "tags": [ - "child" - ] - } -, { - "emoji": "👧" - , "description": "girl" - , "aliases": [ - "girl" - ] - , "tags": [ - "child" - ] - } -, { - "emoji": "👨" - , "description": "man" - , "aliases": [ - "man" - ] - , "tags": [ - "mustache" - , "father" - , "dad" - ] - } -, { - "emoji": "👩" - , "description": "woman" - , "aliases": [ - "woman" - ] - , "tags": [ - "girls" - ] - } -, { - "emoji": "👴" - , "description": "older man" - , "aliases": [ - "older_man" - ] - , "tags": [ - ] - } -, { - "emoji": "👵" - , "description": "older woman" - , "aliases": [ - "older_woman" - ] - , "tags": [ - ] - } -, { - "emoji": "👱" - , "description": "person with blond hair" - , "aliases": [ - "person_with_blond_hair" - ] - , "tags": [ - "boy" - ] - } -, { - "emoji": "👼" - , "description": "baby angel" - , "aliases": [ - "angel" - ] - , "tags": [ - ] - } -, { - "emoji": "👸" - , "description": "princess" - , "aliases": [ - "princess" - ] - , "tags": [ - "blonde" - , "crown" - , "royal" - ] - } -, { - "emoji": "😺" - , "description": "smiling cat face with open mouth" - , "aliases": [ - "smiley_cat" - ] - , "tags": [ - ] - } -, { - "emoji": "😸" - , "description": "grinning cat face with smiling eyes" - , "aliases": [ - "smile_cat" - ] - , "tags": [ - ] - } -, { - "emoji": "😻" - , "description": "smiling cat face with heart-shaped eyes" - , "aliases": [ - "heart_eyes_cat" - ] - , "tags": [ - ] - } -, { - "emoji": "😽" - , "description": "kissing cat face with closed eyes" - , "aliases": [ - "kissing_cat" - ] - , "tags": [ - ] - } -, { - "emoji": "😼" - , "description": "cat face with wry smile" - , "aliases": [ - "smirk_cat" - ] - , "tags": [ - ] - } -, { - "emoji": "🙀" - , "description": "weary cat face" - , "aliases": [ - "scream_cat" - ] - , "tags": [ - "horror" - ] - } -, { - "emoji": "😿" - , "description": "crying cat face" - , "aliases": [ - "crying_cat_face" - ] - , "tags": [ - "sad" - , "tear" - ] - } -, { - "emoji": "😹" - , "description": "cat face with tears of joy" - , "aliases": [ - "joy_cat" - ] - , "tags": [ - ] - } -, { - "emoji": "😾" - , "description": "pouting cat face" - , "aliases": [ - "pouting_cat" - ] - , "tags": [ - ] - } -, { - "emoji": "👹" - , "description": "japanese ogre" - , "aliases": [ - "japanese_ogre" - ] - , "tags": [ - "monster" - ] - } -, { - "emoji": "👺" - , "description": "japanese goblin" - , "aliases": [ - "japanese_goblin" - ] - , "tags": [ - ] - } -, { - "emoji": "🙈" - , "description": "see-no-evil monkey" - , "aliases": [ - "see_no_evil" - ] - , "tags": [ - "monkey" - , "blind" - , "ignore" - ] - } -, { - "emoji": "🙉" - , "description": "hear-no-evil monkey" - , "aliases": [ - "hear_no_evil" - ] - , "tags": [ - "monkey" - , "deaf" - ] - } -, { - "emoji": "🙊" - , "description": "speak-no-evil monkey" - , "aliases": [ - "speak_no_evil" - ] - , "tags": [ - "monkey" - , "mute" - , "hush" - ] - } -, { - "emoji": "💀" - , "description": "skull" - , "aliases": [ - "skull" - ] - , "tags": [ - "dead" - , "danger" - , "poison" - ] - } -, { - "emoji": "👽" - , "description": "extraterrestrial alien" - , "aliases": [ - "alien" - ] - , "tags": [ - "ufo" - ] - } -, { - "emoji": "💩" - , "description": "pile of poo" - , "aliases": [ - "hankey" - , "poop" - , "shit" - ] - , "tags": [ - "crap" - ] - } -, { - "emoji": "🔥" - , "description": "fire" - , "aliases": [ - "fire" - ] - , "tags": [ - "burn" - ] - } -, { - "emoji": "✨" - , "description": "sparkles" - , "aliases": [ - "sparkles" - ] - , "tags": [ - "shiny" - ] - } -, { - "emoji": "🌟" - , "description": "glowing star" - , "aliases": [ - "star2" - ] - , "tags": [ - ] - } -, { - "emoji": "💫" - , "description": "dizzy symbol" - , "aliases": [ - "dizzy" - ] - , "tags": [ - "star" - ] - } -, { - "emoji": "💥" - , "description": "collision symbol" - , "aliases": [ - "boom" - , "collision" - ] - , "tags": [ - "explode" - ] - } -, { - "emoji": "💢" - , "description": "anger symbol" - , "aliases": [ - "anger" - ] - , "tags": [ - "angry" - ] - } -, { - "emoji": "💦" - , "description": "splashing sweat symbol" - , "aliases": [ - "sweat_drops" - ] - , "tags": [ - "water" - , "workout" - ] - } -, { - "emoji": "💧" - , "description": "droplet" - , "aliases": [ - "droplet" - ] - , "tags": [ - "water" - ] - } -, { - "emoji": "💤" - , "description": "sleeping symbol" - , "aliases": [ - "zzz" - ] - , "tags": [ - "sleeping" - ] - } -, { - "emoji": "💨" - , "description": "dash symbol" - , "aliases": [ - "dash" - ] - , "tags": [ - "wind" - , "blow" - , "fast" - ] - } -, { - "emoji": "👂" - , "description": "ear" - , "aliases": [ - "ear" - ] - , "tags": [ - "hear" - , "sound" - , "listen" - ] - } -, { - "emoji": "👀" - , "description": "eyes" - , "aliases": [ - "eyes" - ] - , "tags": [ - "look" - , "see" - , "watch" - ] - } -, { - "emoji": "👃" - , "description": "nose" - , "aliases": [ - "nose" - ] - , "tags": [ - "smell" - ] - } -, { - "emoji": "👅" - , "description": "tongue" - , "aliases": [ - "tongue" - ] - , "tags": [ - "taste" - ] - } -, { - "emoji": "👄" - , "description": "mouth" - , "aliases": [ - "lips" - ] - , "tags": [ - "kiss" - ] - } -, { - "emoji": "👍" - , "description": "thumbs up sign" - , "aliases": [ - "+1" - , "thumbsup" - ] - , "tags": [ - "approve" - , "ok" - ] - } -, { - "emoji": "👎" - , "description": "thumbs down sign" - , "aliases": [ - "-1" - , "thumbsdown" - ] - , "tags": [ - "disapprove" - , "bury" - ] - } -, { - "emoji": "👌" - , "description": "ok hand sign" - , "aliases": [ - "ok_hand" - ] - , "tags": [ - ] - } -, { - "emoji": "👊" - , "description": "fisted hand sign" - , "aliases": [ - "facepunch" - , "punch" - ] - , "tags": [ - "attack" - ] - } -, { - "emoji": "✊" - , "description": "raised fist" - , "aliases": [ - "fist" - ] - , "tags": [ - "power" - ] - } -, { - "emoji": "✌️" - , "description": "victory hand" - , "aliases": [ - "v" - ] - , "tags": [ - "victory" - , "peace" - ] - } -, { - "emoji": "👋" - , "description": "waving hand sign" - , "aliases": [ - "wave" - ] - , "tags": [ - "goodbye" - ] - } -, { - "emoji": "✋" - , "description": "raised hand" - , "aliases": [ - "hand" - , "raised_hand" - ] - , "tags": [ - "highfive" - , "stop" - ] - } -, { - "emoji": "👐" - , "description": "open hands sign" - , "aliases": [ - "open_hands" - ] - , "tags": [ - ] - } -, { - "emoji": "👆" - , "description": "white up pointing backhand index" - , "aliases": [ - "point_up_2" - ] - , "tags": [ - ] - } -, { - "emoji": "👇" - , "description": "white down pointing backhand index" - , "aliases": [ - "point_down" - ] - , "tags": [ - ] - } -, { - "emoji": "👉" - , "description": "white right pointing backhand index" - , "aliases": [ - "point_right" - ] - , "tags": [ - ] - } -, { - "emoji": "👈" - , "description": "white left pointing backhand index" - , "aliases": [ - "point_left" - ] - , "tags": [ - ] - } -, { - "emoji": "🙌" - , "description": "person raising both hands in celebration" - , "aliases": [ - "raised_hands" - ] - , "tags": [ - "hooray" - ] - } -, { - "emoji": "🙏" - , "description": "person with folded hands" - , "aliases": [ - "pray" - ] - , "tags": [ - "please" - , "hope" - , "wish" - ] - } -, { - "emoji": "☝️" - , "description": "white up pointing index" - , "aliases": [ - "point_up" - ] - , "tags": [ - ] - } -, { - "emoji": "👏" - , "description": "clapping hands sign" - , "aliases": [ - "clap" - ] - , "tags": [ - "praise" - , "applause" - ] - } -, { - "emoji": "💪" - , "description": "flexed biceps" - , "aliases": [ - "muscle" - ] - , "tags": [ - "flex" - , "bicep" - , "strong" - , "workout" - ] - } -, { - "emoji": "🚶" - , "description": "pedestrian" - , "aliases": [ - "walking" - ] - , "tags": [ - ] - } -, { - "emoji": "🏃" - , "description": "runner" - , "aliases": [ - "runner" - , "running" - ] - , "tags": [ - "exercise" - , "workout" - , "marathon" - ] - } -, { - "emoji": "💃" - , "description": "dancer" - , "aliases": [ - "dancer" - ] - , "tags": [ - "dress" - ] - } -, { - "emoji": "👫" - , "description": "man and woman holding hands" - , "aliases": [ - "couple" - ] - , "tags": [ - "date" - ] - } -, { - "emoji": "👪" - , "description": "family" - , "aliases": [ - "family" - ] - , "tags": [ - "home" - , "parents" - , "child" - ] - } -, { - "emoji": "👬" - , "description": "two men holding hands" - , "aliases": [ - "two_men_holding_hands" - ] - , "tags": [ - "couple" - , "date" - ] - } -, { - "emoji": "👭" - , "description": "two women holding hands" - , "aliases": [ - "two_women_holding_hands" - ] - , "tags": [ - "couple" - , "date" - ] - } -, { - "emoji": "💏" - , "description": "kiss" - , "aliases": [ - "couplekiss" - ] - , "tags": [ - ] - } -, { - "emoji": "💑" - , "description": "couple with heart" - , "aliases": [ - "couple_with_heart" - ] - , "tags": [ - ] - } -, { - "emoji": "👯" - , "description": "woman with bunny ears" - , "aliases": [ - "dancers" - ] - , "tags": [ - "bunny" - ] - } -, { - "emoji": "🙆" - , "description": "face with ok gesture" - , "aliases": [ - "ok_woman" - ] - , "tags": [ - ] - } -, { - "emoji": "🙅" - , "description": "face with no good gesture" - , "aliases": [ - "no_good" - ] - , "tags": [ - "stop" - , "halt" - ] - } -, { - "emoji": "💁" - , "description": "information desk person" - , "aliases": [ - "information_desk_person" - ] - , "tags": [ - ] - } -, { - "emoji": "🙋" - , "description": "happy person raising one hand" - , "aliases": [ - "raising_hand" - ] - , "tags": [ - ] - } -, { - "emoji": "💆" - , "description": "face massage" - , "aliases": [ - "massage" - ] - , "tags": [ - "spa" - ] - } -, { - "emoji": "💇" - , "description": "haircut" - , "aliases": [ - "haircut" - ] - , "tags": [ - "beauty" - ] - } -, { - "emoji": "💅" - , "description": "nail polish" - , "aliases": [ - "nail_care" - ] - , "tags": [ - "beauty" - , "manicure" - ] - } -, { - "emoji": "👰" - , "description": "bride with veil" - , "aliases": [ - "bride_with_veil" - ] - , "tags": [ - "marriage" - , "wedding" - ] - } -, { - "emoji": "🙎" - , "description": "person with pouting face" - , "aliases": [ - "person_with_pouting_face" - ] - , "tags": [ - ] - } -, { - "emoji": "🙍" - , "description": "person frowning" - , "aliases": [ - "person_frowning" - ] - , "tags": [ - "sad" - ] - } -, { - "emoji": "🙇" - , "description": "person bowing deeply" - , "aliases": [ - "bow" - ] - , "tags": [ - "respect" - , "thanks" - ] - } -, { - "emoji": "🎩" - , "description": "top hat" - , "aliases": [ - "tophat" - ] - , "tags": [ - "hat" - , "classy" - ] - } -, { - "emoji": "👑" - , "description": "crown" - , "aliases": [ - "crown" - ] - , "tags": [ - "king" - , "queen" - , "royal" - ] - } -, { - "emoji": "👒" - , "description": "womans hat" - , "aliases": [ - "womans_hat" - ] - , "tags": [ - ] - } -, { - "emoji": "👟" - , "description": "athletic shoe" - , "aliases": [ - "athletic_shoe" - ] - , "tags": [ - "sneaker" - , "sport" - , "running" - ] - } -, { - "emoji": "👞" - , "description": "mans shoe" - , "aliases": [ - "mans_shoe" - , "shoe" - ] - , "tags": [ - ] - } -, { - "emoji": "👡" - , "description": "womans sandal" - , "aliases": [ - "sandal" - ] - , "tags": [ - "shoe" - ] - } -, { - "emoji": "👠" - , "description": "high-heeled shoe" - , "aliases": [ - "high_heel" - ] - , "tags": [ - "shoe" - ] - } -, { - "emoji": "👢" - , "description": "womans boots" - , "aliases": [ - "boot" - ] - , "tags": [ - ] - } -, { - "emoji": "👕" - , "description": "t-shirt" - , "aliases": [ - "shirt" - , "tshirt" - ] - , "tags": [ - ] - } -, { - "emoji": "👔" - , "description": "necktie" - , "aliases": [ - "necktie" - ] - , "tags": [ - "shirt" - , "formal" - ] - } -, { - "emoji": "👚" - , "description": "womans clothes" - , "aliases": [ - "womans_clothes" - ] - , "tags": [ - ] - } -, { - "emoji": "👗" - , "description": "dress" - , "aliases": [ - "dress" - ] - , "tags": [ - ] - } -, { - "emoji": "🎽" - , "description": "running shirt with sash" - , "aliases": [ - "running_shirt_with_sash" - ] - , "tags": [ - "marathon" - ] - } -, { - "emoji": "👖" - , "description": "jeans" - , "aliases": [ - "jeans" - ] - , "tags": [ - "pants" - ] - } -, { - "emoji": "👘" - , "description": "kimono" - , "aliases": [ - "kimono" - ] - , "tags": [ - ] - } -, { - "emoji": "👙" - , "description": "bikini" - , "aliases": [ - "bikini" - ] - , "tags": [ - "beach" - ] - } -, { - "emoji": "💼" - , "description": "briefcase" - , "aliases": [ - "briefcase" - ] - , "tags": [ - "business" - ] - } -, { - "emoji": "👜" - , "description": "handbag" - , "aliases": [ - "handbag" - ] - , "tags": [ - "bag" - ] - } -, { - "emoji": "👝" - , "description": "pouch" - , "aliases": [ - "pouch" - ] - , "tags": [ - "bag" - ] - } -, { - "emoji": "👛" - , "description": "purse" - , "aliases": [ - "purse" - ] - , "tags": [ - ] - } -, { - "emoji": "👓" - , "description": "eyeglasses" - , "aliases": [ - "eyeglasses" - ] - , "tags": [ - "glasses" - ] - } -, { - "emoji": "🎀" - , "description": "ribbon" - , "aliases": [ - "ribbon" - ] - , "tags": [ - ] - } -, { - "emoji": "🌂" - , "description": "closed umbrella" - , "aliases": [ - "closed_umbrella" - ] - , "tags": [ - "weather" - , "rain" - ] - } -, { - "emoji": "💄" - , "description": "lipstick" - , "aliases": [ - "lipstick" - ] - , "tags": [ - "makeup" - ] - } -, { - "emoji": "💛" - , "description": "yellow heart" - , "aliases": [ - "yellow_heart" - ] - , "tags": [ - ] - } -, { - "emoji": "💙" - , "description": "blue heart" - , "aliases": [ - "blue_heart" - ] - , "tags": [ - ] - } -, { - "emoji": "💜" - , "description": "purple heart" - , "aliases": [ - "purple_heart" - ] - , "tags": [ - ] - } -, { - "emoji": "💚" - , "description": "green heart" - , "aliases": [ - "green_heart" - ] - , "tags": [ - ] - } -, { - "emoji": "❤️" - , "description": "heavy black heart" - , "aliases": [ - "heart" - ] - , "tags": [ - "love" - ] - } -, { - "emoji": "💔" - , "description": "broken heart" - , "aliases": [ - "broken_heart" - ] - , "tags": [ - ] - } -, { - "emoji": "💗" - , "description": "growing heart" - , "aliases": [ - "heartpulse" - ] - , "tags": [ - ] - } -, { - "emoji": "💓" - , "description": "beating heart" - , "aliases": [ - "heartbeat" - ] - , "tags": [ - ] - } -, { - "emoji": "💕" - , "description": "two hearts" - , "aliases": [ - "two_hearts" - ] - , "tags": [ - ] - } -, { - "emoji": "💖" - , "description": "sparkling heart" - , "aliases": [ - "sparkling_heart" - ] - , "tags": [ - ] - } -, { - "emoji": "💞" - , "description": "revolving hearts" - , "aliases": [ - "revolving_hearts" - ] - , "tags": [ - ] - } -, { - "emoji": "💘" - , "description": "heart with arrow" - , "aliases": [ - "cupid" - ] - , "tags": [ - "love" - , "heart" - ] - } -, { - "emoji": "💌" - , "description": "love letter" - , "aliases": [ - "love_letter" - ] - , "tags": [ - "email" - , "envelope" - ] - } -, { - "emoji": "💋" - , "description": "kiss mark" - , "aliases": [ - "kiss" - ] - , "tags": [ - "lipstick" - ] - } -, { - "emoji": "💍" - , "description": "ring" - , "aliases": [ - "ring" - ] - , "tags": [ - "wedding" - , "marriage" - , "engaged" - ] - } -, { - "emoji": "💎" - , "description": "gem stone" - , "aliases": [ - "gem" - ] - , "tags": [ - "diamond" - ] - } -, { - "emoji": "👤" - , "description": "bust in silhouette" - , "aliases": [ - "bust_in_silhouette" - ] - , "tags": [ - "user" - ] - } -, { - "emoji": "👥" - , "description": "busts in silhouette" - , "aliases": [ - "busts_in_silhouette" - ] - , "tags": [ - "users" - , "group" - , "team" - ] - } -, { - "emoji": "💬" - , "description": "speech balloon" - , "aliases": [ - "speech_balloon" - ] - , "tags": [ - "comment" - ] - } -, { - "emoji": "👣" - , "description": "footprints" - , "aliases": [ - "footprints" - ] - , "tags": [ - "feet" - , "tracks" - ] - } -, { - "emoji": "💭" - , "description": "thought balloon" - , "aliases": [ - "thought_balloon" - ] - , "tags": [ - "thinking" - ] - } -, { - "emoji": "🐶" - , "description": "dog face" - , "aliases": [ - "dog" - ] - , "tags": [ - "pet" - ] - } -, { - "emoji": "🐺" - , "description": "wolf face" - , "aliases": [ - "wolf" - ] - , "tags": [ - ] - } -, { - "emoji": "🐱" - , "description": "cat face" - , "aliases": [ - "cat" - ] - , "tags": [ - "pet" - ] - } -, { - "emoji": "🐭" - , "description": "mouse face" - , "aliases": [ - "mouse" - ] - , "tags": [ - ] - } -, { - "emoji": "🐹" - , "description": "hamster face" - , "aliases": [ - "hamster" - ] - , "tags": [ - "pet" - ] - } -, { - "emoji": "🐰" - , "description": "rabbit face" - , "aliases": [ - "rabbit" - ] - , "tags": [ - "bunny" - ] - } -, { - "emoji": "🐸" - , "description": "frog face" - , "aliases": [ - "frog" - ] - , "tags": [ - ] - } -, { - "emoji": "🐯" - , "description": "tiger face" - , "aliases": [ - "tiger" - ] - , "tags": [ - ] - } -, { - "emoji": "🐨" - , "description": "koala" - , "aliases": [ - "koala" - ] - , "tags": [ - ] - } -, { - "emoji": "🐻" - , "description": "bear face" - , "aliases": [ - "bear" - ] - , "tags": [ - ] - } -, { - "emoji": "🐷" - , "description": "pig face" - , "aliases": [ - "pig" - ] - , "tags": [ - ] - } -, { - "emoji": "🐽" - , "description": "pig nose" - , "aliases": [ - "pig_nose" - ] - , "tags": [ - ] - } -, { - "emoji": "🐮" - , "description": "cow face" - , "aliases": [ - "cow" - ] - , "tags": [ - ] - } -, { - "emoji": "🐗" - , "description": "boar" - , "aliases": [ - "boar" - ] - , "tags": [ - ] - } -, { - "emoji": "🐵" - , "description": "monkey face" - , "aliases": [ - "monkey_face" - ] - , "tags": [ - ] - } -, { - "emoji": "🐒" - , "description": "monkey" - , "aliases": [ - "monkey" - ] - , "tags": [ - ] - } -, { - "emoji": "🐴" - , "description": "horse face" - , "aliases": [ - "horse" - ] - , "tags": [ - ] - } -, { - "emoji": "🐑" - , "description": "sheep" - , "aliases": [ - "sheep" - ] - , "tags": [ - ] - } -, { - "emoji": "🐘" - , "description": "elephant" - , "aliases": [ - "elephant" - ] - , "tags": [ - ] - } -, { - "emoji": "🐼" - , "description": "panda face" - , "aliases": [ - "panda_face" - ] - , "tags": [ - ] - } -, { - "emoji": "🐧" - , "description": "penguin" - , "aliases": [ - "penguin" - ] - , "tags": [ - ] - } -, { - "emoji": "🐦" - , "description": "bird" - , "aliases": [ - "bird" - ] - , "tags": [ - ] - } -, { - "emoji": "🐤" - , "description": "baby chick" - , "aliases": [ - "baby_chick" - ] - , "tags": [ - ] - } -, { - "emoji": "🐥" - , "description": "front-facing baby chick" - , "aliases": [ - "hatched_chick" - ] - , "tags": [ - ] - } -, { - "emoji": "🐣" - , "description": "hatching chick" - , "aliases": [ - "hatching_chick" - ] - , "tags": [ - ] - } -, { - "emoji": "🐔" - , "description": "chicken" - , "aliases": [ - "chicken" - ] - , "tags": [ - ] - } -, { - "emoji": "🐍" - , "description": "snake" - , "aliases": [ - "snake" - ] - , "tags": [ - ] - } -, { - "emoji": "🐢" - , "description": "turtle" - , "aliases": [ - "turtle" - ] - , "tags": [ - "slow" - ] - } -, { - "emoji": "🐛" - , "description": "bug" - , "aliases": [ - "bug" - ] - , "tags": [ - ] - } -, { - "emoji": "🐝" - , "description": "honeybee" - , "aliases": [ - "bee" - , "honeybee" - ] - , "tags": [ - ] - } -, { - "emoji": "🐜" - , "description": "ant" - , "aliases": [ - "ant" - ] - , "tags": [ - ] - } -, { - "emoji": "🐞" - , "description": "lady beetle" - , "aliases": [ - "beetle" - ] - , "tags": [ - "bug" - ] - } -, { - "emoji": "🐌" - , "description": "snail" - , "aliases": [ - "snail" - ] - , "tags": [ - "slow" - ] - } -, { - "emoji": "🐙" - , "description": "octopus" - , "aliases": [ - "octopus" - ] - , "tags": [ - ] - } -, { - "emoji": "🐚" - , "description": "spiral shell" - , "aliases": [ - "shell" - ] - , "tags": [ - "sea" - , "beach" - ] - } -, { - "emoji": "🐠" - , "description": "tropical fish" - , "aliases": [ - "tropical_fish" - ] - , "tags": [ - ] - } -, { - "emoji": "🐟" - , "description": "fish" - , "aliases": [ - "fish" - ] - , "tags": [ - ] - } -, { - "emoji": "🐬" - , "description": "dolphin" - , "aliases": [ - "dolphin" - , "flipper" - ] - , "tags": [ - ] - } -, { - "emoji": "🐳" - , "description": "spouting whale" - , "aliases": [ - "whale" - ] - , "tags": [ - "sea" - ] - } -, { - "emoji": "🐋" - , "description": "whale" - , "aliases": [ - "whale2" - ] - , "tags": [ - ] - } -, { - "emoji": "🐄" - , "description": "cow" - , "aliases": [ - "cow2" - ] - , "tags": [ - ] - } -, { - "emoji": "🐏" - , "description": "ram" - , "aliases": [ - "ram" - ] - , "tags": [ - ] - } -, { - "emoji": "🐀" - , "description": "rat" - , "aliases": [ - "rat" - ] - , "tags": [ - ] - } -, { - "emoji": "🐃" - , "description": "water buffalo" - , "aliases": [ - "water_buffalo" - ] - , "tags": [ - ] - } -, { - "emoji": "🐅" - , "description": "tiger" - , "aliases": [ - "tiger2" - ] - , "tags": [ - ] - } -, { - "emoji": "🐇" - , "description": "rabbit" - , "aliases": [ - "rabbit2" - ] - , "tags": [ - ] - } -, { - "emoji": "🐉" - , "description": "dragon" - , "aliases": [ - "dragon" - ] - , "tags": [ - ] - } -, { - "emoji": "🐎" - , "description": "horse" - , "aliases": [ - "racehorse" - ] - , "tags": [ - "speed" - ] - } -, { - "emoji": "🐐" - , "description": "goat" - , "aliases": [ - "goat" - ] - , "tags": [ - ] - } -, { - "emoji": "🐓" - , "description": "rooster" - , "aliases": [ - "rooster" - ] - , "tags": [ - ] - } -, { - "emoji": "🐕" - , "description": "dog" - , "aliases": [ - "dog2" - ] - , "tags": [ - ] - } -, { - "emoji": "🐖" - , "description": "pig" - , "aliases": [ - "pig2" - ] - , "tags": [ - ] - } -, { - "emoji": "🐁" - , "description": "mouse" - , "aliases": [ - "mouse2" - ] - , "tags": [ - ] - } -, { - "emoji": "🐂" - , "description": "ox" - , "aliases": [ - "ox" - ] - , "tags": [ - ] - } -, { - "emoji": "🐲" - , "description": "dragon face" - , "aliases": [ - "dragon_face" - ] - , "tags": [ - ] - } -, { - "emoji": "🐡" - , "description": "blowfish" - , "aliases": [ - "blowfish" - ] - , "tags": [ - ] - } -, { - "emoji": "🐊" - , "description": "crocodile" - , "aliases": [ - "crocodile" - ] - , "tags": [ - ] - } -, { - "emoji": "🐫" - , "description": "bactrian camel" - , "aliases": [ - "camel" - ] - , "tags": [ - ] - } -, { - "emoji": "🐪" - , "description": "dromedary camel" - , "aliases": [ - "dromedary_camel" - ] - , "tags": [ - "desert" - ] - } -, { - "emoji": "🐆" - , "description": "leopard" - , "aliases": [ - "leopard" - ] - , "tags": [ - ] - } -, { - "emoji": "🐈" - , "description": "cat" - , "aliases": [ - "cat2" - ] - , "tags": [ - ] - } -, { - "emoji": "🐩" - , "description": "poodle" - , "aliases": [ - "poodle" - ] - , "tags": [ - "dog" - ] - } -, { - "emoji": "🐾" - , "description": "paw prints" - , "aliases": [ - "feet" - , "paw_prints" - ] - , "tags": [ - ] - } -, { - "emoji": "💐" - , "description": "bouquet" - , "aliases": [ - "bouquet" - ] - , "tags": [ - "flowers" - ] - } -, { - "emoji": "🌸" - , "description": "cherry blossom" - , "aliases": [ - "cherry_blossom" - ] - , "tags": [ - "flower" - , "spring" - ] - } -, { - "emoji": "🌷" - , "description": "tulip" - , "aliases": [ - "tulip" - ] - , "tags": [ - "flower" - ] - } -, { - "emoji": "🍀" - , "description": "four leaf clover" - , "aliases": [ - "four_leaf_clover" - ] - , "tags": [ - "luck" - ] - } -, { - "emoji": "🌹" - , "description": "rose" - , "aliases": [ - "rose" - ] - , "tags": [ - "flower" - ] - } -, { - "emoji": "🌻" - , "description": "sunflower" - , "aliases": [ - "sunflower" - ] - , "tags": [ - ] - } -, { - "emoji": "🌺" - , "description": "hibiscus" - , "aliases": [ - "hibiscus" - ] - , "tags": [ - ] - } -, { - "emoji": "🍁" - , "description": "maple leaf" - , "aliases": [ - "maple_leaf" - ] - , "tags": [ - "canada" - ] - } -, { - "emoji": "🍃" - , "description": "leaf fluttering in wind" - , "aliases": [ - "leaves" - ] - , "tags": [ - "leaf" - ] - } -, { - "emoji": "🍂" - , "description": "fallen leaf" - , "aliases": [ - "fallen_leaf" - ] - , "tags": [ - "autumn" - ] - } -, { - "emoji": "🌿" - , "description": "herb" - , "aliases": [ - "herb" - ] - , "tags": [ - ] - } -, { - "emoji": "🌾" - , "description": "ear of rice" - , "aliases": [ - "ear_of_rice" - ] - , "tags": [ - ] - } -, { - "emoji": "🍄" - , "description": "mushroom" - , "aliases": [ - "mushroom" - ] - , "tags": [ - ] - } -, { - "emoji": "🌵" - , "description": "cactus" - , "aliases": [ - "cactus" - ] - , "tags": [ - ] - } -, { - "emoji": "🌴" - , "description": "palm tree" - , "aliases": [ - "palm_tree" - ] - , "tags": [ - ] - } -, { - "emoji": "🌲" - , "description": "evergreen tree" - , "aliases": [ - "evergreen_tree" - ] - , "tags": [ - "wood" - ] - } -, { - "emoji": "🌳" - , "description": "deciduous tree" - , "aliases": [ - "deciduous_tree" - ] - , "tags": [ - "wood" - ] - } -, { - "emoji": "🌰" - , "description": "chestnut" - , "aliases": [ - "chestnut" - ] - , "tags": [ - ] - } -, { - "emoji": "🌱" - , "description": "seedling" - , "aliases": [ - "seedling" - ] - , "tags": [ - "plant" - ] - } -, { - "emoji": "🌼" - , "description": "blossom" - , "aliases": [ - "blossom" - ] - , "tags": [ - ] - } -, { - "emoji": "🌐" - , "description": "globe with meridians" - , "aliases": [ - "globe_with_meridians" - ] - , "tags": [ - "world" - , "global" - , "international" - ] - } -, { - "emoji": "🌞" - , "description": "sun with face" - , "aliases": [ - "sun_with_face" - ] - , "tags": [ - "summer" - ] - } -, { - "emoji": "🌝" - , "description": "full moon with face" - , "aliases": [ - "full_moon_with_face" - ] - , "tags": [ - ] - } -, { - "emoji": "🌚" - , "description": "new moon with face" - , "aliases": [ - "new_moon_with_face" - ] - , "tags": [ - ] - } -, { - "emoji": "🌑" - , "description": "new moon symbol" - , "aliases": [ - "new_moon" - ] - , "tags": [ - ] - } -, { - "emoji": "🌒" - , "description": "waxing crescent moon symbol" - , "aliases": [ - "waxing_crescent_moon" - ] - , "tags": [ - ] - } -, { - "emoji": "🌓" - , "description": "first quarter moon symbol" - , "aliases": [ - "first_quarter_moon" - ] - , "tags": [ - ] - } -, { - "emoji": "🌔" - , "description": "waxing gibbous moon symbol" - , "aliases": [ - "moon" - , "waxing_gibbous_moon" - ] - , "tags": [ - ] - } -, { - "emoji": "🌕" - , "description": "full moon symbol" - , "aliases": [ - "full_moon" - ] - , "tags": [ - ] - } -, { - "emoji": "🌖" - , "description": "waning gibbous moon symbol" - , "aliases": [ - "waning_gibbous_moon" - ] - , "tags": [ - ] - } -, { - "emoji": "🌗" - , "description": "last quarter moon symbol" - , "aliases": [ - "last_quarter_moon" - ] - , "tags": [ - ] - } -, { - "emoji": "🌘" - , "description": "waning crescent moon symbol" - , "aliases": [ - "waning_crescent_moon" - ] - , "tags": [ - ] - } -, { - "emoji": "🌜" - , "description": "last quarter moon with face" - , "aliases": [ - "last_quarter_moon_with_face" - ] - , "tags": [ - ] - } -, { - "emoji": "🌛" - , "description": "first quarter moon with face" - , "aliases": [ - "first_quarter_moon_with_face" - ] - , "tags": [ - ] - } -, { - "emoji": "🌙" - , "description": "crescent moon" - , "aliases": [ - "crescent_moon" - ] - , "tags": [ - "night" - ] - } -, { - "emoji": "🌍" - , "description": "earth globe europe-africa" - , "aliases": [ - "earth_africa" - ] - , "tags": [ - "globe" - , "world" - , "international" - ] - } -, { - "emoji": "🌎" - , "description": "earth globe americas" - , "aliases": [ - "earth_americas" - ] - , "tags": [ - "globe" - , "world" - , "international" - ] - } -, { - "emoji": "🌏" - , "description": "earth globe asia-australia" - , "aliases": [ - "earth_asia" - ] - , "tags": [ - "globe" - , "world" - , "international" - ] - } -, { - "emoji": "🌋" - , "description": "volcano" - , "aliases": [ - "volcano" - ] - , "tags": [ - ] - } -, { - "emoji": "🌌" - , "description": "milky way" - , "aliases": [ - "milky_way" - ] - , "tags": [ - ] - } -, { - "emoji": "🌠" - , "description": "shooting star" - , "aliases": [ - "stars" - ] - , "tags": [ - ] - } -, { - "emoji": "⭐" - , "description": "white medium star" - , "aliases": [ - "star" - ] - , "tags": [ - ] - } -, { - "emoji": "☀️" - , "description": "black sun with rays" - , "aliases": [ - "sunny" - ] - , "tags": [ - "weather" - ] - } -, { - "emoji": "⛅" - , "description": "sun behind cloud" - , "aliases": [ - "partly_sunny" - ] - , "tags": [ - "weather" - , "cloud" - ] - } -, { - "emoji": "☁️" - , "description": "cloud" - , "aliases": [ - "cloud" - ] - , "tags": [ - ] - } -, { - "emoji": "⚡" - , "description": "high voltage sign" - , "aliases": [ - "zap" - ] - , "tags": [ - "lightning" - , "thunder" - ] - } -, { - "emoji": "☔" - , "description": "umbrella with rain drops" - , "aliases": [ - "umbrella" - ] - , "tags": [ - "rain" - , "weather" - ] - } -, { - "emoji": "❄️" - , "description": "snowflake" - , "aliases": [ - "snowflake" - ] - , "tags": [ - "winter" - , "cold" - , "weather" - ] - } -, { - "emoji": "⛄" - , "description": "snowman without snow" - , "aliases": [ - "snowman" - ] - , "tags": [ - "winter" - , "christmas" - ] - } -, { - "emoji": "🌀" - , "description": "cyclone" - , "aliases": [ - "cyclone" - ] - , "tags": [ - "swirl" - ] - } -, { - "emoji": "🌁" - , "description": "foggy" - , "aliases": [ - "foggy" - ] - , "tags": [ - "karl" - ] - } -, { - "emoji": "🌈" - , "description": "rainbow" - , "aliases": [ - "rainbow" - ] - , "tags": [ - "pride" - ] - } -, { - "emoji": "🌊" - , "description": "water wave" - , "aliases": [ - "ocean" - ] - , "tags": [ - "sea" - ] - } -, { - "emoji": "🎍" - , "description": "pine decoration" - , "aliases": [ - "bamboo" - ] - , "tags": [ - ] - } -, { - "emoji": "💝" - , "description": "heart with ribbon" - , "aliases": [ - "gift_heart" - ] - , "tags": [ - "chocolates" - ] - } -, { - "emoji": "🎎" - , "description": "japanese dolls" - , "aliases": [ - "dolls" - ] - , "tags": [ - ] - } -, { - "emoji": "🎒" - , "description": "school satchel" - , "aliases": [ - "school_satchel" - ] - , "tags": [ - ] - } -, { - "emoji": "🎓" - , "description": "graduation cap" - , "aliases": [ - "mortar_board" - ] - , "tags": [ - "education" - , "college" - , "university" - , "graduation" - ] - } -, { - "emoji": "🎏" - , "description": "carp streamer" - , "aliases": [ - "flags" - ] - , "tags": [ - ] - } -, { - "emoji": "🎆" - , "description": "fireworks" - , "aliases": [ - "fireworks" - ] - , "tags": [ - "festival" - , "celebration" - ] - } -, { - "emoji": "🎇" - , "description": "firework sparkler" - , "aliases": [ - "sparkler" - ] - , "tags": [ - ] - } -, { - "emoji": "🎐" - , "description": "wind chime" - , "aliases": [ - "wind_chime" - ] - , "tags": [ - ] - } -, { - "emoji": "🎑" - , "description": "moon viewing ceremony" - , "aliases": [ - "rice_scene" - ] - , "tags": [ - ] - } -, { - "emoji": "🎃" - , "description": "jack-o-lantern" - , "aliases": [ - "jack_o_lantern" - ] - , "tags": [ - "halloween" - ] - } -, { - "emoji": "👻" - , "description": "ghost" - , "aliases": [ - "ghost" - ] - , "tags": [ - "halloween" - ] - } -, { - "emoji": "🎅" - , "description": "father christmas" - , "aliases": [ - "santa" - ] - , "tags": [ - "christmas" - ] - } -, { - "emoji": "🎄" - , "description": "christmas tree" - , "aliases": [ - "christmas_tree" - ] - , "tags": [ - ] - } -, { - "emoji": "🎁" - , "description": "wrapped present" - , "aliases": [ - "gift" - ] - , "tags": [ - "present" - , "birthday" - , "christmas" - ] - } -, { - "emoji": "🎋" - , "description": "tanabata tree" - , "aliases": [ - "tanabata_tree" - ] - , "tags": [ - ] - } -, { - "emoji": "🎉" - , "description": "party popper" - , "aliases": [ - "tada" - ] - , "tags": [ - "party" - ] - } -, { - "emoji": "🎊" - , "description": "confetti ball" - , "aliases": [ - "confetti_ball" - ] - , "tags": [ - ] - } -, { - "emoji": "🎈" - , "description": "balloon" - , "aliases": [ - "balloon" - ] - , "tags": [ - "party" - , "birthday" - ] - } -, { - "emoji": "🎌" - , "description": "crossed flags" - , "aliases": [ - "crossed_flags" - ] - , "tags": [ - ] - } -, { - "emoji": "🔮" - , "description": "crystal ball" - , "aliases": [ - "crystal_ball" - ] - , "tags": [ - "fortune" - ] - } -, { - "emoji": "🎥" - , "description": "movie camera" - , "aliases": [ - "movie_camera" - ] - , "tags": [ - "film" - , "video" - ] - } -, { - "emoji": "📷" - , "description": "camera" - , "aliases": [ - "camera" - ] - , "tags": [ - "photo" - ] - } -, { - "emoji": "📹" - , "description": "video camera" - , "aliases": [ - "video_camera" - ] - , "tags": [ - ] - } -, { - "emoji": "📼" - , "description": "videocassette" - , "aliases": [ - "vhs" - ] - , "tags": [ - ] - } -, { - "emoji": "💿" - , "description": "optical disc" - , "aliases": [ - "cd" - ] - , "tags": [ - ] - } -, { - "emoji": "📀" - , "description": "dvd" - , "aliases": [ - "dvd" - ] - , "tags": [ - ] - } -, { - "emoji": "💽" - , "description": "minidisc" - , "aliases": [ - "minidisc" - ] - , "tags": [ - ] - } -, { - "emoji": "💾" - , "description": "floppy disk" - , "aliases": [ - "floppy_disk" - ] - , "tags": [ - "save" - ] - } -, { - "emoji": "💻" - , "description": "personal computer" - , "aliases": [ - "computer" - ] - , "tags": [ - "desktop" - , "screen" - ] - } -, { - "emoji": "📱" - , "description": "mobile phone" - , "aliases": [ - "iphone" - ] - , "tags": [ - "smartphone" - , "mobile" - ] - } -, { - "emoji": "☎️" - , "description": "black telephone" - , "aliases": [ - "phone" - , "telephone" - ] - , "tags": [ - ] - } -, { - "emoji": "📞" - , "description": "telephone receiver" - , "aliases": [ - "telephone_receiver" - ] - , "tags": [ - "phone" - , "call" - ] - } -, { - "emoji": "📟" - , "description": "pager" - , "aliases": [ - "pager" - ] - , "tags": [ - ] - } -, { - "emoji": "📠" - , "description": "fax machine" - , "aliases": [ - "fax" - ] - , "tags": [ - ] - } -, { - "emoji": "📡" - , "description": "satellite antenna" - , "aliases": [ - "satellite" - ] - , "tags": [ - "signal" - ] - } -, { - "emoji": "📺" - , "description": "television" - , "aliases": [ - "tv" - ] - , "tags": [ - ] - } -, { - "emoji": "📻" - , "description": "radio" - , "aliases": [ - "radio" - ] - , "tags": [ - "podcast" - ] - } -, { - "emoji": "🔊" - , "description": "speaker with three sound waves" - , "aliases": [ - "loud_sound" - ] - , "tags": [ - "volume" - ] - } -, { - "emoji": "🔉" - , "description": "speaker with one sound wave" - , "aliases": [ - "sound" - ] - , "tags": [ - "volume" - ] - } -, { - "emoji": "🔈" - , "description": "speaker" - , "aliases": [ - "speaker" - ] - , "tags": [ - ] - } -, { - "emoji": "🔇" - , "description": "speaker with cancellation stroke" - , "aliases": [ - "mute" - ] - , "tags": [ - "sound" - , "volume" - ] - } -, { - "emoji": "🔔" - , "description": "bell" - , "aliases": [ - "bell" - ] - , "tags": [ - "sound" - , "notification" - ] - } -, { - "emoji": "🔕" - , "description": "bell with cancellation stroke" - , "aliases": [ - "no_bell" - ] - , "tags": [ - "volume" - , "off" - ] - } -, { - "emoji": "📢" - , "description": "public address loudspeaker" - , "aliases": [ - "loudspeaker" - ] - , "tags": [ - "announcement" - ] - } -, { - "emoji": "📣" - , "description": "cheering megaphone" - , "aliases": [ - "mega" - ] - , "tags": [ - ] - } -, { - "emoji": "⏳" - , "description": "hourglass with flowing sand" - , "aliases": [ - "hourglass_flowing_sand" - ] - , "tags": [ - "time" - ] - } -, { - "emoji": "⌛" - , "description": "hourglass" - , "aliases": [ - "hourglass" - ] - , "tags": [ - "time" - ] - } -, { - "emoji": "⏰" - , "description": "alarm clock" - , "aliases": [ - "alarm_clock" - ] - , "tags": [ - "morning" - ] - } -, { - "emoji": "⌚" - , "description": "watch" - , "aliases": [ - "watch" - ] - , "tags": [ - "time" - ] - } -, { - "emoji": "🔓" - , "description": "open lock" - , "aliases": [ - "unlock" - ] - , "tags": [ - "security" - ] - } -, { - "emoji": "🔒" - , "description": "lock" - , "aliases": [ - "lock" - ] - , "tags": [ - "security" - , "private" - ] - } -, { - "emoji": "🔏" - , "description": "lock with ink pen" - , "aliases": [ - "lock_with_ink_pen" - ] - , "tags": [ - ] - } -, { - "emoji": "🔐" - , "description": "closed lock with key" - , "aliases": [ - "closed_lock_with_key" - ] - , "tags": [ - "security" - ] - } -, { - "emoji": "🔑" - , "description": "key" - , "aliases": [ - "key" - ] - , "tags": [ - "lock" - , "password" - ] - } -, { - "emoji": "🔎" - , "description": "right-pointing magnifying glass" - , "aliases": [ - "mag_right" - ] - , "tags": [ - ] - } -, { - "emoji": "💡" - , "description": "electric light bulb" - , "aliases": [ - "bulb" - ] - , "tags": [ - "idea" - , "light" - ] - } -, { - "emoji": "🔦" - , "description": "electric torch" - , "aliases": [ - "flashlight" - ] - , "tags": [ - ] - } -, { - "emoji": "🔆" - , "description": "high brightness symbol" - , "aliases": [ - "high_brightness" - ] - , "tags": [ - ] - } -, { - "emoji": "🔅" - , "description": "low brightness symbol" - , "aliases": [ - "low_brightness" - ] - , "tags": [ - ] - } -, { - "emoji": "🔌" - , "description": "electric plug" - , "aliases": [ - "electric_plug" - ] - , "tags": [ - ] - } -, { - "emoji": "🔋" - , "description": "battery" - , "aliases": [ - "battery" - ] - , "tags": [ - "power" - ] - } -, { - "emoji": "🔍" - , "description": "left-pointing magnifying glass" - , "aliases": [ - "mag" - ] - , "tags": [ - "search" - , "zoom" - ] - } -, { - "emoji": "🛁" - , "description": "bathtub" - , "aliases": [ - "bathtub" - ] - , "tags": [ - ] - } -, { - "emoji": "🛀" - , "description": "bath" - , "aliases": [ - "bath" - ] - , "tags": [ - "shower" - ] - } -, { - "emoji": "🚿" - , "description": "shower" - , "aliases": [ - "shower" - ] - , "tags": [ - "bath" - ] - } -, { - "emoji": "🚽" - , "description": "toilet" - , "aliases": [ - "toilet" - ] - , "tags": [ - "wc" - ] - } -, { - "emoji": "🔧" - , "description": "wrench" - , "aliases": [ - "wrench" - ] - , "tags": [ - "tool" - ] - } -, { - "emoji": "🔩" - , "description": "nut and bolt" - , "aliases": [ - "nut_and_bolt" - ] - , "tags": [ - ] - } -, { - "emoji": "🔨" - , "description": "hammer" - , "aliases": [ - "hammer" - ] - , "tags": [ - "tool" - ] - } -, { - "emoji": "🚪" - , "description": "door" - , "aliases": [ - "door" - ] - , "tags": [ - ] - } -, { - "emoji": "🚬" - , "description": "smoking symbol" - , "aliases": [ - "smoking" - ] - , "tags": [ - "cigarette" - ] - } -, { - "emoji": "💣" - , "description": "bomb" - , "aliases": [ - "bomb" - ] - , "tags": [ - "boom" - ] - } -, { - "emoji": "🔫" - , "description": "pistol" - , "aliases": [ - "gun" - ] - , "tags": [ - "shoot" - , "weapon" - ] - } -, { - "emoji": "🔪" - , "description": "hocho" - , "aliases": [ - "hocho" - , "knife" - ] - , "tags": [ - "cut" - , "chop" - ] - } -, { - "emoji": "💊" - , "description": "pill" - , "aliases": [ - "pill" - ] - , "tags": [ - "health" - , "medicine" - ] - } -, { - "emoji": "💉" - , "description": "syringe" - , "aliases": [ - "syringe" - ] - , "tags": [ - "health" - , "hospital" - , "needle" - ] - } -, { - "emoji": "💰" - , "description": "money bag" - , "aliases": [ - "moneybag" - ] - , "tags": [ - "dollar" - , "cream" - ] - } -, { - "emoji": "💴" - , "description": "banknote with yen sign" - , "aliases": [ - "yen" - ] - , "tags": [ - ] - } -, { - "emoji": "💵" - , "description": "banknote with dollar sign" - , "aliases": [ - "dollar" - ] - , "tags": [ - "money" - ] - } -, { - "emoji": "💷" - , "description": "banknote with pound sign" - , "aliases": [ - "pound" - ] - , "tags": [ - ] - } -, { - "emoji": "💶" - , "description": "banknote with euro sign" - , "aliases": [ - "euro" - ] - , "tags": [ - ] - } -, { - "emoji": "💳" - , "description": "credit card" - , "aliases": [ - "credit_card" - ] - , "tags": [ - "subscription" - ] - } -, { - "emoji": "💸" - , "description": "money with wings" - , "aliases": [ - "money_with_wings" - ] - , "tags": [ - "dollar" - ] - } -, { - "emoji": "📲" - , "description": "mobile phone with rightwards arrow at left" - , "aliases": [ - "calling" - ] - , "tags": [ - "call" - , "incoming" - ] - } -, { - "emoji": "📧" - , "description": "e-mail symbol" - , "aliases": [ - "e-mail" - ] - , "tags": [ - ] - } -, { - "emoji": "📥" - , "description": "inbox tray" - , "aliases": [ - "inbox_tray" - ] - , "tags": [ - ] - } -, { - "emoji": "📤" - , "description": "outbox tray" - , "aliases": [ - "outbox_tray" - ] - , "tags": [ - ] - } -, { - "emoji": "✉️" - , "description": "envelope" - , "aliases": [ - "email" - , "envelope" - ] - , "tags": [ - "letter" - ] - } -, { - "emoji": "📩" - , "description": "envelope with downwards arrow above" - , "aliases": [ - "envelope_with_arrow" - ] - , "tags": [ - ] - } -, { - "emoji": "📨" - , "description": "incoming envelope" - , "aliases": [ - "incoming_envelope" - ] - , "tags": [ - ] - } -, { - "emoji": "📯" - , "description": "postal horn" - , "aliases": [ - "postal_horn" - ] - , "tags": [ - ] - } -, { - "emoji": "📫" - , "description": "closed mailbox with raised flag" - , "aliases": [ - "mailbox" - ] - , "tags": [ - ] - } -, { - "emoji": "📪" - , "description": "closed mailbox with lowered flag" - , "aliases": [ - "mailbox_closed" - ] - , "tags": [ - ] - } -, { - "emoji": "📬" - , "description": "open mailbox with raised flag" - , "aliases": [ - "mailbox_with_mail" - ] - , "tags": [ - ] - } -, { - "emoji": "📭" - , "description": "open mailbox with lowered flag" - , "aliases": [ - "mailbox_with_no_mail" - ] - , "tags": [ - ] - } -, { - "emoji": "📮" - , "description": "postbox" - , "aliases": [ - "postbox" - ] - , "tags": [ - ] - } -, { - "emoji": "📦" - , "description": "package" - , "aliases": [ - "package" - ] - , "tags": [ - "shipping" - ] - } -, { - "emoji": "📝" - , "description": "memo" - , "aliases": [ - "memo" - , "pencil" - ] - , "tags": [ - "document" - , "note" - ] - } -, { - "emoji": "📄" - , "description": "page facing up" - , "aliases": [ - "page_facing_up" - ] - , "tags": [ - "document" - ] - } -, { - "emoji": "📃" - , "description": "page with curl" - , "aliases": [ - "page_with_curl" - ] - , "tags": [ - ] - } -, { - "emoji": "📑" - , "description": "bookmark tabs" - , "aliases": [ - "bookmark_tabs" - ] - , "tags": [ - ] - } -, { - "emoji": "📊" - , "description": "bar chart" - , "aliases": [ - "bar_chart" - ] - , "tags": [ - "stats" - , "metrics" - ] - } -, { - "emoji": "📈" - , "description": "chart with upwards trend" - , "aliases": [ - "chart_with_upwards_trend" - ] - , "tags": [ - "graph" - , "metrics" - ] - } -, { - "emoji": "📉" - , "description": "chart with downwards trend" - , "aliases": [ - "chart_with_downwards_trend" - ] - , "tags": [ - "graph" - , "metrics" - ] - } -, { - "emoji": "📜" - , "description": "scroll" - , "aliases": [ - "scroll" - ] - , "tags": [ - "document" - ] - } -, { - "emoji": "📋" - , "description": "clipboard" - , "aliases": [ - "clipboard" - ] - , "tags": [ - ] - } -, { - "emoji": "📅" - , "description": "calendar" - , "aliases": [ - "date" - ] - , "tags": [ - "calendar" - , "schedule" - ] - } -, { - "emoji": "📆" - , "description": "tear-off calendar" - , "aliases": [ - "calendar" - ] - , "tags": [ - "schedule" - ] - } -, { - "emoji": "📇" - , "description": "card index" - , "aliases": [ - "card_index" - ] - , "tags": [ - ] - } -, { - "emoji": "📁" - , "description": "file folder" - , "aliases": [ - "file_folder" - ] - , "tags": [ - "directory" - ] - } -, { - "emoji": "📂" - , "description": "open file folder" - , "aliases": [ - "open_file_folder" - ] - , "tags": [ - ] - } -, { - "emoji": "✂️" - , "description": "black scissors" - , "aliases": [ - "scissors" - ] - , "tags": [ - "cut" - ] - } -, { - "emoji": "📌" - , "description": "pushpin" - , "aliases": [ - "pushpin" - ] - , "tags": [ - "location" - ] - } -, { - "emoji": "📎" - , "description": "paperclip" - , "aliases": [ - "paperclip" - ] - , "tags": [ - ] - } -, { - "emoji": "✒️" - , "description": "black nib" - , "aliases": [ - "black_nib" - ] - , "tags": [ - ] - } -, { - "emoji": "✏️" - , "description": "pencil" - , "aliases": [ - "pencil2" - ] - , "tags": [ - ] - } -, { - "emoji": "📏" - , "description": "straight ruler" - , "aliases": [ - "straight_ruler" - ] - , "tags": [ - ] - } -, { - "emoji": "📐" - , "description": "triangular ruler" - , "aliases": [ - "triangular_ruler" - ] - , "tags": [ - ] - } -, { - "emoji": "📕" - , "description": "closed book" - , "aliases": [ - "closed_book" - ] - , "tags": [ - ] - } -, { - "emoji": "📗" - , "description": "green book" - , "aliases": [ - "green_book" - ] - , "tags": [ - ] - } -, { - "emoji": "📘" - , "description": "blue book" - , "aliases": [ - "blue_book" - ] - , "tags": [ - ] - } -, { - "emoji": "📙" - , "description": "orange book" - , "aliases": [ - "orange_book" - ] - , "tags": [ - ] - } -, { - "emoji": "📓" - , "description": "notebook" - , "aliases": [ - "notebook" - ] - , "tags": [ - ] - } -, { - "emoji": "📔" - , "description": "notebook with decorative cover" - , "aliases": [ - "notebook_with_decorative_cover" - ] - , "tags": [ - ] - } -, { - "emoji": "📒" - , "description": "ledger" - , "aliases": [ - "ledger" - ] - , "tags": [ - ] - } -, { - "emoji": "📚" - , "description": "books" - , "aliases": [ - "books" - ] - , "tags": [ - "library" - ] - } -, { - "emoji": "📖" - , "description": "open book" - , "aliases": [ - "book" - , "open_book" - ] - , "tags": [ - ] - } -, { - "emoji": "🔖" - , "description": "bookmark" - , "aliases": [ - "bookmark" - ] - , "tags": [ - ] - } -, { - "emoji": "📛" - , "description": "name badge" - , "aliases": [ - "name_badge" - ] - , "tags": [ - ] - } -, { - "emoji": "🔬" - , "description": "microscope" - , "aliases": [ - "microscope" - ] - , "tags": [ - "science" - , "laboratory" - , "investigate" - ] - } -, { - "emoji": "🔭" - , "description": "telescope" - , "aliases": [ - "telescope" - ] - , "tags": [ - ] - } -, { - "emoji": "📰" - , "description": "newspaper" - , "aliases": [ - "newspaper" - ] - , "tags": [ - "press" - ] - } -, { - "emoji": "🎨" - , "description": "artist palette" - , "aliases": [ - "art" - ] - , "tags": [ - "design" - , "paint" - ] - } -, { - "emoji": "🎬" - , "description": "clapper board" - , "aliases": [ - "clapper" - ] - , "tags": [ - "film" - ] - } -, { - "emoji": "🎤" - , "description": "microphone" - , "aliases": [ - "microphone" - ] - , "tags": [ - "sing" - ] - } -, { - "emoji": "🎧" - , "description": "headphone" - , "aliases": [ - "headphones" - ] - , "tags": [ - "music" - , "earphones" - ] - } -, { - "emoji": "🎼" - , "description": "musical score" - , "aliases": [ - "musical_score" - ] - , "tags": [ - ] - } -, { - "emoji": "🎵" - , "description": "musical note" - , "aliases": [ - "musical_note" - ] - , "tags": [ - ] - } -, { - "emoji": "🎶" - , "description": "multiple musical notes" - , "aliases": [ - "notes" - ] - , "tags": [ - "music" - ] - } -, { - "emoji": "🎹" - , "description": "musical keyboard" - , "aliases": [ - "musical_keyboard" - ] - , "tags": [ - "piano" - ] - } -, { - "emoji": "🎻" - , "description": "violin" - , "aliases": [ - "violin" - ] - , "tags": [ - ] - } -, { - "emoji": "🎺" - , "description": "trumpet" - , "aliases": [ - "trumpet" - ] - , "tags": [ - ] - } -, { - "emoji": "🎷" - , "description": "saxophone" - , "aliases": [ - "saxophone" - ] - , "tags": [ - ] - } -, { - "emoji": "🎸" - , "description": "guitar" - , "aliases": [ - "guitar" - ] - , "tags": [ - "rock" - ] - } -, { - "emoji": "👾" - , "description": "alien monster" - , "aliases": [ - "space_invader" - ] - , "tags": [ - "game" - , "retro" - ] - } -, { - "emoji": "🎮" - , "description": "video game" - , "aliases": [ - "video_game" - ] - , "tags": [ - "play" - , "controller" - , "console" - ] - } -, { - "emoji": "🃏" - , "description": "playing card black joker" - , "aliases": [ - "black_joker" - ] - , "tags": [ - ] - } -, { - "emoji": "🎴" - , "description": "flower playing cards" - , "aliases": [ - "flower_playing_cards" - ] - , "tags": [ - ] - } -, { - "emoji": "🀄" - , "description": "mahjong tile red dragon" - , "aliases": [ - "mahjong" - ] - , "tags": [ - ] - } -, { - "emoji": "🎲" - , "description": "game die" - , "aliases": [ - "game_die" - ] - , "tags": [ - "dice" - , "gambling" - ] - } -, { - "emoji": "🎯" - , "description": "direct hit" - , "aliases": [ - "dart" - ] - , "tags": [ - "target" - ] - } -, { - "emoji": "🏈" - , "description": "american football" - , "aliases": [ - "football" - ] - , "tags": [ - "sports" - ] - } -, { - "emoji": "🏀" - , "description": "basketball and hoop" - , "aliases": [ - "basketball" - ] - , "tags": [ - "sports" - ] - } -, { - "emoji": "⚽" - , "description": "soccer ball" - , "aliases": [ - "soccer" - ] - , "tags": [ - "sports" - ] - } -, { - "emoji": "⚾️" - , "description": "baseball" - , "aliases": [ - "baseball" - ] - , "tags": [ - "sports" - ] - } -, { - "emoji": "🎾" - , "description": "tennis racquet and ball" - , "aliases": [ - "tennis" - ] - , "tags": [ - "sports" - ] - } -, { - "emoji": "🎱" - , "description": "billiards" - , "aliases": [ - "8ball" - ] - , "tags": [ - "pool" - , "billiards" - ] - } -, { - "emoji": "🏉" - , "description": "rugby football" - , "aliases": [ - "rugby_football" - ] - , "tags": [ - ] - } -, { - "emoji": "🎳" - , "description": "bowling" - , "aliases": [ - "bowling" - ] - , "tags": [ - ] - } -, { - "emoji": "⛳" - , "description": "flag in hole" - , "aliases": [ - "golf" - ] - , "tags": [ - ] - } -, { - "emoji": "🚵" - , "description": "mountain bicyclist" - , "aliases": [ - "mountain_bicyclist" - ] - , "tags": [ - ] - } -, { - "emoji": "🚴" - , "description": "bicyclist" - , "aliases": [ - "bicyclist" - ] - , "tags": [ - ] - } -, { - "emoji": "🏁" - , "description": "chequered flag" - , "aliases": [ - "checkered_flag" - ] - , "tags": [ - "milestone" - , "finish" - ] - } -, { - "emoji": "🏇" - , "description": "horse racing" - , "aliases": [ - "horse_racing" - ] - , "tags": [ - ] - } -, { - "emoji": "🏆" - , "description": "trophy" - , "aliases": [ - "trophy" - ] - , "tags": [ - "award" - , "contest" - , "winner" - ] - } -, { - "emoji": "🎿" - , "description": "ski and ski boot" - , "aliases": [ - "ski" - ] - , "tags": [ - ] - } -, { - "emoji": "🏂" - , "description": "snowboarder" - , "aliases": [ - "snowboarder" - ] - , "tags": [ - ] - } -, { - "emoji": "🏊" - , "description": "swimmer" - , "aliases": [ - "swimmer" - ] - , "tags": [ - ] - } -, { - "emoji": "🏄" - , "description": "surfer" - , "aliases": [ - "surfer" - ] - , "tags": [ - ] - } -, { - "emoji": "🎣" - , "description": "fishing pole and fish" - , "aliases": [ - "fishing_pole_and_fish" - ] - , "tags": [ - ] - } -, { - "emoji": "☕" - , "description": "hot beverage" - , "aliases": [ - "coffee" - ] - , "tags": [ - "cafe" - , "espresso" - ] - } -, { - "emoji": "🍵" - , "description": "teacup without handle" - , "aliases": [ - "tea" - ] - , "tags": [ - "green" - , "breakfast" - ] - } -, { - "emoji": "🍶" - , "description": "sake bottle and cup" - , "aliases": [ - "sake" - ] - , "tags": [ - ] - } -, { - "emoji": "🍼" - , "description": "baby bottle" - , "aliases": [ - "baby_bottle" - ] - , "tags": [ - "milk" - ] - } -, { - "emoji": "🍺" - , "description": "beer mug" - , "aliases": [ - "beer" - ] - , "tags": [ - "drink" - ] - } -, { - "emoji": "🍻" - , "description": "clinking beer mugs" - , "aliases": [ - "beers" - ] - , "tags": [ - "drinks" - ] - } -, { - "emoji": "🍸" - , "description": "cocktail glass" - , "aliases": [ - "cocktail" - ] - , "tags": [ - "drink" - ] - } -, { - "emoji": "🍹" - , "description": "tropical drink" - , "aliases": [ - "tropical_drink" - ] - , "tags": [ - "summer" - , "vacation" - ] - } -, { - "emoji": "🍷" - , "description": "wine glass" - , "aliases": [ - "wine_glass" - ] - , "tags": [ - ] - } -, { - "emoji": "🍴" - , "description": "fork and knife" - , "aliases": [ - "fork_and_knife" - ] - , "tags": [ - "cutlery" - ] - } -, { - "emoji": "🍕" - , "description": "slice of pizza" - , "aliases": [ - "pizza" - ] - , "tags": [ - ] - } -, { - "emoji": "🍔" - , "description": "hamburger" - , "aliases": [ - "hamburger" - ] - , "tags": [ - "burger" - ] - } -, { - "emoji": "🍟" - , "description": "french fries" - , "aliases": [ - "fries" - ] - , "tags": [ - ] - } -, { - "emoji": "🍗" - , "description": "poultry leg" - , "aliases": [ - "poultry_leg" - ] - , "tags": [ - "meat" - , "chicken" - ] - } -, { - "emoji": "🍖" - , "description": "meat on bone" - , "aliases": [ - "meat_on_bone" - ] - , "tags": [ - ] - } -, { - "emoji": "🍝" - , "description": "spaghetti" - , "aliases": [ - "spaghetti" - ] - , "tags": [ - "pasta" - ] - } -, { - "emoji": "🍛" - , "description": "curry and rice" - , "aliases": [ - "curry" - ] - , "tags": [ - ] - } -, { - "emoji": "🍤" - , "description": "fried shrimp" - , "aliases": [ - "fried_shrimp" - ] - , "tags": [ - "tempura" - ] - } -, { - "emoji": "🍱" - , "description": "bento box" - , "aliases": [ - "bento" - ] - , "tags": [ - ] - } -, { - "emoji": "🍣" - , "description": "sushi" - , "aliases": [ - "sushi" - ] - , "tags": [ - ] - } -, { - "emoji": "🍥" - , "description": "fish cake with swirl design" - , "aliases": [ - "fish_cake" - ] - , "tags": [ - ] - } -, { - "emoji": "🍙" - , "description": "rice ball" - , "aliases": [ - "rice_ball" - ] - , "tags": [ - ] - } -, { - "emoji": "🍘" - , "description": "rice cracker" - , "aliases": [ - "rice_cracker" - ] - , "tags": [ - ] - } -, { - "emoji": "🍚" - , "description": "cooked rice" - , "aliases": [ - "rice" - ] - , "tags": [ - ] - } -, { - "emoji": "🍜" - , "description": "steaming bowl" - , "aliases": [ - "ramen" - ] - , "tags": [ - "noodle" - ] - } -, { - "emoji": "🍲" - , "description": "pot of food" - , "aliases": [ - "stew" - ] - , "tags": [ - ] - } -, { - "emoji": "🍢" - , "description": "oden" - , "aliases": [ - "oden" - ] - , "tags": [ - ] - } -, { - "emoji": "🍡" - , "description": "dango" - , "aliases": [ - "dango" - ] - , "tags": [ - ] - } -, { - "emoji": "🍳" - , "description": "cooking" - , "aliases": [ - "egg" - ] - , "tags": [ - "breakfast" - ] - } -, { - "emoji": "🍞" - , "description": "bread" - , "aliases": [ - "bread" - ] - , "tags": [ - "toast" - ] - } -, { - "emoji": "🍩" - , "description": "doughnut" - , "aliases": [ - "doughnut" - ] - , "tags": [ - ] - } -, { - "emoji": "🍮" - , "description": "custard" - , "aliases": [ - "custard" - ] - , "tags": [ - ] - } -, { - "emoji": "🍦" - , "description": "soft ice cream" - , "aliases": [ - "icecream" - ] - , "tags": [ - ] - } -, { - "emoji": "🍨" - , "description": "ice cream" - , "aliases": [ - "ice_cream" - ] - , "tags": [ - ] - } -, { - "emoji": "🍧" - , "description": "shaved ice" - , "aliases": [ - "shaved_ice" - ] - , "tags": [ - ] - } -, { - "emoji": "🎂" - , "description": "birthday cake" - , "aliases": [ - "birthday" - ] - , "tags": [ - "party" - ] - } -, { - "emoji": "🍰" - , "description": "shortcake" - , "aliases": [ - "cake" - ] - , "tags": [ - "dessert" - ] - } -, { - "emoji": "🍪" - , "description": "cookie" - , "aliases": [ - "cookie" - ] - , "tags": [ - ] - } -, { - "emoji": "🍫" - , "description": "chocolate bar" - , "aliases": [ - "chocolate_bar" - ] - , "tags": [ - ] - } -, { - "emoji": "🍬" - , "description": "candy" - , "aliases": [ - "candy" - ] - , "tags": [ - "sweet" - ] - } -, { - "emoji": "🍭" - , "description": "lollipop" - , "aliases": [ - "lollipop" - ] - , "tags": [ - ] - } -, { - "emoji": "🍯" - , "description": "honey pot" - , "aliases": [ - "honey_pot" - ] - , "tags": [ - ] - } -, { - "emoji": "🍎" - , "description": "red apple" - , "aliases": [ - "apple" - ] - , "tags": [ - ] - } -, { - "emoji": "🍏" - , "description": "green apple" - , "aliases": [ - "green_apple" - ] - , "tags": [ - "fruit" - ] - } -, { - "emoji": "🍊" - , "description": "tangerine" - , "aliases": [ - "tangerine" - ] - , "tags": [ - ] - } -, { - "emoji": "🍋" - , "description": "lemon" - , "aliases": [ - "lemon" - ] - , "tags": [ - ] - } -, { - "emoji": "🍒" - , "description": "cherries" - , "aliases": [ - "cherries" - ] - , "tags": [ - "fruit" - ] - } -, { - "emoji": "🍇" - , "description": "grapes" - , "aliases": [ - "grapes" - ] - , "tags": [ - ] - } -, { - "emoji": "🍉" - , "description": "watermelon" - , "aliases": [ - "watermelon" - ] - , "tags": [ - ] - } -, { - "emoji": "🍓" - , "description": "strawberry" - , "aliases": [ - "strawberry" - ] - , "tags": [ - "fruit" - ] - } -, { - "emoji": "🍑" - , "description": "peach" - , "aliases": [ - "peach" - ] - , "tags": [ - ] - } -, { - "emoji": "🍈" - , "description": "melon" - , "aliases": [ - "melon" - ] - , "tags": [ - ] - } -, { - "emoji": "🍌" - , "description": "banana" - , "aliases": [ - "banana" - ] - , "tags": [ - "fruit" - ] - } -, { - "emoji": "🍐" - , "description": "pear" - , "aliases": [ - "pear" - ] - , "tags": [ - ] - } -, { - "emoji": "🍍" - , "description": "pineapple" - , "aliases": [ - "pineapple" - ] - , "tags": [ - ] - } -, { - "emoji": "🍠" - , "description": "roasted sweet potato" - , "aliases": [ - "sweet_potato" - ] - , "tags": [ - ] - } -, { - "emoji": "🍆" - , "description": "aubergine" - , "aliases": [ - "eggplant" - ] - , "tags": [ - "aubergine" - ] - } -, { - "emoji": "🍅" - , "description": "tomato" - , "aliases": [ - "tomato" - ] - , "tags": [ - ] - } -, { - "emoji": "🌽" - , "description": "ear of maize" - , "aliases": [ - "corn" - ] - , "tags": [ - ] - } -, { - "emoji": "🏠" - , "description": "house building" - , "aliases": [ - "house" - ] - , "tags": [ - ] - } -, { - "emoji": "🏡" - , "description": "house with garden" - , "aliases": [ - "house_with_garden" - ] - , "tags": [ - ] - } -, { - "emoji": "🏫" - , "description": "school" - , "aliases": [ - "school" - ] - , "tags": [ - ] - } -, { - "emoji": "🏢" - , "description": "office building" - , "aliases": [ - "office" - ] - , "tags": [ - ] - } -, { - "emoji": "🏣" - , "description": "japanese post office" - , "aliases": [ - "post_office" - ] - , "tags": [ - ] - } -, { - "emoji": "🏥" - , "description": "hospital" - , "aliases": [ - "hospital" - ] - , "tags": [ - ] - } -, { - "emoji": "🏦" - , "description": "bank" - , "aliases": [ - "bank" - ] - , "tags": [ - ] - } -, { - "emoji": "🏪" - , "description": "convenience store" - , "aliases": [ - "convenience_store" - ] - , "tags": [ - ] - } -, { - "emoji": "🏩" - , "description": "love hotel" - , "aliases": [ - "love_hotel" - ] - , "tags": [ - ] - } -, { - "emoji": "🏨" - , "description": "hotel" - , "aliases": [ - "hotel" - ] - , "tags": [ - ] - } -, { - "emoji": "💒" - , "description": "wedding" - , "aliases": [ - "wedding" - ] - , "tags": [ - "marriage" - ] - } -, { - "emoji": "⛪" - , "description": "church" - , "aliases": [ - "church" - ] - , "tags": [ - ] - } -, { - "emoji": "🏬" - , "description": "department store" - , "aliases": [ - "department_store" - ] - , "tags": [ - ] - } -, { - "emoji": "🏤" - , "description": "european post office" - , "aliases": [ - "european_post_office" - ] - , "tags": [ - ] - } -, { - "emoji": "🌇" - , "description": "sunset over buildings" - , "aliases": [ +{ + "emojis": [ + { + "code": "1f4af", + "name": "100" + }, + { + "code": "1f522", + "name": "1234" + }, + { + "code": "1f3b1", + "name": "8ball" + }, + { + "code": "1f170", + "name": "a" + }, + { + "code": "1f18e", + "name": "ab" + }, + { + "code": "1f524", + "name": "abc" + }, + { + "code": "1f521", + "name": "abcd" + }, + { + "code": "1f251", + "name": "accept" + }, + { + "code": "1f6a1", + "name": "aerial_tramway" + }, + { + "code": "2708", + "name": "airplane" + }, + { + "code": "1f6ec", + "name": "airplane_arriving" + }, + { + "code": "1f6eb", + "name": "airplane_departure" + }, + { + "code": "1f6e9", + "name": "airplane_small" + }, + { + "code": "23f0", + "name": "alarm_clock" + }, + { + "code": "2697", + "name": "alembic" + }, + { + "code": "1f47d", + "name": "alien" + }, + { + "code": "1f691", + "name": "ambulance" + }, + { + "code": "1f3fa", + "name": "amphora" + }, + { + "code": "2693", + "name": "anchor" + }, + { + "code": "1f47c", + "name": "angel" + }, + { + "code": "1f4a2", + "name": "anger" + }, + { + "code": "1f5ef", + "name": "anger_right" + }, + { + "code": "1f620", + "name": "angry" + }, + { + "code": "1f627", + "name": "anguished" + }, + { + "code": "1f41c", + "name": "ant" + }, + { + "code": "1f34e", + "name": "apple" + }, + { + "code": "2652", + "name": "aquarius" + }, + { + "code": "2648", + "name": "aries" + }, + { + "code": "25c0", + "name": "arrow_backward" + }, + { + "code": "23ec", + "name": "arrow_double_down" + }, + { + "code": "23eb", + "name": "arrow_double_up" + }, + { + "code": "2b07", + "name": "arrow_down" + }, + { + "code": "1f53d", + "name": "arrow_down_small" + }, + { + "code": "25b6", + "name": "arrow_forward" + }, + { + "code": "2935", + "name": "arrow_heading_down" + }, + { + "code": "2934", + "name": "arrow_heading_up" + }, + { + "code": "2b05", + "name": "arrow_left" + }, + { + "code": "2199", + "name": "arrow_lower_left" + }, + { + "code": "2198", + "name": "arrow_lower_right" + }, + { + "code": "27a1", + "name": "arrow_right" + }, + { + "code": "21aa", + "name": "arrow_right_hook" + }, + { + "code": "2b06", + "name": "arrow_up" + }, + { + "code": "2195", + "name": "arrow_up_down" + }, + { + "code": "1f53c", + "name": "arrow_up_small" + }, + { + "code": "2196", + "name": "arrow_upper_left" + }, + { + "code": "2197", + "name": "arrow_upper_right" + }, + { + "code": "1f503", + "name": "arrows_clockwise" + }, + { + "code": "1f504", + "name": "arrows_counterclockwise" + }, + { + "code": "1f3a8", + "name": "art" + }, + { + "code": "1f69b", + "name": "articulated_lorry" + }, + { + "code": "1f632", + "name": "astonished" + }, + { + "code": "1f45f", + "name": "athletic_shoe" + }, + { + "code": "1f3e7", + "name": "atm" + }, + { + "code": "269b", + "name": "atom" + }, + { + "code": "1f171", + "name": "b" + }, + { + "code": "1f476", + "name": "baby" + }, + { + "code": "1f37c", + "name": "baby_bottle" + }, + { + "code": "1f424", + "name": "baby_chick" + }, + { + "code": "1f6bc", + "name": "baby_symbol" + }, + { + "code": "1f519", + "name": "back" + }, + { + "code": "1f3f8", + "name": "badminton" + }, + { + "code": "1f6c4", + "name": "baggage_claim" + }, + { + "code": "1f388", + "name": "balloon" + }, + { + "code": "1f5f3", + "name": "ballot_box" + }, + { + "code": "2611", + "name": "ballot_box_with_check" + }, + { + "code": "1f38d", + "name": "bamboo" + }, + { + "code": "1f34c", + "name": "banana" + }, + { + "code": "203c", + "name": "bangbang" + }, + { + "code": "1f3e6", + "name": "bank" + }, + { + "code": "1f4ca", + "name": "bar_chart" + }, + { + "code": "1f488", + "name": "barber" + }, + { + "code": "26be", + "name": "baseball" + }, + { + "code": "1f3c0", + "name": "basketball" + }, + { + "code": "26f9", + "name": "basketball_player" + }, + { + "code": "1f6c0", + "name": "bath" + }, + { + "code": "1f6c1", + "name": "bathtub" + }, + { + "code": "1f50b", + "name": "battery" + }, + { + "code": "1f3d6", + "name": "beach" + }, + { + "code": "26f1", + "name": "beach_umbrella" + }, + { + "code": "1f43b", + "name": "bear" + }, + { + "code": "1f6cf", + "name": "bed" + }, + { + "code": "1f41d", + "name": "bee" + }, + { + "code": "1f37a", + "name": "beer" + }, + { + "code": "1f37b", + "name": "beers" + }, + { + "code": "1f41e", + "name": "beetle" + }, + { + "code": "1f530", + "name": "beginner" + }, + { + "code": "1f514", + "name": "bell" + }, + { + "code": "1f6ce", + "name": "bellhop" + }, + { + "code": "1f371", + "name": "bento" + }, + { + "code": "1f6b4", + "name": "bicyclist" + }, + { + "code": "1f6b2", + "name": "bike" + }, + { + "code": "1f459", + "name": "bikini" + }, + { + "code": "2623", + "name": "biohazard" + }, + { + "code": "1f426", + "name": "bird" + }, + { + "code": "1f382", + "name": "birthday" + }, + { + "code": "26ab", + "name": "black_circle" + }, + { + "code": "1f0cf", + "name": "black_joker" + }, + { + "code": "2b1b", + "name": "black_large_square" + }, + { + "code": "25fe", + "name": "black_medium_small_square" + }, + { + "code": "25fc", + "name": "black_medium_square" + }, + { + "code": "2712", + "name": "black_nib" + }, + { + "code": "25aa", + "name": "black_small_square" + }, + { + "code": "1f532", + "name": "black_square_button" + }, + { + "code": "1f33c", + "name": "blossom" + }, + { + "code": "1f421", + "name": "blowfish" + }, + { + "code": "1f4d8", + "name": "blue_book" + }, + { + "code": "1f699", + "name": "blue_car" + }, + { + "code": "1f499", + "name": "blue_heart" + }, + { + "code": "1f60a", + "name": "blush" + }, + { + "code": "1f417", + "name": "boar" + }, + { + "code": "1f4a3", + "name": "bomb" + }, + { + "code": "1f4d6", + "name": "book" + }, + { + "code": "1f516", + "name": "bookmark" + }, + { + "code": "1f4d1", + "name": "bookmark_tabs" + }, + { + "code": "1f4da", + "name": "books" + }, + { + "code": "1f4a5", + "name": "boom" + }, + { + "code": "1f462", + "name": "boot" + }, + { + "code": "1f490", + "name": "bouquet" + }, + { + "code": "1f647", + "name": "bow" + }, + { + "code": "1f3f9", + "name": "bow_and_arrow" + }, + { + "code": "1f3b3", + "name": "bowling" + }, + { + "code": "1f466", + "name": "boy" + }, + { + "code": "1f35e", + "name": "bread" + }, + { + "code": "1f470", + "name": "bride_with_veil" + }, + { + "code": "1f309", + "name": "bridge_at_night" + }, + { + "code": "1f4bc", + "name": "briefcase" + }, + { + "code": "1f494", + "name": "broken_heart" + }, + { + "code": "1f41b", + "name": "bug" + }, + { + "code": "1f4a1", + "name": "bulb" + }, + { + "code": "1f685", + "name": "bullettrain_front" + }, + { + "code": "1f684", + "name": "bullettrain_side" + }, + { + "code": "1f32f", + "name": "burrito" + }, + { + "code": "1f68c", + "name": "bus" + }, + { + "code": "1f68f", + "name": "busstop" + }, + { + "code": "1f464", + "name": "bust_in_silhouette" + }, + { + "code": "1f465", + "name": "busts_in_silhouette" + }, + { + "code": "1f335", + "name": "cactus" + }, + { + "code": "1f370", + "name": "cake" + }, + { + "code": "1f4c6", + "name": "calendar" + }, + { + "code": "1f5d3", + "name": "calendar_spiral" + }, + { + "code": "1f4f2", + "name": "calling" + }, + { + "code": "1f42b", + "name": "camel" + }, + { + "code": "1f4f7", + "name": "camera" + }, + { + "code": "1f4f8", + "name": "camera_with_flash" + }, + { + "code": "1f3d5", + "name": "camping" + }, + { + "code": "264b", + "name": "cancer" + }, + { + "code": "1f56f", + "name": "candle" + }, + { + "code": "1f36c", + "name": "candy" + }, + { + "code": "1f520", + "name": "capital_abcd" + }, + { + "code": "2651", + "name": "capricorn" + }, + { + "code": "1f5c3", + "name": "card_box" + }, + { + "code": "1f4c7", + "name": "card_index" + }, + { + "code": "1f3a0", + "name": "carousel_horse" + }, + { + "code": "1f431", + "name": "cat" + }, + { + "code": "1f408", + "name": "cat2" + }, + { + "code": "1f4bf", + "name": "cd" + }, + { + "code": "26d3", + "name": "chains" + }, + { + "code": "1f37e", + "name": "champagne" + }, + { + "code": "1f4b9", + "name": "chart" + }, + { + "code": "1f4c9", + "name": "chart_with_downwards_trend" + }, + { + "code": "1f4c8", + "name": "chart_with_upwards_trend" + }, + { + "code": "1f3c1", + "name": "checkered_flag" + }, + { + "code": "1f9c0", + "name": "cheese" + }, + { + "code": "1f352", + "name": "cherries" + }, + { + "code": "1f338", + "name": "cherry_blossom" + }, + { + "code": "1f330", + "name": "chestnut" + }, + { + "code": "1f414", + "name": "chicken" + }, + { + "code": "1f6b8", + "name": "children_crossing" + }, + { + "code": "1f43f", + "name": "chipmunk" + }, + { + "code": "1f36b", + "name": "chocolate_bar" + }, + { + "code": "1f384", + "name": "christmas_tree" + }, + { + "code": "26ea", + "name": "church" + }, + { + "code": "1f3a6", + "name": "cinema" + }, + { + "code": "1f3aa", + "name": "circus_tent" + }, + { + "code": "1f306", + "name": "city_dusk" + }, + { + "code": "1f307", + "name": "city_sunset" + }, + { + "code": "1f3d9", + "name": "cityscape" + }, + { + "code": "1f191", + "name": "cl" + }, + { + "code": "1f44f", + "name": "clap" + }, + { + "code": "1f3ac", + "name": "clapper" + }, + { + "code": "1f3db", + "name": "classical_building" + }, + { + "code": "1f4cb", + "name": "clipboard" + }, + { + "code": "1f570", + "name": "clock" + }, + { + "code": "1f550", + "name": "clock1" + }, + { + "code": "1f559", + "name": "clock10" + }, + { + "code": "1f565", + "name": "clock1030" + }, + { + "code": "1f55a", + "name": "clock11" + }, + { + "code": "1f566", + "name": "clock1130" + }, + { + "code": "1f55b", + "name": "clock12" + }, + { + "code": "1f567", + "name": "clock1230" + }, + { + "code": "1f55c", + "name": "clock130" + }, + { + "code": "1f551", + "name": "clock2" + }, + { + "code": "1f55d", + "name": "clock230" + }, + { + "code": "1f552", + "name": "clock3" + }, + { + "code": "1f55e", + "name": "clock330" + }, + { + "code": "1f553", + "name": "clock4" + }, + { + "code": "1f55f", + "name": "clock430" + }, + { + "code": "1f554", + "name": "clock5" + }, + { + "code": "1f560", + "name": "clock530" + }, + { + "code": "1f555", + "name": "clock6" + }, + { + "code": "1f561", + "name": "clock630" + }, + { + "code": "1f556", + "name": "clock7" + }, + { + "code": "1f562", + "name": "clock730" + }, + { + "code": "1f557", + "name": "clock8" + }, + { + "code": "1f563", + "name": "clock830" + }, + { + "code": "1f558", + "name": "clock9" + }, + { + "code": "1f564", + "name": "clock930" + }, + { + "code": "1f4d5", + "name": "closed_book" + }, + { + "code": "1f510", + "name": "closed_lock_with_key" + }, + { + "code": "1f302", + "name": "closed_umbrella" + }, + { + "code": "2601", + "name": "cloud" + }, + { + "code": "1f329", + "name": "cloud_lightning" + }, + { + "code": "1f327", + "name": "cloud_rain" + }, + { + "code": "1f328", + "name": "cloud_snow" + }, + { + "code": "1f32a", + "name": "cloud_tornado" + }, + { + "code": "2663", + "name": "clubs" + }, + { + "code": "1f378", + "name": "cocktail" + }, + { + "code": "2615", + "name": "coffee" + }, + { + "code": "26b0", + "name": "coffin" + }, + { + "code": "1f630", + "name": "cold_sweat" + }, + { + "code": "2604", + "name": "comet" + }, + { + "code": "1f5dc", + "name": "compression" + }, + { + "code": "1f4bb", + "name": "computer" + }, + { + "code": "1f38a", + "name": "confetti_ball" + }, + { + "code": "1f616", + "name": "confounded" + }, + { + "code": "1f615", + "name": "confused" + }, + { + "code": "3297", + "name": "congratulations" + }, + { + "code": "1f6a7", + "name": "construction" + }, + { + "code": "1f3d7", + "name": "construction_site" + }, + { + "code": "1f477", + "name": "construction_worker" + }, + { + "code": "1f39b", + "name": "control_knobs" + }, + { + "code": "1f3ea", + "name": "convenience_store" + }, + { + "code": "1f36a", + "name": "cookie" + }, + { + "code": "1f192", + "name": "cool" + }, + { + "code": "1f46e", + "name": "cop" + }, + { + "code": "00a9", + "name": "copyright" + }, + { + "code": "1f33d", + "name": "corn" + }, + { + "code": "1f6cb", + "name": "couch" + }, + { + "code": "1f46b", + "name": "couple" + }, + { + "code": "1f491", + "name": "couple_with_heart" + }, + { + "code": "1f48f", + "name": "couplekiss" + }, + { + "code": "1f42e", + "name": "cow" + }, + { + "code": "1f404", + "name": "cow2" + }, + { + "code": "1f980", + "name": "crab" + }, + { + "code": "1f58d", + "name": "crayon" + }, + { + "code": "1f4b3", + "name": "credit_card" + }, + { + "code": "1f319", + "name": "crescent_moon" + }, + { + "code": "1f3cf", + "name": "cricket" + }, + { + "code": "1f40a", + "name": "crocodile" + }, + { + "code": "271d", + "name": "cross" + }, + { + "code": "1f38c", + "name": "crossed_flags" + }, + { + "code": "2694", + "name": "crossed_swords" + }, + { + "code": "1f451", + "name": "crown" + }, + { + "code": "1f6f3", + "name": "cruise_ship" + }, + { + "code": "1f622", + "name": "cry" + }, + { + "code": "1f63f", + "name": "crying_cat_face" + }, + { + "code": "1f52e", + "name": "crystal_ball" + }, + { + "code": "1f498", + "name": "cupid" + }, + { + "code": "27b0", + "name": "curly_loop" + }, + { + "code": "1f4b1", + "name": "currency_exchange" + }, + { + "code": "1f35b", + "name": "curry" + }, + { + "code": "1f36e", + "name": "custard" + }, + { + "code": "1f6c3", + "name": "customs" + }, + { + "code": "1f300", + "name": "cyclone" + }, + { + "code": "1f5e1", + "name": "dagger" + }, + { + "code": "1f483", + "name": "dancer" + }, + { + "code": "1f46f", + "name": "dancers" + }, + { + "code": "1f361", + "name": "dango" + }, + { + "code": "1f576", + "name": "dark_sunglasses" + }, + { + "code": "1f3af", + "name": "dart" + }, + { + "code": "1f4a8", + "name": "dash" + }, + { + "code": "1f4c5", + "name": "date" + }, + { + "code": "1f333", + "name": "deciduous_tree" + }, + { + "code": "1f3ec", + "name": "department_store" + }, + { + "code": "1f3dc", + "name": "desert" + }, + { + "code": "1f5a5", + "name": "desktop" + }, + { + "code": "1f4a0", + "name": "diamond_shape_with_a_dot_inside" + }, + { + "code": "2666", + "name": "diamonds" + }, + { + "code": "1f61e", + "name": "disappointed" + }, + { + "code": "1f625", + "name": "disappointed_relieved" + }, + { + "code": "1f5c2", + "name": "dividers" + }, + { + "code": "1f4ab", + "name": "dizzy" + }, + { + "code": "1f635", + "name": "dizzy_face" + }, + { + "code": "1f6af", + "name": "do_not_litter" + }, + { + "code": "1f436", + "name": "dog" + }, + { + "code": "1f415", + "name": "dog2" + }, + { + "code": "1f4b5", + "name": "dollar" + }, + { + "code": "1f38e", + "name": "dolls" + }, + { + "code": "1f42c", + "name": "dolphin" + }, + { + "code": "1f6aa", + "name": "door" + }, + { + "code": "1f369", + "name": "doughnut" + }, + { + "code": "1f54a", + "name": "dove" + }, + { + "code": "1f409", + "name": "dragon" + }, + { + "code": "1f432", + "name": "dragon_face" + }, + { + "code": "1f457", + "name": "dress" + }, + { + "code": "1f42a", + "name": "dromedary_camel" + }, + { + "code": "1f4a7", + "name": "droplet" + }, + { + "code": "1f4c0", + "name": "dvd" + }, + { + "code": "1f4e7", + "name": "e-mail" + }, + { + "code": "1f442", + "name": "ear" + }, + { + "code": "1f33e", + "name": "ear_of_rice" + }, + { + "code": "1f30d", + "name": "earth_africa" + }, + { + "code": "1f30e", + "name": "earth_americas" + }, + { + "code": "1f30f", + "name": "earth_asia" + }, + { + "code": "1f373", + "name": "egg" + }, + { + "code": "1f346", + "name": "eggplant" + }, + { + "code": "0038-20e3", + "name": "eight" + }, + { + "code": "2734", + "name": "eight_pointed_black_star" + }, + { + "code": "2733", + "name": "eight_spoked_asterisk" + }, + { + "code": "1f50c", + "name": "electric_plug" + }, + { + "code": "1f418", + "name": "elephant" + }, + { + "code": "1f51a", + "name": "end" + }, + { + "code": "2709", + "name": "envelope" + }, + { + "code": "1f4e9", + "name": "envelope_with_arrow" + }, + { + "code": "1f4b6", + "name": "euro" + }, + { + "code": "1f3f0", + "name": "european_castle" + }, + { + "code": "1f3e4", + "name": "european_post_office" + }, + { + "code": "1f332", + "name": "evergreen_tree" + }, + { + "code": "2757", + "name": "exclamation" + }, + { + "code": "1f611", + "name": "expressionless" + }, + { + "code": "1f441", + "name": "eye" + }, + { + "code": "1f453", + "name": "eyeglasses" + }, + { + "code": "1f440", + "name": "eyes" + }, + { + "code": "1f3ed", + "name": "factory" + }, + { + "code": "1f342", + "name": "fallen_leaf" + }, + { + "code": "1f46a", + "name": "family" + }, + { + "code": "23e9", + "name": "fast_forward" + }, + { + "code": "1f4e0", + "name": "fax" + }, + { + "code": "1f628", + "name": "fearful" + }, + { + "code": "1f43e", + "name": "feet" + }, + { + "code": "1f3a1", + "name": "ferris_wheel" + }, + { + "code": "26f4", + "name": "ferry" + }, + { + "code": "1f3d1", + "name": "field_hockey" + }, + { + "code": "1f5c4", + "name": "file_cabinet" + }, + { + "code": "1f4c1", + "name": "file_folder" + }, + { + "code": "1f39e", + "name": "film_frames" + }, + { + "code": "1f525", + "name": "fire" + }, + { + "code": "1f692", + "name": "fire_engine" + }, + { + "code": "1f386", + "name": "fireworks" + }, + { + "code": "1f313", + "name": "first_quarter_moon" + }, + { + "code": "1f31b", + "name": "first_quarter_moon_with_face" + }, + { + "code": "1f41f", + "name": "fish" + }, + { + "code": "1f365", + "name": "fish_cake" + }, + { + "code": "1f3a3", + "name": "fishing_pole_and_fish" + }, + { + "code": "270a", + "name": "fist" + }, + { + "code": "0035-20e3", + "name": "five" + }, + { + "code": "1f3f4", + "name": "flag_black" + }, + { + "code": "1f1e8-1f1f3", + "name": "flag_cn" + }, + { + "code": "1f1e9-1f1ea", + "name": "flag_de" + }, + { + "code": "1f1ea-1f1f8", + "name": "flag_es" + }, + { + "code": "1f1eb-1f1f7", + "name": "flag_fr" + }, + { + "code": "1f1ec-1f1e7", + "name": "flag_gb" + }, + { + "code": "1f1ee-1f1f9", + "name": "flag_it" + }, + { + "code": "1f1ef-1f1f5", + "name": "flag_jp" + }, + { + "code": "1f1f0-1f1f7", + "name": "flag_kr" + }, + { + "code": "1f1f7-1f1fa", + "name": "flag_ru" + }, + { + "code": "1f1fa-1f1f8", + "name": "flag_us" + }, + { + "code": "1f3f3", + "name": "flag_white" + }, + { + "code": "1f38f", + "name": "flags" + }, + { + "code": "1f526", + "name": "flashlight" + }, + { + "code": "269c", + "name": "fleur-de-lis" + }, + { + "code": "1f4be", + "name": "floppy_disk" + }, + { + "code": "1f3b4", + "name": "flower_playing_cards" + }, + { + "code": "1f633", + "name": "flushed" + }, + { + "code": "1f32b", + "name": "fog" + }, + { + "code": "1f301", + "name": "foggy" + }, + { + "code": "1f3c8", + "name": "football" + }, + { + "code": "1f463", + "name": "footprints" + }, + { + "code": "1f374", + "name": "fork_and_knife" + }, + { + "code": "1f37d", + "name": "fork_knife_plate" + }, + { + "code": "26f2", + "name": "fountain" + }, + { + "code": "0034-20e3", + "name": "four" + }, + { + "code": "1f340", + "name": "four_leaf_clover" + }, + { + "code": "1f5bc", + "name": "frame_photo" + }, + { + "code": "1f193", + "name": "free" + }, + { + "code": "1f364", + "name": "fried_shrimp" + }, + { + "code": "1f35f", + "name": "fries" + }, + { + "code": "1f438", + "name": "frog" + }, + { + "code": "1f626", + "name": "frowning" + }, + { + "code": "2639", + "name": "frowning2" + }, + { + "code": "26fd", + "name": "fuelpump" + }, + { + "code": "1f315", + "name": "full_moon" + }, + { + "code": "1f31d", + "name": "full_moon_with_face" + }, + { + "code": "1f3b2", + "name": "game_die" + }, + { + "code": "2699", + "name": "gear" + }, + { + "code": "1f48e", + "name": "gem" + }, + { + "code": "264a", + "name": "gemini" + }, + { + "code": "1f47b", + "name": "ghost" + }, + { + "code": "1f381", + "name": "gift" + }, + { + "code": "1f49d", + "name": "gift_heart" + }, + { + "code": "1f467", + "name": "girl" + }, + { + "code": "1f310", + "name": "globe_with_meridians" + }, + { + "code": "1f410", + "name": "goat" + }, + { + "code": "26f3", + "name": "golf" + }, + { + "code": "1f3cc", + "name": "golfer" + }, + { + "code": "1f347", + "name": "grapes" + }, + { + "code": "1f34f", + "name": "green_apple" + }, + { + "code": "1f4d7", + "name": "green_book" + }, + { + "code": "1f49a", + "name": "green_heart" + }, + { + "code": "2755", + "name": "grey_exclamation" + }, + { + "code": "2754", + "name": "grey_question" + }, + { + "code": "1f62c", + "name": "grimacing" + }, + { + "code": "1f601", + "name": "grin" + }, + { + "code": "1f600", + "name": "grinning" + }, + { + "code": "1f482", + "name": "guardsman" + }, + { + "code": "1f3b8", + "name": "guitar" + }, + { + "code": "1f52b", + "name": "gun" + }, + { + "code": "1f487", + "name": "haircut" + }, + { + "code": "1f354", + "name": "hamburger" + }, + { + "code": "1f528", + "name": "hammer" + }, + { + "code": "2692", + "name": "hammer_pick" + }, + { + "code": "1f439", + "name": "hamster" + }, + { + "code": "1f590", + "name": "hand_splayed" + }, + { + "code": "1f45c", + "name": "handbag" + }, + { + "code": "0023-20e3", + "name": "hash" + }, + { + "code": "1f425", + "name": "hatched_chick" + }, + { + "code": "1f423", + "name": "hatching_chick" + }, + { + "code": "1f915", + "name": "head_bandage" + }, + { + "code": "1f3a7", + "name": "headphones" + }, + { + "code": "1f649", + "name": "hear_no_evil" + }, + { + "code": "2764", + "name": "heart" + }, + { + "code": "1f49f", + "name": "heart_decoration" + }, + { + "code": "2763", + "name": "heart_exclamation" + }, + { + "code": "1f60d", + "name": "heart_eyes" + }, + { + "code": "1f63b", + "name": "heart_eyes_cat" + }, + { + "code": "1f493", + "name": "heartbeat" + }, + { + "code": "1f497", + "name": "heartpulse" + }, + { + "code": "2665", + "name": "hearts" + }, + { + "code": "2714", + "name": "heavy_check_mark" + }, + { + "code": "2797", + "name": "heavy_division_sign" + }, + { + "code": "1f4b2", + "name": "heavy_dollar_sign" + }, + { + "code": "2796", + "name": "heavy_minus_sign" + }, + { + "code": "2716", + "name": "heavy_multiplication_x" + }, + { + "code": "2795", + "name": "heavy_plus_sign" + }, + { + "code": "1f681", + "name": "helicopter" + }, + { + "code": "26d1", + "name": "helmet_with_cross" + }, + { + "code": "1f33f", + "name": "herb" + }, + { + "code": "1f33a", + "name": "hibiscus" + }, + { + "code": "1f506", + "name": "high_brightness" + }, + { + "code": "1f460", + "name": "high_heel" + }, + { + "code": "1f3d2", + "name": "hockey" + }, + { + "code": "1f573", + "name": "hole" + }, + { + "code": "1f3d8", + "name": "homes" + }, + { + "code": "1f36f", + "name": "honey_pot" + }, + { + "code": "1f434", + "name": "horse" + }, + { + "code": "1f3c7", + "name": "horse_racing" + }, + { + "code": "1f3e5", + "name": "hospital" + }, + { + "code": "1f336", + "name": "hot_pepper" + }, + { + "code": "1f32d", + "name": "hotdog" + }, + { + "code": "1f3e8", + "name": "hotel" + }, + { + "code": "2668", + "name": "hotsprings" + }, + { + "code": "231b", + "name": "hourglass" + }, + { + "code": "23f3", + "name": "hourglass_flowing_sand" + }, + { + "code": "1f3e0", + "name": "house" + }, + { + "code": "1f3da", + "name": "house_abandoned" + }, + { + "code": "1f3e1", + "name": "house_with_garden" + }, + { + "code": "1f917", + "name": "hugging" + }, + { + "code": "1f62f", + "name": "hushed" + }, + { + "code": "1f368", + "name": "ice_cream" + }, + { + "code": "26f8", + "name": "ice_skate" + }, + { + "code": "1f366", + "name": "icecream" + }, + { + "code": "1f194", + "name": "id" + }, + { + "code": "1f250", + "name": "ideograph_advantage" + }, + { + "code": "1f47f", + "name": "imp" + }, + { + "code": "1f4e5", + "name": "inbox_tray" + }, + { + "code": "1f4e8", + "name": "incoming_envelope" + }, + { + "code": "1f481", + "name": "information_desk_person" + }, + { + "code": "2139", + "name": "information_source" + }, + { + "code": "1f607", + "name": "innocent" + }, + { + "code": "2049", + "name": "interrobang" + }, + { + "code": "1f4f1", + "name": "iphone" + }, + { + "code": "1f3dd", + "name": "island" + }, + { + "code": "1f3ee", + "name": "izakaya_lantern" + }, + { + "code": "1f383", + "name": "jack_o_lantern" + }, + { + "code": "1f5fe", + "name": "japan" + }, + { + "code": "1f3ef", + "name": "japanese_castle" + }, + { + "code": "1f47a", + "name": "japanese_goblin" + }, + { + "code": "1f479", + "name": "japanese_ogre" + }, + { + "code": "1f456", + "name": "jeans" + }, + { + "code": "1f602", + "name": "joy" + }, + { + "code": "1f639", + "name": "joy_cat" + }, + { + "code": "1f579", + "name": "joystick" + }, + { + "code": "1f54b", + "name": "kaaba" + }, + { + "code": "1f511", + "name": "key" + }, + { + "code": "1f5dd", + "name": "key2" + }, + { + "code": "2328", + "name": "keyboard" + }, + { + "code": "1f458", + "name": "kimono" + }, + { + "code": "1f48b", + "name": "kiss" + }, + { + "code": "1f617", + "name": "kissing" + }, + { + "code": "1f63d", + "name": "kissing_cat" + }, + { + "code": "1f61a", + "name": "kissing_closed_eyes" + }, + { + "code": "1f618", + "name": "kissing_heart" + }, + { + "code": "1f619", + "name": "kissing_smiling_eyes" + }, + { + "code": "1f52a", + "name": "knife" + }, + { + "code": "1f428", + "name": "koala" + }, + { + "code": "1f201", + "name": "koko" + }, + { + "code": "1f3f7", + "name": "label" + }, + { + "code": "1f535", + "name": "large_blue_circle" + }, + { + "code": "1f537", + "name": "large_blue_diamond" + }, + { + "code": "1f536", + "name": "large_orange_diamond" + }, + { + "code": "1f317", + "name": "last_quarter_moon" + }, + { + "code": "1f31c", + "name": "last_quarter_moon_with_face" + }, + { + "code": "1f606", + "name": "laughing" + }, + { + "code": "1f343", + "name": "leaves" + }, + { + "code": "1f4d2", + "name": "ledger" + }, + { + "code": "1f6c5", + "name": "left_luggage" + }, + { + "code": "2194", + "name": "left_right_arrow" + }, + { + "code": "21a9", + "name": "leftwards_arrow_with_hook" + }, + { + "code": "1f34b", + "name": "lemon" + }, + { + "code": "264c", + "name": "leo" + }, + { + "code": "1f406", + "name": "leopard" + }, + { + "code": "1f39a", + "name": "level_slider" + }, + { + "code": "1f574", + "name": "levitate" + }, + { + "code": "264e", + "name": "libra" + }, + { + "code": "1f3cb", + "name": "lifter" + }, + { + "code": "1f688", + "name": "light_rail" + }, + { + "code": "1f517", + "name": "link" + }, + { + "code": "1f981", + "name": "lion_face" + }, + { + "code": "1f444", + "name": "lips" + }, + { + "code": "1f484", + "name": "lipstick" + }, + { + "code": "1f512", + "name": "lock" + }, + { + "code": "1f50f", + "name": "lock_with_ink_pen" + }, + { + "code": "1f36d", + "name": "lollipop" + }, + { + "code": "27bf", + "name": "loop" + }, + { + "code": "1f50a", + "name": "loud_sound" + }, + { + "code": "1f4e2", + "name": "loudspeaker" + }, + { + "code": "1f3e9", + "name": "love_hotel" + }, + { + "code": "1f48c", + "name": "love_letter" + }, + { + "code": "1f505", + "name": "low_brightness" + }, + { + "code": "24c2", + "name": "m" + }, + { + "code": "1f50d", + "name": "mag" + }, + { + "code": "1f50e", + "name": "mag_right" + }, + { + "code": "1f004", + "name": "mahjong" + }, + { + "code": "1f4eb", + "name": "mailbox" + }, + { + "code": "1f4ea", + "name": "mailbox_closed" + }, + { + "code": "1f4ec", + "name": "mailbox_with_mail" + }, + { + "code": "1f4ed", + "name": "mailbox_with_no_mail" + }, + { + "code": "1f468", + "name": "man" + }, + { + "code": "1f472", + "name": "man_with_gua_pi_mao" + }, + { + "code": "1f473", + "name": "man_with_turban" + }, + { + "code": "1f45e", + "name": "mans_shoe" + }, + { + "code": "1f5fa", + "name": "map" + }, + { + "code": "1f341", + "name": "maple_leaf" + }, + { + "code": "1f637", + "name": "mask" + }, + { + "code": "1f486", + "name": "massage" + }, + { + "code": "1f356", + "name": "meat_on_bone" + }, + { + "code": "1f3c5", + "name": "medal" + }, + { + "code": "1f4e3", + "name": "mega" + }, + { + "code": "1f348", + "name": "melon" + }, + { + "code": "1f54e", + "name": "menorah" + }, + { + "code": "1f6b9", + "name": "mens" + }, + { + "code": "1f918", + "name": "metal" + }, + { + "code": "1f687", + "name": "metro" + }, + { + "code": "1f3a4", + "name": "microphone" + }, + { + "code": "1f399", + "name": "microphone2" + }, + { + "code": "1f52c", + "name": "microscope" + }, + { + "code": "1f595", + "name": "middle_finger" + }, + { + "code": "1f396", + "name": "military_medal" + }, + { + "code": "1f30c", + "name": "milky_way" + }, + { + "code": "1f690", + "name": "minibus" + }, + { + "code": "1f4bd", + "name": "minidisc" + }, + { + "code": "1f4f4", + "name": "mobile_phone_off" + }, + { + "code": "1f911", + "name": "money_mouth" + }, + { + "code": "1f4b8", + "name": "money_with_wings" + }, + { + "code": "1f4b0", + "name": "moneybag" + }, + { + "code": "1f412", + "name": "monkey" + }, + { + "code": "1f435", + "name": "monkey_face" + }, + { + "code": "1f69d", + "name": "monorail" + }, + { + "code": "1f393", + "name": "mortar_board" + }, + { + "code": "1f54c", + "name": "mosque" + }, + { + "code": "1f6e5", + "name": "motorboat" + }, + { + "code": "1f3cd", + "name": "motorcycle" + }, + { + "code": "1f6e3", + "name": "motorway" + }, + { + "code": "1f5fb", + "name": "mount_fuji" + }, + { + "code": "26f0", + "name": "mountain" + }, + { + "code": "1f6b5", + "name": "mountain_bicyclist" + }, + { + "code": "1f6a0", + "name": "mountain_cableway" + }, + { + "code": "1f69e", + "name": "mountain_railway" + }, + { + "code": "1f3d4", + "name": "mountain_snow" + }, + { + "code": "1f42d", + "name": "mouse" + }, + { + "code": "1f401", + "name": "mouse2" + }, + { + "code": "1f5b1", + "name": "mouse_three_button" + }, + { + "code": "1f3a5", + "name": "movie_camera" + }, + { + "code": "1f5ff", + "name": "moyai" + }, + { + "code": "1f4aa", + "name": "muscle" + }, + { + "code": "1f344", + "name": "mushroom" + }, + { + "code": "1f3b9", + "name": "musical_keyboard" + }, + { + "code": "1f3b5", + "name": "musical_note" + }, + { + "code": "1f3bc", + "name": "musical_score" + }, + { + "code": "1f507", + "name": "mute" + }, + { + "code": "1f485", + "name": "nail_care" + }, + { + "code": "1f4db", + "name": "name_badge" + }, + { + "code": "1f454", + "name": "necktie" + }, + { + "code": "274e", + "name": "negative_squared_cross_mark" + }, + { + "code": "1f913", + "name": "nerd" + }, + { + "code": "1f610", + "name": "neutral_face" + }, + { + "code": "1f195", + "name": "new" + }, + { + "code": "1f311", + "name": "new_moon" + }, + { + "code": "1f31a", + "name": "new_moon_with_face" + }, + { + "code": "1f4f0", + "name": "newspaper" + }, + { + "code": "1f5de", + "name": "newspaper2" + }, + { + "code": "1f196", + "name": "ng" + }, + { + "code": "1f303", + "name": "night_with_stars" + }, + { + "code": "0039-20e3", + "name": "nine" + }, + { + "code": "1f515", + "name": "no_bell" + }, + { + "code": "1f6b3", + "name": "no_bicycles" + }, + { + "code": "26d4", + "name": "no_entry" + }, + { + "code": "1f6ab", + "name": "no_entry_sign" + }, + { + "code": "1f645", + "name": "no_good" + }, + { + "code": "1f4f5", + "name": "no_mobile_phones" + }, + { + "code": "1f636", + "name": "no_mouth" + }, + { + "code": "1f6b7", + "name": "no_pedestrians" + }, + { + "code": "1f6ad", + "name": "no_smoking" + }, + { + "code": "1f6b1", + "name": "non-potable_water" + }, + { + "code": "1f443", + "name": "nose" + }, + { + "code": "1f4d3", + "name": "notebook" + }, + { + "code": "1f4d4", + "name": "notebook_with_decorative_cover" + }, + { + "code": "1f5d2", + "name": "notepad_spiral" + }, + { + "code": "1f3b6", + "name": "notes" + }, + { + "code": "1f529", + "name": "nut_and_bolt" + }, + { + "code": "2b55", + "name": "o" + }, + { + "code": "1f17e", + "name": "o2" + }, + { + "code": "1f30a", + "name": "ocean" + }, + { + "code": "1f419", + "name": "octopus" + }, + { + "code": "1f362", + "name": "oden" + }, + { + "code": "1f3e2", + "name": "office" + }, + { + "code": "1f6e2", + "name": "oil" + }, + { + "code": "1f197", + "name": "ok" + }, + { + "code": "1f44c", + "name": "ok_hand" + }, + { + "code": "1f646", + "name": "ok_woman" + }, + { + "code": "1f474", + "name": "older_man" + }, + { + "code": "1f475", + "name": "older_woman" + }, + { + "code": "1f549", + "name": "om_symbol" + }, + { + "code": "1f51b", + "name": "on" + }, + { + "code": "1f698", + "name": "oncoming_automobile" + }, + { + "code": "1f68d", + "name": "oncoming_bus" + }, + { + "code": "1f694", + "name": "oncoming_police_car" + }, + { + "code": "1f696", + "name": "oncoming_taxi" + }, + { + "code": "0031-20e3", + "name": "one" + }, + { + "code": "1f4c2", + "name": "open_file_folder" + }, + { + "code": "1f450", + "name": "open_hands" + }, + { + "code": "1f62e", + "name": "open_mouth" + }, + { + "code": "26ce", + "name": "ophiuchus" + }, + { + "code": "1f4d9", + "name": "orange_book" + }, + { + "code": "2626", + "name": "orthodox_cross" + }, + { + "code": "1f4e4", + "name": "outbox_tray" + }, + { + "code": "1f402", + "name": "ox" + }, + { + "code": "1f4e6", + "name": "package" + }, + { + "code": "1f4c4", + "name": "page_facing_up" + }, + { + "code": "1f4c3", + "name": "page_with_curl" + }, + { + "code": "1f4df", + "name": "pager" + }, + { + "code": "1f58c", + "name": "paintbrush" + }, + { + "code": "1f334", + "name": "palm_tree" + }, + { + "code": "1f43c", + "name": "panda_face" + }, + { + "code": "1f4ce", + "name": "paperclip" + }, + { + "code": "1f587", + "name": "paperclips" + }, + { + "code": "1f3de", + "name": "park" + }, + { + "code": "1f17f", + "name": "parking" + }, + { + "code": "303d", + "name": "part_alternation_mark" + }, + { + "code": "26c5", + "name": "partly_sunny" + }, + { + "code": "1f6c2", + "name": "passport_control" + }, + { + "code": "23f8", + "name": "pause_button" + }, + { + "code": "262e", + "name": "peace" + }, + { + "code": "1f351", + "name": "peach" + }, + { + "code": "1f350", + "name": "pear" + }, + { + "code": "1f58a", + "name": "pen_ballpoint" + }, + { + "code": "1f58b", + "name": "pen_fountain" + }, + { + "code": "1f4dd", + "name": "pencil" + }, + { + "code": "270f", + "name": "pencil2" + }, + { + "code": "1f427", + "name": "penguin" + }, + { + "code": "1f614", + "name": "pensive" + }, + { + "code": "1f3ad", + "name": "performing_arts" + }, + { + "code": "1f623", + "name": "persevere" + }, + { + "code": "1f64d", + "name": "person_frowning" + }, + { + "code": "1f471", + "name": "person_with_blond_hair" + }, + { + "code": "1f64e", + "name": "person_with_pouting_face" + }, + { + "code": "26cf", + "name": "pick" + }, + { + "code": "1f437", + "name": "pig" + }, + { + "code": "1f416", + "name": "pig2" + }, + { + "code": "1f43d", + "name": "pig_nose" + }, + { + "code": "1f48a", + "name": "pill" + }, + { + "code": "1f34d", + "name": "pineapple" + }, + { + "code": "1f3d3", + "name": "ping_pong" + }, + { + "code": "2653", + "name": "pisces" + }, + { + "code": "1f355", + "name": "pizza" + }, + { + "code": "1f6d0", + "name": "place_of_worship" + }, + { + "code": "23ef", + "name": "play_pause" + }, + { + "code": "1f447", + "name": "point_down" + }, + { + "code": "1f448", + "name": "point_left" + }, + { + "code": "1f449", + "name": "point_right" + }, + { + "code": "261d", + "name": "point_up" + }, + { + "code": "1f446", + "name": "point_up_2" + }, + { + "code": "1f693", + "name": "police_car" + }, + { + "code": "1f429", + "name": "poodle" + }, + { + "code": "1f4a9", + "name": "poop" + }, + { + "code": "1f37f", + "name": "popcorn" + }, + { + "code": "1f3e3", + "name": "post_office" + }, + { + "code": "1f4ef", + "name": "postal_horn" + }, + { + "code": "1f4ee", + "name": "postbox" + }, + { + "code": "1f6b0", + "name": "potable_water" + }, + { + "code": "1f45d", + "name": "pouch" + }, + { + "code": "1f357", + "name": "poultry_leg" + }, + { + "code": "1f4b7", + "name": "pound" + }, + { + "code": "1f63e", + "name": "pouting_cat" + }, + { + "code": "1f64f", + "name": "pray" + }, + { + "code": "1f4ff", + "name": "prayer_beads" + }, + { + "code": "1f478", + "name": "princess" + }, + { + "code": "1f5a8", + "name": "printer" + }, + { + "code": "1f4fd", + "name": "projector" + }, + { + "code": "1f44a", + "name": "punch" + }, + { + "code": "1f49c", + "name": "purple_heart" + }, + { + "code": "1f45b", + "name": "purse" + }, + { + "code": "1f4cc", + "name": "pushpin" + }, + { + "code": "1f6ae", + "name": "put_litter_in_its_place" + }, + { + "code": "2753", + "name": "question" + }, + { + "code": "1f430", + "name": "rabbit" + }, + { + "code": "1f407", + "name": "rabbit2" + }, + { + "code": "1f3ce", + "name": "race_car" + }, + { + "code": "1f40e", + "name": "racehorse" + }, + { + "code": "1f4fb", + "name": "radio" + }, + { + "code": "1f518", + "name": "radio_button" + }, + { + "code": "2622", + "name": "radioactive" + }, + { + "code": "1f621", + "name": "rage" + }, + { + "code": "1f683", + "name": "railway_car" + }, + { + "code": "1f6e4", + "name": "railway_track" + }, + { + "code": "1f308", + "name": "rainbow" + }, + { + "code": "270b", + "name": "raised_hand" + }, + { + "code": "1f64c", + "name": "raised_hands" + }, + { + "code": "1f64b", + "name": "raising_hand" + }, + { + "code": "1f40f", + "name": "ram" + }, + { + "code": "1f35c", + "name": "ramen" + }, + { + "code": "1f400", + "name": "rat" + }, + { + "code": "23fa", + "name": "record_button" + }, + { + "code": "267b", + "name": "recycle" + }, + { + "code": "1f697", + "name": "red_car" + }, + { + "code": "1f534", + "name": "red_circle" + }, + { + "code": "00ae", + "name": "registered" + }, + { + "code": "263a", + "name": "relaxed" + }, + { + "code": "1f60c", + "name": "relieved" + }, + { + "code": "1f397", + "name": "reminder_ribbon" + }, + { + "code": "1f501", + "name": "repeat" + }, + { + "code": "1f502", + "name": "repeat_one" + }, + { + "code": "1f6bb", + "name": "restroom" + }, + { + "code": "1f49e", + "name": "revolving_hearts" + }, + { + "code": "23ea", + "name": "rewind" + }, + { + "code": "1f380", + "name": "ribbon" + }, + { + "code": "1f35a", + "name": "rice" + }, + { + "code": "1f359", + "name": "rice_ball" + }, + { + "code": "1f358", + "name": "rice_cracker" + }, + { + "code": "1f391", + "name": "rice_scene" + }, + { + "code": "1f48d", + "name": "ring" + }, + { + "code": "1f916", + "name": "robot" + }, + { + "code": "1f680", + "name": "rocket" + }, + { + "code": "1f3a2", + "name": "roller_coaster" + }, + { + "code": "1f644", + "name": "rolling_eyes" + }, + { + "code": "1f413", + "name": "rooster" + }, + { + "code": "1f339", + "name": "rose" + }, + { + "code": "1f3f5", + "name": "rosette" + }, + { + "code": "1f6a8", + "name": "rotating_light" + }, + { + "code": "1f4cd", + "name": "round_pushpin" + }, + { + "code": "1f6a3", + "name": "rowboat" + }, + { + "code": "1f3c9", + "name": "rugby_football" + }, + { + "code": "1f3c3", + "name": "runner" + }, + { + "code": "1f3bd", + "name": "running_shirt_with_sash" + }, + { + "code": "1f202", + "name": "sa" + }, + { + "code": "2650", + "name": "sagittarius" + }, + { + "code": "26f5", + "name": "sailboat" + }, + { + "code": "1f376", + "name": "sake" + }, + { + "code": "1f461", + "name": "sandal" + }, + { + "code": "1f385", + "name": "santa" + }, + { + "code": "1f4e1", + "name": "satellite" + }, + { + "code": "1f6f0", + "name": "satellite_orbital" + }, + { + "code": "1f3b7", + "name": "saxophone" + }, + { + "code": "2696", + "name": "scales" + }, + { + "code": "1f3eb", + "name": "school" + }, + { + "code": "1f392", + "name": "school_satchel" + }, + { + "code": "2702", + "name": "scissors" + }, + { + "code": "1f982", + "name": "scorpion" + }, + { + "code": "264f", + "name": "scorpius" + }, + { + "code": "1f631", + "name": "scream" + }, + { + "code": "1f640", + "name": "scream_cat" + }, + { + "code": "1f4dc", + "name": "scroll" + }, + { + "code": "1f4ba", + "name": "seat" + }, + { + "code": "3299", + "name": "secret" + }, + { + "code": "1f648", + "name": "see_no_evil" + }, + { + "code": "1f331", + "name": "seedling" + }, + { + "code": "0037-20e3", + "name": "seven" + }, + { + "code": "2618", + "name": "shamrock" + }, + { + "code": "1f367", + "name": "shaved_ice" + }, + { + "code": "1f411", + "name": "sheep" + }, + { + "code": "1f41a", + "name": "shell" + }, + { + "code": "1f6e1", + "name": "shield" + }, + { + "code": "26e9", + "name": "shinto_shrine" + }, + { + "code": "1f6a2", + "name": "ship" + }, + { + "code": "1f455", + "name": "shirt" + }, + { + "code": "1f6cd", + "name": "shopping_bags" + }, + { + "code": "1f6bf", + "name": "shower" + }, + { + "code": "1f4f6", + "name": "signal_strength" + }, + { + "code": "0036-20e3", + "name": "six" + }, + { + "code": "1f52f", + "name": "six_pointed_star" + }, + { + "code": "1f3bf", + "name": "ski" + }, + { + "code": "26f7", + "name": "skier" + }, + { + "code": "1f480", + "name": "skull" + }, + { + "code": "2620", + "name": "skull_crossbones" + }, + { + "code": "1f634", + "name": "sleeping" + }, + { + "code": "1f6cc", + "name": "sleeping_accommodation" + }, + { + "code": "1f62a", + "name": "sleepy" + }, + { + "code": "1f641", + "name": "slight_frown" + }, + { + "code": "1f642", + "name": "slight_smile" + }, + { + "code": "1f3b0", + "name": "slot_machine" + }, + { + "code": "1f539", + "name": "small_blue_diamond" + }, + { + "code": "1f538", + "name": "small_orange_diamond" + }, + { + "code": "1f53a", + "name": "small_red_triangle" + }, + { + "code": "1f53b", + "name": "small_red_triangle_down" + }, + { + "code": "1f604", + "name": "smile" + }, + { + "code": "1f638", + "name": "smile_cat" + }, + { + "code": "1f603", + "name": "smiley" + }, + { + "code": "1f63a", + "name": "smiley_cat" + }, + { + "code": "1f608", + "name": "smiling_imp" + }, + { + "code": "1f60f", + "name": "smirk" + }, + { + "code": "1f63c", + "name": "smirk_cat" + }, + { + "code": "1f6ac", + "name": "smoking" + }, + { + "code": "1f40c", + "name": "snail" + }, + { + "code": "1f40d", + "name": "snake" + }, + { + "code": "1f3c2", + "name": "snowboarder" + }, + { + "code": "2744", + "name": "snowflake" + }, + { + "code": "26c4", + "name": "snowman" + }, + { + "code": "2603", + "name": "snowman2" + }, + { + "code": "1f62d", + "name": "sob" + }, + { + "code": "26bd", + "name": "soccer" + }, + { + "code": "1f51c", + "name": "soon" + }, + { + "code": "1f198", + "name": "sos" + }, + { + "code": "1f509", + "name": "sound" + }, + { + "code": "1f47e", + "name": "space_invader" + }, + { + "code": "2660", + "name": "spades" + }, + { + "code": "1f35d", + "name": "spaghetti" + }, + { + "code": "2747", + "name": "sparkle" + }, + { + "code": "1f387", + "name": "sparkler" + }, + { + "code": "2728", + "name": "sparkles" + }, + { + "code": "1f496", + "name": "sparkling_heart" + }, + { + "code": "1f64a", + "name": "speak_no_evil" + }, + { + "code": "1f508", + "name": "speaker" + }, + { + "code": "1f5e3", + "name": "speaking_head" + }, + { + "code": "1f4ac", + "name": "speech_balloon" + }, + { + "code": "1f6a4", + "name": "speedboat" + }, + { + "code": "1f577", + "name": "spider" + }, + { + "code": "1f578", + "name": "spider_web" + }, + { + "code": "1f575", + "name": "spy" + }, + { + "code": "1f3df", + "name": "stadium" + }, + { + "code": "2b50", + "name": "star" + }, + { + "code": "1f31f", + "name": "star2" + }, + { + "code": "262a", + "name": "star_and_crescent" + }, + { + "code": "2721", + "name": "star_of_david" + }, + { + "code": "1f320", + "name": "stars" + }, + { + "code": "1f689", + "name": "station" + }, + { + "code": "1f5fd", + "name": "statue_of_liberty" + }, + { + "code": "1f682", + "name": "steam_locomotive" + }, + { + "code": "1f372", + "name": "stew" + }, + { + "code": "23f9", + "name": "stop_button" + }, + { + "code": "23f1", + "name": "stopwatch" + }, + { + "code": "1f4cf", + "name": "straight_ruler" + }, + { + "code": "1f353", + "name": "strawberry" + }, + { + "code": "1f61b", + "name": "stuck_out_tongue" + }, + { + "code": "1f61d", + "name": "stuck_out_tongue_closed_eyes" + }, + { + "code": "1f61c", + "name": "stuck_out_tongue_winking_eye" + }, + { + "code": "1f31e", + "name": "sun_with_face" + }, + { + "code": "1f33b", + "name": "sunflower" + }, + { + "code": "1f60e", + "name": "sunglasses" + }, + { + "code": "2600", + "name": "sunny" + }, + { + "code": "1f305", + "name": "sunrise" + }, + { + "code": "1f304", + "name": "sunrise_over_mountains" + }, + { + "code": "1f3c4", + "name": "surfer" + }, + { + "code": "1f363", + "name": "sushi" + }, + { + "code": "1f69f", + "name": "suspension_railway" + }, + { + "code": "1f613", + "name": "sweat" + }, + { + "code": "1f4a6", + "name": "sweat_drops" + }, + { + "code": "1f605", + "name": "sweat_smile" + }, + { + "code": "1f360", + "name": "sweet_potato" + }, + { + "code": "1f3ca", + "name": "swimmer" + }, + { + "code": "1f523", + "name": "symbols" + }, + { + "code": "1f54d", + "name": "synagogue" + }, + { + "code": "1f489", + "name": "syringe" + }, + { + "code": "1f32e", + "name": "taco" + }, + { + "code": "1f389", + "name": "tada" + }, + { + "code": "1f38b", + "name": "tanabata_tree" + }, + { + "code": "1f34a", + "name": "tangerine" + }, + { + "code": "2649", + "name": "taurus" + }, + { + "code": "1f695", + "name": "taxi" + }, + { + "code": "1f375", + "name": "tea" + }, + { + "code": "260e", + "name": "telephone" + }, + { + "code": "1f4de", + "name": "telephone_receiver" + }, + { + "code": "1f52d", + "name": "telescope" + }, + { + "code": "1f51f", + "name": "ten" + }, + { + "code": "1f3be", + "name": "tennis" + }, + { + "code": "26fa", + "name": "tent" + }, + { + "code": "1f321", + "name": "thermometer" + }, + { + "code": "1f912", + "name": "thermometer_face" + }, + { + "code": "1f914", + "name": "thinking" + }, + { + "code": "1f4ad", + "name": "thought_balloon" + }, + { + "code": "0033-20e3", + "name": "three" + }, + { + "code": "1f44e", + "name": "thumbsdown" + }, + { + "code": "1f44d", + "name": "thumbsup" + }, + { + "code": "26c8", + "name": "thunder_cloud_rain" + }, + { + "code": "1f3ab", + "name": "ticket" + }, + { + "code": "1f39f", + "name": "tickets" + }, + { + "code": "1f42f", + "name": "tiger" + }, + { + "code": "1f405", + "name": "tiger2" + }, + { + "code": "23f2", + "name": "timer" + }, + { + "code": "1f62b", + "name": "tired_face" + }, + { + "code": "2122", + "name": "tm" + }, + { + "code": "1f6bd", + "name": "toilet" + }, + { + "code": "1f5fc", + "name": "tokyo_tower" + }, + { + "code": "1f345", + "name": "tomato" + }, + { + "code": "1f445", + "name": "tongue" + }, + { + "code": "1f6e0", + "name": "tools" + }, + { + "code": "1f51d", + "name": "top" + }, + { + "code": "1f3a9", + "name": "tophat" + }, + { + "code": "23ed", + "name": "track_next" + }, + { + "code": "23ee", + "name": "track_previous" + }, + { + "code": "1f5b2", + "name": "trackball" + }, + { + "code": "1f69c", + "name": "tractor" + }, + { + "code": "1f6a5", + "name": "traffic_light" + }, + { + "code": "1f68b", + "name": "train" + }, + { + "code": "1f686", + "name": "train2" + }, + { + "code": "1f68a", + "name": "tram" + }, + { + "code": "1f6a9", + "name": "triangular_flag_on_post" + }, + { + "code": "1f4d0", + "name": "triangular_ruler" + }, + { + "code": "1f531", + "name": "trident" + }, + { + "code": "1f624", + "name": "triumph" + }, + { + "code": "1f68e", + "name": "trolleybus" + }, + { + "code": "1f3c6", + "name": "trophy" + }, + { + "code": "1f379", + "name": "tropical_drink" + }, + { + "code": "1f420", + "name": "tropical_fish" + }, + { + "code": "1f69a", + "name": "truck" + }, + { + "code": "1f3ba", + "name": "trumpet" + }, + { + "code": "1f337", + "name": "tulip" + }, + { + "code": "1f983", + "name": "turkey" + }, + { + "code": "1f422", + "name": "turtle" + }, + { + "code": "1f4fa", + "name": "tv" + }, + { + "code": "1f500", + "name": "twisted_rightwards_arrows" + }, + { + "code": "0032-20e3", + "name": "two" + }, + { + "code": "1f495", + "name": "two_hearts" + }, + { + "code": "1f46c", + "name": "two_men_holding_hands" + }, + { + "code": "1f46d", + "name": "two_women_holding_hands" + }, + { + "code": "1f239", + "name": "u5272" + }, + { + "code": "1f234", + "name": "u5408" + }, + { + "code": "1f23a", + "name": "u55b6" + }, + { + "code": "1f22f", + "name": "u6307" + }, + { + "code": "1f237", + "name": "u6708" + }, + { + "code": "1f236", + "name": "u6709" + }, + { + "code": "1f235", + "name": "u6e80" + }, + { + "code": "1f21a", + "name": "u7121" + }, + { + "code": "1f238", + "name": "u7533" + }, + { + "code": "1f232", + "name": "u7981" + }, + { + "code": "1f233", + "name": "u7a7a" + }, + { + "code": "2614", + "name": "umbrella" + }, + { + "code": "2602", + "name": "umbrella2" + }, + { + "code": "1f612", + "name": "unamused" + }, + { + "code": "1f51e", + "name": "underage" + }, + { + "code": "1f984", + "name": "unicorn" + }, + { + "code": "1f513", + "name": "unlock" + }, + { + "code": "1f199", + "name": "up" + }, + { + "code": "1f643", + "name": "upside_down" + }, + { + "code": "26b1", + "name": "urn" + }, + { + "code": "270c", + "name": "v" + }, + { + "code": "1f6a6", + "name": "vertical_traffic_light" + }, + { + "code": "1f4fc", + "name": "vhs" + }, + { + "code": "1f4f3", + "name": "vibration_mode" + }, + { + "code": "1f4f9", + "name": "video_camera" + }, + { + "code": "1f3ae", + "name": "video_game" + }, + { + "code": "1f3bb", + "name": "violin" + }, + { + "code": "264d", + "name": "virgo" + }, + { + "code": "1f30b", + "name": "volcano" + }, + { + "code": "1f3d0", + "name": "volleyball" + }, + { + "code": "1f19a", + "name": "vs" + }, + { + "code": "1f596", + "name": "vulcan" + }, + { + "code": "1f6b6", + "name": "walking" + }, + { + "code": "1f318", + "name": "waning_crescent_moon" + }, + { + "code": "1f316", + "name": "waning_gibbous_moon" + }, + { + "code": "26a0", + "name": "warning" + }, + { + "code": "1f5d1", + "name": "wastebasket" + }, + { + "code": "231a", + "name": "watch" + }, + { + "code": "1f403", + "name": "water_buffalo" + }, + { + "code": "1f349", + "name": "watermelon" + }, + { + "code": "1f44b", + "name": "wave" + }, + { + "code": "3030", + "name": "wavy_dash" + }, + { + "code": "1f312", + "name": "waxing_crescent_moon" + }, + { + "code": "1f314", + "name": "waxing_gibbous_moon" + }, + { + "code": "1f6be", + "name": "wc" + }, + { + "code": "1f629", + "name": "weary" + }, + { + "code": "1f492", + "name": "wedding" + }, + { + "code": "1f433", + "name": "whale" + }, + { + "code": "1f40b", + "name": "whale2" + }, + { + "code": "2638", + "name": "wheel_of_dharma" + }, + { + "code": "267f", + "name": "wheelchair" + }, + { + "code": "2705", + "name": "white_check_mark" + }, + { + "code": "26aa", + "name": "white_circle" + }, + { + "code": "1f4ae", + "name": "white_flower" + }, + { + "code": "2b1c", + "name": "white_large_square" + }, + { + "code": "25fd", + "name": "white_medium_small_square" + }, + { + "code": "25fb", + "name": "white_medium_square" + }, + { + "code": "25ab", + "name": "white_small_square" + }, + { + "code": "1f533", + "name": "white_square_button" + }, + { + "code": "1f325", + "name": "white_sun_cloud" + }, + { + "code": "1f326", + "name": "white_sun_rain_cloud" + }, + { + "code": "1f324", + "name": "white_sun_small_cloud" + }, + { + "code": "1f32c", + "name": "wind_blowing_face" + }, + { + "code": "1f390", + "name": "wind_chime" + }, + { + "code": "1f377", + "name": "wine_glass" + }, + { + "code": "1f609", + "name": "wink" + }, + { + "code": "1f43a", + "name": "wolf" + }, + { + "code": "1f469", + "name": "woman" + }, + { + "code": "1f45a", + "name": "womans_clothes" + }, + { + "code": "1f452", + "name": "womans_hat" + }, + { + "code": "1f6ba", + "name": "womens" + }, + { + "code": "1f61f", + "name": "worried" + }, + { + "code": "1f527", + "name": "wrench" + }, + { + "code": "270d", + "name": "writing_hand" + }, + { + "code": "274c", + "name": "x" + }, + { + "code": "1f49b", + "name": "yellow_heart" + }, + { + "code": "1f4b4", + "name": "yen" + }, + { + "code": "262f", + "name": "yin_yang" + }, + { + "code": "1f60b", + "name": "yum" + }, + { + "code": "26a1", + "name": "zap" + }, + { + "code": "0030-20e3", + "name": "zero" + }, + { + "code": "1f910", + "name": "zipper_mouth" + }, + { + "code": "1f4a4", + "name": "zzz" + } + ], + "aliases": { + "airplane_small": [ + "small_airplane" + ], + "anger_right": [ + "right_anger_bubble" + ], + "atom": [ + "atom_symbol" + ], + "ballot_box": [ + "ballot_box_with_ballot" + ], + "basketball_player": [ + "person_with_ball" + ], + "beach": [ + "beach_with_umbrella" + ], + "beach_umbrella": [ + "umbrella_on_ground" + ], + "bellhop": [ + "bellhop_bell" + ], + "biohazard": [ + "biohazard_sign" + ], + "bow_and_arrow": [ + "archery" + ], + "calendar_spiral": [ + "spiral_calendar_pad" + ], + "card_box": [ + "card_file_box" + ], + "champagne": [ + "bottle_with_popping_cork" + ], + "cheese": [ + "cheese_wedge" + ], + "city_sunset": [ "city_sunrise" - ] - , "tags": [ - ] - } -, { - "emoji": "🌆" - , "description": "cityscape at dusk" - , "aliases": [ - "city_sunset" - ] - , "tags": [ - ] - } -, { - "emoji": "🏯" - , "description": "japanese castle" - , "aliases": [ - "japanese_castle" - ] - , "tags": [ - ] - } -, { - "emoji": "🏰" - , "description": "european castle" - , "aliases": [ - "european_castle" - ] - , "tags": [ - ] - } -, { - "emoji": "⛺" - , "description": "tent" - , "aliases": [ - "tent" - ] - , "tags": [ - "camping" - ] - } -, { - "emoji": "🏭" - , "description": "factory" - , "aliases": [ - "factory" - ] - , "tags": [ - ] - } -, { - "emoji": "🗼" - , "description": "tokyo tower" - , "aliases": [ - "tokyo_tower" - ] - , "tags": [ - ] - } -, { - "emoji": "🗾" - , "description": "silhouette of japan" - , "aliases": [ - "japan" - ] - , "tags": [ - ] - } -, { - "emoji": "🗻" - , "description": "mount fuji" - , "aliases": [ - "mount_fuji" - ] - , "tags": [ - ] - } -, { - "emoji": "🌄" - , "description": "sunrise over mountains" - , "aliases": [ - "sunrise_over_mountains" - ] - , "tags": [ - ] - } -, { - "emoji": "🌅" - , "description": "sunrise" - , "aliases": [ - "sunrise" - ] - , "tags": [ - ] - } -, { - "emoji": "🌃" - , "description": "night with stars" - , "aliases": [ - "night_with_stars" - ] - , "tags": [ - ] - } -, { - "emoji": "🗽" - , "description": "statue of liberty" - , "aliases": [ - "statue_of_liberty" - ] - , "tags": [ - ] - } -, { - "emoji": "🌉" - , "description": "bridge at night" - , "aliases": [ - "bridge_at_night" - ] - , "tags": [ - ] - } -, { - "emoji": "🎠" - , "description": "carousel horse" - , "aliases": [ - "carousel_horse" - ] - , "tags": [ - ] - } -, { - "emoji": "🎡" - , "description": "ferris wheel" - , "aliases": [ - "ferris_wheel" - ] - , "tags": [ - ] - } -, { - "emoji": "⛲" - , "description": "fountain" - , "aliases": [ - "fountain" - ] - , "tags": [ - ] - } -, { - "emoji": "🎢" - , "description": "roller coaster" - , "aliases": [ - "roller_coaster" - ] - , "tags": [ - ] - } -, { - "emoji": "🚢" - , "description": "ship" - , "aliases": [ - "ship" - ] - , "tags": [ - ] - } -, { - "emoji": "⛵" - , "description": "sailboat" - , "aliases": [ - "boat" - , "sailboat" - ] - , "tags": [ - ] - } -, { - "emoji": "🚤" - , "description": "speedboat" - , "aliases": [ - "speedboat" - ] - , "tags": [ - "ship" - ] - } -, { - "emoji": "🚣" - , "description": "rowboat" - , "aliases": [ - "rowboat" - ] - , "tags": [ - ] - } -, { - "emoji": "⚓" - , "description": "anchor" - , "aliases": [ - "anchor" - ] - , "tags": [ - "ship" - ] - } -, { - "emoji": "🚀" - , "description": "rocket" - , "aliases": [ - "rocket" - ] - , "tags": [ - "ship" - , "launch" - ] - } -, { - "emoji": "✈️" - , "description": "airplane" - , "aliases": [ - "airplane" - ] - , "tags": [ - "flight" - ] - } -, { - "emoji": "💺" - , "description": "seat" - , "aliases": [ - "seat" - ] - , "tags": [ - ] - } -, { - "emoji": "🚁" - , "description": "helicopter" - , "aliases": [ - "helicopter" - ] - , "tags": [ - ] - } -, { - "emoji": "🚂" - , "description": "steam locomotive" - , "aliases": [ - "steam_locomotive" - ] - , "tags": [ - "train" - ] - } -, { - "emoji": "🚊" - , "description": "tram" - , "aliases": [ - "tram" - ] - , "tags": [ - ] - } -, { - "emoji": "🚉" - , "description": "station" - , "aliases": [ - "station" - ] - , "tags": [ - ] - } -, { - "emoji": "🚞" - , "description": "mountain railway" - , "aliases": [ - "mountain_railway" - ] - , "tags": [ - ] - } -, { - "emoji": "🚆" - , "description": "train" - , "aliases": [ - "train2" - ] - , "tags": [ - ] - } -, { - "emoji": "🚄" - , "description": "high-speed train" - , "aliases": [ - "bullettrain_side" - ] - , "tags": [ - "train" - ] - } -, { - "emoji": "🚅" - , "description": "high-speed train with bullet nose" - , "aliases": [ - "bullettrain_front" - ] - , "tags": [ - "train" - ] - } -, { - "emoji": "🚈" - , "description": "light rail" - , "aliases": [ - "light_rail" - ] - , "tags": [ - ] - } -, { - "emoji": "🚇" - , "description": "metro" - , "aliases": [ - "metro" - ] - , "tags": [ - ] - } -, { - "emoji": "🚝" - , "description": "monorail" - , "aliases": [ - "monorail" - ] - , "tags": [ - ] - } -, { - "emoji": "🚋" - , "description": "tram car" - , "aliases": [ - "train" - ] - , "tags": [ - ] - } -, { - "emoji": "🚃" - , "description": "railway car" - , "aliases": [ - "railway_car" - ] - , "tags": [ - ] - } -, { - "emoji": "🚎" - , "description": "trolleybus" - , "aliases": [ - "trolleybus" - ] - , "tags": [ - ] - } -, { - "emoji": "🚌" - , "description": "bus" - , "aliases": [ - "bus" - ] - , "tags": [ - ] - } -, { - "emoji": "🚍" - , "description": "oncoming bus" - , "aliases": [ - "oncoming_bus" - ] - , "tags": [ - ] - } -, { - "emoji": "🚙" - , "description": "recreational vehicle" - , "aliases": [ - "blue_car" - ] - , "tags": [ - ] - } -, { - "emoji": "🚘" - , "description": "oncoming automobile" - , "aliases": [ - "oncoming_automobile" - ] - , "tags": [ - ] - } -, { - "emoji": "🚗" - , "description": "automobile" - , "aliases": [ - "car" - , "red_car" - ] - , "tags": [ - ] - } -, { - "emoji": "🚕" - , "description": "taxi" - , "aliases": [ - "taxi" - ] - , "tags": [ - ] - } -, { - "emoji": "🚖" - , "description": "oncoming taxi" - , "aliases": [ - "oncoming_taxi" - ] - , "tags": [ - ] - } -, { - "emoji": "🚛" - , "description": "articulated lorry" - , "aliases": [ - "articulated_lorry" - ] - , "tags": [ - ] - } -, { - "emoji": "🚚" - , "description": "delivery truck" - , "aliases": [ - "truck" - ] - , "tags": [ - ] - } -, { - "emoji": "🚨" - , "description": "police cars revolving light" - , "aliases": [ - "rotating_light" - ] - , "tags": [ - "911" - , "emergency" - ] - } -, { - "emoji": "🚓" - , "description": "police car" - , "aliases": [ - "police_car" - ] - , "tags": [ - ] - } -, { - "emoji": "🚔" - , "description": "oncoming police car" - , "aliases": [ - "oncoming_police_car" - ] - , "tags": [ - ] - } -, { - "emoji": "🚒" - , "description": "fire engine" - , "aliases": [ - "fire_engine" - ] - , "tags": [ - ] - } -, { - "emoji": "🚑" - , "description": "ambulance" - , "aliases": [ - "ambulance" - ] - , "tags": [ - ] - } -, { - "emoji": "🚐" - , "description": "minibus" - , "aliases": [ - "minibus" - ] - , "tags": [ - ] - } -, { - "emoji": "🚲" - , "description": "bicycle" - , "aliases": [ - "bike" - ] - , "tags": [ - "bicycle" - ] - } -, { - "emoji": "🚡" - , "description": "aerial tramway" - , "aliases": [ - "aerial_tramway" - ] - , "tags": [ - ] - } -, { - "emoji": "🚟" - , "description": "suspension railway" - , "aliases": [ - "suspension_railway" - ] - , "tags": [ - ] - } -, { - "emoji": "🚠" - , "description": "mountain cableway" - , "aliases": [ - "mountain_cableway" - ] - , "tags": [ - ] - } -, { - "emoji": "🚜" - , "description": "tractor" - , "aliases": [ - "tractor" - ] - , "tags": [ - ] - } -, { - "emoji": "💈" - , "description": "barber pole" - , "aliases": [ - "barber" - ] - , "tags": [ - ] - } -, { - "emoji": "🚏" - , "description": "bus stop" - , "aliases": [ - "busstop" - ] - , "tags": [ - ] - } -, { - "emoji": "🎫" - , "description": "ticket" - , "aliases": [ - "ticket" - ] - , "tags": [ - ] - } -, { - "emoji": "🚦" - , "description": "vertical traffic light" - , "aliases": [ - "vertical_traffic_light" - ] - , "tags": [ - "semaphore" - ] - } -, { - "emoji": "🚥" - , "description": "horizontal traffic light" - , "aliases": [ - "traffic_light" - ] - , "tags": [ - ] - } -, { - "emoji": "⚠️" - , "description": "warning sign" - , "aliases": [ - "warning" - ] - , "tags": [ - "wip" - ] - } -, { - "emoji": "🚧" - , "description": "construction sign" - , "aliases": [ - "construction" - ] - , "tags": [ - "wip" - ] - } -, { - "emoji": "🔰" - , "description": "japanese symbol for beginner" - , "aliases": [ - "beginner" - ] - , "tags": [ - ] - } -, { - "emoji": "⛽" - , "description": "fuel pump" - , "aliases": [ - "fuelpump" - ] - , "tags": [ - ] - } -, { - "emoji": "🏮" - , "description": "izakaya lantern" - , "aliases": [ - "izakaya_lantern" - , "lantern" - ] - , "tags": [ - ] - } -, { - "emoji": "🎰" - , "description": "slot machine" - , "aliases": [ - "slot_machine" - ] - , "tags": [ - ] - } -, { - "emoji": "♨️" - , "description": "hot springs" - , "aliases": [ - "hotsprings" - ] - , "tags": [ - ] - } -, { - "emoji": "🗿" - , "description": "moyai" - , "aliases": [ - "moyai" - ] - , "tags": [ - "stone" - ] - } -, { - "emoji": "🎪" - , "description": "circus tent" - , "aliases": [ - "circus_tent" - ] - , "tags": [ - ] - } -, { - "emoji": "🎭" - , "description": "performing arts" - , "aliases": [ - "performing_arts" - ] - , "tags": [ - "theater" - , "drama" - ] - } -, { - "emoji": "📍" - , "description": "round pushpin" - , "aliases": [ - "round_pushpin" - ] - , "tags": [ - "location" - ] - } -, { - "emoji": "🚩" - , "description": "triangular flag on post" - , "aliases": [ - "triangular_flag_on_post" - ] - , "tags": [ - ] - } -, { - "emoji": "🇯🇵" - , "description": "regional indicator symbol letter j + regional indicator symbol letter p" - , "aliases": [ - "jp" - ] - , "tags": [ - "japan" - ] - } -, { - "emoji": "🇰🇷" - , "description": "regional indicator symbol letter k + regional indicator symbol letter r" - , "aliases": [ - "kr" - ] - , "tags": [ - "korea" - ] - } -, { - "emoji": "🇩🇪" - , "description": "regional indicator symbol letter d + regional indicator symbol letter e" - , "aliases": [ - "de" - ] - , "tags": [ - "flag" - , "germany" - ] - } -, { - "emoji": "🇨🇳" - , "description": "regional indicator symbol letter c + regional indicator symbol letter n" - , "aliases": [ + ], + "clock": [ + "mantlepiece_clock" + ], + "cloud_lightning": [ + "cloud_with_lightning" + ], + "cloud_rain": [ + "cloud_with_rain" + ], + "cloud_snow": [ + "cloud_with_snow" + ], + "cloud_tornado": [ + "cloud_with_tornado" + ], + "construction_site": [ + "building_construction" + ], + "couch": [ + "couch_and_lamp" + ], + "crayon": [ + "lower_left_crayon" + ], + "cricket": [ + "cricket_bat_ball" + ], + "cross": [ + "latin_cross" + ], + "cruise_ship": [ + "passenger_ship" + ], + "dagger": [ + "dagger_knife" + ], + "desktop": [ + "desktop_computer" + ], + "dividers": [ + "card_index_dividers" + ], + "dove": [ + "dove_of_peace" + ], + "e-mail": [ + "email" + ], + "feet": [ + "paw_prints" + ], + "fire": [ + "flame" + ], + "flag_black": [ + "waving_black_flag" + ], + "flag_cn": [ "cn" - ] - , "tags": [ - "china" - ] - } -, { - "emoji": "🇺🇸" - , "description": "regional indicator symbol letter u + regional indicator symbol letter s" - , "aliases": [ - "us" - ] - , "tags": [ - "flag" - , "united" - , "america" - ] - } -, { - "emoji": "🇫🇷" - , "description": "regional indicator symbol letter f + regional indicator symbol letter r" - , "aliases": [ - "fr" - ] - , "tags": [ - "france" - , "french" - ] - } -, { - "emoji": "🇪🇸" - , "description": "regional indicator symbol letter e + regional indicator symbol letter s" - , "aliases": [ + ], + "flag_de": [ + "de" + ], + "flag_es": [ "es" - ] - , "tags": [ - "spain" - ] - } -, { - "emoji": "🇮🇹" - , "description": "regional indicator symbol letter i + regional indicator symbol letter t" - , "aliases": [ - "it" - ] - , "tags": [ - "italy" - ] - } -, { - "emoji": "🇷🇺" - , "description": "regional indicator symbol letter r + regional indicator symbol letter u" - , "aliases": [ - "ru" - ] - , "tags": [ - "russia" - ] - } -, { - "emoji": "🇬🇧" - , "description": "regional indicator symbol letter g + regional indicator symbol letter b" - , "aliases": [ + ], + "flag_fr": [ + "fr" + ], + "flag_gb": [ "gb" - , "uk" - ] - , "tags": [ - "flag" - , "british" - ] - } -, { - "emoji": "1️⃣" - , "description": "digit one + combining enclosing keycap" - , "aliases": [ - "one" - ] - , "tags": [ - ] - } -, { - "emoji": "2️⃣" - , "description": "digit two + combining enclosing keycap" - , "aliases": [ - "two" - ] - , "tags": [ - ] - } -, { - "emoji": "3️⃣" - , "description": "digit three + combining enclosing keycap" - , "aliases": [ - "three" - ] - , "tags": [ - ] - } -, { - "emoji": "4️⃣" - , "description": "digit four + combining enclosing keycap" - , "aliases": [ - "four" - ] - , "tags": [ - ] - } -, { - "emoji": "5️⃣" - , "description": "digit five + combining enclosing keycap" - , "aliases": [ - "five" - ] - , "tags": [ - ] - } -, { - "emoji": "6️⃣" - , "description": "digit six + combining enclosing keycap" - , "aliases": [ - "six" - ] - , "tags": [ - ] - } -, { - "emoji": "7️⃣" - , "description": "digit seven + combining enclosing keycap" - , "aliases": [ - "seven" - ] - , "tags": [ - ] - } -, { - "emoji": "8️⃣" - , "description": "digit eight + combining enclosing keycap" - , "aliases": [ - "eight" - ] - , "tags": [ - ] - } -, { - "emoji": "9️⃣" - , "description": "digit nine + combining enclosing keycap" - , "aliases": [ - "nine" - ] - , "tags": [ - ] - } -, { - "emoji": "0️⃣" - , "description": "digit zero + combining enclosing keycap" - , "aliases": [ - "zero" - ] - , "tags": [ - ] - } -, { - "emoji": "🔟" - , "description": "keycap ten" - , "aliases": [ - "keycap_ten" - ] - , "tags": [ - ] - } -, { - "emoji": "🔢" - , "description": "input symbol for numbers" - , "aliases": [ - "1234" - ] - , "tags": [ - "numbers" - ] - } -, { - "emoji": "#️⃣" - , "description": "number sign + combining enclosing keycap" - , "aliases": [ - "hash" - ] - , "tags": [ - "number" - ] - } -, { - "emoji": "🔣" - , "description": "input symbol for symbols" - , "aliases": [ - "symbols" - ] - , "tags": [ - ] - } -, { - "emoji": "⬆️" - , "description": "upwards black arrow" - , "aliases": [ - "arrow_up" - ] - , "tags": [ - ] - } -, { - "emoji": "⬇️" - , "description": "downwards black arrow" - , "aliases": [ - "arrow_down" - ] - , "tags": [ - ] - } -, { - "emoji": "⬅️" - , "description": "leftwards black arrow" - , "aliases": [ - "arrow_left" - ] - , "tags": [ - ] - } -, { - "emoji": "➡️" - , "description": "black rightwards arrow" - , "aliases": [ - "arrow_right" - ] - , "tags": [ - ] - } -, { - "emoji": "🔠" - , "description": "input symbol for latin capital letters" - , "aliases": [ - "capital_abcd" - ] - , "tags": [ - "letters" - ] - } -, { - "emoji": "🔡" - , "description": "input symbol for latin small letters" - , "aliases": [ - "abcd" - ] - , "tags": [ - ] - } -, { - "emoji": "🔤" - , "description": "input symbol for latin letters" - , "aliases": [ - "abc" - ] - , "tags": [ - "alphabet" - ] - } -, { - "emoji": "↗️" - , "description": "north east arrow" - , "aliases": [ - "arrow_upper_right" - ] - , "tags": [ - ] - } -, { - "emoji": "↖️" - , "description": "north west arrow" - , "aliases": [ - "arrow_upper_left" - ] - , "tags": [ - ] - } -, { - "emoji": "↘️" - , "description": "south east arrow" - , "aliases": [ - "arrow_lower_right" - ] - , "tags": [ - ] - } -, { - "emoji": "↙️" - , "description": "south west arrow" - , "aliases": [ - "arrow_lower_left" - ] - , "tags": [ - ] - } -, { - "emoji": "↔️" - , "description": "left right arrow" - , "aliases": [ - "left_right_arrow" - ] - , "tags": [ - ] - } -, { - "emoji": "↕️" - , "description": "up down arrow" - , "aliases": [ - "arrow_up_down" - ] - , "tags": [ - ] - } -, { - "emoji": "🔄" - , "description": "anticlockwise downwards and upwards open circle arrows" - , "aliases": [ - "arrows_counterclockwise" - ] - , "tags": [ - "sync" - ] - } -, { - "emoji": "◀️" - , "description": "black left-pointing triangle" - , "aliases": [ - "arrow_backward" - ] - , "tags": [ - ] - } -, { - "emoji": "▶️" - , "description": "black right-pointing triangle" - , "aliases": [ - "arrow_forward" - ] - , "tags": [ - ] - } -, { - "emoji": "🔼" - , "description": "up-pointing small red triangle" - , "aliases": [ - "arrow_up_small" - ] - , "tags": [ - ] - } -, { - "emoji": "🔽" - , "description": "down-pointing small red triangle" - , "aliases": [ - "arrow_down_small" - ] - , "tags": [ - ] - } -, { - "emoji": "↩️" - , "description": "leftwards arrow with hook" - , "aliases": [ - "leftwards_arrow_with_hook" - ] - , "tags": [ - "return" - ] - } -, { - "emoji": "↪️" - , "description": "rightwards arrow with hook" - , "aliases": [ - "arrow_right_hook" - ] - , "tags": [ - ] - } -, { - "emoji": "ℹ️" - , "description": "information source" - , "aliases": [ - "information_source" - ] - , "tags": [ - ] - } -, { - "emoji": "⏪" - , "description": "black left-pointing double triangle" - , "aliases": [ - "rewind" - ] - , "tags": [ - ] - } -, { - "emoji": "⏩" - , "description": "black right-pointing double triangle" - , "aliases": [ - "fast_forward" - ] - , "tags": [ - ] - } -, { - "emoji": "⏫" - , "description": "black up-pointing double triangle" - , "aliases": [ - "arrow_double_up" - ] - , "tags": [ - ] - } -, { - "emoji": "⏬" - , "description": "black down-pointing double triangle" - , "aliases": [ - "arrow_double_down" - ] - , "tags": [ - ] - } -, { - "emoji": "⤵️" - , "description": "arrow pointing rightwards then curving downwards" - , "aliases": [ - "arrow_heading_down" - ] - , "tags": [ - ] - } -, { - "emoji": "⤴️" - , "description": "arrow pointing rightwards then curving upwards" - , "aliases": [ - "arrow_heading_up" - ] - , "tags": [ - ] - } -, { - "emoji": "🆗" - , "description": "squared ok" - , "aliases": [ - "ok" - ] - , "tags": [ - "yes" - ] - } -, { - "emoji": "🔀" - , "description": "twisted rightwards arrows" - , "aliases": [ - "twisted_rightwards_arrows" - ] - , "tags": [ - "shuffle" - ] - } -, { - "emoji": "🔁" - , "description": "clockwise rightwards and leftwards open circle arrows" - , "aliases": [ - "repeat" - ] - , "tags": [ - "loop" - ] - } -, { - "emoji": "🔂" - , "description": "clockwise rightwards and leftwards open circle arrows with circled one overlay" - , "aliases": [ - "repeat_one" - ] - , "tags": [ - ] - } -, { - "emoji": "🆕" - , "description": "squared new" - , "aliases": [ - "new" - ] - , "tags": [ - "fresh" - ] - } -, { - "emoji": "🆙" - , "description": "squared up with exclamation mark" - , "aliases": [ - "up" - ] - , "tags": [ - ] - } -, { - "emoji": "🆒" - , "description": "squared cool" - , "aliases": [ - "cool" - ] - , "tags": [ - ] - } -, { - "emoji": "🆓" - , "description": "squared free" - , "aliases": [ - "free" - ] - , "tags": [ - ] - } -, { - "emoji": "🆖" - , "description": "squared ng" - , "aliases": [ - "ng" - ] - , "tags": [ - ] - } -, { - "emoji": "📶" - , "description": "antenna with bars" - , "aliases": [ - "signal_strength" - ] - , "tags": [ - "wifi" - ] - } -, { - "emoji": "🎦" - , "description": "cinema" - , "aliases": [ - "cinema" - ] - , "tags": [ - "film" - , "movie" - ] - } -, { - "emoji": "🈁" - , "description": "squared katakana koko" - , "aliases": [ - "koko" - ] - , "tags": [ - ] - } -, { - "emoji": "🈯" - , "description": "squared cjk unified ideograph-6307" - , "aliases": [ - "u6307" - ] - , "tags": [ - ] - } -, { - "emoji": "🈳" - , "description": "squared cjk unified ideograph-7a7a" - , "aliases": [ - "u7a7a" - ] - , "tags": [ - ] - } -, { - "emoji": "🈵" - , "description": "squared cjk unified ideograph-6e80" - , "aliases": [ - "u6e80" - ] - , "tags": [ - ] - } -, { - "emoji": "🈴" - , "description": "squared cjk unified ideograph-5408" - , "aliases": [ - "u5408" - ] - , "tags": [ - ] - } -, { - "emoji": "🈲" - , "description": "squared cjk unified ideograph-7981" - , "aliases": [ - "u7981" - ] - , "tags": [ - ] - } -, { - "emoji": "🉐" - , "description": "circled ideograph advantage" - , "aliases": [ - "ideograph_advantage" - ] - , "tags": [ - ] - } -, { - "emoji": "🈹" - , "description": "squared cjk unified ideograph-5272" - , "aliases": [ - "u5272" - ] - , "tags": [ - ] - } -, { - "emoji": "🈺" - , "description": "squared cjk unified ideograph-55b6" - , "aliases": [ - "u55b6" - ] - , "tags": [ - ] - } -, { - "emoji": "🈶" - , "description": "squared cjk unified ideograph-6709" - , "aliases": [ - "u6709" - ] - , "tags": [ - ] - } -, { - "emoji": "🈚" - , "description": "squared cjk unified ideograph-7121" - , "aliases": [ - "u7121" - ] - , "tags": [ - ] - } -, { - "emoji": "🚻" - , "description": "restroom" - , "aliases": [ - "restroom" - ] - , "tags": [ - "toilet" - ] - } -, { - "emoji": "🚹" - , "description": "mens symbol" - , "aliases": [ - "mens" - ] - , "tags": [ - ] - } -, { - "emoji": "🚺" - , "description": "womens symbol" - , "aliases": [ - "womens" - ] - , "tags": [ - ] - } -, { - "emoji": "🚼" - , "description": "baby symbol" - , "aliases": [ - "baby_symbol" - ] - , "tags": [ - ] - } -, { - "emoji": "🚾" - , "description": "water closet" - , "aliases": [ - "wc" - ] - , "tags": [ - "toilet" - , "restroom" - ] - } -, { - "emoji": "🚰" - , "description": "potable water symbol" - , "aliases": [ - "potable_water" - ] - , "tags": [ - ] - } -, { - "emoji": "🚮" - , "description": "put litter in its place symbol" - , "aliases": [ - "put_litter_in_its_place" - ] - , "tags": [ - ] - } -, { - "emoji": "🅿️" - , "description": "negative squared latin capital letter p" - , "aliases": [ - "parking" - ] - , "tags": [ - ] - } -, { - "emoji": "♿" - , "description": "wheelchair symbol" - , "aliases": [ - "wheelchair" - ] - , "tags": [ - "accessibility" - ] - } -, { - "emoji": "🚭" - , "description": "no smoking symbol" - , "aliases": [ - "no_smoking" - ] - , "tags": [ - ] - } -, { - "emoji": "🈷️" - , "description": "squared cjk unified ideograph-6708" - , "aliases": [ - "u6708" - ] - , "tags": [ - ] - } -, { - "emoji": "🈸" - , "description": "squared cjk unified ideograph-7533" - , "aliases": [ - "u7533" - ] - , "tags": [ - ] - } -, { - "emoji": "🈂️" - , "description": "squared katakana sa" - , "aliases": [ - "sa" - ] - , "tags": [ - ] - } -, { - "emoji": "Ⓜ️" - , "description": "circled latin capital letter m" - , "aliases": [ - "m" - ] - , "tags": [ - ] - } -, { - "emoji": "🛂" - , "description": "passport control" - , "aliases": [ - "passport_control" - ] - , "tags": [ - ] - } -, { - "emoji": "🛄" - , "description": "baggage claim" - , "aliases": [ - "baggage_claim" - ] - , "tags": [ - "airport" - ] - } -, { - "emoji": "🛅" - , "description": "left luggage" - , "aliases": [ - "left_luggage" - ] - , "tags": [ - ] - } -, { - "emoji": "🛃" - , "description": "customs" - , "aliases": [ - "customs" - ] - , "tags": [ - ] - } -, { - "emoji": "🉑" - , "description": "circled ideograph accept" - , "aliases": [ - "accept" - ] - , "tags": [ - ] - } -, { - "emoji": "㊙️" - , "description": "circled ideograph secret" - , "aliases": [ - "secret" - ] - , "tags": [ - ] - } -, { - "emoji": "㊗️" - , "description": "circled ideograph congratulation" - , "aliases": [ - "congratulations" - ] - , "tags": [ - ] - } -, { - "emoji": "🆑" - , "description": "squared cl" - , "aliases": [ - "cl" - ] - , "tags": [ - ] - } -, { - "emoji": "🆘" - , "description": "squared sos" - , "aliases": [ - "sos" - ] - , "tags": [ - "help" - , "emergency" - ] - } -, { - "emoji": "🆔" - , "description": "squared id" - , "aliases": [ - "id" - ] - , "tags": [ - ] - } -, { - "emoji": "🚫" - , "description": "no entry sign" - , "aliases": [ - "no_entry_sign" - ] - , "tags": [ - "block" - , "forbidden" - ] - } -, { - "emoji": "🔞" - , "description": "no one under eighteen symbol" - , "aliases": [ - "underage" - ] - , "tags": [ - ] - } -, { - "emoji": "📵" - , "description": "no mobile phones" - , "aliases": [ - "no_mobile_phones" - ] - , "tags": [ - ] - } -, { - "emoji": "🚯" - , "description": "do not litter symbol" - , "aliases": [ - "do_not_litter" - ] - , "tags": [ - ] - } -, { - "emoji": "🚱" - , "description": "non-potable water symbol" - , "aliases": [ - "non-potable_water" - ] - , "tags": [ - ] - } -, { - "emoji": "🚳" - , "description": "no bicycles" - , "aliases": [ - "no_bicycles" - ] - , "tags": [ - ] - } -, { - "emoji": "🚷" - , "description": "no pedestrians" - , "aliases": [ - "no_pedestrians" - ] - , "tags": [ - ] - } -, { - "emoji": "🚸" - , "description": "children crossing" - , "aliases": [ - "children_crossing" - ] - , "tags": [ - ] - } -, { - "emoji": "⛔" - , "description": "no entry" - , "aliases": [ - "no_entry" - ] - , "tags": [ - "limit" - ] - } -, { - "emoji": "✳️" - , "description": "eight spoked asterisk" - , "aliases": [ - "eight_spoked_asterisk" - ] - , "tags": [ - ] - } -, { - "emoji": "❇️" - , "description": "sparkle" - , "aliases": [ - "sparkle" - ] - , "tags": [ - ] - } -, { - "emoji": "❎" - , "description": "negative squared cross mark" - , "aliases": [ - "negative_squared_cross_mark" - ] - , "tags": [ - ] - } -, { - "emoji": "✅" - , "description": "white heavy check mark" - , "aliases": [ - "white_check_mark" - ] - , "tags": [ - ] - } -, { - "emoji": "✴️" - , "description": "eight pointed black star" - , "aliases": [ - "eight_pointed_black_star" - ] - , "tags": [ - ] - } -, { - "emoji": "💟" - , "description": "heart decoration" - , "aliases": [ - "heart_decoration" - ] - , "tags": [ - ] - } -, { - "emoji": "🆚" - , "description": "squared vs" - , "aliases": [ - "vs" - ] - , "tags": [ - ] - } -, { - "emoji": "📳" - , "description": "vibration mode" - , "aliases": [ - "vibration_mode" - ] - , "tags": [ - ] - } -, { - "emoji": "📴" - , "description": "mobile phone off" - , "aliases": [ - "mobile_phone_off" - ] - , "tags": [ - "mute" - , "off" - ] - } -, { - "emoji": "🅰️" - , "description": "negative squared latin capital letter a" - , "aliases": [ - "a" - ] - , "tags": [ - ] - } -, { - "emoji": "🅱️" - , "description": "negative squared latin capital letter b" - , "aliases": [ - "b" - ] - , "tags": [ - ] - } -, { - "emoji": "🆎" - , "description": "negative squared ab" - , "aliases": [ - "ab" - ] - , "tags": [ - ] - } -, { - "emoji": "🅾️" - , "description": "negative squared latin capital letter o" - , "aliases": [ - "o2" - ] - , "tags": [ - ] - } -, { - "emoji": "💠" - , "description": "diamond shape with a dot inside" - , "aliases": [ - "diamond_shape_with_a_dot_inside" - ] - , "tags": [ - ] - } -, { - "emoji": "➿" - , "description": "double curly loop" - , "aliases": [ - "loop" - ] - , "tags": [ - ] - } -, { - "emoji": "♻️" - , "description": "black universal recycling symbol" - , "aliases": [ - "recycle" - ] - , "tags": [ - "environment" - , "green" - ] - } -, { - "emoji": "♈" - , "description": "aries" - , "aliases": [ - "aries" - ] - , "tags": [ - ] - } -, { - "emoji": "♉" - , "description": "taurus" - , "aliases": [ - "taurus" - ] - , "tags": [ - ] - } -, { - "emoji": "♊" - , "description": "gemini" - , "aliases": [ - "gemini" - ] - , "tags": [ - ] - } -, { - "emoji": "♋" - , "description": "cancer" - , "aliases": [ - "cancer" - ] - , "tags": [ - ] - } -, { - "emoji": "♌" - , "description": "leo" - , "aliases": [ - "leo" - ] - , "tags": [ - ] - } -, { - "emoji": "♍" - , "description": "virgo" - , "aliases": [ - "virgo" - ] - , "tags": [ - ] - } -, { - "emoji": "♎" - , "description": "libra" - , "aliases": [ - "libra" - ] - , "tags": [ - ] - } -, { - "emoji": "♏" - , "description": "scorpius" - , "aliases": [ - "scorpius" - ] - , "tags": [ - ] - } -, { - "emoji": "♐" - , "description": "sagittarius" - , "aliases": [ - "sagittarius" - ] - , "tags": [ - ] - } -, { - "emoji": "♑" - , "description": "capricorn" - , "aliases": [ - "capricorn" - ] - , "tags": [ - ] - } -, { - "emoji": "♒" - , "description": "aquarius" - , "aliases": [ - "aquarius" - ] - , "tags": [ - ] - } -, { - "emoji": "♓" - , "description": "pisces" - , "aliases": [ - "pisces" - ] - , "tags": [ - ] - } -, { - "emoji": "⛎" - , "description": "ophiuchus" - , "aliases": [ - "ophiuchus" - ] - , "tags": [ - ] - } -, { - "emoji": "🔯" - , "description": "six pointed star with middle dot" - , "aliases": [ - "six_pointed_star" - ] - , "tags": [ - ] - } -, { - "emoji": "🏧" - , "description": "automated teller machine" - , "aliases": [ - "atm" - ] - , "tags": [ - ] - } -, { - "emoji": "💹" - , "description": "chart with upwards trend and yen sign" - , "aliases": [ - "chart" - ] - , "tags": [ - ] - } -, { - "emoji": "💲" - , "description": "heavy dollar sign" - , "aliases": [ - "heavy_dollar_sign" - ] - , "tags": [ - ] - } -, { - "emoji": "💱" - , "description": "currency exchange" - , "aliases": [ - "currency_exchange" - ] - , "tags": [ - ] - } -, { - "emoji": "©️" - , "description": "copyright sign" - , "aliases": [ - "copyright" - ] - , "tags": [ - ] - } -, { - "emoji": "®️" - , "description": "registered sign" - , "aliases": [ - "registered" - ] - , "tags": [ - ] - } -, { - "emoji": "™️" - , "description": "trade mark sign" - , "aliases": [ - "tm" - ] - , "tags": [ - "trademark" - ] - } -, { - "emoji": "❌" - , "description": "cross mark" - , "aliases": [ - "x" - ] - , "tags": [ - ] - } -, { - "emoji": "‼️" - , "description": "double exclamation mark" - , "aliases": [ - "bangbang" - ] - , "tags": [ - ] - } -, { - "emoji": "⁉️" - , "description": "exclamation question mark" - , "aliases": [ - "interrobang" - ] - , "tags": [ - ] - } -, { - "emoji": "❗" - , "description": "heavy exclamation mark symbol" - , "aliases": [ - "exclamation" - , "heavy_exclamation_mark" - ] - , "tags": [ - "bang" - ] - } -, { - "emoji": "❓" - , "description": "black question mark ornament" - , "aliases": [ - "question" - ] - , "tags": [ - "confused" - ] - } -, { - "emoji": "❕" - , "description": "white exclamation mark ornament" - , "aliases": [ - "grey_exclamation" - ] - , "tags": [ - ] - } -, { - "emoji": "❔" - , "description": "white question mark ornament" - , "aliases": [ - "grey_question" - ] - , "tags": [ - ] - } -, { - "emoji": "⭕" - , "description": "heavy large circle" - , "aliases": [ - "o" - ] - , "tags": [ - ] - } -, { - "emoji": "🔝" - , "description": "top with upwards arrow above" - , "aliases": [ - "top" - ] - , "tags": [ - ] - } -, { - "emoji": "🔚" - , "description": "end with leftwards arrow above" - , "aliases": [ - "end" - ] - , "tags": [ - ] - } -, { - "emoji": "🔙" - , "description": "back with leftwards arrow above" - , "aliases": [ - "back" - ] - , "tags": [ - ] - } -, { - "emoji": "🔛" - , "description": "on with exclamation mark with left right arrow above" - , "aliases": [ - "on" - ] - , "tags": [ - ] - } -, { - "emoji": "🔜" - , "description": "soon with rightwards arrow above" - , "aliases": [ - "soon" - ] - , "tags": [ - ] - } -, { - "emoji": "🔃" - , "description": "clockwise downwards and upwards open circle arrows" - , "aliases": [ - "arrows_clockwise" - ] - , "tags": [ - ] - } -, { - "emoji": "🕛" - , "description": "clock face twelve oclock" - , "aliases": [ - "clock12" - ] - , "tags": [ - ] - } -, { - "emoji": "🕧" - , "description": "clock face twelve-thirty" - , "aliases": [ - "clock1230" - ] - , "tags": [ - ] - } -, { - "emoji": "🕐" - , "description": "clock face one oclock" - , "aliases": [ - "clock1" - ] - , "tags": [ - ] - } -, { - "emoji": "🕜" - , "description": "clock face one-thirty" - , "aliases": [ - "clock130" - ] - , "tags": [ - ] - } -, { - "emoji": "🕑" - , "description": "clock face two oclock" - , "aliases": [ - "clock2" - ] - , "tags": [ - ] - } -, { - "emoji": "🕝" - , "description": "clock face two-thirty" - , "aliases": [ - "clock230" - ] - , "tags": [ - ] - } -, { - "emoji": "🕒" - , "description": "clock face three oclock" - , "aliases": [ - "clock3" - ] - , "tags": [ - ] - } -, { - "emoji": "🕞" - , "description": "clock face three-thirty" - , "aliases": [ - "clock330" - ] - , "tags": [ - ] - } -, { - "emoji": "🕓" - , "description": "clock face four oclock" - , "aliases": [ - "clock4" - ] - , "tags": [ - ] - } -, { - "emoji": "🕟" - , "description": "clock face four-thirty" - , "aliases": [ - "clock430" - ] - , "tags": [ - ] - } -, { - "emoji": "🕔" - , "description": "clock face five oclock" - , "aliases": [ - "clock5" - ] - , "tags": [ - ] - } -, { - "emoji": "🕠" - , "description": "clock face five-thirty" - , "aliases": [ - "clock530" - ] - , "tags": [ - ] - } -, { - "emoji": "🕕" - , "description": "clock face six oclock" - , "aliases": [ - "clock6" - ] - , "tags": [ - ] - } -, { - "emoji": "🕖" - , "description": "clock face seven oclock" - , "aliases": [ - "clock7" - ] - , "tags": [ - ] - } -, { - "emoji": "🕗" - , "description": "clock face eight oclock" - , "aliases": [ - "clock8" - ] - , "tags": [ - ] - } -, { - "emoji": "🕘" - , "description": "clock face nine oclock" - , "aliases": [ - "clock9" - ] - , "tags": [ - ] - } -, { - "emoji": "🕙" - , "description": "clock face ten oclock" - , "aliases": [ - "clock10" - ] - , "tags": [ - ] - } -, { - "emoji": "🕚" - , "description": "clock face eleven oclock" - , "aliases": [ - "clock11" - ] - , "tags": [ - ] - } -, { - "emoji": "🕡" - , "description": "clock face six-thirty" - , "aliases": [ - "clock630" - ] - , "tags": [ - ] - } -, { - "emoji": "🕢" - , "description": "clock face seven-thirty" - , "aliases": [ - "clock730" - ] - , "tags": [ - ] - } -, { - "emoji": "🕣" - , "description": "clock face eight-thirty" - , "aliases": [ - "clock830" - ] - , "tags": [ - ] - } -, { - "emoji": "🕤" - , "description": "clock face nine-thirty" - , "aliases": [ - "clock930" - ] - , "tags": [ - ] - } -, { - "emoji": "🕥" - , "description": "clock face ten-thirty" - , "aliases": [ - "clock1030" - ] - , "tags": [ - ] - } -, { - "emoji": "🕦" - , "description": "clock face eleven-thirty" - , "aliases": [ - "clock1130" - ] - , "tags": [ - ] - } -, { - "emoji": "✖️" - , "description": "heavy multiplication x" - , "aliases": [ - "heavy_multiplication_x" - ] - , "tags": [ - ] - } -, { - "emoji": "➕" - , "description": "heavy plus sign" - , "aliases": [ - "heavy_plus_sign" - ] - , "tags": [ - ] - } -, { - "emoji": "➖" - , "description": "heavy minus sign" - , "aliases": [ - "heavy_minus_sign" - ] - , "tags": [ - ] - } -, { - "emoji": "➗" - , "description": "heavy division sign" - , "aliases": [ - "heavy_division_sign" - ] - , "tags": [ - ] - } -, { - "emoji": "♠️" - , "description": "black spade suit" - , "aliases": [ - "spades" - ] - , "tags": [ - ] - } -, { - "emoji": "♥️" - , "description": "black heart suit" - , "aliases": [ - "hearts" - ] - , "tags": [ - ] - } -, { - "emoji": "♣️" - , "description": "black club suit" - , "aliases": [ - "clubs" - ] - , "tags": [ - ] - } -, { - "emoji": "♦️" - , "description": "black diamond suit" - , "aliases": [ - "diamonds" - ] - , "tags": [ - ] - } -, { - "emoji": "💮" - , "description": "white flower" - , "aliases": [ - "white_flower" - ] - , "tags": [ - ] - } -, { - "emoji": "💯" - , "description": "hundred points symbol" - , "aliases": [ - "100" - ] - , "tags": [ - "score" - , "perfect" - ] - } -, { - "emoji": "✔️" - , "description": "heavy check mark" - , "aliases": [ - "heavy_check_mark" - ] - , "tags": [ - ] - } -, { - "emoji": "☑️" - , "description": "ballot box with check" - , "aliases": [ - "ballot_box_with_check" - ] - , "tags": [ - ] - } -, { - "emoji": "🔘" - , "description": "radio button" - , "aliases": [ - "radio_button" - ] - , "tags": [ - ] - } -, { - "emoji": "🔗" - , "description": "link symbol" - , "aliases": [ - "link" - ] - , "tags": [ - ] - } -, { - "emoji": "➰" - , "description": "curly loop" - , "aliases": [ - "curly_loop" - ] - , "tags": [ - ] - } -, { - "emoji": "〰️" - , "description": "wavy dash" - , "aliases": [ - "wavy_dash" - ] - , "tags": [ - ] - } -, { - "emoji": "〽️" - , "description": "part alternation mark" - , "aliases": [ - "part_alternation_mark" - ] - , "tags": [ - ] - } -, { - "emoji": "🔱" - , "description": "trident emblem" - , "aliases": [ - "trident" - ] - , "tags": [ - ] - } -, { - "emoji": "◼️" - , "description": "black medium square" - , "aliases": [ - "black_medium_square" - ] - , "tags": [ - ] - } -, { - "emoji": "◻️" - , "description": "white medium square" - , "aliases": [ - "white_medium_square" - ] - , "tags": [ - ] - } -, { - "emoji": "◾" - , "description": "black medium small square" - , "aliases": [ - "black_medium_small_square" - ] - , "tags": [ - ] - } -, { - "emoji": "◽" - , "description": "white medium small square" - , "aliases": [ - "white_medium_small_square" - ] - , "tags": [ - ] - } -, { - "emoji": "▪️" - , "description": "black small square" - , "aliases": [ - "black_small_square" - ] - , "tags": [ - ] - } -, { - "emoji": "▫️" - , "description": "white small square" - , "aliases": [ - "white_small_square" - ] - , "tags": [ - ] - } -, { - "emoji": "🔺" - , "description": "up-pointing red triangle" - , "aliases": [ - "small_red_triangle" - ] - , "tags": [ - ] - } -, { - "emoji": "🔲" - , "description": "black square button" - , "aliases": [ - "black_square_button" - ] - , "tags": [ - ] - } -, { - "emoji": "🔳" - , "description": "white square button" - , "aliases": [ - "white_square_button" - ] - , "tags": [ - ] - } -, { - "emoji": "⚫" - , "description": "medium black circle" - , "aliases": [ - "black_circle" - ] - , "tags": [ - ] - } -, { - "emoji": "⚪" - , "description": "medium white circle" - , "aliases": [ - "white_circle" - ] - , "tags": [ - ] - } -, { - "emoji": "🔴" - , "description": "large red circle" - , "aliases": [ - "red_circle" - ] - , "tags": [ - ] - } -, { - "emoji": "🔵" - , "description": "large blue circle" - , "aliases": [ - "large_blue_circle" - ] - , "tags": [ - ] - } -, { - "emoji": "🔻" - , "description": "down-pointing red triangle" - , "aliases": [ - "small_red_triangle_down" - ] - , "tags": [ - ] - } -, { - "emoji": "⬜" - , "description": "white large square" - , "aliases": [ - "white_large_square" - ] - , "tags": [ - ] - } -, { - "emoji": "⬛" - , "description": "black large square" - , "aliases": [ - "black_large_square" - ] - , "tags": [ - ] - } -, { - "emoji": "🔶" - , "description": "large orange diamond" - , "aliases": [ - "large_orange_diamond" - ] - , "tags": [ - ] - } -, { - "emoji": "🔷" - , "description": "large blue diamond" - , "aliases": [ - "large_blue_diamond" - ] - , "tags": [ - ] - } -, { - "emoji": "🔸" - , "description": "small orange diamond" - , "aliases": [ - "small_orange_diamond" - ] - , "tags": [ - ] - } -, { - "emoji": "🔹" - , "description": "small blue diamond" - , "aliases": [ - "small_blue_diamond" - ] - , "tags": [ - ] - } -] + ], + "flag_it": [ + "it" + ], + "flag_jp": [ + "jp" + ], + "flag_kr": [ + "kr" + ], + "flag_ru": [ + "ru" + ], + "flag_us": [ + "us" + ], + "flag_white": [ + "waving_white_flag" + ], + "fork_knife_plate": [ + "fork_and_knife_with_plate" + ], + "frame_photo": [ + "frame_with_picture" + ], + "frowning2": [ + "white_frowning_face" + ], + "hammer_pick": [ + "hammer_and_pick" + ], + "hand_splayed": [ + "raised_hand_with_fingers_splayed" + ], + "head_bandage": [ + "face_with_head_bandage" + ], + "heart_exclamation": [ + "heavy_heart_exclamation_mark_ornament" + ], + "helmet_with_cross": [ + "helmet_with_white_cross" + ], + "homes": [ + "house_buildings" + ], + "hotdog": [ + "hot_dog" + ], + "house_abandoned": [ + "derelict_house_building" + ], + "hugging": [ + "hugging_face" + ], + "island": [ + "desert_island" + ], + "key2": [ + "old_key" + ], + "laughing": [ + "satisfied" + ], + "levitate": [ + "man_in_business_suit_levitating" + ], + "lifter": [ + "weight_lifter" + ], + "lion_face": [ + "lion" + ], + "map": [ + "world_map" + ], + "medal": [ + "sports_medal" + ], + "metal": [ + "sign_of_the_horns" + ], + "microphone2": [ + "studio_microphone" + ], + "middle_finger": [ + "reversed_hand_with_middle_finger_extended" + ], + "money_mouth": [ + "money_mouth_face" + ], + "motorcycle": [ + "racing_motorcycle" + ], + "mountain_snow": [ + "snow_capped_mountain" + ], + "mouse_three_button": [ + "three_button_mouse" + ], + "nerd": [ + "nerd_face" + ], + "newspaper2": [ + "rolled_up_newspaper" + ], + "notepad_spiral": [ + "spiral_note_pad" + ], + "oil": [ + "oil_drum" + ], + "older_woman": [ + "grandma" + ], + "paintbrush": [ + "lower_left_paintbrush" + ], + "paperclips": [ + "linked_paperclips" + ], + "park": [ + "national_park" + ], + "pause_button": [ + "double_vertical_bar" + ], + "peace": [ + "peace_symbol" + ], + "pen_ballpoint": [ + "lower_left_ballpoint_pen" + ], + "pen_fountain": [ + "lower_left_fountain_pen" + ], + "ping_pong": [ + "table_tennis" + ], + "place_of_worship": [ + "worship_symbol" + ], + "poop": [ + "shit", + "hankey", + "poo" + ], + "projector": [ + "film_projector" + ], + "race_car": [ + "racing_car" + ], + "radioactive": [ + "radioactive_sign" + ], + "railway_track": [ + "railroad_track" + ], + "robot": [ + "robot_face" + ], + "rolling_eyes": [ + "face_with_rolling_eyes" + ], + "skull": [ + "skeleton" + ], + "skull_crossbones": [ + "skull_and_crossbones" + ], + "slight_frown": [ + "slightly_frowning_face" + ], + "slight_smile": [ + "slightly_smiling_face" + ], + "speaking_head": [ + "speaking_head_in_silhouette" + ], + "spy": [ + "sleuth_or_spy" + ], + "thermometer_face": [ + "face_with_thermometer" + ], + "thinking": [ + "thinking_face" + ], + "thumbsdown": [ + "-1" + ], + "thumbsup": [ + "+1" + ], + "thunder_cloud_rain": [ + "thunder_cloud_and_rain" + ], + "tickets": [ + "admission_tickets" + ], + "timer": [ + "timer_clock" + ], + "tools": [ + "hammer_and_wrench" + ], + "track_next": [ + "next_track" + ], + "track_previous": [ + "previous_track" + ], + "unicorn": [ + "unicorn_face" + ], + "upside_down": [ + "upside_down_face" + ], + "urn": [ + "funeral_urn" + ], + "vulcan": [ + "raised_hand_with_part_between_middle_and_ring_fingers" + ], + "white_sun_cloud": [ + "white_sun_behind_cloud" + ], + "white_sun_rain_cloud": [ + "white_sun_behind_cloud_with_rain" + ], + "white_sun_small_cloud": [ + "white_sun_with_small_cloud" + ], + "zipper_mouth": [ + "zipper_mouth_face" + ] + } +} 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 169985693c..d54524fe68 100644 --- a/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb +++ b/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb @@ -143,7 +143,7 @@ module Tilt def generate_source(scope) js_source = ::JSON.generate(data, quirks_mode: true) - js_source = "babel.transform(#{js_source}, {ast: false, whitelist: ['es6.constants', 'es6.properties.shorthand', 'es6.arrowFunctions', 'es6.blockScoping', 'es6.destructuring', 'es6.spread', 'es6.parameters', 'es6.templateLiterals', 'es6.regex.unicode', 'es7.decorators']})['code']" + js_source = "babel.transform(#{js_source}, {ast: false, whitelist: ['es6.constants', 'es6.properties.shorthand', 'es6.arrowFunctions', 'es6.blockScoping', 'es6.destructuring', 'es6.spread', 'es6.parameters', 'es6.templateLiterals', 'es6.regex.unicode', 'es7.decorators', 'es6.classes']})['code']" "new module.exports.Compiler(#{js_source}, '#{module_name(scope.root_path, scope.logical_path)}', #{compiler_options}).#{compiler_method}()" end diff --git a/lib/freedom_patches/translate_accelerator.rb b/lib/freedom_patches/translate_accelerator.rb index 8b131d3247..4b41a24c27 100644 --- a/lib/freedom_patches/translate_accelerator.rb +++ b/lib/freedom_patches/translate_accelerator.rb @@ -28,6 +28,7 @@ module I18n @overrides_by_site = {} reload_no_cache! + ensure_all_loaded! end LOAD_MUTEX = Mutex.new @@ -105,14 +106,19 @@ module I18n by_site = @overrides_by_site[site] - by_locale = nil - unless by_site + if by_site.nil? || !by_site.has_key?(locale) by_site = @overrides_by_site[site] = {} # Load overrides - TranslationOverride.where(locale: locale).pluck(:translation_key, :value).each do |tuple| - by_locale = by_site[locale] ||= {} - by_locale[tuple[0]] = tuple[1] + translations_overrides = TranslationOverride.where(locale: locale).pluck(:translation_key, :value) + + if translations_overrides.empty? + by_site[locale] = {} + else + translations_overrides.each do |tuple| + by_locale = by_site[locale] ||= {} + by_locale[tuple[0]] = tuple[1] + end end end diff --git a/lib/guardian.rb b/lib/guardian.rb index 92c09f2ed2..576d477b13 100644 --- a/lib/guardian.rb +++ b/lib/guardian.rb @@ -22,6 +22,7 @@ class Guardian def staff?; false; end def moderator?; false; end def approved?; false; end + def staged?; false; end def secure_category_ids; []; end def topic_create_allowed_category_ids; []; end def has_trust_level?(level); false; end diff --git a/lib/guardian/category_guardian.rb b/lib/guardian/category_guardian.rb index c24c652b61..b711c12d03 100644 --- a/lib/guardian/category_guardian.rb +++ b/lib/guardian/category_guardian.rb @@ -45,7 +45,10 @@ module CategoryGuardian end def can_see_category?(category) - not(category.read_restricted) || secure_category_ids.include?(category.id) + is_admin? || + !category.read_restricted || + (@user.staged? && category.email_in.present? && category.email_in_allow_strangers) || + secure_category_ids.include?(category.id) end def secure_category_ids diff --git a/lib/i18n/backend/discourse_i18n.rb b/lib/i18n/backend/discourse_i18n.rb index c4bccbf122..8b2ea23759 100644 --- a/lib/i18n/backend/discourse_i18n.rb +++ b/lib/i18n/backend/discourse_i18n.rb @@ -43,7 +43,13 @@ module I18n end def search(locale, query) - find_results(/#{query}/i, {}, translations[locale]) + results = {} + + fallbacks(locale).each do |fallback| + find_results(/#{query}/i, results, translations[fallback]) + end + + results end protected @@ -54,7 +60,9 @@ module I18n k = k_sym.to_s key_path = path ? "#{path}.#{k}" : k if v.is_a?(String) - results[key_path] = v if key_path =~ regexp || v =~ regexp + unless results.has_key?(key_path) + results[key_path] = v if key_path =~ regexp || v =~ regexp + end elsif v.is_a?(Hash) find_results(regexp, results, v, key_path) end diff --git a/lib/import_export/category_importer.rb b/lib/import_export/category_importer.rb index 48ceb23f5d..9b21b7aa26 100644 --- a/lib/import_export/category_importer.rb +++ b/lib/import_export/category_importer.rb @@ -39,25 +39,33 @@ module ImportExport def import_categories id = @export_data[:category].delete(:id) - permissions = @export_data[:category].delete(:permissions_params) - parent = Category.new(@export_data[:category]) - parent.user_id = @topic_importer.new_user_id(@export_data[:category][:user_id]) # imported user's new id - parent.custom_fields["import_id"] = id - parent.permissions = permissions if permissions - parent.save! - set_category_description(parent, @export_data[:category][:description]) + parent = CategoryCustomField.where(name: 'import_id', value: id.to_s).first.try(:category) + + unless parent + permissions = @export_data[:category].delete(:permissions_params) + parent = Category.new(@export_data[:category]) + parent.user_id = @topic_importer.new_user_id(@export_data[:category][:user_id]) # imported user's new id + parent.custom_fields["import_id"] = id + parent.permissions = permissions if permissions + parent.save! + set_category_description(parent, @export_data[:category][:description]) + end @export_data[:subcategories].each do |cat_attrs| id = cat_attrs.delete(:id) - permissions = cat_attrs.delete(:permissions_params) - subcategory = Category.new(cat_attrs) - subcategory.parent_category_id = parent.id - subcategory.user_id = @topic_importer.new_user_id(cat_attrs[:user_id]) - subcategory.custom_fields["import_id"] = id - subcategory.permissions = permissions if permissions - subcategory.save! - set_category_description(subcategory, cat_attrs[:description]) + existing = CategoryCustomField.where(name: 'import_id', value: id.to_s).first.try(:category) + + unless existing + permissions = cat_attrs.delete(:permissions_params) + subcategory = Category.new(cat_attrs) + subcategory.parent_category_id = parent.id + subcategory.user_id = @topic_importer.new_user_id(cat_attrs[:user_id]) + subcategory.custom_fields["import_id"] = id + subcategory.permissions = permissions if permissions + subcategory.save! + set_category_description(subcategory, cat_attrs[:description]) + end end end diff --git a/lib/import_export/topic_importer.rb b/lib/import_export/topic_importer.rb index c101f768ab..e7fc2d8f36 100644 --- a/lib/import_export/topic_importer.rb +++ b/lib/import_export/topic_importer.rb @@ -19,9 +19,11 @@ module ImportExport def import_users @export_data[:users].each do |u| existing = User.where(email: u[:email]).first - if existing && existing.custom_fields["import_id"] != u[:id] - existing.custom_fields["import_id"] = u[:id] - existing.save! + if existing + if existing.custom_fields["import_id"] != u[:id] + existing.custom_fields["import_id"] = u[:id] + existing.save! + end else u = create_user(u, u[:id]) # see ImportScripts::Base end @@ -38,15 +40,24 @@ module ImportExport first_post_attrs[:user_id] = new_user_id(first_post_attrs[:user_id]) first_post_attrs[:category] = new_category_id(t[:category_id]) - first_post = create_post( first_post_attrs, first_post_attrs[:id] ) + first_post = PostCustomField.where(name: "import_id", value: first_post_attrs[:id]).first.try(:post) + + unless first_post + first_post = create_post( first_post_attrs, first_post_attrs[:id] ) + end + topic_id = first_post.topic_id + t[:posts].each_with_index do |post_data, i| next if i == 0 print "." - create_post(post_data.merge({ - topic_id: topic_id, - user_id: new_user_id(post_data[:user_id]) - }), post_data[:id]) # see ImportScripts::Base + existing = PostCustomField.where(name: "import_id", value: post_data[:id]).first.try(:post) + unless existing + create_post(post_data.merge({ + topic_id: topic_id, + user_id: new_user_id(post_data[:user_id]) + }), post_data[:id]) # see ImportScripts::Base + end end end diff --git a/lib/new_post_manager.rb b/lib/new_post_manager.rb index f66421d667..923315d915 100644 --- a/lib/new_post_manager.rb +++ b/lib/new_post_manager.rb @@ -71,7 +71,7 @@ class NewPostManager return false if user.staff? || user.staged - (user.post_count < SiteSetting.approve_post_count) || + (user.trust_level <= TrustLevel.levels[:basic] && user.post_count < SiteSetting.approve_post_count) || (user.trust_level < SiteSetting.approve_unless_trust_level.to_i) || is_fast_typer?(manager) || matches_auto_block_regex?(manager) diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb index fbd30ba232..6dacab922d 100644 --- a/lib/pretty_text.rb +++ b/lib/pretty_text.rb @@ -72,10 +72,6 @@ module PrettyText @mutex = Mutex.new @ctx_init = Mutex.new - def self.mention_matcher - Regexp.new("\\W@(\\w{#{SiteSetting.min_username_length},#{SiteSetting.max_username_length}})\\b") - end - def self.app_root Rails.root end @@ -205,6 +201,12 @@ module PrettyText end end + if SiteSetting.enable_emoji? + context.eval("Discourse.Dialect.setUnicodeReplacements(#{Emoji.unicode_replacements_json})"); + else + context.eval("Discourse.Dialect.setUnicodeReplacements(null)"); + end + # reset emojis (v8 context is shared amongst multisites) context.eval("Discourse.Dialect.resetEmojis();") # custom emojis @@ -263,7 +265,6 @@ module PrettyText options[:topicId] = opts[:topic_id] working_text = text.dup - Emoji.sub_unicode!(working_text) if SiteSetting.enable_emoji? sanitized = markdown(working_text, options) doc = Nokogiri::HTML.fragment(sanitized) diff --git a/lib/tasks/auto_annotate_models.rake b/lib/tasks/auto_annotate_models.rake index fb1be240b3..dde0cc0364 100644 --- a/lib/tasks/auto_annotate_models.rake +++ b/lib/tasks/auto_annotate_models.rake @@ -1,7 +1,7 @@ # NOTE: only doing this in development as some production environments (Heroku) # NOTE: are sensitive to local FS writes, and besides -- it's just not proper # NOTE: to have a dev-mode tool do its thing in production. -if(Rails.env.development?) +if(Rails.env.development? || Rails.env.test?) task :set_annotation_options do # You can override any of these by setting an environment variable of the # same name. @@ -18,8 +18,10 @@ if(Rails.env.development?) 'require' => "", 'exclude_tests' => "true", 'exclude_fixtures' => "true", + 'exclude_helpers' => "true", 'exclude_factories' => "true", 'exclude_serializers' => "true", + 'exclude_controllers' => "true", 'ignore_model_sub_dir' => "false", 'skip_on_db_migrate' => "true", 'format_bare' => "true", diff --git a/lib/topic_query.rb b/lib/topic_query.rb index cdd5abbb4b..1c061107c4 100644 --- a/lib/topic_query.rb +++ b/lib/topic_query.rb @@ -401,6 +401,11 @@ class TopicQuery return result.includes(:first_post).order("(SELECT like_count FROM posts p3 WHERE p3.topic_id = topics.id AND p3.post_number = 1) #{sort_dir}") end + if sort_column.start_with?('custom_fields') + field = sort_column.split('.')[1] + return result.order("(SELECT CASE WHEN EXISTS (SELECT true FROM topic_custom_fields tcf WHERE tcf.topic_id::integer = topics.id::integer AND tcf.name = '#{field}') THEN (SELECT value::integer FROM topic_custom_fields tcf WHERE tcf.topic_id::integer = topics.id::integer AND tcf.name = '#{field}') ELSE 0 END) #{sort_dir}") + end + result.order("topics.#{sort_column} #{sort_dir}") end diff --git a/lib/topic_view.rb b/lib/topic_view.rb index 752c04b46c..97b903ec50 100644 --- a/lib/topic_view.rb +++ b/lib/topic_view.rb @@ -43,10 +43,7 @@ class TopicView self.instance_variable_set("@#{key}".to_sym, value) end - # work around people somehow sending in arrays, - # arrays are not supported - @page = @page.to_i rescue 1 - @page = 1 if @page.zero? + @page = 1 if (!@page || @page.zero?) @chunk_size = options[:slow_platform] ? TopicView.slow_chunk_size : TopicView.chunk_size @limit ||= @chunk_size @@ -183,7 +180,7 @@ class TopicView return filter_posts_by_ids(opts[:post_ids]) if opts[:post_ids].present? return filter_best(opts[:best], opts) if opts[:best].present? - filter_posts_paged(opts[:page].to_i) + filter_posts_paged(@page) end def primary_group_names diff --git a/lib/validators/password_validator.rb b/lib/validators/password_validator.rb index 015f08f12e..7b8ee765e2 100644 --- a/lib/validators/password_validator.rb +++ b/lib/validators/password_validator.rb @@ -6,6 +6,8 @@ class PasswordValidator < ActiveModel::EachValidator return unless record.password_required? if value.nil? record.errors.add(attribute, :blank) + elsif value.length < SiteSetting.min_admin_password_length && (record.admin? || is_developer?(record.email)) + record.errors.add(attribute, :too_short, count: SiteSetting.min_admin_password_length) elsif value.length < SiteSetting.min_password_length record.errors.add(attribute, :too_short, count: SiteSetting.min_password_length) elsif record.username.present? && value == record.username @@ -17,4 +19,8 @@ class PasswordValidator < ActiveModel::EachValidator end end + def is_developer?(value) + Rails.configuration.respond_to?(:developer_emails) && Rails.configuration.developer_emails.include?(value) + end + end diff --git a/lib/validators/upload_validator.rb b/lib/validators/upload_validator.rb index 985fe928d9..b200fc16c3 100644 --- a/lib/validators/upload_validator.rb +++ b/lib/validators/upload_validator.rb @@ -5,6 +5,8 @@ module Validators; end class Validators::UploadValidator < ActiveModel::Validator def validate(upload) + return true if upload.is_attachment_for_group_message && SiteSetting.allow_all_attachments_for_group_messages + extension = File.extname(upload.original_filename)[1..-1] || "" if is_authorized?(upload, extension) diff --git a/lib/version.rb b/lib/version.rb index 881f27a2c1..ab7cf56dfa 100644 --- a/lib/version.rb +++ b/lib/version.rb @@ -5,7 +5,7 @@ module Discourse MAJOR = 1 MINOR = 5 TINY = 0 - PRE = 'beta11' + PRE = 'beta12' STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/plugins/discourse-details/assets/javascripts/initializers/apply-details.js.es6 b/plugins/discourse-details/assets/javascripts/initializers/apply-details.js.es6 index 9813a1d6ea..367607f8f2 100644 --- a/plugins/discourse-details/assets/javascripts/initializers/apply-details.js.es6 +++ b/plugins/discourse-details/assets/javascripts/initializers/apply-details.js.es6 @@ -1,10 +1,11 @@ -import { decorateCooked } from "discourse/lib/plugin-api"; +import { withPluginApi } from 'discourse/lib/plugin-api'; export default { name: "apply-details", - initialize(container) { - decorateCooked(container, $elem => $("details", $elem).details()); + initialize() { + withPluginApi('0.1', api => { + api.decorateCooked($elem => $("details", $elem).details()); + }); } - }; diff --git a/plugins/lazyYT/assets/javascripts/initializers/lazyYT.js.es6 b/plugins/lazyYT/assets/javascripts/initializers/lazyYT.js.es6 index 0743a30c37..34950f184d 100644 --- a/plugins/lazyYT/assets/javascripts/initializers/lazyYT.js.es6 +++ b/plugins/lazyYT/assets/javascripts/initializers/lazyYT.js.es6 @@ -1,13 +1,18 @@ -/** - Apply lazyYT when the app boots -**/ -import { decorateCooked } from 'discourse/lib/plugin-api'; +import { withPluginApi } from 'discourse/lib/plugin-api'; export default { name: "apply-lazyYT", - initialize: function(container) { - decorateCooked(container, function($elem) { - $('.lazyYT', $elem).lazyYT(); + initialize() { + withPluginApi('0.1', api => { + api.decorateCooked($elem => $('.lazyYT', $elem).lazyYT({ + onPlay(e, $el) { + // don't cloak posts that have playing videos in them + const postId = parseInt($el.closest('article').data('post-id')); + if (postId) { + api.preventCloak(postId); + } + } + })); }); } }; diff --git a/plugins/lazyYT/assets/javascripts/lazyYT.js b/plugins/lazyYT/assets/javascripts/lazyYT.js index bce0077581..10673ebd13 100644 --- a/plugins/lazyYT/assets/javascripts/lazyYT.js +++ b/plugins/lazyYT/assets/javascripts/lazyYT.js @@ -6,9 +6,12 @@ * Contributors: https://github.com/tylerpearson/lazyYT/graphs/contributors || https://github.com/daugilas/lazyYT/graphs/contributors * * Usage:
loading...
+* +* Note: Discourse has forked this from the original, beware when updating the file. +* */ -;(function ($) { +(function ($) { 'use strict'; function setUp($el, settings) { @@ -100,10 +103,15 @@ .addClass('lazyYT-image-loaded') .on('click', function (e) { e.preventDefault(); + if (!$el.hasClass('lazyYT-video-loaded') && $thumb.hasClass('lazyYT-image-loaded')) { $el.html('') .addClass('lazyYT-video-loaded'); } + + if (settings.onPlay) { + settings.onPlay(e, $el); + } }); } @@ -122,4 +130,4 @@ }); }; -}(jQuery)); +})(jQuery); diff --git a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6 b/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6 index f96da54dd7..c27957849d 100644 --- a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6 +++ b/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6 @@ -1,12 +1,8 @@ -import PostView from "discourse/views/post"; -import TopicController from "discourse/controllers/topic"; -import Post from "discourse/models/post"; - -import { on } from "ember-addons/ember-computed-decorators"; +import { withPluginApi } from 'discourse/lib/plugin-api'; function createPollView(container, post, poll, vote) { - const controller = container.lookup("controller:poll", { singleton: false }), - view = container.lookup("view:poll"); + const controller = container.lookup("controller:poll", { singleton: false }); + const view = container.lookup("view:poll"); controller.set("vote", vote); controller.setProperties({ model: poll, post }); @@ -15,88 +11,95 @@ function createPollView(container, post, poll, vote) { return view; } +let _pollViews; + +function initializePolls(api) { + + const TopicController = api.container.lookupFactory('controller:topic'); + TopicController.reopen({ + subscribe(){ + this._super(); + this.messageBus.subscribe("/polls/" + this.get("model.id"), msg => { + const post = this.get('model.postStream').findLoadedPost(msg.post_id); + if (post) { + post.set('polls', msg.polls); + } + }); + }, + unsubscribe(){ + this.messageBus.unsubscribe('/polls/*'); + this._super(); + } + }); + + const Post = api.container.lookupFactory('model:post'); + Post.reopen({ + _polls: null, + pollsObject: null, + + // we need a proper ember object so it is bindable + pollsChanged: function(){ + const polls = this.get("polls"); + if (polls) { + this._polls = this._polls || {}; + _.map(polls, (v,k) => { + const existing = this._polls[k]; + if (existing) { + this._polls[k].setProperties(v); + } else { + this._polls[k] = Em.Object.create(v); + } + }); + this.set("pollsObject", this._polls); + } + }.observes("polls") + }); + + function cleanUpPollViews() { + if (_pollViews) { + Object.keys(_pollViews).forEach(pollName => _pollViews[pollName].destroy()); + } + _pollViews = null; + } + + function createPollViews($elem, helper) { + const $polls = $('.poll', $elem); + if (!$polls.length) { return; } + + const post = helper.getModel(); + const votes = post.get('polls_votes') || {}; + + post.pollsChanged(); + + const polls = post.get("pollsObject"); + if (!polls) { return; } + + cleanUpPollViews(); + const postPollViews = {}; + + $polls.each((idx, pollElem) => { + const $div = $("
"); + const $poll = $(pollElem); + + const pollName = $poll.data("poll-name"); + const pollView = createPollView(helper.container, post, polls[pollName], votes[pollName]); + + $poll.replaceWith($div); + Em.run.next(() => pollView.renderer.replaceIn(pollView, $div[0])); + postPollViews[pollName] = pollView; + }); + + _pollViews = postPollViews; + } + + api.decorateCooked(createPollViews, { onlyStream: true }); + api.cleanupStream(cleanUpPollViews); +} + export default { name: "extend-for-poll", - initialize(container) { - - Post.reopen({ - // we need a proper ember object so it is bindable - pollsChanged: function(){ - const polls = this.get("polls"); - if (polls) { - this._polls = this._polls || {}; - _.map(polls, (v,k) => { - const existing = this._polls[k]; - if (existing) { - this._polls[k].setProperties(v); - } else { - this._polls[k] = Em.Object.create(v); - } - }); - this.set("pollsObject", this._polls); - } - }.observes("polls") - }); - - TopicController.reopen({ - subscribe(){ - this._super(); - this.messageBus.subscribe("/polls/" + this.get("model.id"), msg => { - const post = this.get('model.postStream').findLoadedPost(msg.post_id); - if (post) { - post.set('polls', msg.polls); - } - }); - }, - unsubscribe(){ - this.messageBus.unsubscribe('/polls/*'); - this._super(); - } - }); - - // overwrite polls - PostView.reopen({ - - @on("postViewInserted", "postViewUpdated") - _createPollViews($post) { - const post = this.get("post"), - votes = post.get("polls_votes") || {}; - - post.pollsChanged(); - const polls = post.get("pollsObject"); - - // don't even bother when there's no poll - if (!polls) { return; } - - // TODO inject cleanly into - - // clean-up if needed - this._cleanUpPollViews(); - - const pollViews = {}; - - // iterate over all polls - $(".poll", $post).each(function() { - const $div = $("
"), - $poll = $(this), - pollName = $poll.data("poll-name"), - pollView = createPollView(container, post, polls[pollName], votes[pollName]); - - $poll.replaceWith($div); - Em.run.next(() => pollView.renderer.replaceIn(pollView, $div[0])); - pollViews[pollName] = pollView; - }); - - this.set("pollViews", pollViews); - }, - - @on("willClearRender") - _cleanUpPollViews() { - if (this.get("pollViews")) { - _.forEach(this.get("pollViews"), v => v.destroy()); - } - } - }); + initialize() { + withPluginApi('0.1', initializePolls); } }; diff --git a/plugins/poll/config/locales/client.ko.yml b/plugins/poll/config/locales/client.ko.yml index e2b5da05e1..52454181ce 100644 --- a/plugins/poll/config/locales/client.ko.yml +++ b/plugins/poll/config/locales/client.ko.yml @@ -15,6 +15,12 @@ ko: average_rating: "평균: %{average}." multiple: help: + at_least_min_options: + other: "적어도 %{count}개의 옵션은 선택해야 합니다." + up_to_max_options: + other: "옵션은 %{count} 개까지 선택할 수 있습니다." + x_options: + other: "옵션은 %{count} 개 선택해야 합니다." between_min_and_max_options: "%{min}개에서 %{max}개까지 선택할 수 있습니다." cast-votes: title: "표 던지기" diff --git a/public/images/emoji/apple/airplane_arriving.png b/public/images/emoji/apple/airplane_arriving.png new file mode 100644 index 0000000000..5b7bfeb801 Binary files /dev/null and b/public/images/emoji/apple/airplane_arriving.png differ diff --git a/public/images/emoji/apple/airplane_departure.png b/public/images/emoji/apple/airplane_departure.png new file mode 100644 index 0000000000..3d2f9379ef Binary files /dev/null and b/public/images/emoji/apple/airplane_departure.png differ diff --git a/public/images/emoji/apple/airplane_small.png b/public/images/emoji/apple/airplane_small.png new file mode 100644 index 0000000000..a3a07e0f37 Binary files /dev/null and b/public/images/emoji/apple/airplane_small.png differ diff --git a/public/images/emoji/apple/alembic.png b/public/images/emoji/apple/alembic.png new file mode 100644 index 0000000000..1e47e111a4 Binary files /dev/null and b/public/images/emoji/apple/alembic.png differ diff --git a/public/images/emoji/apple/amphora.png b/public/images/emoji/apple/amphora.png new file mode 100644 index 0000000000..35f8769144 Binary files /dev/null and b/public/images/emoji/apple/amphora.png differ diff --git a/public/images/emoji/apple/anger_right.png b/public/images/emoji/apple/anger_right.png new file mode 100644 index 0000000000..bb53b70b07 Binary files /dev/null and b/public/images/emoji/apple/anger_right.png differ diff --git a/public/images/emoji/apple/atom.png b/public/images/emoji/apple/atom.png new file mode 100644 index 0000000000..21841ed317 Binary files /dev/null and b/public/images/emoji/apple/atom.png differ diff --git a/public/images/emoji/apple/badminton.png b/public/images/emoji/apple/badminton.png new file mode 100644 index 0000000000..4770463742 Binary files /dev/null and b/public/images/emoji/apple/badminton.png differ diff --git a/public/images/emoji/apple/ballot_box.png b/public/images/emoji/apple/ballot_box.png new file mode 100644 index 0000000000..e2ccbccd0b Binary files /dev/null and b/public/images/emoji/apple/ballot_box.png differ diff --git a/public/images/emoji/apple/basketball_player.png b/public/images/emoji/apple/basketball_player.png new file mode 100644 index 0000000000..244f3dd463 Binary files /dev/null and b/public/images/emoji/apple/basketball_player.png differ diff --git a/public/images/emoji/apple/beach.png b/public/images/emoji/apple/beach.png new file mode 100644 index 0000000000..6801405016 Binary files /dev/null and b/public/images/emoji/apple/beach.png differ diff --git a/public/images/emoji/apple/beach_umbrella.png b/public/images/emoji/apple/beach_umbrella.png new file mode 100644 index 0000000000..8e380d70da Binary files /dev/null and b/public/images/emoji/apple/beach_umbrella.png differ diff --git a/public/images/emoji/apple/bed.png b/public/images/emoji/apple/bed.png new file mode 100644 index 0000000000..94261fa5a7 Binary files /dev/null and b/public/images/emoji/apple/bed.png differ diff --git a/public/images/emoji/apple/bellhop.png b/public/images/emoji/apple/bellhop.png new file mode 100644 index 0000000000..77900e7215 Binary files /dev/null and b/public/images/emoji/apple/bellhop.png differ diff --git a/public/images/emoji/apple/biohazard.png b/public/images/emoji/apple/biohazard.png new file mode 100644 index 0000000000..9fae39a844 Binary files /dev/null and b/public/images/emoji/apple/biohazard.png differ diff --git a/public/images/emoji/apple/bow_and_arrow.png b/public/images/emoji/apple/bow_and_arrow.png new file mode 100644 index 0000000000..b0c8684ddd Binary files /dev/null and b/public/images/emoji/apple/bow_and_arrow.png differ diff --git a/public/images/emoji/apple/burrito.png b/public/images/emoji/apple/burrito.png new file mode 100644 index 0000000000..18f30ae5a6 Binary files /dev/null and b/public/images/emoji/apple/burrito.png differ diff --git a/public/images/emoji/apple/calendar_spiral.png b/public/images/emoji/apple/calendar_spiral.png new file mode 100644 index 0000000000..9f0d0f20a0 Binary files /dev/null and b/public/images/emoji/apple/calendar_spiral.png differ diff --git a/public/images/emoji/apple/camera_with_flash.png b/public/images/emoji/apple/camera_with_flash.png new file mode 100644 index 0000000000..1689926e26 Binary files /dev/null and b/public/images/emoji/apple/camera_with_flash.png differ diff --git a/public/images/emoji/apple/camping.png b/public/images/emoji/apple/camping.png new file mode 100644 index 0000000000..463e13d77c Binary files /dev/null and b/public/images/emoji/apple/camping.png differ diff --git a/public/images/emoji/apple/candle.png b/public/images/emoji/apple/candle.png new file mode 100644 index 0000000000..db982079ab Binary files /dev/null and b/public/images/emoji/apple/candle.png differ diff --git a/public/images/emoji/apple/card_box.png b/public/images/emoji/apple/card_box.png new file mode 100644 index 0000000000..851c3b2f5c Binary files /dev/null and b/public/images/emoji/apple/card_box.png differ diff --git a/public/images/emoji/apple/chains.png b/public/images/emoji/apple/chains.png new file mode 100644 index 0000000000..dadbfd85e5 Binary files /dev/null and b/public/images/emoji/apple/chains.png differ diff --git a/public/images/emoji/apple/champagne.png b/public/images/emoji/apple/champagne.png new file mode 100644 index 0000000000..21240556f6 Binary files /dev/null and b/public/images/emoji/apple/champagne.png differ diff --git a/public/images/emoji/apple/cheese.png b/public/images/emoji/apple/cheese.png new file mode 100644 index 0000000000..f397292e14 Binary files /dev/null and b/public/images/emoji/apple/cheese.png differ diff --git a/public/images/emoji/apple/chipmunk.png b/public/images/emoji/apple/chipmunk.png new file mode 100644 index 0000000000..e3d61a3810 Binary files /dev/null and b/public/images/emoji/apple/chipmunk.png differ diff --git a/public/images/emoji/apple/city_dusk.png b/public/images/emoji/apple/city_dusk.png new file mode 100644 index 0000000000..e9841b4148 Binary files /dev/null and b/public/images/emoji/apple/city_dusk.png differ diff --git a/public/images/emoji/apple/cityscape.png b/public/images/emoji/apple/cityscape.png new file mode 100644 index 0000000000..023e1049d7 Binary files /dev/null and b/public/images/emoji/apple/cityscape.png differ diff --git a/public/images/emoji/apple/classical_building.png b/public/images/emoji/apple/classical_building.png new file mode 100644 index 0000000000..dd1bc910e8 Binary files /dev/null and b/public/images/emoji/apple/classical_building.png differ diff --git a/public/images/emoji/apple/clock.png b/public/images/emoji/apple/clock.png new file mode 100644 index 0000000000..03bbdaf3c8 Binary files /dev/null and b/public/images/emoji/apple/clock.png differ diff --git a/public/images/emoji/apple/cloud_lightning.png b/public/images/emoji/apple/cloud_lightning.png new file mode 100644 index 0000000000..637f618d06 Binary files /dev/null and b/public/images/emoji/apple/cloud_lightning.png differ diff --git a/public/images/emoji/apple/cloud_rain.png b/public/images/emoji/apple/cloud_rain.png new file mode 100644 index 0000000000..704e3fa822 Binary files /dev/null and b/public/images/emoji/apple/cloud_rain.png differ diff --git a/public/images/emoji/apple/cloud_snow.png b/public/images/emoji/apple/cloud_snow.png new file mode 100644 index 0000000000..a502b63a4b Binary files /dev/null and b/public/images/emoji/apple/cloud_snow.png differ diff --git a/public/images/emoji/apple/cloud_tornado.png b/public/images/emoji/apple/cloud_tornado.png new file mode 100644 index 0000000000..df48b70f5d Binary files /dev/null and b/public/images/emoji/apple/cloud_tornado.png differ diff --git a/public/images/emoji/apple/cn.png b/public/images/emoji/apple/cn.png index 22db7b69bc..4be941fa0b 100644 Binary files a/public/images/emoji/apple/cn.png and b/public/images/emoji/apple/cn.png differ diff --git a/public/images/emoji/apple/coffin.png b/public/images/emoji/apple/coffin.png new file mode 100644 index 0000000000..08b08c3951 Binary files /dev/null and b/public/images/emoji/apple/coffin.png differ diff --git a/public/images/emoji/apple/comet.png b/public/images/emoji/apple/comet.png new file mode 100644 index 0000000000..2e54816809 Binary files /dev/null and b/public/images/emoji/apple/comet.png differ diff --git a/public/images/emoji/apple/compression.png b/public/images/emoji/apple/compression.png new file mode 100644 index 0000000000..281e7b250d Binary files /dev/null and b/public/images/emoji/apple/compression.png differ diff --git a/public/images/emoji/apple/construction_site.png b/public/images/emoji/apple/construction_site.png new file mode 100644 index 0000000000..a78635ffec Binary files /dev/null and b/public/images/emoji/apple/construction_site.png differ diff --git a/public/images/emoji/apple/control_knobs.png b/public/images/emoji/apple/control_knobs.png new file mode 100644 index 0000000000..9b2a45d0dc Binary files /dev/null and b/public/images/emoji/apple/control_knobs.png differ diff --git a/public/images/emoji/apple/couch.png b/public/images/emoji/apple/couch.png new file mode 100644 index 0000000000..0fe1d1dc72 Binary files /dev/null and b/public/images/emoji/apple/couch.png differ diff --git a/public/images/emoji/apple/crab.png b/public/images/emoji/apple/crab.png new file mode 100644 index 0000000000..fc81d467c7 Binary files /dev/null and b/public/images/emoji/apple/crab.png differ diff --git a/public/images/emoji/apple/crayon.png b/public/images/emoji/apple/crayon.png new file mode 100644 index 0000000000..1527eabeaf Binary files /dev/null and b/public/images/emoji/apple/crayon.png differ diff --git a/public/images/emoji/apple/cricket.png b/public/images/emoji/apple/cricket.png new file mode 100644 index 0000000000..fad7fbf328 Binary files /dev/null and b/public/images/emoji/apple/cricket.png differ diff --git a/public/images/emoji/apple/cross.png b/public/images/emoji/apple/cross.png new file mode 100644 index 0000000000..605f15122d Binary files /dev/null and b/public/images/emoji/apple/cross.png differ diff --git a/public/images/emoji/apple/crossed_swords.png b/public/images/emoji/apple/crossed_swords.png new file mode 100644 index 0000000000..79b38cf12d Binary files /dev/null and b/public/images/emoji/apple/crossed_swords.png differ diff --git a/public/images/emoji/apple/cruise_ship.png b/public/images/emoji/apple/cruise_ship.png new file mode 100644 index 0000000000..c3db46e31f Binary files /dev/null and b/public/images/emoji/apple/cruise_ship.png differ diff --git a/public/images/emoji/apple/dagger.png b/public/images/emoji/apple/dagger.png new file mode 100644 index 0000000000..76ecf22803 Binary files /dev/null and b/public/images/emoji/apple/dagger.png differ diff --git a/public/images/emoji/apple/dark_sunglasses.png b/public/images/emoji/apple/dark_sunglasses.png new file mode 100644 index 0000000000..3a24fb7fd6 Binary files /dev/null and b/public/images/emoji/apple/dark_sunglasses.png differ diff --git a/public/images/emoji/apple/de.png b/public/images/emoji/apple/de.png index 52908ea565..1eea32e76a 100644 Binary files a/public/images/emoji/apple/de.png and b/public/images/emoji/apple/de.png differ diff --git a/public/images/emoji/apple/desert.png b/public/images/emoji/apple/desert.png new file mode 100644 index 0000000000..eed6da83a9 Binary files /dev/null and b/public/images/emoji/apple/desert.png differ diff --git a/public/images/emoji/apple/desktop.png b/public/images/emoji/apple/desktop.png new file mode 100644 index 0000000000..651803e109 Binary files /dev/null and b/public/images/emoji/apple/desktop.png differ diff --git a/public/images/emoji/apple/dividers.png b/public/images/emoji/apple/dividers.png new file mode 100644 index 0000000000..90fdd826d3 Binary files /dev/null and b/public/images/emoji/apple/dividers.png differ diff --git a/public/images/emoji/apple/dove.png b/public/images/emoji/apple/dove.png new file mode 100644 index 0000000000..6dc892768b Binary files /dev/null and b/public/images/emoji/apple/dove.png differ diff --git a/public/images/emoji/apple/es.png b/public/images/emoji/apple/es.png index c3eef9db3f..2e7761c07a 100644 Binary files a/public/images/emoji/apple/es.png and b/public/images/emoji/apple/es.png differ diff --git a/public/images/emoji/apple/eye.png b/public/images/emoji/apple/eye.png new file mode 100644 index 0000000000..2e04514af4 Binary files /dev/null and b/public/images/emoji/apple/eye.png differ diff --git a/public/images/emoji/apple/ferry.png b/public/images/emoji/apple/ferry.png new file mode 100644 index 0000000000..a3a798ec02 Binary files /dev/null and b/public/images/emoji/apple/ferry.png differ diff --git a/public/images/emoji/apple/field_hockey.png b/public/images/emoji/apple/field_hockey.png new file mode 100644 index 0000000000..3c107b28d5 Binary files /dev/null and b/public/images/emoji/apple/field_hockey.png differ diff --git a/public/images/emoji/apple/file_cabinet.png b/public/images/emoji/apple/file_cabinet.png new file mode 100644 index 0000000000..e5a2ed1eea Binary files /dev/null and b/public/images/emoji/apple/file_cabinet.png differ diff --git a/public/images/emoji/apple/film_frames.png b/public/images/emoji/apple/film_frames.png new file mode 100644 index 0000000000..6bd06eb564 Binary files /dev/null and b/public/images/emoji/apple/film_frames.png differ diff --git a/public/images/emoji/apple/flag_black.png b/public/images/emoji/apple/flag_black.png new file mode 100644 index 0000000000..c132e2c23e Binary files /dev/null and b/public/images/emoji/apple/flag_black.png differ diff --git a/public/images/emoji/apple/flag_cn.png b/public/images/emoji/apple/flag_cn.png new file mode 100644 index 0000000000..0b265515a9 Binary files /dev/null and b/public/images/emoji/apple/flag_cn.png differ diff --git a/public/images/emoji/apple/flag_de.png b/public/images/emoji/apple/flag_de.png new file mode 100644 index 0000000000..24aa3d0d8b Binary files /dev/null and b/public/images/emoji/apple/flag_de.png differ diff --git a/public/images/emoji/apple/flag_es.png b/public/images/emoji/apple/flag_es.png new file mode 100644 index 0000000000..d2cfcef840 Binary files /dev/null and b/public/images/emoji/apple/flag_es.png differ diff --git a/public/images/emoji/apple/flag_fr.png b/public/images/emoji/apple/flag_fr.png new file mode 100644 index 0000000000..aab8b4737e Binary files /dev/null and b/public/images/emoji/apple/flag_fr.png differ diff --git a/public/images/emoji/apple/flag_gb.png b/public/images/emoji/apple/flag_gb.png new file mode 100644 index 0000000000..d4ad5e4a9c Binary files /dev/null and b/public/images/emoji/apple/flag_gb.png differ diff --git a/public/images/emoji/apple/flag_it.png b/public/images/emoji/apple/flag_it.png new file mode 100644 index 0000000000..e5d64a1db7 Binary files /dev/null and b/public/images/emoji/apple/flag_it.png differ diff --git a/public/images/emoji/apple/flag_jp.png b/public/images/emoji/apple/flag_jp.png new file mode 100644 index 0000000000..6eb4257c86 Binary files /dev/null and b/public/images/emoji/apple/flag_jp.png differ diff --git a/public/images/emoji/apple/flag_kr.png b/public/images/emoji/apple/flag_kr.png new file mode 100644 index 0000000000..57757ef4a9 Binary files /dev/null and b/public/images/emoji/apple/flag_kr.png differ diff --git a/public/images/emoji/apple/flag_ru.png b/public/images/emoji/apple/flag_ru.png new file mode 100644 index 0000000000..77666f357d Binary files /dev/null and b/public/images/emoji/apple/flag_ru.png differ diff --git a/public/images/emoji/apple/flag_us.png b/public/images/emoji/apple/flag_us.png new file mode 100644 index 0000000000..a3f9378086 Binary files /dev/null and b/public/images/emoji/apple/flag_us.png differ diff --git a/public/images/emoji/apple/flag_white.png b/public/images/emoji/apple/flag_white.png new file mode 100644 index 0000000000..6b6becc253 Binary files /dev/null and b/public/images/emoji/apple/flag_white.png differ diff --git a/public/images/emoji/apple/fleur-de-lis.png b/public/images/emoji/apple/fleur-de-lis.png new file mode 100644 index 0000000000..5f98df5b2d Binary files /dev/null and b/public/images/emoji/apple/fleur-de-lis.png differ diff --git a/public/images/emoji/apple/fog.png b/public/images/emoji/apple/fog.png new file mode 100644 index 0000000000..2f2c2080b5 Binary files /dev/null and b/public/images/emoji/apple/fog.png differ diff --git a/public/images/emoji/apple/fork_knife_plate.png b/public/images/emoji/apple/fork_knife_plate.png new file mode 100644 index 0000000000..0abb5afedc Binary files /dev/null and b/public/images/emoji/apple/fork_knife_plate.png differ diff --git a/public/images/emoji/apple/frame_photo.png b/public/images/emoji/apple/frame_photo.png new file mode 100644 index 0000000000..75b50f2600 Binary files /dev/null and b/public/images/emoji/apple/frame_photo.png differ diff --git a/public/images/emoji/apple/frowning2.png b/public/images/emoji/apple/frowning2.png new file mode 100644 index 0000000000..917fc06cbc Binary files /dev/null and b/public/images/emoji/apple/frowning2.png differ diff --git a/public/images/emoji/apple/gb.png b/public/images/emoji/apple/gb.png index a468f28195..1ff35d0715 100644 Binary files a/public/images/emoji/apple/gb.png and b/public/images/emoji/apple/gb.png differ diff --git a/public/images/emoji/apple/gear.png b/public/images/emoji/apple/gear.png new file mode 100644 index 0000000000..465d74e5f6 Binary files /dev/null and b/public/images/emoji/apple/gear.png differ diff --git a/public/images/emoji/apple/golfer.png b/public/images/emoji/apple/golfer.png new file mode 100644 index 0000000000..ddbe2baefb Binary files /dev/null and b/public/images/emoji/apple/golfer.png differ diff --git a/public/images/emoji/apple/hammer_pick.png b/public/images/emoji/apple/hammer_pick.png new file mode 100644 index 0000000000..d18d84cf96 Binary files /dev/null and b/public/images/emoji/apple/hammer_pick.png differ diff --git a/public/images/emoji/apple/hand_splayed.png b/public/images/emoji/apple/hand_splayed.png new file mode 100644 index 0000000000..f26ba2724d Binary files /dev/null and b/public/images/emoji/apple/hand_splayed.png differ diff --git a/public/images/emoji/apple/head_bandage.png b/public/images/emoji/apple/head_bandage.png new file mode 100644 index 0000000000..f3fb32796f Binary files /dev/null and b/public/images/emoji/apple/head_bandage.png differ diff --git a/public/images/emoji/apple/heart_exclamation.png b/public/images/emoji/apple/heart_exclamation.png new file mode 100644 index 0000000000..6b4ad655b3 Binary files /dev/null and b/public/images/emoji/apple/heart_exclamation.png differ diff --git a/public/images/emoji/apple/helmet_with_cross.png b/public/images/emoji/apple/helmet_with_cross.png new file mode 100644 index 0000000000..e93c2897c7 Binary files /dev/null and b/public/images/emoji/apple/helmet_with_cross.png differ diff --git a/public/images/emoji/apple/hockey.png b/public/images/emoji/apple/hockey.png new file mode 100644 index 0000000000..b6fb640c5c Binary files /dev/null and b/public/images/emoji/apple/hockey.png differ diff --git a/public/images/emoji/apple/hole.png b/public/images/emoji/apple/hole.png new file mode 100644 index 0000000000..dba53ead68 Binary files /dev/null and b/public/images/emoji/apple/hole.png differ diff --git a/public/images/emoji/apple/homes.png b/public/images/emoji/apple/homes.png new file mode 100644 index 0000000000..08f06a1fd2 Binary files /dev/null and b/public/images/emoji/apple/homes.png differ diff --git a/public/images/emoji/apple/hot_pepper.png b/public/images/emoji/apple/hot_pepper.png new file mode 100644 index 0000000000..70669ca874 Binary files /dev/null and b/public/images/emoji/apple/hot_pepper.png differ diff --git a/public/images/emoji/apple/hotdog.png b/public/images/emoji/apple/hotdog.png new file mode 100644 index 0000000000..262c1cde79 Binary files /dev/null and b/public/images/emoji/apple/hotdog.png differ diff --git a/public/images/emoji/apple/house_abandoned.png b/public/images/emoji/apple/house_abandoned.png new file mode 100644 index 0000000000..91de077016 Binary files /dev/null and b/public/images/emoji/apple/house_abandoned.png differ diff --git a/public/images/emoji/apple/hugging.png b/public/images/emoji/apple/hugging.png new file mode 100644 index 0000000000..efe205463b Binary files /dev/null and b/public/images/emoji/apple/hugging.png differ diff --git a/public/images/emoji/apple/ice_skate.png b/public/images/emoji/apple/ice_skate.png new file mode 100644 index 0000000000..ed97c898b5 Binary files /dev/null and b/public/images/emoji/apple/ice_skate.png differ diff --git a/public/images/emoji/apple/island.png b/public/images/emoji/apple/island.png new file mode 100644 index 0000000000..d5957062bf Binary files /dev/null and b/public/images/emoji/apple/island.png differ diff --git a/public/images/emoji/apple/it.png b/public/images/emoji/apple/it.png index fdee93be2a..c332890a00 100644 Binary files a/public/images/emoji/apple/it.png and b/public/images/emoji/apple/it.png differ diff --git a/public/images/emoji/apple/joystick.png b/public/images/emoji/apple/joystick.png new file mode 100644 index 0000000000..198d724907 Binary files /dev/null and b/public/images/emoji/apple/joystick.png differ diff --git a/public/images/emoji/apple/jp.png b/public/images/emoji/apple/jp.png index eacde52533..beb79a4ace 100644 Binary files a/public/images/emoji/apple/jp.png and b/public/images/emoji/apple/jp.png differ diff --git a/public/images/emoji/apple/kaaba.png b/public/images/emoji/apple/kaaba.png new file mode 100644 index 0000000000..7319c5b065 Binary files /dev/null and b/public/images/emoji/apple/kaaba.png differ diff --git a/public/images/emoji/apple/key2.png b/public/images/emoji/apple/key2.png new file mode 100644 index 0000000000..0fe04f3d27 Binary files /dev/null and b/public/images/emoji/apple/key2.png differ diff --git a/public/images/emoji/apple/keyboard.png b/public/images/emoji/apple/keyboard.png new file mode 100644 index 0000000000..f4e6fa7ee6 Binary files /dev/null and b/public/images/emoji/apple/keyboard.png differ diff --git a/public/images/emoji/apple/kr.png b/public/images/emoji/apple/kr.png index da1b1cd4f9..e9b0b623f7 100644 Binary files a/public/images/emoji/apple/kr.png and b/public/images/emoji/apple/kr.png differ diff --git a/public/images/emoji/apple/label.png b/public/images/emoji/apple/label.png new file mode 100644 index 0000000000..b1d0009545 Binary files /dev/null and b/public/images/emoji/apple/label.png differ diff --git a/public/images/emoji/apple/level_slider.png b/public/images/emoji/apple/level_slider.png new file mode 100644 index 0000000000..3a1eef0fa8 Binary files /dev/null and b/public/images/emoji/apple/level_slider.png differ diff --git a/public/images/emoji/apple/levitate.png b/public/images/emoji/apple/levitate.png new file mode 100644 index 0000000000..2021cb1ce7 Binary files /dev/null and b/public/images/emoji/apple/levitate.png differ diff --git a/public/images/emoji/apple/lifter.png b/public/images/emoji/apple/lifter.png new file mode 100644 index 0000000000..f86ca73335 Binary files /dev/null and b/public/images/emoji/apple/lifter.png differ diff --git a/public/images/emoji/apple/lion_face.png b/public/images/emoji/apple/lion_face.png new file mode 100644 index 0000000000..0be5ba6dfe Binary files /dev/null and b/public/images/emoji/apple/lion_face.png differ diff --git a/public/images/emoji/apple/map.png b/public/images/emoji/apple/map.png new file mode 100644 index 0000000000..0faacb80f8 Binary files /dev/null and b/public/images/emoji/apple/map.png differ diff --git a/public/images/emoji/apple/medal.png b/public/images/emoji/apple/medal.png new file mode 100644 index 0000000000..c75dc457c4 Binary files /dev/null and b/public/images/emoji/apple/medal.png differ diff --git a/public/images/emoji/apple/menorah.png b/public/images/emoji/apple/menorah.png new file mode 100644 index 0000000000..27a8a09c96 Binary files /dev/null and b/public/images/emoji/apple/menorah.png differ diff --git a/public/images/emoji/apple/metal.png b/public/images/emoji/apple/metal.png new file mode 100644 index 0000000000..ef19c2fee1 Binary files /dev/null and b/public/images/emoji/apple/metal.png differ diff --git a/public/images/emoji/apple/microphone2.png b/public/images/emoji/apple/microphone2.png new file mode 100644 index 0000000000..1adc026c0c Binary files /dev/null and b/public/images/emoji/apple/microphone2.png differ diff --git a/public/images/emoji/apple/middle_finger.png b/public/images/emoji/apple/middle_finger.png new file mode 100644 index 0000000000..3159f7b765 Binary files /dev/null and b/public/images/emoji/apple/middle_finger.png differ diff --git a/public/images/emoji/apple/military_medal.png b/public/images/emoji/apple/military_medal.png new file mode 100644 index 0000000000..552eabc99b Binary files /dev/null and b/public/images/emoji/apple/military_medal.png differ diff --git a/public/images/emoji/apple/money_mouth.png b/public/images/emoji/apple/money_mouth.png new file mode 100644 index 0000000000..7942cbe6c7 Binary files /dev/null and b/public/images/emoji/apple/money_mouth.png differ diff --git a/public/images/emoji/apple/mosque.png b/public/images/emoji/apple/mosque.png new file mode 100644 index 0000000000..2b3126dfd2 Binary files /dev/null and b/public/images/emoji/apple/mosque.png differ diff --git a/public/images/emoji/apple/motorboat.png b/public/images/emoji/apple/motorboat.png new file mode 100644 index 0000000000..2e2a7ac718 Binary files /dev/null and b/public/images/emoji/apple/motorboat.png differ diff --git a/public/images/emoji/apple/motorcycle.png b/public/images/emoji/apple/motorcycle.png new file mode 100644 index 0000000000..2db9d397cd Binary files /dev/null and b/public/images/emoji/apple/motorcycle.png differ diff --git a/public/images/emoji/apple/motorway.png b/public/images/emoji/apple/motorway.png new file mode 100644 index 0000000000..d2cdd05982 Binary files /dev/null and b/public/images/emoji/apple/motorway.png differ diff --git a/public/images/emoji/apple/mountain.png b/public/images/emoji/apple/mountain.png new file mode 100644 index 0000000000..372fc7e677 Binary files /dev/null and b/public/images/emoji/apple/mountain.png differ diff --git a/public/images/emoji/apple/mountain_snow.png b/public/images/emoji/apple/mountain_snow.png new file mode 100644 index 0000000000..eb618233dd Binary files /dev/null and b/public/images/emoji/apple/mountain_snow.png differ diff --git a/public/images/emoji/apple/mouse_three_button.png b/public/images/emoji/apple/mouse_three_button.png new file mode 100644 index 0000000000..15d3480e24 Binary files /dev/null and b/public/images/emoji/apple/mouse_three_button.png differ diff --git a/public/images/emoji/apple/nerd.png b/public/images/emoji/apple/nerd.png new file mode 100644 index 0000000000..f7fdc39095 Binary files /dev/null and b/public/images/emoji/apple/nerd.png differ diff --git a/public/images/emoji/apple/newspaper2.png b/public/images/emoji/apple/newspaper2.png new file mode 100644 index 0000000000..2371b569da Binary files /dev/null and b/public/images/emoji/apple/newspaper2.png differ diff --git a/public/images/emoji/apple/notepad_spiral.png b/public/images/emoji/apple/notepad_spiral.png new file mode 100644 index 0000000000..ca00c4e0c9 Binary files /dev/null and b/public/images/emoji/apple/notepad_spiral.png differ diff --git a/public/images/emoji/apple/oil.png b/public/images/emoji/apple/oil.png new file mode 100644 index 0000000000..a0d4f87c17 Binary files /dev/null and b/public/images/emoji/apple/oil.png differ diff --git a/public/images/emoji/apple/om_symbol.png b/public/images/emoji/apple/om_symbol.png new file mode 100644 index 0000000000..abe320afa7 Binary files /dev/null and b/public/images/emoji/apple/om_symbol.png differ diff --git a/public/images/emoji/apple/orthodox_cross.png b/public/images/emoji/apple/orthodox_cross.png new file mode 100644 index 0000000000..510d19c1d0 Binary files /dev/null and b/public/images/emoji/apple/orthodox_cross.png differ diff --git a/public/images/emoji/apple/paintbrush.png b/public/images/emoji/apple/paintbrush.png new file mode 100644 index 0000000000..cc4b8ef70d Binary files /dev/null and b/public/images/emoji/apple/paintbrush.png differ diff --git a/public/images/emoji/apple/paperclips.png b/public/images/emoji/apple/paperclips.png new file mode 100644 index 0000000000..04c736a409 Binary files /dev/null and b/public/images/emoji/apple/paperclips.png differ diff --git a/public/images/emoji/apple/park.png b/public/images/emoji/apple/park.png new file mode 100644 index 0000000000..ebd8a9e958 Binary files /dev/null and b/public/images/emoji/apple/park.png differ diff --git a/public/images/emoji/apple/pause_button.png b/public/images/emoji/apple/pause_button.png new file mode 100644 index 0000000000..aac27c376b Binary files /dev/null and b/public/images/emoji/apple/pause_button.png differ diff --git a/public/images/emoji/apple/peace.png b/public/images/emoji/apple/peace.png new file mode 100644 index 0000000000..7001b6a4e7 Binary files /dev/null and b/public/images/emoji/apple/peace.png differ diff --git a/public/images/emoji/apple/pen_ballpoint.png b/public/images/emoji/apple/pen_ballpoint.png new file mode 100644 index 0000000000..14b06985eb Binary files /dev/null and b/public/images/emoji/apple/pen_ballpoint.png differ diff --git a/public/images/emoji/apple/pen_fountain.png b/public/images/emoji/apple/pen_fountain.png new file mode 100644 index 0000000000..5e9a10292e Binary files /dev/null and b/public/images/emoji/apple/pen_fountain.png differ diff --git a/public/images/emoji/apple/pick.png b/public/images/emoji/apple/pick.png new file mode 100644 index 0000000000..70ad820ce3 Binary files /dev/null and b/public/images/emoji/apple/pick.png differ diff --git a/public/images/emoji/apple/ping_pong.png b/public/images/emoji/apple/ping_pong.png new file mode 100644 index 0000000000..186e254d75 Binary files /dev/null and b/public/images/emoji/apple/ping_pong.png differ diff --git a/public/images/emoji/apple/place_of_worship.png b/public/images/emoji/apple/place_of_worship.png new file mode 100644 index 0000000000..b66a3f0f65 Binary files /dev/null and b/public/images/emoji/apple/place_of_worship.png differ diff --git a/public/images/emoji/apple/play_pause.png b/public/images/emoji/apple/play_pause.png new file mode 100644 index 0000000000..b12ac1f131 Binary files /dev/null and b/public/images/emoji/apple/play_pause.png differ diff --git a/public/images/emoji/apple/popcorn.png b/public/images/emoji/apple/popcorn.png new file mode 100644 index 0000000000..ec9fe13950 Binary files /dev/null and b/public/images/emoji/apple/popcorn.png differ diff --git a/public/images/emoji/apple/prayer_beads.png b/public/images/emoji/apple/prayer_beads.png new file mode 100644 index 0000000000..dee68150bd Binary files /dev/null and b/public/images/emoji/apple/prayer_beads.png differ diff --git a/public/images/emoji/apple/printer.png b/public/images/emoji/apple/printer.png new file mode 100644 index 0000000000..39a692c648 Binary files /dev/null and b/public/images/emoji/apple/printer.png differ diff --git a/public/images/emoji/apple/projector.png b/public/images/emoji/apple/projector.png new file mode 100644 index 0000000000..e944d739e8 Binary files /dev/null and b/public/images/emoji/apple/projector.png differ diff --git a/public/images/emoji/apple/race_car.png b/public/images/emoji/apple/race_car.png new file mode 100644 index 0000000000..0b9dc36daf Binary files /dev/null and b/public/images/emoji/apple/race_car.png differ diff --git a/public/images/emoji/apple/radioactive.png b/public/images/emoji/apple/radioactive.png new file mode 100644 index 0000000000..f9c1d5e8a6 Binary files /dev/null and b/public/images/emoji/apple/radioactive.png differ diff --git a/public/images/emoji/apple/railway_track.png b/public/images/emoji/apple/railway_track.png new file mode 100644 index 0000000000..d664615901 Binary files /dev/null and b/public/images/emoji/apple/railway_track.png differ diff --git a/public/images/emoji/apple/record_button.png b/public/images/emoji/apple/record_button.png new file mode 100644 index 0000000000..578fc82947 Binary files /dev/null and b/public/images/emoji/apple/record_button.png differ diff --git a/public/images/emoji/apple/reminder_ribbon.png b/public/images/emoji/apple/reminder_ribbon.png new file mode 100644 index 0000000000..bc905d6454 Binary files /dev/null and b/public/images/emoji/apple/reminder_ribbon.png differ diff --git a/public/images/emoji/apple/robot.png b/public/images/emoji/apple/robot.png new file mode 100644 index 0000000000..751776d185 Binary files /dev/null and b/public/images/emoji/apple/robot.png differ diff --git a/public/images/emoji/apple/rolling_eyes.png b/public/images/emoji/apple/rolling_eyes.png new file mode 100644 index 0000000000..f29bda511f Binary files /dev/null and b/public/images/emoji/apple/rolling_eyes.png differ diff --git a/public/images/emoji/apple/rosette.png b/public/images/emoji/apple/rosette.png new file mode 100644 index 0000000000..0c47885097 Binary files /dev/null and b/public/images/emoji/apple/rosette.png differ diff --git a/public/images/emoji/apple/ru.png b/public/images/emoji/apple/ru.png index 8408204b25..f62d984e4e 100644 Binary files a/public/images/emoji/apple/ru.png and b/public/images/emoji/apple/ru.png differ diff --git a/public/images/emoji/apple/satellite_orbital.png b/public/images/emoji/apple/satellite_orbital.png new file mode 100644 index 0000000000..1c02e1c78c Binary files /dev/null and b/public/images/emoji/apple/satellite_orbital.png differ diff --git a/public/images/emoji/apple/scales.png b/public/images/emoji/apple/scales.png new file mode 100644 index 0000000000..11fa8f8ae0 Binary files /dev/null and b/public/images/emoji/apple/scales.png differ diff --git a/public/images/emoji/apple/scorpion.png b/public/images/emoji/apple/scorpion.png new file mode 100644 index 0000000000..74779cb829 Binary files /dev/null and b/public/images/emoji/apple/scorpion.png differ diff --git a/public/images/emoji/apple/shamrock.png b/public/images/emoji/apple/shamrock.png new file mode 100644 index 0000000000..7a68121349 Binary files /dev/null and b/public/images/emoji/apple/shamrock.png differ diff --git a/public/images/emoji/apple/shield.png b/public/images/emoji/apple/shield.png new file mode 100644 index 0000000000..c2146a8e4c Binary files /dev/null and b/public/images/emoji/apple/shield.png differ diff --git a/public/images/emoji/apple/shinto_shrine.png b/public/images/emoji/apple/shinto_shrine.png new file mode 100644 index 0000000000..f04a6e4043 Binary files /dev/null and b/public/images/emoji/apple/shinto_shrine.png differ diff --git a/public/images/emoji/apple/shopping_bags.png b/public/images/emoji/apple/shopping_bags.png new file mode 100644 index 0000000000..5c1fdae6fe Binary files /dev/null and b/public/images/emoji/apple/shopping_bags.png differ diff --git a/public/images/emoji/apple/skier.png b/public/images/emoji/apple/skier.png new file mode 100644 index 0000000000..9f4aaf09cd Binary files /dev/null and b/public/images/emoji/apple/skier.png differ diff --git a/public/images/emoji/apple/skull_crossbones.png b/public/images/emoji/apple/skull_crossbones.png new file mode 100644 index 0000000000..27db39049d Binary files /dev/null and b/public/images/emoji/apple/skull_crossbones.png differ diff --git a/public/images/emoji/apple/sleeping_accommodation.png b/public/images/emoji/apple/sleeping_accommodation.png new file mode 100644 index 0000000000..15d17edc2d Binary files /dev/null and b/public/images/emoji/apple/sleeping_accommodation.png differ diff --git a/public/images/emoji/apple/slight_frown.png b/public/images/emoji/apple/slight_frown.png new file mode 100644 index 0000000000..0c0cb44bb9 Binary files /dev/null and b/public/images/emoji/apple/slight_frown.png differ diff --git a/public/images/emoji/apple/slight_smile.png b/public/images/emoji/apple/slight_smile.png new file mode 100644 index 0000000000..3d3b6e0837 Binary files /dev/null and b/public/images/emoji/apple/slight_smile.png differ diff --git a/public/images/emoji/apple/snowman2.png b/public/images/emoji/apple/snowman2.png new file mode 100644 index 0000000000..89e619f41f Binary files /dev/null and b/public/images/emoji/apple/snowman2.png differ diff --git a/public/images/emoji/apple/speaking_head.png b/public/images/emoji/apple/speaking_head.png new file mode 100644 index 0000000000..b25c49724b Binary files /dev/null and b/public/images/emoji/apple/speaking_head.png differ diff --git a/public/images/emoji/apple/spider.png b/public/images/emoji/apple/spider.png new file mode 100644 index 0000000000..4df7e8bfeb Binary files /dev/null and b/public/images/emoji/apple/spider.png differ diff --git a/public/images/emoji/apple/spider_web.png b/public/images/emoji/apple/spider_web.png new file mode 100644 index 0000000000..bbb08b0e12 Binary files /dev/null and b/public/images/emoji/apple/spider_web.png differ diff --git a/public/images/emoji/apple/spy.png b/public/images/emoji/apple/spy.png new file mode 100644 index 0000000000..9cd898d6c1 Binary files /dev/null and b/public/images/emoji/apple/spy.png differ diff --git a/public/images/emoji/apple/stadium.png b/public/images/emoji/apple/stadium.png new file mode 100644 index 0000000000..342032abbd Binary files /dev/null and b/public/images/emoji/apple/stadium.png differ diff --git a/public/images/emoji/apple/star_and_crescent.png b/public/images/emoji/apple/star_and_crescent.png new file mode 100644 index 0000000000..77fd9928d9 Binary files /dev/null and b/public/images/emoji/apple/star_and_crescent.png differ diff --git a/public/images/emoji/apple/star_of_david.png b/public/images/emoji/apple/star_of_david.png new file mode 100644 index 0000000000..82bc00d3ff Binary files /dev/null and b/public/images/emoji/apple/star_of_david.png differ diff --git a/public/images/emoji/apple/stop_button.png b/public/images/emoji/apple/stop_button.png new file mode 100644 index 0000000000..99258e0249 Binary files /dev/null and b/public/images/emoji/apple/stop_button.png differ diff --git a/public/images/emoji/apple/stopwatch.png b/public/images/emoji/apple/stopwatch.png new file mode 100644 index 0000000000..d194a2d99a Binary files /dev/null and b/public/images/emoji/apple/stopwatch.png differ diff --git a/public/images/emoji/apple/synagogue.png b/public/images/emoji/apple/synagogue.png new file mode 100644 index 0000000000..9aec9500ca Binary files /dev/null and b/public/images/emoji/apple/synagogue.png differ diff --git a/public/images/emoji/apple/taco.png b/public/images/emoji/apple/taco.png new file mode 100644 index 0000000000..a4e8ba4e30 Binary files /dev/null and b/public/images/emoji/apple/taco.png differ diff --git a/public/images/emoji/apple/ten.png b/public/images/emoji/apple/ten.png new file mode 100644 index 0000000000..68ae72c0f7 Binary files /dev/null and b/public/images/emoji/apple/ten.png differ diff --git a/public/images/emoji/apple/thermometer.png b/public/images/emoji/apple/thermometer.png new file mode 100644 index 0000000000..94d30503cd Binary files /dev/null and b/public/images/emoji/apple/thermometer.png differ diff --git a/public/images/emoji/apple/thermometer_face.png b/public/images/emoji/apple/thermometer_face.png new file mode 100644 index 0000000000..462afa0e8e Binary files /dev/null and b/public/images/emoji/apple/thermometer_face.png differ diff --git a/public/images/emoji/apple/thinking.png b/public/images/emoji/apple/thinking.png new file mode 100644 index 0000000000..471c4a3a4b Binary files /dev/null and b/public/images/emoji/apple/thinking.png differ diff --git a/public/images/emoji/apple/thunder_cloud_rain.png b/public/images/emoji/apple/thunder_cloud_rain.png new file mode 100644 index 0000000000..54d0d491ba Binary files /dev/null and b/public/images/emoji/apple/thunder_cloud_rain.png differ diff --git a/public/images/emoji/apple/tickets.png b/public/images/emoji/apple/tickets.png new file mode 100644 index 0000000000..d019a6976f Binary files /dev/null and b/public/images/emoji/apple/tickets.png differ diff --git a/public/images/emoji/apple/timer.png b/public/images/emoji/apple/timer.png new file mode 100644 index 0000000000..a900a0599d Binary files /dev/null and b/public/images/emoji/apple/timer.png differ diff --git a/public/images/emoji/apple/tools.png b/public/images/emoji/apple/tools.png new file mode 100644 index 0000000000..05671ef41e Binary files /dev/null and b/public/images/emoji/apple/tools.png differ diff --git a/public/images/emoji/apple/track_next.png b/public/images/emoji/apple/track_next.png new file mode 100644 index 0000000000..6c6638ce88 Binary files /dev/null and b/public/images/emoji/apple/track_next.png differ diff --git a/public/images/emoji/apple/track_previous.png b/public/images/emoji/apple/track_previous.png new file mode 100644 index 0000000000..6bef75ae03 Binary files /dev/null and b/public/images/emoji/apple/track_previous.png differ diff --git a/public/images/emoji/apple/trackball.png b/public/images/emoji/apple/trackball.png new file mode 100644 index 0000000000..26567260c7 Binary files /dev/null and b/public/images/emoji/apple/trackball.png differ diff --git a/public/images/emoji/apple/turkey.png b/public/images/emoji/apple/turkey.png new file mode 100644 index 0000000000..bb5f149351 Binary files /dev/null and b/public/images/emoji/apple/turkey.png differ diff --git a/public/images/emoji/apple/umbrella2.png b/public/images/emoji/apple/umbrella2.png new file mode 100644 index 0000000000..541849c8bb Binary files /dev/null and b/public/images/emoji/apple/umbrella2.png differ diff --git a/public/images/emoji/apple/unicorn.png b/public/images/emoji/apple/unicorn.png new file mode 100644 index 0000000000..6fe83ed344 Binary files /dev/null and b/public/images/emoji/apple/unicorn.png differ diff --git a/public/images/emoji/apple/upside_down.png b/public/images/emoji/apple/upside_down.png new file mode 100644 index 0000000000..34b6fec258 Binary files /dev/null and b/public/images/emoji/apple/upside_down.png differ diff --git a/public/images/emoji/apple/urn.png b/public/images/emoji/apple/urn.png new file mode 100644 index 0000000000..1a71bd1f84 Binary files /dev/null and b/public/images/emoji/apple/urn.png differ diff --git a/public/images/emoji/apple/us.png b/public/images/emoji/apple/us.png index fc29b566bf..72a949d087 100644 Binary files a/public/images/emoji/apple/us.png and b/public/images/emoji/apple/us.png differ diff --git a/public/images/emoji/apple/volleyball.png b/public/images/emoji/apple/volleyball.png new file mode 100644 index 0000000000..50db05cd43 Binary files /dev/null and b/public/images/emoji/apple/volleyball.png differ diff --git a/public/images/emoji/apple/vulcan.png b/public/images/emoji/apple/vulcan.png new file mode 100644 index 0000000000..9f1006c0fd Binary files /dev/null and b/public/images/emoji/apple/vulcan.png differ diff --git a/public/images/emoji/apple/wastebasket.png b/public/images/emoji/apple/wastebasket.png new file mode 100644 index 0000000000..2288fcaf86 Binary files /dev/null and b/public/images/emoji/apple/wastebasket.png differ diff --git a/public/images/emoji/apple/wheel_of_dharma.png b/public/images/emoji/apple/wheel_of_dharma.png new file mode 100644 index 0000000000..90ca228b38 Binary files /dev/null and b/public/images/emoji/apple/wheel_of_dharma.png differ diff --git a/public/images/emoji/apple/white_sun_cloud.png b/public/images/emoji/apple/white_sun_cloud.png new file mode 100644 index 0000000000..ecdd80a365 Binary files /dev/null and b/public/images/emoji/apple/white_sun_cloud.png differ diff --git a/public/images/emoji/apple/white_sun_rain_cloud.png b/public/images/emoji/apple/white_sun_rain_cloud.png new file mode 100644 index 0000000000..6235af0b93 Binary files /dev/null and b/public/images/emoji/apple/white_sun_rain_cloud.png differ diff --git a/public/images/emoji/apple/white_sun_small_cloud.png b/public/images/emoji/apple/white_sun_small_cloud.png new file mode 100644 index 0000000000..af664c7f25 Binary files /dev/null and b/public/images/emoji/apple/white_sun_small_cloud.png differ diff --git a/public/images/emoji/apple/wind_blowing_face.png b/public/images/emoji/apple/wind_blowing_face.png new file mode 100644 index 0000000000..785159cf3d Binary files /dev/null and b/public/images/emoji/apple/wind_blowing_face.png differ diff --git a/public/images/emoji/apple/writing_hand.png b/public/images/emoji/apple/writing_hand.png new file mode 100644 index 0000000000..83421711b1 Binary files /dev/null and b/public/images/emoji/apple/writing_hand.png differ diff --git a/public/images/emoji/apple/yin_yang.png b/public/images/emoji/apple/yin_yang.png new file mode 100644 index 0000000000..8fb121fcda Binary files /dev/null and b/public/images/emoji/apple/yin_yang.png differ diff --git a/public/images/emoji/apple/zipper_mouth.png b/public/images/emoji/apple/zipper_mouth.png new file mode 100644 index 0000000000..c5d1323c5c Binary files /dev/null and b/public/images/emoji/apple/zipper_mouth.png differ diff --git a/public/images/emoji/emoji_one/airplane_arriving.png b/public/images/emoji/emoji_one/airplane_arriving.png new file mode 100644 index 0000000000..5358f5d98c Binary files /dev/null and b/public/images/emoji/emoji_one/airplane_arriving.png differ diff --git a/public/images/emoji/emoji_one/airplane_departure.png b/public/images/emoji/emoji_one/airplane_departure.png new file mode 100644 index 0000000000..94e455bf4e Binary files /dev/null and b/public/images/emoji/emoji_one/airplane_departure.png differ diff --git a/public/images/emoji/emoji_one/airplane_small.png b/public/images/emoji/emoji_one/airplane_small.png new file mode 100644 index 0000000000..2328135495 Binary files /dev/null and b/public/images/emoji/emoji_one/airplane_small.png differ diff --git a/public/images/emoji/emoji_one/alembic.png b/public/images/emoji/emoji_one/alembic.png new file mode 100644 index 0000000000..82b4e96293 Binary files /dev/null and b/public/images/emoji/emoji_one/alembic.png differ diff --git a/public/images/emoji/emoji_one/amphora.png b/public/images/emoji/emoji_one/amphora.png new file mode 100644 index 0000000000..9e0b5a18f2 Binary files /dev/null and b/public/images/emoji/emoji_one/amphora.png differ diff --git a/public/images/emoji/emoji_one/anger_right.png b/public/images/emoji/emoji_one/anger_right.png new file mode 100644 index 0000000000..d711e6d31f Binary files /dev/null and b/public/images/emoji/emoji_one/anger_right.png differ diff --git a/public/images/emoji/emoji_one/atom.png b/public/images/emoji/emoji_one/atom.png new file mode 100644 index 0000000000..05ad819496 Binary files /dev/null and b/public/images/emoji/emoji_one/atom.png differ diff --git a/public/images/emoji/emoji_one/badminton.png b/public/images/emoji/emoji_one/badminton.png new file mode 100644 index 0000000000..19737e99be Binary files /dev/null and b/public/images/emoji/emoji_one/badminton.png differ diff --git a/public/images/emoji/emoji_one/ballot_box.png b/public/images/emoji/emoji_one/ballot_box.png new file mode 100644 index 0000000000..7effe6710e Binary files /dev/null and b/public/images/emoji/emoji_one/ballot_box.png differ diff --git a/public/images/emoji/emoji_one/basketball_player.png b/public/images/emoji/emoji_one/basketball_player.png new file mode 100644 index 0000000000..19a60cb845 Binary files /dev/null and b/public/images/emoji/emoji_one/basketball_player.png differ diff --git a/public/images/emoji/emoji_one/beach.png b/public/images/emoji/emoji_one/beach.png new file mode 100644 index 0000000000..e4066df5d5 Binary files /dev/null and b/public/images/emoji/emoji_one/beach.png differ diff --git a/public/images/emoji/emoji_one/beach_umbrella.png b/public/images/emoji/emoji_one/beach_umbrella.png new file mode 100644 index 0000000000..f1f55d8ca9 Binary files /dev/null and b/public/images/emoji/emoji_one/beach_umbrella.png differ diff --git a/public/images/emoji/emoji_one/bed.png b/public/images/emoji/emoji_one/bed.png new file mode 100644 index 0000000000..3a859bbf93 Binary files /dev/null and b/public/images/emoji/emoji_one/bed.png differ diff --git a/public/images/emoji/emoji_one/bellhop.png b/public/images/emoji/emoji_one/bellhop.png new file mode 100644 index 0000000000..fc7301104c Binary files /dev/null and b/public/images/emoji/emoji_one/bellhop.png differ diff --git a/public/images/emoji/emoji_one/biohazard.png b/public/images/emoji/emoji_one/biohazard.png new file mode 100644 index 0000000000..9c3e4e989e Binary files /dev/null and b/public/images/emoji/emoji_one/biohazard.png differ diff --git a/public/images/emoji/emoji_one/bow_and_arrow.png b/public/images/emoji/emoji_one/bow_and_arrow.png new file mode 100644 index 0000000000..6a8fa6984e Binary files /dev/null and b/public/images/emoji/emoji_one/bow_and_arrow.png differ diff --git a/public/images/emoji/emoji_one/burrito.png b/public/images/emoji/emoji_one/burrito.png new file mode 100644 index 0000000000..ec7bd0cd2a Binary files /dev/null and b/public/images/emoji/emoji_one/burrito.png differ diff --git a/public/images/emoji/emoji_one/calendar_spiral.png b/public/images/emoji/emoji_one/calendar_spiral.png new file mode 100644 index 0000000000..d9c5f699d2 Binary files /dev/null and b/public/images/emoji/emoji_one/calendar_spiral.png differ diff --git a/public/images/emoji/emoji_one/camera_with_flash.png b/public/images/emoji/emoji_one/camera_with_flash.png new file mode 100644 index 0000000000..6ea04f7719 Binary files /dev/null and b/public/images/emoji/emoji_one/camera_with_flash.png differ diff --git a/public/images/emoji/emoji_one/camping.png b/public/images/emoji/emoji_one/camping.png new file mode 100644 index 0000000000..943c8fc7d0 Binary files /dev/null and b/public/images/emoji/emoji_one/camping.png differ diff --git a/public/images/emoji/emoji_one/candle.png b/public/images/emoji/emoji_one/candle.png new file mode 100644 index 0000000000..11bc738701 Binary files /dev/null and b/public/images/emoji/emoji_one/candle.png differ diff --git a/public/images/emoji/emoji_one/card_box.png b/public/images/emoji/emoji_one/card_box.png new file mode 100644 index 0000000000..3fd527452d Binary files /dev/null and b/public/images/emoji/emoji_one/card_box.png differ diff --git a/public/images/emoji/emoji_one/chains.png b/public/images/emoji/emoji_one/chains.png new file mode 100644 index 0000000000..d743480f98 Binary files /dev/null and b/public/images/emoji/emoji_one/chains.png differ diff --git a/public/images/emoji/emoji_one/champagne.png b/public/images/emoji/emoji_one/champagne.png new file mode 100644 index 0000000000..56e394220c Binary files /dev/null and b/public/images/emoji/emoji_one/champagne.png differ diff --git a/public/images/emoji/emoji_one/cheese.png b/public/images/emoji/emoji_one/cheese.png new file mode 100644 index 0000000000..a9ed4b2e0d Binary files /dev/null and b/public/images/emoji/emoji_one/cheese.png differ diff --git a/public/images/emoji/emoji_one/chipmunk.png b/public/images/emoji/emoji_one/chipmunk.png new file mode 100644 index 0000000000..3c809f36a0 Binary files /dev/null and b/public/images/emoji/emoji_one/chipmunk.png differ diff --git a/public/images/emoji/emoji_one/city_dusk.png b/public/images/emoji/emoji_one/city_dusk.png new file mode 100644 index 0000000000..27ef7c850d Binary files /dev/null and b/public/images/emoji/emoji_one/city_dusk.png differ diff --git a/public/images/emoji/emoji_one/cityscape.png b/public/images/emoji/emoji_one/cityscape.png new file mode 100644 index 0000000000..f5e3089acb Binary files /dev/null and b/public/images/emoji/emoji_one/cityscape.png differ diff --git a/public/images/emoji/emoji_one/classical_building.png b/public/images/emoji/emoji_one/classical_building.png new file mode 100644 index 0000000000..1950bec035 Binary files /dev/null and b/public/images/emoji/emoji_one/classical_building.png differ diff --git a/public/images/emoji/emoji_one/clock.png b/public/images/emoji/emoji_one/clock.png new file mode 100644 index 0000000000..a65722fd41 Binary files /dev/null and b/public/images/emoji/emoji_one/clock.png differ diff --git a/public/images/emoji/emoji_one/cloud_lightning.png b/public/images/emoji/emoji_one/cloud_lightning.png new file mode 100644 index 0000000000..a199f6e883 Binary files /dev/null and b/public/images/emoji/emoji_one/cloud_lightning.png differ diff --git a/public/images/emoji/emoji_one/cloud_rain.png b/public/images/emoji/emoji_one/cloud_rain.png new file mode 100644 index 0000000000..d285e3f759 Binary files /dev/null and b/public/images/emoji/emoji_one/cloud_rain.png differ diff --git a/public/images/emoji/emoji_one/cloud_snow.png b/public/images/emoji/emoji_one/cloud_snow.png new file mode 100644 index 0000000000..e0cc8c4acb Binary files /dev/null and b/public/images/emoji/emoji_one/cloud_snow.png differ diff --git a/public/images/emoji/emoji_one/cloud_tornado.png b/public/images/emoji/emoji_one/cloud_tornado.png new file mode 100644 index 0000000000..00bb97ae09 Binary files /dev/null and b/public/images/emoji/emoji_one/cloud_tornado.png differ diff --git a/public/images/emoji/emoji_one/coffin.png b/public/images/emoji/emoji_one/coffin.png new file mode 100644 index 0000000000..f38c07847e Binary files /dev/null and b/public/images/emoji/emoji_one/coffin.png differ diff --git a/public/images/emoji/emoji_one/comet.png b/public/images/emoji/emoji_one/comet.png new file mode 100644 index 0000000000..6d27243697 Binary files /dev/null and b/public/images/emoji/emoji_one/comet.png differ diff --git a/public/images/emoji/emoji_one/compression.png b/public/images/emoji/emoji_one/compression.png new file mode 100644 index 0000000000..86f9362923 Binary files /dev/null and b/public/images/emoji/emoji_one/compression.png differ diff --git a/public/images/emoji/emoji_one/construction_site.png b/public/images/emoji/emoji_one/construction_site.png new file mode 100644 index 0000000000..04d111a6f4 Binary files /dev/null and b/public/images/emoji/emoji_one/construction_site.png differ diff --git a/public/images/emoji/emoji_one/control_knobs.png b/public/images/emoji/emoji_one/control_knobs.png new file mode 100644 index 0000000000..1a3ae01fb7 Binary files /dev/null and b/public/images/emoji/emoji_one/control_knobs.png differ diff --git a/public/images/emoji/emoji_one/couch.png b/public/images/emoji/emoji_one/couch.png new file mode 100644 index 0000000000..95676c09e8 Binary files /dev/null and b/public/images/emoji/emoji_one/couch.png differ diff --git a/public/images/emoji/emoji_one/crab.png b/public/images/emoji/emoji_one/crab.png new file mode 100644 index 0000000000..04374656af Binary files /dev/null and b/public/images/emoji/emoji_one/crab.png differ diff --git a/public/images/emoji/emoji_one/crayon.png b/public/images/emoji/emoji_one/crayon.png new file mode 100644 index 0000000000..67043e2a21 Binary files /dev/null and b/public/images/emoji/emoji_one/crayon.png differ diff --git a/public/images/emoji/emoji_one/cricket.png b/public/images/emoji/emoji_one/cricket.png new file mode 100644 index 0000000000..2e20bfcd03 Binary files /dev/null and b/public/images/emoji/emoji_one/cricket.png differ diff --git a/public/images/emoji/emoji_one/cross.png b/public/images/emoji/emoji_one/cross.png new file mode 100644 index 0000000000..02a0842181 Binary files /dev/null and b/public/images/emoji/emoji_one/cross.png differ diff --git a/public/images/emoji/emoji_one/crossed_swords.png b/public/images/emoji/emoji_one/crossed_swords.png new file mode 100644 index 0000000000..7e992fa3c3 Binary files /dev/null and b/public/images/emoji/emoji_one/crossed_swords.png differ diff --git a/public/images/emoji/emoji_one/cruise_ship.png b/public/images/emoji/emoji_one/cruise_ship.png new file mode 100644 index 0000000000..7427136779 Binary files /dev/null and b/public/images/emoji/emoji_one/cruise_ship.png differ diff --git a/public/images/emoji/emoji_one/dagger.png b/public/images/emoji/emoji_one/dagger.png new file mode 100644 index 0000000000..4093ea9fce Binary files /dev/null and b/public/images/emoji/emoji_one/dagger.png differ diff --git a/public/images/emoji/emoji_one/dark_sunglasses.png b/public/images/emoji/emoji_one/dark_sunglasses.png new file mode 100644 index 0000000000..cd95402d6e Binary files /dev/null and b/public/images/emoji/emoji_one/dark_sunglasses.png differ diff --git a/public/images/emoji/emoji_one/desert.png b/public/images/emoji/emoji_one/desert.png new file mode 100644 index 0000000000..a548ec13c0 Binary files /dev/null and b/public/images/emoji/emoji_one/desert.png differ diff --git a/public/images/emoji/emoji_one/desktop.png b/public/images/emoji/emoji_one/desktop.png new file mode 100644 index 0000000000..0bb0db8794 Binary files /dev/null and b/public/images/emoji/emoji_one/desktop.png differ diff --git a/public/images/emoji/emoji_one/dividers.png b/public/images/emoji/emoji_one/dividers.png new file mode 100644 index 0000000000..8f162232c1 Binary files /dev/null and b/public/images/emoji/emoji_one/dividers.png differ diff --git a/public/images/emoji/emoji_one/dove.png b/public/images/emoji/emoji_one/dove.png new file mode 100644 index 0000000000..88ddff7a6c Binary files /dev/null and b/public/images/emoji/emoji_one/dove.png differ diff --git a/public/images/emoji/emoji_one/eye.png b/public/images/emoji/emoji_one/eye.png new file mode 100644 index 0000000000..9a71b46700 Binary files /dev/null and b/public/images/emoji/emoji_one/eye.png differ diff --git a/public/images/emoji/emoji_one/ferry.png b/public/images/emoji/emoji_one/ferry.png new file mode 100644 index 0000000000..a4a8793c9b Binary files /dev/null and b/public/images/emoji/emoji_one/ferry.png differ diff --git a/public/images/emoji/emoji_one/field_hockey.png b/public/images/emoji/emoji_one/field_hockey.png new file mode 100644 index 0000000000..f4f8066009 Binary files /dev/null and b/public/images/emoji/emoji_one/field_hockey.png differ diff --git a/public/images/emoji/emoji_one/file_cabinet.png b/public/images/emoji/emoji_one/file_cabinet.png new file mode 100644 index 0000000000..c26b487c00 Binary files /dev/null and b/public/images/emoji/emoji_one/file_cabinet.png differ diff --git a/public/images/emoji/emoji_one/film_frames.png b/public/images/emoji/emoji_one/film_frames.png new file mode 100644 index 0000000000..6d4307f187 Binary files /dev/null and b/public/images/emoji/emoji_one/film_frames.png differ diff --git a/public/images/emoji/emoji_one/flag_black.png b/public/images/emoji/emoji_one/flag_black.png new file mode 100644 index 0000000000..22df4375be Binary files /dev/null and b/public/images/emoji/emoji_one/flag_black.png differ diff --git a/public/images/emoji/emoji_one/flag_cn.png b/public/images/emoji/emoji_one/flag_cn.png new file mode 100644 index 0000000000..98ecf053cf Binary files /dev/null and b/public/images/emoji/emoji_one/flag_cn.png differ diff --git a/public/images/emoji/emoji_one/flag_de.png b/public/images/emoji/emoji_one/flag_de.png new file mode 100644 index 0000000000..3991db99bd Binary files /dev/null and b/public/images/emoji/emoji_one/flag_de.png differ diff --git a/public/images/emoji/emoji_one/flag_es.png b/public/images/emoji/emoji_one/flag_es.png new file mode 100644 index 0000000000..00a7ac17cb Binary files /dev/null and b/public/images/emoji/emoji_one/flag_es.png differ diff --git a/public/images/emoji/emoji_one/flag_fr.png b/public/images/emoji/emoji_one/flag_fr.png new file mode 100644 index 0000000000..58ae8bb0ce Binary files /dev/null and b/public/images/emoji/emoji_one/flag_fr.png differ diff --git a/public/images/emoji/emoji_one/flag_gb.png b/public/images/emoji/emoji_one/flag_gb.png new file mode 100644 index 0000000000..594fda36ae Binary files /dev/null and b/public/images/emoji/emoji_one/flag_gb.png differ diff --git a/public/images/emoji/emoji_one/flag_it.png b/public/images/emoji/emoji_one/flag_it.png new file mode 100644 index 0000000000..4f55dfdc76 Binary files /dev/null and b/public/images/emoji/emoji_one/flag_it.png differ diff --git a/public/images/emoji/emoji_one/flag_jp.png b/public/images/emoji/emoji_one/flag_jp.png new file mode 100644 index 0000000000..1860a8644e Binary files /dev/null and b/public/images/emoji/emoji_one/flag_jp.png differ diff --git a/public/images/emoji/emoji_one/flag_kr.png b/public/images/emoji/emoji_one/flag_kr.png new file mode 100644 index 0000000000..3dc0748e7f Binary files /dev/null and b/public/images/emoji/emoji_one/flag_kr.png differ diff --git a/public/images/emoji/emoji_one/flag_ru.png b/public/images/emoji/emoji_one/flag_ru.png new file mode 100644 index 0000000000..472ba846d8 Binary files /dev/null and b/public/images/emoji/emoji_one/flag_ru.png differ diff --git a/public/images/emoji/emoji_one/flag_us.png b/public/images/emoji/emoji_one/flag_us.png new file mode 100644 index 0000000000..4c41fbbaa6 Binary files /dev/null and b/public/images/emoji/emoji_one/flag_us.png differ diff --git a/public/images/emoji/emoji_one/flag_white.png b/public/images/emoji/emoji_one/flag_white.png new file mode 100644 index 0000000000..a6b355cf74 Binary files /dev/null and b/public/images/emoji/emoji_one/flag_white.png differ diff --git a/public/images/emoji/emoji_one/fleur-de-lis.png b/public/images/emoji/emoji_one/fleur-de-lis.png new file mode 100644 index 0000000000..d802f1d582 Binary files /dev/null and b/public/images/emoji/emoji_one/fleur-de-lis.png differ diff --git a/public/images/emoji/emoji_one/fog.png b/public/images/emoji/emoji_one/fog.png new file mode 100644 index 0000000000..7bd54ed1dd Binary files /dev/null and b/public/images/emoji/emoji_one/fog.png differ diff --git a/public/images/emoji/emoji_one/fork_knife_plate.png b/public/images/emoji/emoji_one/fork_knife_plate.png new file mode 100644 index 0000000000..4174200d93 Binary files /dev/null and b/public/images/emoji/emoji_one/fork_knife_plate.png differ diff --git a/public/images/emoji/emoji_one/frame_photo.png b/public/images/emoji/emoji_one/frame_photo.png new file mode 100644 index 0000000000..508116dfcb Binary files /dev/null and b/public/images/emoji/emoji_one/frame_photo.png differ diff --git a/public/images/emoji/emoji_one/frowning2.png b/public/images/emoji/emoji_one/frowning2.png new file mode 100644 index 0000000000..353b28360e Binary files /dev/null and b/public/images/emoji/emoji_one/frowning2.png differ diff --git a/public/images/emoji/emoji_one/gear.png b/public/images/emoji/emoji_one/gear.png new file mode 100644 index 0000000000..fede124a4a Binary files /dev/null and b/public/images/emoji/emoji_one/gear.png differ diff --git a/public/images/emoji/emoji_one/golfer.png b/public/images/emoji/emoji_one/golfer.png new file mode 100644 index 0000000000..54d2c8aa87 Binary files /dev/null and b/public/images/emoji/emoji_one/golfer.png differ diff --git a/public/images/emoji/emoji_one/hammer_pick.png b/public/images/emoji/emoji_one/hammer_pick.png new file mode 100644 index 0000000000..3b7bb9dbe0 Binary files /dev/null and b/public/images/emoji/emoji_one/hammer_pick.png differ diff --git a/public/images/emoji/emoji_one/hand_splayed.png b/public/images/emoji/emoji_one/hand_splayed.png new file mode 100644 index 0000000000..c08b63bf04 Binary files /dev/null and b/public/images/emoji/emoji_one/hand_splayed.png differ diff --git a/public/images/emoji/emoji_one/head_bandage.png b/public/images/emoji/emoji_one/head_bandage.png new file mode 100644 index 0000000000..b249b12768 Binary files /dev/null and b/public/images/emoji/emoji_one/head_bandage.png differ diff --git a/public/images/emoji/emoji_one/heart_exclamation.png b/public/images/emoji/emoji_one/heart_exclamation.png new file mode 100644 index 0000000000..be54295cc8 Binary files /dev/null and b/public/images/emoji/emoji_one/heart_exclamation.png differ diff --git a/public/images/emoji/emoji_one/helmet_with_cross.png b/public/images/emoji/emoji_one/helmet_with_cross.png new file mode 100644 index 0000000000..22efa363c9 Binary files /dev/null and b/public/images/emoji/emoji_one/helmet_with_cross.png differ diff --git a/public/images/emoji/emoji_one/hockey.png b/public/images/emoji/emoji_one/hockey.png new file mode 100644 index 0000000000..464a11003a Binary files /dev/null and b/public/images/emoji/emoji_one/hockey.png differ diff --git a/public/images/emoji/emoji_one/hole.png b/public/images/emoji/emoji_one/hole.png new file mode 100644 index 0000000000..19e228f662 Binary files /dev/null and b/public/images/emoji/emoji_one/hole.png differ diff --git a/public/images/emoji/emoji_one/homes.png b/public/images/emoji/emoji_one/homes.png new file mode 100644 index 0000000000..77fd2f37f1 Binary files /dev/null and b/public/images/emoji/emoji_one/homes.png differ diff --git a/public/images/emoji/emoji_one/hot_pepper.png b/public/images/emoji/emoji_one/hot_pepper.png new file mode 100644 index 0000000000..e8c0fa8621 Binary files /dev/null and b/public/images/emoji/emoji_one/hot_pepper.png differ diff --git a/public/images/emoji/emoji_one/hotdog.png b/public/images/emoji/emoji_one/hotdog.png new file mode 100644 index 0000000000..224b69ae2f Binary files /dev/null and b/public/images/emoji/emoji_one/hotdog.png differ diff --git a/public/images/emoji/emoji_one/house_abandoned.png b/public/images/emoji/emoji_one/house_abandoned.png new file mode 100644 index 0000000000..0a10ee267e Binary files /dev/null and b/public/images/emoji/emoji_one/house_abandoned.png differ diff --git a/public/images/emoji/emoji_one/hugging.png b/public/images/emoji/emoji_one/hugging.png new file mode 100644 index 0000000000..d1a7725abf Binary files /dev/null and b/public/images/emoji/emoji_one/hugging.png differ diff --git a/public/images/emoji/emoji_one/ice_skate.png b/public/images/emoji/emoji_one/ice_skate.png new file mode 100644 index 0000000000..40e307241a Binary files /dev/null and b/public/images/emoji/emoji_one/ice_skate.png differ diff --git a/public/images/emoji/emoji_one/island.png b/public/images/emoji/emoji_one/island.png new file mode 100644 index 0000000000..bbb88f6e26 Binary files /dev/null and b/public/images/emoji/emoji_one/island.png differ diff --git a/public/images/emoji/emoji_one/joystick.png b/public/images/emoji/emoji_one/joystick.png new file mode 100644 index 0000000000..3d2e5b8f43 Binary files /dev/null and b/public/images/emoji/emoji_one/joystick.png differ diff --git a/public/images/emoji/emoji_one/kaaba.png b/public/images/emoji/emoji_one/kaaba.png new file mode 100644 index 0000000000..47ee22a82b Binary files /dev/null and b/public/images/emoji/emoji_one/kaaba.png differ diff --git a/public/images/emoji/emoji_one/key2.png b/public/images/emoji/emoji_one/key2.png new file mode 100644 index 0000000000..7dc9ba58e4 Binary files /dev/null and b/public/images/emoji/emoji_one/key2.png differ diff --git a/public/images/emoji/emoji_one/keyboard.png b/public/images/emoji/emoji_one/keyboard.png new file mode 100644 index 0000000000..38ac5cb3f5 Binary files /dev/null and b/public/images/emoji/emoji_one/keyboard.png differ diff --git a/public/images/emoji/emoji_one/label.png b/public/images/emoji/emoji_one/label.png new file mode 100644 index 0000000000..16efa7a6f5 Binary files /dev/null and b/public/images/emoji/emoji_one/label.png differ diff --git a/public/images/emoji/emoji_one/level_slider.png b/public/images/emoji/emoji_one/level_slider.png new file mode 100644 index 0000000000..b436f72973 Binary files /dev/null and b/public/images/emoji/emoji_one/level_slider.png differ diff --git a/public/images/emoji/emoji_one/levitate.png b/public/images/emoji/emoji_one/levitate.png new file mode 100644 index 0000000000..7c2517d75a Binary files /dev/null and b/public/images/emoji/emoji_one/levitate.png differ diff --git a/public/images/emoji/emoji_one/lifter.png b/public/images/emoji/emoji_one/lifter.png new file mode 100644 index 0000000000..3e52cf7e3e Binary files /dev/null and b/public/images/emoji/emoji_one/lifter.png differ diff --git a/public/images/emoji/emoji_one/lion_face.png b/public/images/emoji/emoji_one/lion_face.png new file mode 100644 index 0000000000..fc03a057db Binary files /dev/null and b/public/images/emoji/emoji_one/lion_face.png differ diff --git a/public/images/emoji/emoji_one/map.png b/public/images/emoji/emoji_one/map.png new file mode 100644 index 0000000000..fe9c43d924 Binary files /dev/null and b/public/images/emoji/emoji_one/map.png differ diff --git a/public/images/emoji/emoji_one/medal.png b/public/images/emoji/emoji_one/medal.png new file mode 100644 index 0000000000..280bc07a91 Binary files /dev/null and b/public/images/emoji/emoji_one/medal.png differ diff --git a/public/images/emoji/emoji_one/menorah.png b/public/images/emoji/emoji_one/menorah.png new file mode 100644 index 0000000000..b6a5b0b59e Binary files /dev/null and b/public/images/emoji/emoji_one/menorah.png differ diff --git a/public/images/emoji/emoji_one/metal.png b/public/images/emoji/emoji_one/metal.png new file mode 100644 index 0000000000..a653d61904 Binary files /dev/null and b/public/images/emoji/emoji_one/metal.png differ diff --git a/public/images/emoji/emoji_one/microphone2.png b/public/images/emoji/emoji_one/microphone2.png new file mode 100644 index 0000000000..9948996441 Binary files /dev/null and b/public/images/emoji/emoji_one/microphone2.png differ diff --git a/public/images/emoji/emoji_one/middle_finger.png b/public/images/emoji/emoji_one/middle_finger.png new file mode 100644 index 0000000000..014e172555 Binary files /dev/null and b/public/images/emoji/emoji_one/middle_finger.png differ diff --git a/public/images/emoji/emoji_one/military_medal.png b/public/images/emoji/emoji_one/military_medal.png new file mode 100644 index 0000000000..a42f53c56c Binary files /dev/null and b/public/images/emoji/emoji_one/military_medal.png differ diff --git a/public/images/emoji/emoji_one/money_mouth.png b/public/images/emoji/emoji_one/money_mouth.png new file mode 100644 index 0000000000..e2b81259a6 Binary files /dev/null and b/public/images/emoji/emoji_one/money_mouth.png differ diff --git a/public/images/emoji/emoji_one/mosque.png b/public/images/emoji/emoji_one/mosque.png new file mode 100644 index 0000000000..4e3dd287c5 Binary files /dev/null and b/public/images/emoji/emoji_one/mosque.png differ diff --git a/public/images/emoji/emoji_one/motorboat.png b/public/images/emoji/emoji_one/motorboat.png new file mode 100644 index 0000000000..12a63b3f68 Binary files /dev/null and b/public/images/emoji/emoji_one/motorboat.png differ diff --git a/public/images/emoji/emoji_one/motorcycle.png b/public/images/emoji/emoji_one/motorcycle.png new file mode 100644 index 0000000000..45c7567a41 Binary files /dev/null and b/public/images/emoji/emoji_one/motorcycle.png differ diff --git a/public/images/emoji/emoji_one/motorway.png b/public/images/emoji/emoji_one/motorway.png new file mode 100644 index 0000000000..4b54f99ee2 Binary files /dev/null and b/public/images/emoji/emoji_one/motorway.png differ diff --git a/public/images/emoji/emoji_one/mountain.png b/public/images/emoji/emoji_one/mountain.png new file mode 100644 index 0000000000..fc1ca084b7 Binary files /dev/null and b/public/images/emoji/emoji_one/mountain.png differ diff --git a/public/images/emoji/emoji_one/mountain_snow.png b/public/images/emoji/emoji_one/mountain_snow.png new file mode 100644 index 0000000000..0684e4ce6d Binary files /dev/null and b/public/images/emoji/emoji_one/mountain_snow.png differ diff --git a/public/images/emoji/emoji_one/mouse_three_button.png b/public/images/emoji/emoji_one/mouse_three_button.png new file mode 100644 index 0000000000..5eb22b18a8 Binary files /dev/null and b/public/images/emoji/emoji_one/mouse_three_button.png differ diff --git a/public/images/emoji/emoji_one/nerd.png b/public/images/emoji/emoji_one/nerd.png new file mode 100644 index 0000000000..0861d21f60 Binary files /dev/null and b/public/images/emoji/emoji_one/nerd.png differ diff --git a/public/images/emoji/emoji_one/newspaper2.png b/public/images/emoji/emoji_one/newspaper2.png new file mode 100644 index 0000000000..ef62361f06 Binary files /dev/null and b/public/images/emoji/emoji_one/newspaper2.png differ diff --git a/public/images/emoji/emoji_one/notepad_spiral.png b/public/images/emoji/emoji_one/notepad_spiral.png new file mode 100644 index 0000000000..4d29c1ec0f Binary files /dev/null and b/public/images/emoji/emoji_one/notepad_spiral.png differ diff --git a/public/images/emoji/emoji_one/oil.png b/public/images/emoji/emoji_one/oil.png new file mode 100644 index 0000000000..8c00bde733 Binary files /dev/null and b/public/images/emoji/emoji_one/oil.png differ diff --git a/public/images/emoji/emoji_one/om_symbol.png b/public/images/emoji/emoji_one/om_symbol.png new file mode 100644 index 0000000000..badf010f07 Binary files /dev/null and b/public/images/emoji/emoji_one/om_symbol.png differ diff --git a/public/images/emoji/emoji_one/orthodox_cross.png b/public/images/emoji/emoji_one/orthodox_cross.png new file mode 100644 index 0000000000..79e13464ab Binary files /dev/null and b/public/images/emoji/emoji_one/orthodox_cross.png differ diff --git a/public/images/emoji/emoji_one/paintbrush.png b/public/images/emoji/emoji_one/paintbrush.png new file mode 100644 index 0000000000..7f8ae7efd7 Binary files /dev/null and b/public/images/emoji/emoji_one/paintbrush.png differ diff --git a/public/images/emoji/emoji_one/paperclips.png b/public/images/emoji/emoji_one/paperclips.png new file mode 100644 index 0000000000..3c086978d3 Binary files /dev/null and b/public/images/emoji/emoji_one/paperclips.png differ diff --git a/public/images/emoji/emoji_one/park.png b/public/images/emoji/emoji_one/park.png new file mode 100644 index 0000000000..f2c8362c39 Binary files /dev/null and b/public/images/emoji/emoji_one/park.png differ diff --git a/public/images/emoji/emoji_one/pause_button.png b/public/images/emoji/emoji_one/pause_button.png new file mode 100644 index 0000000000..b66c56af7b Binary files /dev/null and b/public/images/emoji/emoji_one/pause_button.png differ diff --git a/public/images/emoji/emoji_one/peace.png b/public/images/emoji/emoji_one/peace.png new file mode 100644 index 0000000000..556d48acaa Binary files /dev/null and b/public/images/emoji/emoji_one/peace.png differ diff --git a/public/images/emoji/emoji_one/pen_ballpoint.png b/public/images/emoji/emoji_one/pen_ballpoint.png new file mode 100644 index 0000000000..c6d87b9fb2 Binary files /dev/null and b/public/images/emoji/emoji_one/pen_ballpoint.png differ diff --git a/public/images/emoji/emoji_one/pen_fountain.png b/public/images/emoji/emoji_one/pen_fountain.png new file mode 100644 index 0000000000..0b11b69de7 Binary files /dev/null and b/public/images/emoji/emoji_one/pen_fountain.png differ diff --git a/public/images/emoji/emoji_one/pick.png b/public/images/emoji/emoji_one/pick.png new file mode 100644 index 0000000000..c7f116e236 Binary files /dev/null and b/public/images/emoji/emoji_one/pick.png differ diff --git a/public/images/emoji/emoji_one/ping_pong.png b/public/images/emoji/emoji_one/ping_pong.png new file mode 100644 index 0000000000..5bb1f058be Binary files /dev/null and b/public/images/emoji/emoji_one/ping_pong.png differ diff --git a/public/images/emoji/emoji_one/place_of_worship.png b/public/images/emoji/emoji_one/place_of_worship.png new file mode 100644 index 0000000000..6ae5d822a6 Binary files /dev/null and b/public/images/emoji/emoji_one/place_of_worship.png differ diff --git a/public/images/emoji/emoji_one/play_pause.png b/public/images/emoji/emoji_one/play_pause.png new file mode 100644 index 0000000000..617619659c Binary files /dev/null and b/public/images/emoji/emoji_one/play_pause.png differ diff --git a/public/images/emoji/emoji_one/popcorn.png b/public/images/emoji/emoji_one/popcorn.png new file mode 100644 index 0000000000..d0e482bcc4 Binary files /dev/null and b/public/images/emoji/emoji_one/popcorn.png differ diff --git a/public/images/emoji/emoji_one/prayer_beads.png b/public/images/emoji/emoji_one/prayer_beads.png new file mode 100644 index 0000000000..40da4878b7 Binary files /dev/null and b/public/images/emoji/emoji_one/prayer_beads.png differ diff --git a/public/images/emoji/emoji_one/printer.png b/public/images/emoji/emoji_one/printer.png new file mode 100644 index 0000000000..a314326739 Binary files /dev/null and b/public/images/emoji/emoji_one/printer.png differ diff --git a/public/images/emoji/emoji_one/projector.png b/public/images/emoji/emoji_one/projector.png new file mode 100644 index 0000000000..fa46ba0a29 Binary files /dev/null and b/public/images/emoji/emoji_one/projector.png differ diff --git a/public/images/emoji/emoji_one/race_car.png b/public/images/emoji/emoji_one/race_car.png new file mode 100644 index 0000000000..4b094c2660 Binary files /dev/null and b/public/images/emoji/emoji_one/race_car.png differ diff --git a/public/images/emoji/emoji_one/radioactive.png b/public/images/emoji/emoji_one/radioactive.png new file mode 100644 index 0000000000..cac4064d43 Binary files /dev/null and b/public/images/emoji/emoji_one/radioactive.png differ diff --git a/public/images/emoji/emoji_one/railway_track.png b/public/images/emoji/emoji_one/railway_track.png new file mode 100644 index 0000000000..641cbe2cba Binary files /dev/null and b/public/images/emoji/emoji_one/railway_track.png differ diff --git a/public/images/emoji/emoji_one/record_button.png b/public/images/emoji/emoji_one/record_button.png new file mode 100644 index 0000000000..b62b87170e Binary files /dev/null and b/public/images/emoji/emoji_one/record_button.png differ diff --git a/public/images/emoji/emoji_one/reminder_ribbon.png b/public/images/emoji/emoji_one/reminder_ribbon.png new file mode 100644 index 0000000000..c9267457ff Binary files /dev/null and b/public/images/emoji/emoji_one/reminder_ribbon.png differ diff --git a/public/images/emoji/emoji_one/robot.png b/public/images/emoji/emoji_one/robot.png new file mode 100644 index 0000000000..cdbad6d12d Binary files /dev/null and b/public/images/emoji/emoji_one/robot.png differ diff --git a/public/images/emoji/emoji_one/rolling_eyes.png b/public/images/emoji/emoji_one/rolling_eyes.png new file mode 100644 index 0000000000..da716bbca1 Binary files /dev/null and b/public/images/emoji/emoji_one/rolling_eyes.png differ diff --git a/public/images/emoji/emoji_one/rosette.png b/public/images/emoji/emoji_one/rosette.png new file mode 100644 index 0000000000..9180c9d4dd Binary files /dev/null and b/public/images/emoji/emoji_one/rosette.png differ diff --git a/public/images/emoji/emoji_one/satellite_orbital.png b/public/images/emoji/emoji_one/satellite_orbital.png new file mode 100644 index 0000000000..a0d8127853 Binary files /dev/null and b/public/images/emoji/emoji_one/satellite_orbital.png differ diff --git a/public/images/emoji/emoji_one/scales.png b/public/images/emoji/emoji_one/scales.png new file mode 100644 index 0000000000..3c88977da8 Binary files /dev/null and b/public/images/emoji/emoji_one/scales.png differ diff --git a/public/images/emoji/emoji_one/scorpion.png b/public/images/emoji/emoji_one/scorpion.png new file mode 100644 index 0000000000..a8fec65a5b Binary files /dev/null and b/public/images/emoji/emoji_one/scorpion.png differ diff --git a/public/images/emoji/emoji_one/shamrock.png b/public/images/emoji/emoji_one/shamrock.png new file mode 100644 index 0000000000..a14f158f7f Binary files /dev/null and b/public/images/emoji/emoji_one/shamrock.png differ diff --git a/public/images/emoji/emoji_one/shield.png b/public/images/emoji/emoji_one/shield.png new file mode 100644 index 0000000000..caa71afde7 Binary files /dev/null and b/public/images/emoji/emoji_one/shield.png differ diff --git a/public/images/emoji/emoji_one/shinto_shrine.png b/public/images/emoji/emoji_one/shinto_shrine.png new file mode 100644 index 0000000000..25366b5c5c Binary files /dev/null and b/public/images/emoji/emoji_one/shinto_shrine.png differ diff --git a/public/images/emoji/emoji_one/shopping_bags.png b/public/images/emoji/emoji_one/shopping_bags.png new file mode 100644 index 0000000000..08c37ca907 Binary files /dev/null and b/public/images/emoji/emoji_one/shopping_bags.png differ diff --git a/public/images/emoji/emoji_one/skier.png b/public/images/emoji/emoji_one/skier.png new file mode 100644 index 0000000000..9000b55db4 Binary files /dev/null and b/public/images/emoji/emoji_one/skier.png differ diff --git a/public/images/emoji/emoji_one/skull_crossbones.png b/public/images/emoji/emoji_one/skull_crossbones.png new file mode 100644 index 0000000000..08105bf1cc Binary files /dev/null and b/public/images/emoji/emoji_one/skull_crossbones.png differ diff --git a/public/images/emoji/emoji_one/sleeping_accommodation.png b/public/images/emoji/emoji_one/sleeping_accommodation.png new file mode 100644 index 0000000000..cd5399bf1e Binary files /dev/null and b/public/images/emoji/emoji_one/sleeping_accommodation.png differ diff --git a/public/images/emoji/emoji_one/slight_frown.png b/public/images/emoji/emoji_one/slight_frown.png new file mode 100644 index 0000000000..0325955e3c Binary files /dev/null and b/public/images/emoji/emoji_one/slight_frown.png differ diff --git a/public/images/emoji/emoji_one/slight_smile.png b/public/images/emoji/emoji_one/slight_smile.png new file mode 100644 index 0000000000..0417e8db99 Binary files /dev/null and b/public/images/emoji/emoji_one/slight_smile.png differ diff --git a/public/images/emoji/emoji_one/snowman2.png b/public/images/emoji/emoji_one/snowman2.png new file mode 100644 index 0000000000..d4a0c9e0d9 Binary files /dev/null and b/public/images/emoji/emoji_one/snowman2.png differ diff --git a/public/images/emoji/emoji_one/speaking_head.png b/public/images/emoji/emoji_one/speaking_head.png new file mode 100644 index 0000000000..6fe847e3a2 Binary files /dev/null and b/public/images/emoji/emoji_one/speaking_head.png differ diff --git a/public/images/emoji/emoji_one/spider.png b/public/images/emoji/emoji_one/spider.png new file mode 100644 index 0000000000..3dc4af311d Binary files /dev/null and b/public/images/emoji/emoji_one/spider.png differ diff --git a/public/images/emoji/emoji_one/spider_web.png b/public/images/emoji/emoji_one/spider_web.png new file mode 100644 index 0000000000..9eaa5dcddb Binary files /dev/null and b/public/images/emoji/emoji_one/spider_web.png differ diff --git a/public/images/emoji/emoji_one/spy.png b/public/images/emoji/emoji_one/spy.png new file mode 100644 index 0000000000..057a54743e Binary files /dev/null and b/public/images/emoji/emoji_one/spy.png differ diff --git a/public/images/emoji/emoji_one/stadium.png b/public/images/emoji/emoji_one/stadium.png new file mode 100644 index 0000000000..e1c2547420 Binary files /dev/null and b/public/images/emoji/emoji_one/stadium.png differ diff --git a/public/images/emoji/emoji_one/star_and_crescent.png b/public/images/emoji/emoji_one/star_and_crescent.png new file mode 100644 index 0000000000..c5f8c7cd06 Binary files /dev/null and b/public/images/emoji/emoji_one/star_and_crescent.png differ diff --git a/public/images/emoji/emoji_one/star_of_david.png b/public/images/emoji/emoji_one/star_of_david.png new file mode 100644 index 0000000000..73d3f921cb Binary files /dev/null and b/public/images/emoji/emoji_one/star_of_david.png differ diff --git a/public/images/emoji/emoji_one/stop_button.png b/public/images/emoji/emoji_one/stop_button.png new file mode 100644 index 0000000000..66a8974323 Binary files /dev/null and b/public/images/emoji/emoji_one/stop_button.png differ diff --git a/public/images/emoji/emoji_one/stopwatch.png b/public/images/emoji/emoji_one/stopwatch.png new file mode 100644 index 0000000000..4d75528744 Binary files /dev/null and b/public/images/emoji/emoji_one/stopwatch.png differ diff --git a/public/images/emoji/emoji_one/synagogue.png b/public/images/emoji/emoji_one/synagogue.png new file mode 100644 index 0000000000..5b092e0174 Binary files /dev/null and b/public/images/emoji/emoji_one/synagogue.png differ diff --git a/public/images/emoji/emoji_one/taco.png b/public/images/emoji/emoji_one/taco.png new file mode 100644 index 0000000000..b3a126a781 Binary files /dev/null and b/public/images/emoji/emoji_one/taco.png differ diff --git a/public/images/emoji/emoji_one/ten.png b/public/images/emoji/emoji_one/ten.png new file mode 100644 index 0000000000..ea9109e26a Binary files /dev/null and b/public/images/emoji/emoji_one/ten.png differ diff --git a/public/images/emoji/emoji_one/thermometer.png b/public/images/emoji/emoji_one/thermometer.png new file mode 100644 index 0000000000..b5568957ad Binary files /dev/null and b/public/images/emoji/emoji_one/thermometer.png differ diff --git a/public/images/emoji/emoji_one/thermometer_face.png b/public/images/emoji/emoji_one/thermometer_face.png new file mode 100644 index 0000000000..0047a14560 Binary files /dev/null and b/public/images/emoji/emoji_one/thermometer_face.png differ diff --git a/public/images/emoji/emoji_one/thinking.png b/public/images/emoji/emoji_one/thinking.png new file mode 100644 index 0000000000..588362c874 Binary files /dev/null and b/public/images/emoji/emoji_one/thinking.png differ diff --git a/public/images/emoji/emoji_one/thunder_cloud_rain.png b/public/images/emoji/emoji_one/thunder_cloud_rain.png new file mode 100644 index 0000000000..ba43488b8e Binary files /dev/null and b/public/images/emoji/emoji_one/thunder_cloud_rain.png differ diff --git a/public/images/emoji/emoji_one/tickets.png b/public/images/emoji/emoji_one/tickets.png new file mode 100644 index 0000000000..61866239d8 Binary files /dev/null and b/public/images/emoji/emoji_one/tickets.png differ diff --git a/public/images/emoji/emoji_one/timer.png b/public/images/emoji/emoji_one/timer.png new file mode 100644 index 0000000000..584922da25 Binary files /dev/null and b/public/images/emoji/emoji_one/timer.png differ diff --git a/public/images/emoji/emoji_one/tools.png b/public/images/emoji/emoji_one/tools.png new file mode 100644 index 0000000000..dfb667419d Binary files /dev/null and b/public/images/emoji/emoji_one/tools.png differ diff --git a/public/images/emoji/emoji_one/track_next.png b/public/images/emoji/emoji_one/track_next.png new file mode 100644 index 0000000000..9bf5647f7f Binary files /dev/null and b/public/images/emoji/emoji_one/track_next.png differ diff --git a/public/images/emoji/emoji_one/track_previous.png b/public/images/emoji/emoji_one/track_previous.png new file mode 100644 index 0000000000..1fd22e0f70 Binary files /dev/null and b/public/images/emoji/emoji_one/track_previous.png differ diff --git a/public/images/emoji/emoji_one/trackball.png b/public/images/emoji/emoji_one/trackball.png new file mode 100644 index 0000000000..a5d8244241 Binary files /dev/null and b/public/images/emoji/emoji_one/trackball.png differ diff --git a/public/images/emoji/emoji_one/turkey.png b/public/images/emoji/emoji_one/turkey.png new file mode 100644 index 0000000000..2a47cf2d1e Binary files /dev/null and b/public/images/emoji/emoji_one/turkey.png differ diff --git a/public/images/emoji/emoji_one/umbrella2.png b/public/images/emoji/emoji_one/umbrella2.png new file mode 100644 index 0000000000..e1857c1fd7 Binary files /dev/null and b/public/images/emoji/emoji_one/umbrella2.png differ diff --git a/public/images/emoji/emoji_one/unicorn.png b/public/images/emoji/emoji_one/unicorn.png new file mode 100644 index 0000000000..dca45abbd5 Binary files /dev/null and b/public/images/emoji/emoji_one/unicorn.png differ diff --git a/public/images/emoji/emoji_one/upside_down.png b/public/images/emoji/emoji_one/upside_down.png new file mode 100644 index 0000000000..d097e4f97d Binary files /dev/null and b/public/images/emoji/emoji_one/upside_down.png differ diff --git a/public/images/emoji/emoji_one/urn.png b/public/images/emoji/emoji_one/urn.png new file mode 100644 index 0000000000..9d934bad0c Binary files /dev/null and b/public/images/emoji/emoji_one/urn.png differ diff --git a/public/images/emoji/emoji_one/volleyball.png b/public/images/emoji/emoji_one/volleyball.png new file mode 100644 index 0000000000..f93768a378 Binary files /dev/null and b/public/images/emoji/emoji_one/volleyball.png differ diff --git a/public/images/emoji/emoji_one/vulcan.png b/public/images/emoji/emoji_one/vulcan.png new file mode 100644 index 0000000000..21beed5b60 Binary files /dev/null and b/public/images/emoji/emoji_one/vulcan.png differ diff --git a/public/images/emoji/emoji_one/wastebasket.png b/public/images/emoji/emoji_one/wastebasket.png new file mode 100644 index 0000000000..952d9a962d Binary files /dev/null and b/public/images/emoji/emoji_one/wastebasket.png differ diff --git a/public/images/emoji/emoji_one/wheel_of_dharma.png b/public/images/emoji/emoji_one/wheel_of_dharma.png new file mode 100644 index 0000000000..d6569d3a5e Binary files /dev/null and b/public/images/emoji/emoji_one/wheel_of_dharma.png differ diff --git a/public/images/emoji/emoji_one/white_sun_cloud.png b/public/images/emoji/emoji_one/white_sun_cloud.png new file mode 100644 index 0000000000..461a1f85ba Binary files /dev/null and b/public/images/emoji/emoji_one/white_sun_cloud.png differ diff --git a/public/images/emoji/emoji_one/white_sun_rain_cloud.png b/public/images/emoji/emoji_one/white_sun_rain_cloud.png new file mode 100644 index 0000000000..0d8475bbd0 Binary files /dev/null and b/public/images/emoji/emoji_one/white_sun_rain_cloud.png differ diff --git a/public/images/emoji/emoji_one/white_sun_small_cloud.png b/public/images/emoji/emoji_one/white_sun_small_cloud.png new file mode 100644 index 0000000000..403550e950 Binary files /dev/null and b/public/images/emoji/emoji_one/white_sun_small_cloud.png differ diff --git a/public/images/emoji/emoji_one/wind_blowing_face.png b/public/images/emoji/emoji_one/wind_blowing_face.png new file mode 100644 index 0000000000..6b933af8e7 Binary files /dev/null and b/public/images/emoji/emoji_one/wind_blowing_face.png differ diff --git a/public/images/emoji/emoji_one/writing_hand.png b/public/images/emoji/emoji_one/writing_hand.png new file mode 100644 index 0000000000..c49c6987de Binary files /dev/null and b/public/images/emoji/emoji_one/writing_hand.png differ diff --git a/public/images/emoji/emoji_one/yin_yang.png b/public/images/emoji/emoji_one/yin_yang.png new file mode 100644 index 0000000000..e8769c4c40 Binary files /dev/null and b/public/images/emoji/emoji_one/yin_yang.png differ diff --git a/public/images/emoji/emoji_one/zipper_mouth.png b/public/images/emoji/emoji_one/zipper_mouth.png new file mode 100644 index 0000000000..2ddaf45491 Binary files /dev/null and b/public/images/emoji/emoji_one/zipper_mouth.png differ diff --git a/public/images/emoji/google/airplane_arriving.png b/public/images/emoji/google/airplane_arriving.png new file mode 100644 index 0000000000..a385ba0070 Binary files /dev/null and b/public/images/emoji/google/airplane_arriving.png differ diff --git a/public/images/emoji/google/airplane_departure.png b/public/images/emoji/google/airplane_departure.png new file mode 100644 index 0000000000..30dd2054ca Binary files /dev/null and b/public/images/emoji/google/airplane_departure.png differ diff --git a/public/images/emoji/google/airplane_small.png b/public/images/emoji/google/airplane_small.png new file mode 100644 index 0000000000..4f97922d5d Binary files /dev/null and b/public/images/emoji/google/airplane_small.png differ diff --git a/public/images/emoji/google/alembic.png b/public/images/emoji/google/alembic.png new file mode 100644 index 0000000000..553d1ceefc Binary files /dev/null and b/public/images/emoji/google/alembic.png differ diff --git a/public/images/emoji/google/amphora.png b/public/images/emoji/google/amphora.png new file mode 100644 index 0000000000..58998b83d3 Binary files /dev/null and b/public/images/emoji/google/amphora.png differ diff --git a/public/images/emoji/google/anger_right.png b/public/images/emoji/google/anger_right.png new file mode 100644 index 0000000000..fed984143e Binary files /dev/null and b/public/images/emoji/google/anger_right.png differ diff --git a/public/images/emoji/google/atom.png b/public/images/emoji/google/atom.png new file mode 100644 index 0000000000..7b2e8e2de8 Binary files /dev/null and b/public/images/emoji/google/atom.png differ diff --git a/public/images/emoji/google/badminton.png b/public/images/emoji/google/badminton.png new file mode 100644 index 0000000000..30d0a70212 Binary files /dev/null and b/public/images/emoji/google/badminton.png differ diff --git a/public/images/emoji/google/ballot_box.png b/public/images/emoji/google/ballot_box.png new file mode 100644 index 0000000000..1b2a590b0f Binary files /dev/null and b/public/images/emoji/google/ballot_box.png differ diff --git a/public/images/emoji/google/basketball_player.png b/public/images/emoji/google/basketball_player.png new file mode 100644 index 0000000000..17d02ddbdb Binary files /dev/null and b/public/images/emoji/google/basketball_player.png differ diff --git a/public/images/emoji/google/beach.png b/public/images/emoji/google/beach.png new file mode 100644 index 0000000000..9bb4009a4a Binary files /dev/null and b/public/images/emoji/google/beach.png differ diff --git a/public/images/emoji/google/beach_umbrella.png b/public/images/emoji/google/beach_umbrella.png new file mode 100644 index 0000000000..4e54263e13 Binary files /dev/null and b/public/images/emoji/google/beach_umbrella.png differ diff --git a/public/images/emoji/google/bed.png b/public/images/emoji/google/bed.png new file mode 100644 index 0000000000..20fcedb2a6 Binary files /dev/null and b/public/images/emoji/google/bed.png differ diff --git a/public/images/emoji/google/bellhop.png b/public/images/emoji/google/bellhop.png new file mode 100644 index 0000000000..b9b876ebd9 Binary files /dev/null and b/public/images/emoji/google/bellhop.png differ diff --git a/public/images/emoji/google/biohazard.png b/public/images/emoji/google/biohazard.png new file mode 100644 index 0000000000..deae4dd8a0 Binary files /dev/null and b/public/images/emoji/google/biohazard.png differ diff --git a/public/images/emoji/google/bow_and_arrow.png b/public/images/emoji/google/bow_and_arrow.png new file mode 100644 index 0000000000..d49fc2cd53 Binary files /dev/null and b/public/images/emoji/google/bow_and_arrow.png differ diff --git a/public/images/emoji/google/burrito.png b/public/images/emoji/google/burrito.png new file mode 100644 index 0000000000..844a16b1c3 Binary files /dev/null and b/public/images/emoji/google/burrito.png differ diff --git a/public/images/emoji/google/calendar_spiral.png b/public/images/emoji/google/calendar_spiral.png new file mode 100644 index 0000000000..bd6dd7125e Binary files /dev/null and b/public/images/emoji/google/calendar_spiral.png differ diff --git a/public/images/emoji/google/camera_with_flash.png b/public/images/emoji/google/camera_with_flash.png new file mode 100644 index 0000000000..6530f83f23 Binary files /dev/null and b/public/images/emoji/google/camera_with_flash.png differ diff --git a/public/images/emoji/google/camping.png b/public/images/emoji/google/camping.png new file mode 100644 index 0000000000..93415ad3c5 Binary files /dev/null and b/public/images/emoji/google/camping.png differ diff --git a/public/images/emoji/google/candle.png b/public/images/emoji/google/candle.png new file mode 100644 index 0000000000..d39a732971 Binary files /dev/null and b/public/images/emoji/google/candle.png differ diff --git a/public/images/emoji/google/card_box.png b/public/images/emoji/google/card_box.png new file mode 100644 index 0000000000..99e43b255f Binary files /dev/null and b/public/images/emoji/google/card_box.png differ diff --git a/public/images/emoji/google/chains.png b/public/images/emoji/google/chains.png new file mode 100644 index 0000000000..b351a69dd2 Binary files /dev/null and b/public/images/emoji/google/chains.png differ diff --git a/public/images/emoji/google/champagne.png b/public/images/emoji/google/champagne.png new file mode 100644 index 0000000000..e42cfacfe6 Binary files /dev/null and b/public/images/emoji/google/champagne.png differ diff --git a/public/images/emoji/google/cheese.png b/public/images/emoji/google/cheese.png new file mode 100644 index 0000000000..b41475b401 Binary files /dev/null and b/public/images/emoji/google/cheese.png differ diff --git a/public/images/emoji/google/chipmunk.png b/public/images/emoji/google/chipmunk.png new file mode 100644 index 0000000000..3e582e29d8 Binary files /dev/null and b/public/images/emoji/google/chipmunk.png differ diff --git a/public/images/emoji/google/city_dusk.png b/public/images/emoji/google/city_dusk.png new file mode 100644 index 0000000000..1d5e0b932d Binary files /dev/null and b/public/images/emoji/google/city_dusk.png differ diff --git a/public/images/emoji/google/cityscape.png b/public/images/emoji/google/cityscape.png new file mode 100644 index 0000000000..e42dd1941e Binary files /dev/null and b/public/images/emoji/google/cityscape.png differ diff --git a/public/images/emoji/google/classical_building.png b/public/images/emoji/google/classical_building.png new file mode 100644 index 0000000000..7c52f6c988 Binary files /dev/null and b/public/images/emoji/google/classical_building.png differ diff --git a/public/images/emoji/google/clock.png b/public/images/emoji/google/clock.png new file mode 100644 index 0000000000..a01e801f2c Binary files /dev/null and b/public/images/emoji/google/clock.png differ diff --git a/public/images/emoji/google/cloud_lightning.png b/public/images/emoji/google/cloud_lightning.png new file mode 100644 index 0000000000..7928332acf Binary files /dev/null and b/public/images/emoji/google/cloud_lightning.png differ diff --git a/public/images/emoji/google/cloud_rain.png b/public/images/emoji/google/cloud_rain.png new file mode 100644 index 0000000000..9c98ad6c66 Binary files /dev/null and b/public/images/emoji/google/cloud_rain.png differ diff --git a/public/images/emoji/google/cloud_snow.png b/public/images/emoji/google/cloud_snow.png new file mode 100644 index 0000000000..06159ea0e7 Binary files /dev/null and b/public/images/emoji/google/cloud_snow.png differ diff --git a/public/images/emoji/google/cloud_tornado.png b/public/images/emoji/google/cloud_tornado.png new file mode 100644 index 0000000000..3cd4cfb519 Binary files /dev/null and b/public/images/emoji/google/cloud_tornado.png differ diff --git a/public/images/emoji/google/coffin.png b/public/images/emoji/google/coffin.png new file mode 100644 index 0000000000..07777d3fd1 Binary files /dev/null and b/public/images/emoji/google/coffin.png differ diff --git a/public/images/emoji/google/comet.png b/public/images/emoji/google/comet.png new file mode 100644 index 0000000000..9cad61148d Binary files /dev/null and b/public/images/emoji/google/comet.png differ diff --git a/public/images/emoji/google/compression.png b/public/images/emoji/google/compression.png new file mode 100644 index 0000000000..ac7dd4ca76 Binary files /dev/null and b/public/images/emoji/google/compression.png differ diff --git a/public/images/emoji/google/construction_site.png b/public/images/emoji/google/construction_site.png new file mode 100644 index 0000000000..2b27bfb896 Binary files /dev/null and b/public/images/emoji/google/construction_site.png differ diff --git a/public/images/emoji/google/control_knobs.png b/public/images/emoji/google/control_knobs.png new file mode 100644 index 0000000000..01aa45bcfd Binary files /dev/null and b/public/images/emoji/google/control_knobs.png differ diff --git a/public/images/emoji/google/couch.png b/public/images/emoji/google/couch.png new file mode 100644 index 0000000000..b5628b0201 Binary files /dev/null and b/public/images/emoji/google/couch.png differ diff --git a/public/images/emoji/google/crab.png b/public/images/emoji/google/crab.png new file mode 100644 index 0000000000..37b3180429 Binary files /dev/null and b/public/images/emoji/google/crab.png differ diff --git a/public/images/emoji/google/crayon.png b/public/images/emoji/google/crayon.png new file mode 100644 index 0000000000..0096c9c637 Binary files /dev/null and b/public/images/emoji/google/crayon.png differ diff --git a/public/images/emoji/google/cricket.png b/public/images/emoji/google/cricket.png new file mode 100644 index 0000000000..300b76d576 Binary files /dev/null and b/public/images/emoji/google/cricket.png differ diff --git a/public/images/emoji/google/cross.png b/public/images/emoji/google/cross.png new file mode 100644 index 0000000000..1529863dfd Binary files /dev/null and b/public/images/emoji/google/cross.png differ diff --git a/public/images/emoji/google/crossed_swords.png b/public/images/emoji/google/crossed_swords.png new file mode 100644 index 0000000000..636eb7e8e0 Binary files /dev/null and b/public/images/emoji/google/crossed_swords.png differ diff --git a/public/images/emoji/google/cruise_ship.png b/public/images/emoji/google/cruise_ship.png new file mode 100644 index 0000000000..b9360e8eda Binary files /dev/null and b/public/images/emoji/google/cruise_ship.png differ diff --git a/public/images/emoji/google/dagger.png b/public/images/emoji/google/dagger.png new file mode 100644 index 0000000000..6a4b31e00f Binary files /dev/null and b/public/images/emoji/google/dagger.png differ diff --git a/public/images/emoji/google/dark_sunglasses.png b/public/images/emoji/google/dark_sunglasses.png new file mode 100644 index 0000000000..ded25ea1d9 Binary files /dev/null and b/public/images/emoji/google/dark_sunglasses.png differ diff --git a/public/images/emoji/google/desert.png b/public/images/emoji/google/desert.png new file mode 100644 index 0000000000..beac9e023c Binary files /dev/null and b/public/images/emoji/google/desert.png differ diff --git a/public/images/emoji/google/desktop.png b/public/images/emoji/google/desktop.png new file mode 100644 index 0000000000..7aa0819ee4 Binary files /dev/null and b/public/images/emoji/google/desktop.png differ diff --git a/public/images/emoji/google/dividers.png b/public/images/emoji/google/dividers.png new file mode 100644 index 0000000000..b526d0e34b Binary files /dev/null and b/public/images/emoji/google/dividers.png differ diff --git a/public/images/emoji/google/dove.png b/public/images/emoji/google/dove.png new file mode 100644 index 0000000000..4095825d74 Binary files /dev/null and b/public/images/emoji/google/dove.png differ diff --git a/public/images/emoji/google/eye.png b/public/images/emoji/google/eye.png new file mode 100644 index 0000000000..61e901e6cd Binary files /dev/null and b/public/images/emoji/google/eye.png differ diff --git a/public/images/emoji/google/ferry.png b/public/images/emoji/google/ferry.png new file mode 100644 index 0000000000..06b9353718 Binary files /dev/null and b/public/images/emoji/google/ferry.png differ diff --git a/public/images/emoji/google/field_hockey.png b/public/images/emoji/google/field_hockey.png new file mode 100644 index 0000000000..7213afedce Binary files /dev/null and b/public/images/emoji/google/field_hockey.png differ diff --git a/public/images/emoji/google/file_cabinet.png b/public/images/emoji/google/file_cabinet.png new file mode 100644 index 0000000000..c197648675 Binary files /dev/null and b/public/images/emoji/google/file_cabinet.png differ diff --git a/public/images/emoji/google/film_frames.png b/public/images/emoji/google/film_frames.png new file mode 100644 index 0000000000..d3a79feff7 Binary files /dev/null and b/public/images/emoji/google/film_frames.png differ diff --git a/public/images/emoji/google/flag_black.png b/public/images/emoji/google/flag_black.png new file mode 100644 index 0000000000..01ecfa2753 Binary files /dev/null and b/public/images/emoji/google/flag_black.png differ diff --git a/public/images/emoji/google/flag_cn.png b/public/images/emoji/google/flag_cn.png new file mode 100644 index 0000000000..2d9c3dad8d Binary files /dev/null and b/public/images/emoji/google/flag_cn.png differ diff --git a/public/images/emoji/google/flag_de.png b/public/images/emoji/google/flag_de.png new file mode 100644 index 0000000000..0baf83652e Binary files /dev/null and b/public/images/emoji/google/flag_de.png differ diff --git a/public/images/emoji/google/flag_es.png b/public/images/emoji/google/flag_es.png new file mode 100644 index 0000000000..e04765d6b7 Binary files /dev/null and b/public/images/emoji/google/flag_es.png differ diff --git a/public/images/emoji/google/flag_fr.png b/public/images/emoji/google/flag_fr.png new file mode 100644 index 0000000000..674b50805a Binary files /dev/null and b/public/images/emoji/google/flag_fr.png differ diff --git a/public/images/emoji/google/flag_gb.png b/public/images/emoji/google/flag_gb.png new file mode 100644 index 0000000000..c5c919ada6 Binary files /dev/null and b/public/images/emoji/google/flag_gb.png differ diff --git a/public/images/emoji/google/flag_it.png b/public/images/emoji/google/flag_it.png new file mode 100644 index 0000000000..7d98f98011 Binary files /dev/null and b/public/images/emoji/google/flag_it.png differ diff --git a/public/images/emoji/google/flag_jp.png b/public/images/emoji/google/flag_jp.png new file mode 100644 index 0000000000..a04b719f8a Binary files /dev/null and b/public/images/emoji/google/flag_jp.png differ diff --git a/public/images/emoji/google/flag_kr.png b/public/images/emoji/google/flag_kr.png new file mode 100644 index 0000000000..12b9ab1257 Binary files /dev/null and b/public/images/emoji/google/flag_kr.png differ diff --git a/public/images/emoji/google/flag_ru.png b/public/images/emoji/google/flag_ru.png new file mode 100644 index 0000000000..5121b0cac4 Binary files /dev/null and b/public/images/emoji/google/flag_ru.png differ diff --git a/public/images/emoji/google/flag_us.png b/public/images/emoji/google/flag_us.png new file mode 100644 index 0000000000..9ad26a6680 Binary files /dev/null and b/public/images/emoji/google/flag_us.png differ diff --git a/public/images/emoji/google/flag_white.png b/public/images/emoji/google/flag_white.png new file mode 100644 index 0000000000..4afc58a157 Binary files /dev/null and b/public/images/emoji/google/flag_white.png differ diff --git a/public/images/emoji/google/fleur-de-lis.png b/public/images/emoji/google/fleur-de-lis.png new file mode 100644 index 0000000000..726a9dbfc6 Binary files /dev/null and b/public/images/emoji/google/fleur-de-lis.png differ diff --git a/public/images/emoji/google/fog.png b/public/images/emoji/google/fog.png new file mode 100644 index 0000000000..99c75ed752 Binary files /dev/null and b/public/images/emoji/google/fog.png differ diff --git a/public/images/emoji/google/fork_knife_plate.png b/public/images/emoji/google/fork_knife_plate.png new file mode 100644 index 0000000000..7522473180 Binary files /dev/null and b/public/images/emoji/google/fork_knife_plate.png differ diff --git a/public/images/emoji/google/frame_photo.png b/public/images/emoji/google/frame_photo.png new file mode 100644 index 0000000000..2472435901 Binary files /dev/null and b/public/images/emoji/google/frame_photo.png differ diff --git a/public/images/emoji/google/frowning2.png b/public/images/emoji/google/frowning2.png new file mode 100644 index 0000000000..60077a561c Binary files /dev/null and b/public/images/emoji/google/frowning2.png differ diff --git a/public/images/emoji/google/gear.png b/public/images/emoji/google/gear.png new file mode 100644 index 0000000000..79dd801a12 Binary files /dev/null and b/public/images/emoji/google/gear.png differ diff --git a/public/images/emoji/google/golfer.png b/public/images/emoji/google/golfer.png new file mode 100644 index 0000000000..2aff3e9dc4 Binary files /dev/null and b/public/images/emoji/google/golfer.png differ diff --git a/public/images/emoji/google/hammer_pick.png b/public/images/emoji/google/hammer_pick.png new file mode 100644 index 0000000000..58690f4623 Binary files /dev/null and b/public/images/emoji/google/hammer_pick.png differ diff --git a/public/images/emoji/google/hand_splayed.png b/public/images/emoji/google/hand_splayed.png new file mode 100644 index 0000000000..140e5edf6c Binary files /dev/null and b/public/images/emoji/google/hand_splayed.png differ diff --git a/public/images/emoji/google/head_bandage.png b/public/images/emoji/google/head_bandage.png new file mode 100644 index 0000000000..bb6358bd84 Binary files /dev/null and b/public/images/emoji/google/head_bandage.png differ diff --git a/public/images/emoji/google/heart_exclamation.png b/public/images/emoji/google/heart_exclamation.png new file mode 100644 index 0000000000..4bcc043268 Binary files /dev/null and b/public/images/emoji/google/heart_exclamation.png differ diff --git a/public/images/emoji/google/helmet_with_cross.png b/public/images/emoji/google/helmet_with_cross.png new file mode 100644 index 0000000000..7b60b84c7d Binary files /dev/null and b/public/images/emoji/google/helmet_with_cross.png differ diff --git a/public/images/emoji/google/hockey.png b/public/images/emoji/google/hockey.png new file mode 100644 index 0000000000..a224a9d862 Binary files /dev/null and b/public/images/emoji/google/hockey.png differ diff --git a/public/images/emoji/google/hole.png b/public/images/emoji/google/hole.png new file mode 100644 index 0000000000..a74093e97c Binary files /dev/null and b/public/images/emoji/google/hole.png differ diff --git a/public/images/emoji/google/homes.png b/public/images/emoji/google/homes.png new file mode 100644 index 0000000000..330612a230 Binary files /dev/null and b/public/images/emoji/google/homes.png differ diff --git a/public/images/emoji/google/hot_pepper.png b/public/images/emoji/google/hot_pepper.png new file mode 100644 index 0000000000..4b96b89987 Binary files /dev/null and b/public/images/emoji/google/hot_pepper.png differ diff --git a/public/images/emoji/google/hotdog.png b/public/images/emoji/google/hotdog.png new file mode 100644 index 0000000000..9b656e4e6e Binary files /dev/null and b/public/images/emoji/google/hotdog.png differ diff --git a/public/images/emoji/google/house_abandoned.png b/public/images/emoji/google/house_abandoned.png new file mode 100644 index 0000000000..65339656f6 Binary files /dev/null and b/public/images/emoji/google/house_abandoned.png differ diff --git a/public/images/emoji/google/hugging.png b/public/images/emoji/google/hugging.png new file mode 100644 index 0000000000..f96f020cb1 Binary files /dev/null and b/public/images/emoji/google/hugging.png differ diff --git a/public/images/emoji/google/ice_skate.png b/public/images/emoji/google/ice_skate.png new file mode 100644 index 0000000000..9c4c849ca9 Binary files /dev/null and b/public/images/emoji/google/ice_skate.png differ diff --git a/public/images/emoji/google/island.png b/public/images/emoji/google/island.png new file mode 100644 index 0000000000..eb33977cf6 Binary files /dev/null and b/public/images/emoji/google/island.png differ diff --git a/public/images/emoji/google/joystick.png b/public/images/emoji/google/joystick.png new file mode 100644 index 0000000000..a2891008d0 Binary files /dev/null and b/public/images/emoji/google/joystick.png differ diff --git a/public/images/emoji/google/kaaba.png b/public/images/emoji/google/kaaba.png new file mode 100644 index 0000000000..ea2a60b17b Binary files /dev/null and b/public/images/emoji/google/kaaba.png differ diff --git a/public/images/emoji/google/key2.png b/public/images/emoji/google/key2.png new file mode 100644 index 0000000000..37bbcbb7cb Binary files /dev/null and b/public/images/emoji/google/key2.png differ diff --git a/public/images/emoji/google/keyboard.png b/public/images/emoji/google/keyboard.png new file mode 100644 index 0000000000..5c7ad21445 Binary files /dev/null and b/public/images/emoji/google/keyboard.png differ diff --git a/public/images/emoji/google/label.png b/public/images/emoji/google/label.png new file mode 100644 index 0000000000..61c4f8021d Binary files /dev/null and b/public/images/emoji/google/label.png differ diff --git a/public/images/emoji/google/level_slider.png b/public/images/emoji/google/level_slider.png new file mode 100644 index 0000000000..74adedad39 Binary files /dev/null and b/public/images/emoji/google/level_slider.png differ diff --git a/public/images/emoji/google/levitate.png b/public/images/emoji/google/levitate.png new file mode 100644 index 0000000000..b257d1b652 Binary files /dev/null and b/public/images/emoji/google/levitate.png differ diff --git a/public/images/emoji/google/lifter.png b/public/images/emoji/google/lifter.png new file mode 100644 index 0000000000..52dd8c972a Binary files /dev/null and b/public/images/emoji/google/lifter.png differ diff --git a/public/images/emoji/google/lion_face.png b/public/images/emoji/google/lion_face.png new file mode 100644 index 0000000000..18ec861a2d Binary files /dev/null and b/public/images/emoji/google/lion_face.png differ diff --git a/public/images/emoji/google/map.png b/public/images/emoji/google/map.png new file mode 100644 index 0000000000..47a97c65b3 Binary files /dev/null and b/public/images/emoji/google/map.png differ diff --git a/public/images/emoji/google/medal.png b/public/images/emoji/google/medal.png new file mode 100644 index 0000000000..01f0e9af78 Binary files /dev/null and b/public/images/emoji/google/medal.png differ diff --git a/public/images/emoji/google/menorah.png b/public/images/emoji/google/menorah.png new file mode 100644 index 0000000000..d618e60f65 Binary files /dev/null and b/public/images/emoji/google/menorah.png differ diff --git a/public/images/emoji/google/metal.png b/public/images/emoji/google/metal.png new file mode 100644 index 0000000000..fe5ca6ecb4 Binary files /dev/null and b/public/images/emoji/google/metal.png differ diff --git a/public/images/emoji/google/microphone2.png b/public/images/emoji/google/microphone2.png new file mode 100644 index 0000000000..4a772830df Binary files /dev/null and b/public/images/emoji/google/microphone2.png differ diff --git a/public/images/emoji/google/middle_finger.png b/public/images/emoji/google/middle_finger.png new file mode 100644 index 0000000000..7bab9e62d0 Binary files /dev/null and b/public/images/emoji/google/middle_finger.png differ diff --git a/public/images/emoji/google/military_medal.png b/public/images/emoji/google/military_medal.png new file mode 100644 index 0000000000..905a838924 Binary files /dev/null and b/public/images/emoji/google/military_medal.png differ diff --git a/public/images/emoji/google/money_mouth.png b/public/images/emoji/google/money_mouth.png new file mode 100644 index 0000000000..231c21c161 Binary files /dev/null and b/public/images/emoji/google/money_mouth.png differ diff --git a/public/images/emoji/google/mosque.png b/public/images/emoji/google/mosque.png new file mode 100644 index 0000000000..0aee1ca20d Binary files /dev/null and b/public/images/emoji/google/mosque.png differ diff --git a/public/images/emoji/google/motorboat.png b/public/images/emoji/google/motorboat.png new file mode 100644 index 0000000000..a735312ec6 Binary files /dev/null and b/public/images/emoji/google/motorboat.png differ diff --git a/public/images/emoji/google/motorcycle.png b/public/images/emoji/google/motorcycle.png new file mode 100644 index 0000000000..26da5995fe Binary files /dev/null and b/public/images/emoji/google/motorcycle.png differ diff --git a/public/images/emoji/google/motorway.png b/public/images/emoji/google/motorway.png new file mode 100644 index 0000000000..3fbb18ea25 Binary files /dev/null and b/public/images/emoji/google/motorway.png differ diff --git a/public/images/emoji/google/mountain.png b/public/images/emoji/google/mountain.png new file mode 100644 index 0000000000..869d358f1f Binary files /dev/null and b/public/images/emoji/google/mountain.png differ diff --git a/public/images/emoji/google/mountain_snow.png b/public/images/emoji/google/mountain_snow.png new file mode 100644 index 0000000000..e5c77bfc5e Binary files /dev/null and b/public/images/emoji/google/mountain_snow.png differ diff --git a/public/images/emoji/google/mouse_three_button.png b/public/images/emoji/google/mouse_three_button.png new file mode 100644 index 0000000000..6ac3b8f8c9 Binary files /dev/null and b/public/images/emoji/google/mouse_three_button.png differ diff --git a/public/images/emoji/google/nerd.png b/public/images/emoji/google/nerd.png new file mode 100644 index 0000000000..29712d83c9 Binary files /dev/null and b/public/images/emoji/google/nerd.png differ diff --git a/public/images/emoji/google/newspaper2.png b/public/images/emoji/google/newspaper2.png new file mode 100644 index 0000000000..d8abf1de67 Binary files /dev/null and b/public/images/emoji/google/newspaper2.png differ diff --git a/public/images/emoji/google/notepad_spiral.png b/public/images/emoji/google/notepad_spiral.png new file mode 100644 index 0000000000..160c8c2e28 Binary files /dev/null and b/public/images/emoji/google/notepad_spiral.png differ diff --git a/public/images/emoji/google/oil.png b/public/images/emoji/google/oil.png new file mode 100644 index 0000000000..c7214f9013 Binary files /dev/null and b/public/images/emoji/google/oil.png differ diff --git a/public/images/emoji/google/om_symbol.png b/public/images/emoji/google/om_symbol.png new file mode 100644 index 0000000000..df39c8dec0 Binary files /dev/null and b/public/images/emoji/google/om_symbol.png differ diff --git a/public/images/emoji/google/orthodox_cross.png b/public/images/emoji/google/orthodox_cross.png new file mode 100644 index 0000000000..5355c810f2 Binary files /dev/null and b/public/images/emoji/google/orthodox_cross.png differ diff --git a/public/images/emoji/google/paintbrush.png b/public/images/emoji/google/paintbrush.png new file mode 100644 index 0000000000..e41a4f6b5d Binary files /dev/null and b/public/images/emoji/google/paintbrush.png differ diff --git a/public/images/emoji/google/paperclips.png b/public/images/emoji/google/paperclips.png new file mode 100644 index 0000000000..d9d9c5c8a4 Binary files /dev/null and b/public/images/emoji/google/paperclips.png differ diff --git a/public/images/emoji/google/park.png b/public/images/emoji/google/park.png new file mode 100644 index 0000000000..468fd0fb89 Binary files /dev/null and b/public/images/emoji/google/park.png differ diff --git a/public/images/emoji/google/pause_button.png b/public/images/emoji/google/pause_button.png new file mode 100644 index 0000000000..31f4ff5284 Binary files /dev/null and b/public/images/emoji/google/pause_button.png differ diff --git a/public/images/emoji/google/peace.png b/public/images/emoji/google/peace.png new file mode 100644 index 0000000000..d1f1f7a3bf Binary files /dev/null and b/public/images/emoji/google/peace.png differ diff --git a/public/images/emoji/google/pen_ballpoint.png b/public/images/emoji/google/pen_ballpoint.png new file mode 100644 index 0000000000..a935dd5eac Binary files /dev/null and b/public/images/emoji/google/pen_ballpoint.png differ diff --git a/public/images/emoji/google/pen_fountain.png b/public/images/emoji/google/pen_fountain.png new file mode 100644 index 0000000000..10c36f30c0 Binary files /dev/null and b/public/images/emoji/google/pen_fountain.png differ diff --git a/public/images/emoji/google/pick.png b/public/images/emoji/google/pick.png new file mode 100644 index 0000000000..8fd6623bb1 Binary files /dev/null and b/public/images/emoji/google/pick.png differ diff --git a/public/images/emoji/google/ping_pong.png b/public/images/emoji/google/ping_pong.png new file mode 100644 index 0000000000..c5547d94ca Binary files /dev/null and b/public/images/emoji/google/ping_pong.png differ diff --git a/public/images/emoji/google/place_of_worship.png b/public/images/emoji/google/place_of_worship.png new file mode 100644 index 0000000000..dc4b77ccc0 Binary files /dev/null and b/public/images/emoji/google/place_of_worship.png differ diff --git a/public/images/emoji/google/play_pause.png b/public/images/emoji/google/play_pause.png new file mode 100644 index 0000000000..ad2c3639ac Binary files /dev/null and b/public/images/emoji/google/play_pause.png differ diff --git a/public/images/emoji/google/popcorn.png b/public/images/emoji/google/popcorn.png new file mode 100644 index 0000000000..f71c7d08f2 Binary files /dev/null and b/public/images/emoji/google/popcorn.png differ diff --git a/public/images/emoji/google/prayer_beads.png b/public/images/emoji/google/prayer_beads.png new file mode 100644 index 0000000000..8121c40e8d Binary files /dev/null and b/public/images/emoji/google/prayer_beads.png differ diff --git a/public/images/emoji/google/printer.png b/public/images/emoji/google/printer.png new file mode 100644 index 0000000000..1bf9570bba Binary files /dev/null and b/public/images/emoji/google/printer.png differ diff --git a/public/images/emoji/google/projector.png b/public/images/emoji/google/projector.png new file mode 100644 index 0000000000..cd06f11a21 Binary files /dev/null and b/public/images/emoji/google/projector.png differ diff --git a/public/images/emoji/google/race_car.png b/public/images/emoji/google/race_car.png new file mode 100644 index 0000000000..a751071429 Binary files /dev/null and b/public/images/emoji/google/race_car.png differ diff --git a/public/images/emoji/google/radioactive.png b/public/images/emoji/google/radioactive.png new file mode 100644 index 0000000000..01e580ddf4 Binary files /dev/null and b/public/images/emoji/google/radioactive.png differ diff --git a/public/images/emoji/google/railway_track.png b/public/images/emoji/google/railway_track.png new file mode 100644 index 0000000000..ceac451e0f Binary files /dev/null and b/public/images/emoji/google/railway_track.png differ diff --git a/public/images/emoji/google/record_button.png b/public/images/emoji/google/record_button.png new file mode 100644 index 0000000000..c532d18d8d Binary files /dev/null and b/public/images/emoji/google/record_button.png differ diff --git a/public/images/emoji/google/reminder_ribbon.png b/public/images/emoji/google/reminder_ribbon.png new file mode 100644 index 0000000000..95930a1858 Binary files /dev/null and b/public/images/emoji/google/reminder_ribbon.png differ diff --git a/public/images/emoji/google/robot.png b/public/images/emoji/google/robot.png new file mode 100644 index 0000000000..e3f6762523 Binary files /dev/null and b/public/images/emoji/google/robot.png differ diff --git a/public/images/emoji/google/rolling_eyes.png b/public/images/emoji/google/rolling_eyes.png new file mode 100644 index 0000000000..a6660d55aa Binary files /dev/null and b/public/images/emoji/google/rolling_eyes.png differ diff --git a/public/images/emoji/google/rosette.png b/public/images/emoji/google/rosette.png new file mode 100644 index 0000000000..dc5b0ff48c Binary files /dev/null and b/public/images/emoji/google/rosette.png differ diff --git a/public/images/emoji/google/satellite_orbital.png b/public/images/emoji/google/satellite_orbital.png new file mode 100644 index 0000000000..a788d48b52 Binary files /dev/null and b/public/images/emoji/google/satellite_orbital.png differ diff --git a/public/images/emoji/google/scales.png b/public/images/emoji/google/scales.png new file mode 100644 index 0000000000..dea79c4121 Binary files /dev/null and b/public/images/emoji/google/scales.png differ diff --git a/public/images/emoji/google/scorpion.png b/public/images/emoji/google/scorpion.png new file mode 100644 index 0000000000..d8ac29bdf9 Binary files /dev/null and b/public/images/emoji/google/scorpion.png differ diff --git a/public/images/emoji/google/shamrock.png b/public/images/emoji/google/shamrock.png new file mode 100644 index 0000000000..e5c458477e Binary files /dev/null and b/public/images/emoji/google/shamrock.png differ diff --git a/public/images/emoji/google/shield.png b/public/images/emoji/google/shield.png new file mode 100644 index 0000000000..8a69eef136 Binary files /dev/null and b/public/images/emoji/google/shield.png differ diff --git a/public/images/emoji/google/shinto_shrine.png b/public/images/emoji/google/shinto_shrine.png new file mode 100644 index 0000000000..bd55e6fb8a Binary files /dev/null and b/public/images/emoji/google/shinto_shrine.png differ diff --git a/public/images/emoji/google/shopping_bags.png b/public/images/emoji/google/shopping_bags.png new file mode 100644 index 0000000000..cff8a39cbd Binary files /dev/null and b/public/images/emoji/google/shopping_bags.png differ diff --git a/public/images/emoji/google/skier.png b/public/images/emoji/google/skier.png new file mode 100644 index 0000000000..9407ff3497 Binary files /dev/null and b/public/images/emoji/google/skier.png differ diff --git a/public/images/emoji/google/skull_crossbones.png b/public/images/emoji/google/skull_crossbones.png new file mode 100644 index 0000000000..f3f0d910d8 Binary files /dev/null and b/public/images/emoji/google/skull_crossbones.png differ diff --git a/public/images/emoji/google/sleeping_accommodation.png b/public/images/emoji/google/sleeping_accommodation.png new file mode 100644 index 0000000000..c6344e1f87 Binary files /dev/null and b/public/images/emoji/google/sleeping_accommodation.png differ diff --git a/public/images/emoji/google/slight_frown.png b/public/images/emoji/google/slight_frown.png new file mode 100644 index 0000000000..56816d4954 Binary files /dev/null and b/public/images/emoji/google/slight_frown.png differ diff --git a/public/images/emoji/google/slight_smile.png b/public/images/emoji/google/slight_smile.png new file mode 100644 index 0000000000..7fbc5699e5 Binary files /dev/null and b/public/images/emoji/google/slight_smile.png differ diff --git a/public/images/emoji/google/snowman2.png b/public/images/emoji/google/snowman2.png new file mode 100644 index 0000000000..5e1b3c3287 Binary files /dev/null and b/public/images/emoji/google/snowman2.png differ diff --git a/public/images/emoji/google/speaking_head.png b/public/images/emoji/google/speaking_head.png new file mode 100644 index 0000000000..3df8c91a9b Binary files /dev/null and b/public/images/emoji/google/speaking_head.png differ diff --git a/public/images/emoji/google/spider.png b/public/images/emoji/google/spider.png new file mode 100644 index 0000000000..6441b957f1 Binary files /dev/null and b/public/images/emoji/google/spider.png differ diff --git a/public/images/emoji/google/spider_web.png b/public/images/emoji/google/spider_web.png new file mode 100644 index 0000000000..89dff1e576 Binary files /dev/null and b/public/images/emoji/google/spider_web.png differ diff --git a/public/images/emoji/google/spy.png b/public/images/emoji/google/spy.png new file mode 100644 index 0000000000..fc5d8db4a8 Binary files /dev/null and b/public/images/emoji/google/spy.png differ diff --git a/public/images/emoji/google/stadium.png b/public/images/emoji/google/stadium.png new file mode 100644 index 0000000000..55151d4b41 Binary files /dev/null and b/public/images/emoji/google/stadium.png differ diff --git a/public/images/emoji/google/star_and_crescent.png b/public/images/emoji/google/star_and_crescent.png new file mode 100644 index 0000000000..d653df867f Binary files /dev/null and b/public/images/emoji/google/star_and_crescent.png differ diff --git a/public/images/emoji/google/star_of_david.png b/public/images/emoji/google/star_of_david.png new file mode 100644 index 0000000000..7109e573ed Binary files /dev/null and b/public/images/emoji/google/star_of_david.png differ diff --git a/public/images/emoji/google/stop_button.png b/public/images/emoji/google/stop_button.png new file mode 100644 index 0000000000..cd00a6dd93 Binary files /dev/null and b/public/images/emoji/google/stop_button.png differ diff --git a/public/images/emoji/google/stopwatch.png b/public/images/emoji/google/stopwatch.png new file mode 100644 index 0000000000..10e6d92019 Binary files /dev/null and b/public/images/emoji/google/stopwatch.png differ diff --git a/public/images/emoji/google/synagogue.png b/public/images/emoji/google/synagogue.png new file mode 100644 index 0000000000..9ab7aac973 Binary files /dev/null and b/public/images/emoji/google/synagogue.png differ diff --git a/public/images/emoji/google/taco.png b/public/images/emoji/google/taco.png new file mode 100644 index 0000000000..880e316f83 Binary files /dev/null and b/public/images/emoji/google/taco.png differ diff --git a/public/images/emoji/google/ten.png b/public/images/emoji/google/ten.png new file mode 100644 index 0000000000..43c3ab79a3 Binary files /dev/null and b/public/images/emoji/google/ten.png differ diff --git a/public/images/emoji/google/thermometer.png b/public/images/emoji/google/thermometer.png new file mode 100644 index 0000000000..f5fd7cb0b6 Binary files /dev/null and b/public/images/emoji/google/thermometer.png differ diff --git a/public/images/emoji/google/thermometer_face.png b/public/images/emoji/google/thermometer_face.png new file mode 100644 index 0000000000..c83df33be8 Binary files /dev/null and b/public/images/emoji/google/thermometer_face.png differ diff --git a/public/images/emoji/google/thinking.png b/public/images/emoji/google/thinking.png new file mode 100644 index 0000000000..ffdaf974ae Binary files /dev/null and b/public/images/emoji/google/thinking.png differ diff --git a/public/images/emoji/google/thunder_cloud_rain.png b/public/images/emoji/google/thunder_cloud_rain.png new file mode 100644 index 0000000000..4bf859a12d Binary files /dev/null and b/public/images/emoji/google/thunder_cloud_rain.png differ diff --git a/public/images/emoji/google/tickets.png b/public/images/emoji/google/tickets.png new file mode 100644 index 0000000000..c61d207c75 Binary files /dev/null and b/public/images/emoji/google/tickets.png differ diff --git a/public/images/emoji/google/timer.png b/public/images/emoji/google/timer.png new file mode 100644 index 0000000000..e504759aca Binary files /dev/null and b/public/images/emoji/google/timer.png differ diff --git a/public/images/emoji/google/tools.png b/public/images/emoji/google/tools.png new file mode 100644 index 0000000000..81401c5680 Binary files /dev/null and b/public/images/emoji/google/tools.png differ diff --git a/public/images/emoji/google/track_next.png b/public/images/emoji/google/track_next.png new file mode 100644 index 0000000000..904f3b32f4 Binary files /dev/null and b/public/images/emoji/google/track_next.png differ diff --git a/public/images/emoji/google/track_previous.png b/public/images/emoji/google/track_previous.png new file mode 100644 index 0000000000..4b2d3c48a0 Binary files /dev/null and b/public/images/emoji/google/track_previous.png differ diff --git a/public/images/emoji/google/trackball.png b/public/images/emoji/google/trackball.png new file mode 100644 index 0000000000..2de9f53c98 Binary files /dev/null and b/public/images/emoji/google/trackball.png differ diff --git a/public/images/emoji/google/turkey.png b/public/images/emoji/google/turkey.png new file mode 100644 index 0000000000..ecc3d40b4c Binary files /dev/null and b/public/images/emoji/google/turkey.png differ diff --git a/public/images/emoji/google/umbrella2.png b/public/images/emoji/google/umbrella2.png new file mode 100644 index 0000000000..869153d75b Binary files /dev/null and b/public/images/emoji/google/umbrella2.png differ diff --git a/public/images/emoji/google/unicorn.png b/public/images/emoji/google/unicorn.png new file mode 100644 index 0000000000..ffcb1839ee Binary files /dev/null and b/public/images/emoji/google/unicorn.png differ diff --git a/public/images/emoji/google/upside_down.png b/public/images/emoji/google/upside_down.png new file mode 100644 index 0000000000..b0bc852137 Binary files /dev/null and b/public/images/emoji/google/upside_down.png differ diff --git a/public/images/emoji/google/urn.png b/public/images/emoji/google/urn.png new file mode 100644 index 0000000000..edc661551b Binary files /dev/null and b/public/images/emoji/google/urn.png differ diff --git a/public/images/emoji/google/volleyball.png b/public/images/emoji/google/volleyball.png new file mode 100644 index 0000000000..77d998d3e9 Binary files /dev/null and b/public/images/emoji/google/volleyball.png differ diff --git a/public/images/emoji/google/vulcan.png b/public/images/emoji/google/vulcan.png new file mode 100644 index 0000000000..20cb6f2786 Binary files /dev/null and b/public/images/emoji/google/vulcan.png differ diff --git a/public/images/emoji/google/wastebasket.png b/public/images/emoji/google/wastebasket.png new file mode 100644 index 0000000000..7064341987 Binary files /dev/null and b/public/images/emoji/google/wastebasket.png differ diff --git a/public/images/emoji/google/wheel_of_dharma.png b/public/images/emoji/google/wheel_of_dharma.png new file mode 100644 index 0000000000..c102a50a51 Binary files /dev/null and b/public/images/emoji/google/wheel_of_dharma.png differ diff --git a/public/images/emoji/google/white_sun_cloud.png b/public/images/emoji/google/white_sun_cloud.png new file mode 100644 index 0000000000..4ae2fd114a Binary files /dev/null and b/public/images/emoji/google/white_sun_cloud.png differ diff --git a/public/images/emoji/google/white_sun_rain_cloud.png b/public/images/emoji/google/white_sun_rain_cloud.png new file mode 100644 index 0000000000..78535070d6 Binary files /dev/null and b/public/images/emoji/google/white_sun_rain_cloud.png differ diff --git a/public/images/emoji/google/white_sun_small_cloud.png b/public/images/emoji/google/white_sun_small_cloud.png new file mode 100644 index 0000000000..1e2117f247 Binary files /dev/null and b/public/images/emoji/google/white_sun_small_cloud.png differ diff --git a/public/images/emoji/google/wind_blowing_face.png b/public/images/emoji/google/wind_blowing_face.png new file mode 100644 index 0000000000..3db7093280 Binary files /dev/null and b/public/images/emoji/google/wind_blowing_face.png differ diff --git a/public/images/emoji/google/writing_hand.png b/public/images/emoji/google/writing_hand.png new file mode 100644 index 0000000000..b178941f4c Binary files /dev/null and b/public/images/emoji/google/writing_hand.png differ diff --git a/public/images/emoji/google/yin_yang.png b/public/images/emoji/google/yin_yang.png new file mode 100644 index 0000000000..1e682f0582 Binary files /dev/null and b/public/images/emoji/google/yin_yang.png differ diff --git a/public/images/emoji/google/zipper_mouth.png b/public/images/emoji/google/zipper_mouth.png new file mode 100644 index 0000000000..de15534fb7 Binary files /dev/null and b/public/images/emoji/google/zipper_mouth.png differ diff --git a/public/images/emoji/twitter/airplane_arriving.png b/public/images/emoji/twitter/airplane_arriving.png new file mode 100644 index 0000000000..a75656592f Binary files /dev/null and b/public/images/emoji/twitter/airplane_arriving.png differ diff --git a/public/images/emoji/twitter/airplane_departure.png b/public/images/emoji/twitter/airplane_departure.png new file mode 100644 index 0000000000..dc86670a86 Binary files /dev/null and b/public/images/emoji/twitter/airplane_departure.png differ diff --git a/public/images/emoji/twitter/airplane_small.png b/public/images/emoji/twitter/airplane_small.png new file mode 100644 index 0000000000..6a67b428f9 Binary files /dev/null and b/public/images/emoji/twitter/airplane_small.png differ diff --git a/public/images/emoji/twitter/alembic.png b/public/images/emoji/twitter/alembic.png new file mode 100644 index 0000000000..f450e6da1f Binary files /dev/null and b/public/images/emoji/twitter/alembic.png differ diff --git a/public/images/emoji/twitter/amphora.png b/public/images/emoji/twitter/amphora.png new file mode 100644 index 0000000000..550f047067 Binary files /dev/null and b/public/images/emoji/twitter/amphora.png differ diff --git a/public/images/emoji/twitter/anger_right.png b/public/images/emoji/twitter/anger_right.png new file mode 100644 index 0000000000..d6e6ffd819 Binary files /dev/null and b/public/images/emoji/twitter/anger_right.png differ diff --git a/public/images/emoji/twitter/atom.png b/public/images/emoji/twitter/atom.png new file mode 100644 index 0000000000..e1203eec7d Binary files /dev/null and b/public/images/emoji/twitter/atom.png differ diff --git a/public/images/emoji/twitter/badminton.png b/public/images/emoji/twitter/badminton.png new file mode 100644 index 0000000000..86cf6f1465 Binary files /dev/null and b/public/images/emoji/twitter/badminton.png differ diff --git a/public/images/emoji/twitter/ballot_box.png b/public/images/emoji/twitter/ballot_box.png new file mode 100644 index 0000000000..583ec9c01d Binary files /dev/null and b/public/images/emoji/twitter/ballot_box.png differ diff --git a/public/images/emoji/twitter/basketball_player.png b/public/images/emoji/twitter/basketball_player.png new file mode 100644 index 0000000000..8b98c38994 Binary files /dev/null and b/public/images/emoji/twitter/basketball_player.png differ diff --git a/public/images/emoji/twitter/beach.png b/public/images/emoji/twitter/beach.png new file mode 100644 index 0000000000..16509a7e8d Binary files /dev/null and b/public/images/emoji/twitter/beach.png differ diff --git a/public/images/emoji/twitter/beach_umbrella.png b/public/images/emoji/twitter/beach_umbrella.png new file mode 100644 index 0000000000..2bb23697b7 Binary files /dev/null and b/public/images/emoji/twitter/beach_umbrella.png differ diff --git a/public/images/emoji/twitter/bed.png b/public/images/emoji/twitter/bed.png new file mode 100644 index 0000000000..4680571709 Binary files /dev/null and b/public/images/emoji/twitter/bed.png differ diff --git a/public/images/emoji/twitter/bellhop.png b/public/images/emoji/twitter/bellhop.png new file mode 100644 index 0000000000..07c6badfda Binary files /dev/null and b/public/images/emoji/twitter/bellhop.png differ diff --git a/public/images/emoji/twitter/biohazard.png b/public/images/emoji/twitter/biohazard.png new file mode 100644 index 0000000000..1ef96832a0 Binary files /dev/null and b/public/images/emoji/twitter/biohazard.png differ diff --git a/public/images/emoji/twitter/bow_and_arrow.png b/public/images/emoji/twitter/bow_and_arrow.png new file mode 100644 index 0000000000..f50a1389fe Binary files /dev/null and b/public/images/emoji/twitter/bow_and_arrow.png differ diff --git a/public/images/emoji/twitter/burrito.png b/public/images/emoji/twitter/burrito.png new file mode 100644 index 0000000000..74894241cc Binary files /dev/null and b/public/images/emoji/twitter/burrito.png differ diff --git a/public/images/emoji/twitter/calendar_spiral.png b/public/images/emoji/twitter/calendar_spiral.png new file mode 100644 index 0000000000..e2edcfeeb3 Binary files /dev/null and b/public/images/emoji/twitter/calendar_spiral.png differ diff --git a/public/images/emoji/twitter/camera_with_flash.png b/public/images/emoji/twitter/camera_with_flash.png new file mode 100644 index 0000000000..ddb3b744bf Binary files /dev/null and b/public/images/emoji/twitter/camera_with_flash.png differ diff --git a/public/images/emoji/twitter/camping.png b/public/images/emoji/twitter/camping.png new file mode 100644 index 0000000000..1bcf75dfd4 Binary files /dev/null and b/public/images/emoji/twitter/camping.png differ diff --git a/public/images/emoji/twitter/candle.png b/public/images/emoji/twitter/candle.png new file mode 100644 index 0000000000..57a63deca6 Binary files /dev/null and b/public/images/emoji/twitter/candle.png differ diff --git a/public/images/emoji/twitter/card_box.png b/public/images/emoji/twitter/card_box.png new file mode 100644 index 0000000000..9a032fff61 Binary files /dev/null and b/public/images/emoji/twitter/card_box.png differ diff --git a/public/images/emoji/twitter/chains.png b/public/images/emoji/twitter/chains.png new file mode 100644 index 0000000000..15b22f2e75 Binary files /dev/null and b/public/images/emoji/twitter/chains.png differ diff --git a/public/images/emoji/twitter/champagne.png b/public/images/emoji/twitter/champagne.png new file mode 100644 index 0000000000..f27c9ea1e2 Binary files /dev/null and b/public/images/emoji/twitter/champagne.png differ diff --git a/public/images/emoji/twitter/cheese.png b/public/images/emoji/twitter/cheese.png new file mode 100644 index 0000000000..8566b2e59b Binary files /dev/null and b/public/images/emoji/twitter/cheese.png differ diff --git a/public/images/emoji/twitter/chipmunk.png b/public/images/emoji/twitter/chipmunk.png new file mode 100644 index 0000000000..e46b2790d6 Binary files /dev/null and b/public/images/emoji/twitter/chipmunk.png differ diff --git a/public/images/emoji/twitter/city_dusk.png b/public/images/emoji/twitter/city_dusk.png new file mode 100644 index 0000000000..2fd9ace38c Binary files /dev/null and b/public/images/emoji/twitter/city_dusk.png differ diff --git a/public/images/emoji/twitter/cityscape.png b/public/images/emoji/twitter/cityscape.png new file mode 100644 index 0000000000..74a0df8a9a Binary files /dev/null and b/public/images/emoji/twitter/cityscape.png differ diff --git a/public/images/emoji/twitter/classical_building.png b/public/images/emoji/twitter/classical_building.png new file mode 100644 index 0000000000..4e9508d696 Binary files /dev/null and b/public/images/emoji/twitter/classical_building.png differ diff --git a/public/images/emoji/twitter/clock.png b/public/images/emoji/twitter/clock.png new file mode 100644 index 0000000000..028f514b37 Binary files /dev/null and b/public/images/emoji/twitter/clock.png differ diff --git a/public/images/emoji/twitter/cloud_lightning.png b/public/images/emoji/twitter/cloud_lightning.png new file mode 100644 index 0000000000..032be57a73 Binary files /dev/null and b/public/images/emoji/twitter/cloud_lightning.png differ diff --git a/public/images/emoji/twitter/cloud_rain.png b/public/images/emoji/twitter/cloud_rain.png new file mode 100644 index 0000000000..d7f1c98964 Binary files /dev/null and b/public/images/emoji/twitter/cloud_rain.png differ diff --git a/public/images/emoji/twitter/cloud_snow.png b/public/images/emoji/twitter/cloud_snow.png new file mode 100644 index 0000000000..e7c797ba25 Binary files /dev/null and b/public/images/emoji/twitter/cloud_snow.png differ diff --git a/public/images/emoji/twitter/cloud_tornado.png b/public/images/emoji/twitter/cloud_tornado.png new file mode 100644 index 0000000000..720f7faec9 Binary files /dev/null and b/public/images/emoji/twitter/cloud_tornado.png differ diff --git a/public/images/emoji/twitter/coffin.png b/public/images/emoji/twitter/coffin.png new file mode 100644 index 0000000000..c61f4912f4 Binary files /dev/null and b/public/images/emoji/twitter/coffin.png differ diff --git a/public/images/emoji/twitter/comet.png b/public/images/emoji/twitter/comet.png new file mode 100644 index 0000000000..4ddea9ad81 Binary files /dev/null and b/public/images/emoji/twitter/comet.png differ diff --git a/public/images/emoji/twitter/compression.png b/public/images/emoji/twitter/compression.png new file mode 100644 index 0000000000..b22237fb7f Binary files /dev/null and b/public/images/emoji/twitter/compression.png differ diff --git a/public/images/emoji/twitter/construction_site.png b/public/images/emoji/twitter/construction_site.png new file mode 100644 index 0000000000..082a743265 Binary files /dev/null and b/public/images/emoji/twitter/construction_site.png differ diff --git a/public/images/emoji/twitter/control_knobs.png b/public/images/emoji/twitter/control_knobs.png new file mode 100644 index 0000000000..336be91878 Binary files /dev/null and b/public/images/emoji/twitter/control_knobs.png differ diff --git a/public/images/emoji/twitter/couch.png b/public/images/emoji/twitter/couch.png new file mode 100644 index 0000000000..56a8bfa9ed Binary files /dev/null and b/public/images/emoji/twitter/couch.png differ diff --git a/public/images/emoji/twitter/crab.png b/public/images/emoji/twitter/crab.png new file mode 100644 index 0000000000..021356a53d Binary files /dev/null and b/public/images/emoji/twitter/crab.png differ diff --git a/public/images/emoji/twitter/crayon.png b/public/images/emoji/twitter/crayon.png new file mode 100644 index 0000000000..d309e3ba3a Binary files /dev/null and b/public/images/emoji/twitter/crayon.png differ diff --git a/public/images/emoji/twitter/cricket.png b/public/images/emoji/twitter/cricket.png new file mode 100644 index 0000000000..128d9efa82 Binary files /dev/null and b/public/images/emoji/twitter/cricket.png differ diff --git a/public/images/emoji/twitter/cross.png b/public/images/emoji/twitter/cross.png new file mode 100644 index 0000000000..53f8e5cd4b Binary files /dev/null and b/public/images/emoji/twitter/cross.png differ diff --git a/public/images/emoji/twitter/crossed_swords.png b/public/images/emoji/twitter/crossed_swords.png new file mode 100644 index 0000000000..ec1da04367 Binary files /dev/null and b/public/images/emoji/twitter/crossed_swords.png differ diff --git a/public/images/emoji/twitter/cruise_ship.png b/public/images/emoji/twitter/cruise_ship.png new file mode 100644 index 0000000000..99ea24ed75 Binary files /dev/null and b/public/images/emoji/twitter/cruise_ship.png differ diff --git a/public/images/emoji/twitter/dagger.png b/public/images/emoji/twitter/dagger.png new file mode 100644 index 0000000000..85607ff4c0 Binary files /dev/null and b/public/images/emoji/twitter/dagger.png differ diff --git a/public/images/emoji/twitter/dark_sunglasses.png b/public/images/emoji/twitter/dark_sunglasses.png new file mode 100644 index 0000000000..5e20bb49f5 Binary files /dev/null and b/public/images/emoji/twitter/dark_sunglasses.png differ diff --git a/public/images/emoji/twitter/desert.png b/public/images/emoji/twitter/desert.png new file mode 100644 index 0000000000..3ec8a867b4 Binary files /dev/null and b/public/images/emoji/twitter/desert.png differ diff --git a/public/images/emoji/twitter/desktop.png b/public/images/emoji/twitter/desktop.png new file mode 100644 index 0000000000..ba57371eba Binary files /dev/null and b/public/images/emoji/twitter/desktop.png differ diff --git a/public/images/emoji/twitter/dividers.png b/public/images/emoji/twitter/dividers.png new file mode 100644 index 0000000000..fe01846bb5 Binary files /dev/null and b/public/images/emoji/twitter/dividers.png differ diff --git a/public/images/emoji/twitter/dove.png b/public/images/emoji/twitter/dove.png new file mode 100644 index 0000000000..c303dda429 Binary files /dev/null and b/public/images/emoji/twitter/dove.png differ diff --git a/public/images/emoji/twitter/eye.png b/public/images/emoji/twitter/eye.png new file mode 100644 index 0000000000..182e105230 Binary files /dev/null and b/public/images/emoji/twitter/eye.png differ diff --git a/public/images/emoji/twitter/ferry.png b/public/images/emoji/twitter/ferry.png new file mode 100644 index 0000000000..26633aad4d Binary files /dev/null and b/public/images/emoji/twitter/ferry.png differ diff --git a/public/images/emoji/twitter/field_hockey.png b/public/images/emoji/twitter/field_hockey.png new file mode 100644 index 0000000000..1021200777 Binary files /dev/null and b/public/images/emoji/twitter/field_hockey.png differ diff --git a/public/images/emoji/twitter/file_cabinet.png b/public/images/emoji/twitter/file_cabinet.png new file mode 100644 index 0000000000..73162f3305 Binary files /dev/null and b/public/images/emoji/twitter/file_cabinet.png differ diff --git a/public/images/emoji/twitter/film_frames.png b/public/images/emoji/twitter/film_frames.png new file mode 100644 index 0000000000..f0fcd6fc1d Binary files /dev/null and b/public/images/emoji/twitter/film_frames.png differ diff --git a/public/images/emoji/twitter/flag_black.png b/public/images/emoji/twitter/flag_black.png new file mode 100644 index 0000000000..c8d8e24c3a Binary files /dev/null and b/public/images/emoji/twitter/flag_black.png differ diff --git a/public/images/emoji/twitter/flag_cn.png b/public/images/emoji/twitter/flag_cn.png new file mode 100644 index 0000000000..3c8867958c Binary files /dev/null and b/public/images/emoji/twitter/flag_cn.png differ diff --git a/public/images/emoji/twitter/flag_de.png b/public/images/emoji/twitter/flag_de.png new file mode 100644 index 0000000000..8df6465dfe Binary files /dev/null and b/public/images/emoji/twitter/flag_de.png differ diff --git a/public/images/emoji/twitter/flag_es.png b/public/images/emoji/twitter/flag_es.png new file mode 100644 index 0000000000..4f5942de64 Binary files /dev/null and b/public/images/emoji/twitter/flag_es.png differ diff --git a/public/images/emoji/twitter/flag_fr.png b/public/images/emoji/twitter/flag_fr.png new file mode 100644 index 0000000000..1818a910e9 Binary files /dev/null and b/public/images/emoji/twitter/flag_fr.png differ diff --git a/public/images/emoji/twitter/flag_gb.png b/public/images/emoji/twitter/flag_gb.png new file mode 100644 index 0000000000..fa1e1d6580 Binary files /dev/null and b/public/images/emoji/twitter/flag_gb.png differ diff --git a/public/images/emoji/twitter/flag_it.png b/public/images/emoji/twitter/flag_it.png new file mode 100644 index 0000000000..556a8df4b2 Binary files /dev/null and b/public/images/emoji/twitter/flag_it.png differ diff --git a/public/images/emoji/twitter/flag_jp.png b/public/images/emoji/twitter/flag_jp.png new file mode 100644 index 0000000000..53fabdb484 Binary files /dev/null and b/public/images/emoji/twitter/flag_jp.png differ diff --git a/public/images/emoji/twitter/flag_kr.png b/public/images/emoji/twitter/flag_kr.png new file mode 100644 index 0000000000..2132a435e3 Binary files /dev/null and b/public/images/emoji/twitter/flag_kr.png differ diff --git a/public/images/emoji/twitter/flag_ru.png b/public/images/emoji/twitter/flag_ru.png new file mode 100644 index 0000000000..7988099751 Binary files /dev/null and b/public/images/emoji/twitter/flag_ru.png differ diff --git a/public/images/emoji/twitter/flag_us.png b/public/images/emoji/twitter/flag_us.png new file mode 100644 index 0000000000..d2d67ab784 Binary files /dev/null and b/public/images/emoji/twitter/flag_us.png differ diff --git a/public/images/emoji/twitter/flag_white.png b/public/images/emoji/twitter/flag_white.png new file mode 100644 index 0000000000..68543be8f2 Binary files /dev/null and b/public/images/emoji/twitter/flag_white.png differ diff --git a/public/images/emoji/twitter/fleur-de-lis.png b/public/images/emoji/twitter/fleur-de-lis.png new file mode 100644 index 0000000000..eaa91aeb3a Binary files /dev/null and b/public/images/emoji/twitter/fleur-de-lis.png differ diff --git a/public/images/emoji/twitter/fog.png b/public/images/emoji/twitter/fog.png new file mode 100644 index 0000000000..f8aee2c7b5 Binary files /dev/null and b/public/images/emoji/twitter/fog.png differ diff --git a/public/images/emoji/twitter/fork_knife_plate.png b/public/images/emoji/twitter/fork_knife_plate.png new file mode 100644 index 0000000000..693fa161c6 Binary files /dev/null and b/public/images/emoji/twitter/fork_knife_plate.png differ diff --git a/public/images/emoji/twitter/frame_photo.png b/public/images/emoji/twitter/frame_photo.png new file mode 100644 index 0000000000..c498052425 Binary files /dev/null and b/public/images/emoji/twitter/frame_photo.png differ diff --git a/public/images/emoji/twitter/frowning2.png b/public/images/emoji/twitter/frowning2.png new file mode 100644 index 0000000000..0b8335cd57 Binary files /dev/null and b/public/images/emoji/twitter/frowning2.png differ diff --git a/public/images/emoji/twitter/gear.png b/public/images/emoji/twitter/gear.png new file mode 100644 index 0000000000..b85014eca3 Binary files /dev/null and b/public/images/emoji/twitter/gear.png differ diff --git a/public/images/emoji/twitter/golfer.png b/public/images/emoji/twitter/golfer.png new file mode 100644 index 0000000000..e13b10d9e6 Binary files /dev/null and b/public/images/emoji/twitter/golfer.png differ diff --git a/public/images/emoji/twitter/hammer_pick.png b/public/images/emoji/twitter/hammer_pick.png new file mode 100644 index 0000000000..3243f0a422 Binary files /dev/null and b/public/images/emoji/twitter/hammer_pick.png differ diff --git a/public/images/emoji/twitter/hand_splayed.png b/public/images/emoji/twitter/hand_splayed.png new file mode 100644 index 0000000000..cf2dcda2dc Binary files /dev/null and b/public/images/emoji/twitter/hand_splayed.png differ diff --git a/public/images/emoji/twitter/head_bandage.png b/public/images/emoji/twitter/head_bandage.png new file mode 100644 index 0000000000..3be8843a96 Binary files /dev/null and b/public/images/emoji/twitter/head_bandage.png differ diff --git a/public/images/emoji/twitter/heart_exclamation.png b/public/images/emoji/twitter/heart_exclamation.png new file mode 100644 index 0000000000..adcc6238e0 Binary files /dev/null and b/public/images/emoji/twitter/heart_exclamation.png differ diff --git a/public/images/emoji/twitter/helmet_with_cross.png b/public/images/emoji/twitter/helmet_with_cross.png new file mode 100644 index 0000000000..5d8a20a6b1 Binary files /dev/null and b/public/images/emoji/twitter/helmet_with_cross.png differ diff --git a/public/images/emoji/twitter/hockey.png b/public/images/emoji/twitter/hockey.png new file mode 100644 index 0000000000..0959352b88 Binary files /dev/null and b/public/images/emoji/twitter/hockey.png differ diff --git a/public/images/emoji/twitter/hole.png b/public/images/emoji/twitter/hole.png new file mode 100644 index 0000000000..0f35340287 Binary files /dev/null and b/public/images/emoji/twitter/hole.png differ diff --git a/public/images/emoji/twitter/homes.png b/public/images/emoji/twitter/homes.png new file mode 100644 index 0000000000..42fdacd954 Binary files /dev/null and b/public/images/emoji/twitter/homes.png differ diff --git a/public/images/emoji/twitter/hot_pepper.png b/public/images/emoji/twitter/hot_pepper.png new file mode 100644 index 0000000000..c0f7d3a8f0 Binary files /dev/null and b/public/images/emoji/twitter/hot_pepper.png differ diff --git a/public/images/emoji/twitter/hotdog.png b/public/images/emoji/twitter/hotdog.png new file mode 100644 index 0000000000..9d5050a3c9 Binary files /dev/null and b/public/images/emoji/twitter/hotdog.png differ diff --git a/public/images/emoji/twitter/house_abandoned.png b/public/images/emoji/twitter/house_abandoned.png new file mode 100644 index 0000000000..4ca92ee5ca Binary files /dev/null and b/public/images/emoji/twitter/house_abandoned.png differ diff --git a/public/images/emoji/twitter/hugging.png b/public/images/emoji/twitter/hugging.png new file mode 100644 index 0000000000..aa07844841 Binary files /dev/null and b/public/images/emoji/twitter/hugging.png differ diff --git a/public/images/emoji/twitter/ice_skate.png b/public/images/emoji/twitter/ice_skate.png new file mode 100644 index 0000000000..373137fb1d Binary files /dev/null and b/public/images/emoji/twitter/ice_skate.png differ diff --git a/public/images/emoji/twitter/island.png b/public/images/emoji/twitter/island.png new file mode 100644 index 0000000000..8be357d21f Binary files /dev/null and b/public/images/emoji/twitter/island.png differ diff --git a/public/images/emoji/twitter/joystick.png b/public/images/emoji/twitter/joystick.png new file mode 100644 index 0000000000..2cb7d212e2 Binary files /dev/null and b/public/images/emoji/twitter/joystick.png differ diff --git a/public/images/emoji/twitter/kaaba.png b/public/images/emoji/twitter/kaaba.png new file mode 100644 index 0000000000..1f4914e706 Binary files /dev/null and b/public/images/emoji/twitter/kaaba.png differ diff --git a/public/images/emoji/twitter/key2.png b/public/images/emoji/twitter/key2.png new file mode 100644 index 0000000000..bb0baeeb6d Binary files /dev/null and b/public/images/emoji/twitter/key2.png differ diff --git a/public/images/emoji/twitter/keyboard.png b/public/images/emoji/twitter/keyboard.png new file mode 100644 index 0000000000..35faa872ef Binary files /dev/null and b/public/images/emoji/twitter/keyboard.png differ diff --git a/public/images/emoji/twitter/label.png b/public/images/emoji/twitter/label.png new file mode 100644 index 0000000000..b455f5684d Binary files /dev/null and b/public/images/emoji/twitter/label.png differ diff --git a/public/images/emoji/twitter/level_slider.png b/public/images/emoji/twitter/level_slider.png new file mode 100644 index 0000000000..560cb59a09 Binary files /dev/null and b/public/images/emoji/twitter/level_slider.png differ diff --git a/public/images/emoji/twitter/levitate.png b/public/images/emoji/twitter/levitate.png new file mode 100644 index 0000000000..3a3c4b9894 Binary files /dev/null and b/public/images/emoji/twitter/levitate.png differ diff --git a/public/images/emoji/twitter/lifter.png b/public/images/emoji/twitter/lifter.png new file mode 100644 index 0000000000..5f43a35776 Binary files /dev/null and b/public/images/emoji/twitter/lifter.png differ diff --git a/public/images/emoji/twitter/lion_face.png b/public/images/emoji/twitter/lion_face.png new file mode 100644 index 0000000000..7e818c2c11 Binary files /dev/null and b/public/images/emoji/twitter/lion_face.png differ diff --git a/public/images/emoji/twitter/map.png b/public/images/emoji/twitter/map.png new file mode 100644 index 0000000000..c7a727c28f Binary files /dev/null and b/public/images/emoji/twitter/map.png differ diff --git a/public/images/emoji/twitter/medal.png b/public/images/emoji/twitter/medal.png new file mode 100644 index 0000000000..c56f77095f Binary files /dev/null and b/public/images/emoji/twitter/medal.png differ diff --git a/public/images/emoji/twitter/menorah.png b/public/images/emoji/twitter/menorah.png new file mode 100644 index 0000000000..f63c13ac9b Binary files /dev/null and b/public/images/emoji/twitter/menorah.png differ diff --git a/public/images/emoji/twitter/metal.png b/public/images/emoji/twitter/metal.png new file mode 100644 index 0000000000..6107226f13 Binary files /dev/null and b/public/images/emoji/twitter/metal.png differ diff --git a/public/images/emoji/twitter/microphone2.png b/public/images/emoji/twitter/microphone2.png new file mode 100644 index 0000000000..a256e3d491 Binary files /dev/null and b/public/images/emoji/twitter/microphone2.png differ diff --git a/public/images/emoji/twitter/middle_finger.png b/public/images/emoji/twitter/middle_finger.png new file mode 100644 index 0000000000..ba7dcb95d6 Binary files /dev/null and b/public/images/emoji/twitter/middle_finger.png differ diff --git a/public/images/emoji/twitter/military_medal.png b/public/images/emoji/twitter/military_medal.png new file mode 100644 index 0000000000..afa7ac77e8 Binary files /dev/null and b/public/images/emoji/twitter/military_medal.png differ diff --git a/public/images/emoji/twitter/money_mouth.png b/public/images/emoji/twitter/money_mouth.png new file mode 100644 index 0000000000..c1f7dcaa33 Binary files /dev/null and b/public/images/emoji/twitter/money_mouth.png differ diff --git a/public/images/emoji/twitter/mosque.png b/public/images/emoji/twitter/mosque.png new file mode 100644 index 0000000000..570f6971c6 Binary files /dev/null and b/public/images/emoji/twitter/mosque.png differ diff --git a/public/images/emoji/twitter/motorboat.png b/public/images/emoji/twitter/motorboat.png new file mode 100644 index 0000000000..a849f0683a Binary files /dev/null and b/public/images/emoji/twitter/motorboat.png differ diff --git a/public/images/emoji/twitter/motorcycle.png b/public/images/emoji/twitter/motorcycle.png new file mode 100644 index 0000000000..89f8265e3f Binary files /dev/null and b/public/images/emoji/twitter/motorcycle.png differ diff --git a/public/images/emoji/twitter/motorway.png b/public/images/emoji/twitter/motorway.png new file mode 100644 index 0000000000..8bc3caf951 Binary files /dev/null and b/public/images/emoji/twitter/motorway.png differ diff --git a/public/images/emoji/twitter/mountain.png b/public/images/emoji/twitter/mountain.png new file mode 100644 index 0000000000..01384a0d1e Binary files /dev/null and b/public/images/emoji/twitter/mountain.png differ diff --git a/public/images/emoji/twitter/mountain_snow.png b/public/images/emoji/twitter/mountain_snow.png new file mode 100644 index 0000000000..05f51304e9 Binary files /dev/null and b/public/images/emoji/twitter/mountain_snow.png differ diff --git a/public/images/emoji/twitter/mouse_three_button.png b/public/images/emoji/twitter/mouse_three_button.png new file mode 100644 index 0000000000..08541826f4 Binary files /dev/null and b/public/images/emoji/twitter/mouse_three_button.png differ diff --git a/public/images/emoji/twitter/nerd.png b/public/images/emoji/twitter/nerd.png new file mode 100644 index 0000000000..1d14fc303c Binary files /dev/null and b/public/images/emoji/twitter/nerd.png differ diff --git a/public/images/emoji/twitter/newspaper2.png b/public/images/emoji/twitter/newspaper2.png new file mode 100644 index 0000000000..bc184c041e Binary files /dev/null and b/public/images/emoji/twitter/newspaper2.png differ diff --git a/public/images/emoji/twitter/notepad_spiral.png b/public/images/emoji/twitter/notepad_spiral.png new file mode 100644 index 0000000000..b57a95c28a Binary files /dev/null and b/public/images/emoji/twitter/notepad_spiral.png differ diff --git a/public/images/emoji/twitter/oil.png b/public/images/emoji/twitter/oil.png new file mode 100644 index 0000000000..6aab4045d7 Binary files /dev/null and b/public/images/emoji/twitter/oil.png differ diff --git a/public/images/emoji/twitter/om_symbol.png b/public/images/emoji/twitter/om_symbol.png new file mode 100644 index 0000000000..6b59c98032 Binary files /dev/null and b/public/images/emoji/twitter/om_symbol.png differ diff --git a/public/images/emoji/twitter/orthodox_cross.png b/public/images/emoji/twitter/orthodox_cross.png new file mode 100644 index 0000000000..796b51f9d1 Binary files /dev/null and b/public/images/emoji/twitter/orthodox_cross.png differ diff --git a/public/images/emoji/twitter/paintbrush.png b/public/images/emoji/twitter/paintbrush.png new file mode 100644 index 0000000000..94b575de12 Binary files /dev/null and b/public/images/emoji/twitter/paintbrush.png differ diff --git a/public/images/emoji/twitter/paperclips.png b/public/images/emoji/twitter/paperclips.png new file mode 100644 index 0000000000..126b439269 Binary files /dev/null and b/public/images/emoji/twitter/paperclips.png differ diff --git a/public/images/emoji/twitter/park.png b/public/images/emoji/twitter/park.png new file mode 100644 index 0000000000..5dec43509b Binary files /dev/null and b/public/images/emoji/twitter/park.png differ diff --git a/public/images/emoji/twitter/pause_button.png b/public/images/emoji/twitter/pause_button.png new file mode 100644 index 0000000000..78d4ae8ac9 Binary files /dev/null and b/public/images/emoji/twitter/pause_button.png differ diff --git a/public/images/emoji/twitter/peace.png b/public/images/emoji/twitter/peace.png new file mode 100644 index 0000000000..74e529b159 Binary files /dev/null and b/public/images/emoji/twitter/peace.png differ diff --git a/public/images/emoji/twitter/pen_ballpoint.png b/public/images/emoji/twitter/pen_ballpoint.png new file mode 100644 index 0000000000..6219ae26cc Binary files /dev/null and b/public/images/emoji/twitter/pen_ballpoint.png differ diff --git a/public/images/emoji/twitter/pen_fountain.png b/public/images/emoji/twitter/pen_fountain.png new file mode 100644 index 0000000000..f2579410b2 Binary files /dev/null and b/public/images/emoji/twitter/pen_fountain.png differ diff --git a/public/images/emoji/twitter/pick.png b/public/images/emoji/twitter/pick.png new file mode 100644 index 0000000000..696accaff2 Binary files /dev/null and b/public/images/emoji/twitter/pick.png differ diff --git a/public/images/emoji/twitter/ping_pong.png b/public/images/emoji/twitter/ping_pong.png new file mode 100644 index 0000000000..44de4d9510 Binary files /dev/null and b/public/images/emoji/twitter/ping_pong.png differ diff --git a/public/images/emoji/twitter/place_of_worship.png b/public/images/emoji/twitter/place_of_worship.png new file mode 100644 index 0000000000..b8e0996955 Binary files /dev/null and b/public/images/emoji/twitter/place_of_worship.png differ diff --git a/public/images/emoji/twitter/play_pause.png b/public/images/emoji/twitter/play_pause.png new file mode 100644 index 0000000000..0839a426ee Binary files /dev/null and b/public/images/emoji/twitter/play_pause.png differ diff --git a/public/images/emoji/twitter/popcorn.png b/public/images/emoji/twitter/popcorn.png new file mode 100644 index 0000000000..6f4e0f0b6b Binary files /dev/null and b/public/images/emoji/twitter/popcorn.png differ diff --git a/public/images/emoji/twitter/prayer_beads.png b/public/images/emoji/twitter/prayer_beads.png new file mode 100644 index 0000000000..e7709c6cb2 Binary files /dev/null and b/public/images/emoji/twitter/prayer_beads.png differ diff --git a/public/images/emoji/twitter/printer.png b/public/images/emoji/twitter/printer.png new file mode 100644 index 0000000000..58961b6b09 Binary files /dev/null and b/public/images/emoji/twitter/printer.png differ diff --git a/public/images/emoji/twitter/projector.png b/public/images/emoji/twitter/projector.png new file mode 100644 index 0000000000..6135a3366c Binary files /dev/null and b/public/images/emoji/twitter/projector.png differ diff --git a/public/images/emoji/twitter/race_car.png b/public/images/emoji/twitter/race_car.png new file mode 100644 index 0000000000..894f1b62c2 Binary files /dev/null and b/public/images/emoji/twitter/race_car.png differ diff --git a/public/images/emoji/twitter/radioactive.png b/public/images/emoji/twitter/radioactive.png new file mode 100644 index 0000000000..2c4d0ab579 Binary files /dev/null and b/public/images/emoji/twitter/radioactive.png differ diff --git a/public/images/emoji/twitter/railway_track.png b/public/images/emoji/twitter/railway_track.png new file mode 100644 index 0000000000..8a09aa1ede Binary files /dev/null and b/public/images/emoji/twitter/railway_track.png differ diff --git a/public/images/emoji/twitter/record_button.png b/public/images/emoji/twitter/record_button.png new file mode 100644 index 0000000000..3725e1c215 Binary files /dev/null and b/public/images/emoji/twitter/record_button.png differ diff --git a/public/images/emoji/twitter/reminder_ribbon.png b/public/images/emoji/twitter/reminder_ribbon.png new file mode 100644 index 0000000000..09d8d0e308 Binary files /dev/null and b/public/images/emoji/twitter/reminder_ribbon.png differ diff --git a/public/images/emoji/twitter/robot.png b/public/images/emoji/twitter/robot.png new file mode 100644 index 0000000000..03eff68a69 Binary files /dev/null and b/public/images/emoji/twitter/robot.png differ diff --git a/public/images/emoji/twitter/rolling_eyes.png b/public/images/emoji/twitter/rolling_eyes.png new file mode 100644 index 0000000000..e2e047be10 Binary files /dev/null and b/public/images/emoji/twitter/rolling_eyes.png differ diff --git a/public/images/emoji/twitter/rosette.png b/public/images/emoji/twitter/rosette.png new file mode 100644 index 0000000000..3ef48e7eb1 Binary files /dev/null and b/public/images/emoji/twitter/rosette.png differ diff --git a/public/images/emoji/twitter/satellite_orbital.png b/public/images/emoji/twitter/satellite_orbital.png new file mode 100644 index 0000000000..81715516af Binary files /dev/null and b/public/images/emoji/twitter/satellite_orbital.png differ diff --git a/public/images/emoji/twitter/scales.png b/public/images/emoji/twitter/scales.png new file mode 100644 index 0000000000..1647464628 Binary files /dev/null and b/public/images/emoji/twitter/scales.png differ diff --git a/public/images/emoji/twitter/scorpion.png b/public/images/emoji/twitter/scorpion.png new file mode 100644 index 0000000000..cf0f2e7e1f Binary files /dev/null and b/public/images/emoji/twitter/scorpion.png differ diff --git a/public/images/emoji/twitter/shamrock.png b/public/images/emoji/twitter/shamrock.png new file mode 100644 index 0000000000..275a505981 Binary files /dev/null and b/public/images/emoji/twitter/shamrock.png differ diff --git a/public/images/emoji/twitter/shield.png b/public/images/emoji/twitter/shield.png new file mode 100644 index 0000000000..51ce00cd20 Binary files /dev/null and b/public/images/emoji/twitter/shield.png differ diff --git a/public/images/emoji/twitter/shinto_shrine.png b/public/images/emoji/twitter/shinto_shrine.png new file mode 100644 index 0000000000..d5c11c548d Binary files /dev/null and b/public/images/emoji/twitter/shinto_shrine.png differ diff --git a/public/images/emoji/twitter/shopping_bags.png b/public/images/emoji/twitter/shopping_bags.png new file mode 100644 index 0000000000..685a70cdcd Binary files /dev/null and b/public/images/emoji/twitter/shopping_bags.png differ diff --git a/public/images/emoji/twitter/skier.png b/public/images/emoji/twitter/skier.png new file mode 100644 index 0000000000..0a99f58df8 Binary files /dev/null and b/public/images/emoji/twitter/skier.png differ diff --git a/public/images/emoji/twitter/skull_crossbones.png b/public/images/emoji/twitter/skull_crossbones.png new file mode 100644 index 0000000000..8aebd69f28 Binary files /dev/null and b/public/images/emoji/twitter/skull_crossbones.png differ diff --git a/public/images/emoji/twitter/sleeping_accommodation.png b/public/images/emoji/twitter/sleeping_accommodation.png new file mode 100644 index 0000000000..aab85aeaa5 Binary files /dev/null and b/public/images/emoji/twitter/sleeping_accommodation.png differ diff --git a/public/images/emoji/twitter/slight_frown.png b/public/images/emoji/twitter/slight_frown.png new file mode 100644 index 0000000000..3f3c9251aa Binary files /dev/null and b/public/images/emoji/twitter/slight_frown.png differ diff --git a/public/images/emoji/twitter/slight_smile.png b/public/images/emoji/twitter/slight_smile.png new file mode 100644 index 0000000000..4360c49ec5 Binary files /dev/null and b/public/images/emoji/twitter/slight_smile.png differ diff --git a/public/images/emoji/twitter/snowman2.png b/public/images/emoji/twitter/snowman2.png new file mode 100644 index 0000000000..8d53ae6e2e Binary files /dev/null and b/public/images/emoji/twitter/snowman2.png differ diff --git a/public/images/emoji/twitter/speaking_head.png b/public/images/emoji/twitter/speaking_head.png new file mode 100644 index 0000000000..56d482de53 Binary files /dev/null and b/public/images/emoji/twitter/speaking_head.png differ diff --git a/public/images/emoji/twitter/spider.png b/public/images/emoji/twitter/spider.png new file mode 100644 index 0000000000..e3e128e540 Binary files /dev/null and b/public/images/emoji/twitter/spider.png differ diff --git a/public/images/emoji/twitter/spider_web.png b/public/images/emoji/twitter/spider_web.png new file mode 100644 index 0000000000..683a02c906 Binary files /dev/null and b/public/images/emoji/twitter/spider_web.png differ diff --git a/public/images/emoji/twitter/spy.png b/public/images/emoji/twitter/spy.png new file mode 100644 index 0000000000..5dfa1e366b Binary files /dev/null and b/public/images/emoji/twitter/spy.png differ diff --git a/public/images/emoji/twitter/stadium.png b/public/images/emoji/twitter/stadium.png new file mode 100644 index 0000000000..6e56ffd85c Binary files /dev/null and b/public/images/emoji/twitter/stadium.png differ diff --git a/public/images/emoji/twitter/star_and_crescent.png b/public/images/emoji/twitter/star_and_crescent.png new file mode 100644 index 0000000000..ae1f138691 Binary files /dev/null and b/public/images/emoji/twitter/star_and_crescent.png differ diff --git a/public/images/emoji/twitter/star_of_david.png b/public/images/emoji/twitter/star_of_david.png new file mode 100644 index 0000000000..efe21ecdfe Binary files /dev/null and b/public/images/emoji/twitter/star_of_david.png differ diff --git a/public/images/emoji/twitter/stop_button.png b/public/images/emoji/twitter/stop_button.png new file mode 100644 index 0000000000..8b8953809a Binary files /dev/null and b/public/images/emoji/twitter/stop_button.png differ diff --git a/public/images/emoji/twitter/stopwatch.png b/public/images/emoji/twitter/stopwatch.png new file mode 100644 index 0000000000..91ee4827ad Binary files /dev/null and b/public/images/emoji/twitter/stopwatch.png differ diff --git a/public/images/emoji/twitter/synagogue.png b/public/images/emoji/twitter/synagogue.png new file mode 100644 index 0000000000..9dc959850a Binary files /dev/null and b/public/images/emoji/twitter/synagogue.png differ diff --git a/public/images/emoji/twitter/taco.png b/public/images/emoji/twitter/taco.png new file mode 100644 index 0000000000..fdb8752e1f Binary files /dev/null and b/public/images/emoji/twitter/taco.png differ diff --git a/public/images/emoji/twitter/ten.png b/public/images/emoji/twitter/ten.png new file mode 100644 index 0000000000..9151e978ce Binary files /dev/null and b/public/images/emoji/twitter/ten.png differ diff --git a/public/images/emoji/twitter/thermometer.png b/public/images/emoji/twitter/thermometer.png new file mode 100644 index 0000000000..53746a78bf Binary files /dev/null and b/public/images/emoji/twitter/thermometer.png differ diff --git a/public/images/emoji/twitter/thermometer_face.png b/public/images/emoji/twitter/thermometer_face.png new file mode 100644 index 0000000000..c9440239c0 Binary files /dev/null and b/public/images/emoji/twitter/thermometer_face.png differ diff --git a/public/images/emoji/twitter/thinking.png b/public/images/emoji/twitter/thinking.png new file mode 100644 index 0000000000..41be4fd6bc Binary files /dev/null and b/public/images/emoji/twitter/thinking.png differ diff --git a/public/images/emoji/twitter/thunder_cloud_rain.png b/public/images/emoji/twitter/thunder_cloud_rain.png new file mode 100644 index 0000000000..71c2af1396 Binary files /dev/null and b/public/images/emoji/twitter/thunder_cloud_rain.png differ diff --git a/public/images/emoji/twitter/tickets.png b/public/images/emoji/twitter/tickets.png new file mode 100644 index 0000000000..11c88ec854 Binary files /dev/null and b/public/images/emoji/twitter/tickets.png differ diff --git a/public/images/emoji/twitter/timer.png b/public/images/emoji/twitter/timer.png new file mode 100644 index 0000000000..c7f6d21c6c Binary files /dev/null and b/public/images/emoji/twitter/timer.png differ diff --git a/public/images/emoji/twitter/tools.png b/public/images/emoji/twitter/tools.png new file mode 100644 index 0000000000..2448331da8 Binary files /dev/null and b/public/images/emoji/twitter/tools.png differ diff --git a/public/images/emoji/twitter/track_next.png b/public/images/emoji/twitter/track_next.png new file mode 100644 index 0000000000..9aafe8deb8 Binary files /dev/null and b/public/images/emoji/twitter/track_next.png differ diff --git a/public/images/emoji/twitter/track_previous.png b/public/images/emoji/twitter/track_previous.png new file mode 100644 index 0000000000..d6f3c89e27 Binary files /dev/null and b/public/images/emoji/twitter/track_previous.png differ diff --git a/public/images/emoji/twitter/trackball.png b/public/images/emoji/twitter/trackball.png new file mode 100644 index 0000000000..8205a4e843 Binary files /dev/null and b/public/images/emoji/twitter/trackball.png differ diff --git a/public/images/emoji/twitter/turkey.png b/public/images/emoji/twitter/turkey.png new file mode 100644 index 0000000000..20856a9e8b Binary files /dev/null and b/public/images/emoji/twitter/turkey.png differ diff --git a/public/images/emoji/twitter/umbrella2.png b/public/images/emoji/twitter/umbrella2.png new file mode 100644 index 0000000000..24e72f080b Binary files /dev/null and b/public/images/emoji/twitter/umbrella2.png differ diff --git a/public/images/emoji/twitter/unicorn.png b/public/images/emoji/twitter/unicorn.png new file mode 100644 index 0000000000..4afcbe217f Binary files /dev/null and b/public/images/emoji/twitter/unicorn.png differ diff --git a/public/images/emoji/twitter/upside_down.png b/public/images/emoji/twitter/upside_down.png new file mode 100644 index 0000000000..e8abd43812 Binary files /dev/null and b/public/images/emoji/twitter/upside_down.png differ diff --git a/public/images/emoji/twitter/urn.png b/public/images/emoji/twitter/urn.png new file mode 100644 index 0000000000..cc65fe127e Binary files /dev/null and b/public/images/emoji/twitter/urn.png differ diff --git a/public/images/emoji/twitter/volleyball.png b/public/images/emoji/twitter/volleyball.png new file mode 100644 index 0000000000..08edda7440 Binary files /dev/null and b/public/images/emoji/twitter/volleyball.png differ diff --git a/public/images/emoji/twitter/vulcan.png b/public/images/emoji/twitter/vulcan.png new file mode 100644 index 0000000000..72cc1170de Binary files /dev/null and b/public/images/emoji/twitter/vulcan.png differ diff --git a/public/images/emoji/twitter/wastebasket.png b/public/images/emoji/twitter/wastebasket.png new file mode 100644 index 0000000000..9e8f4719ec Binary files /dev/null and b/public/images/emoji/twitter/wastebasket.png differ diff --git a/public/images/emoji/twitter/wheel_of_dharma.png b/public/images/emoji/twitter/wheel_of_dharma.png new file mode 100644 index 0000000000..c4d0c56251 Binary files /dev/null and b/public/images/emoji/twitter/wheel_of_dharma.png differ diff --git a/public/images/emoji/twitter/white_sun_cloud.png b/public/images/emoji/twitter/white_sun_cloud.png new file mode 100644 index 0000000000..cabbfd2497 Binary files /dev/null and b/public/images/emoji/twitter/white_sun_cloud.png differ diff --git a/public/images/emoji/twitter/white_sun_rain_cloud.png b/public/images/emoji/twitter/white_sun_rain_cloud.png new file mode 100644 index 0000000000..1270388a29 Binary files /dev/null and b/public/images/emoji/twitter/white_sun_rain_cloud.png differ diff --git a/public/images/emoji/twitter/white_sun_small_cloud.png b/public/images/emoji/twitter/white_sun_small_cloud.png new file mode 100644 index 0000000000..8757d5503c Binary files /dev/null and b/public/images/emoji/twitter/white_sun_small_cloud.png differ diff --git a/public/images/emoji/twitter/wind_blowing_face.png b/public/images/emoji/twitter/wind_blowing_face.png new file mode 100644 index 0000000000..190cfc18a8 Binary files /dev/null and b/public/images/emoji/twitter/wind_blowing_face.png differ diff --git a/public/images/emoji/twitter/writing_hand.png b/public/images/emoji/twitter/writing_hand.png new file mode 100644 index 0000000000..eb2e8c89b9 Binary files /dev/null and b/public/images/emoji/twitter/writing_hand.png differ diff --git a/public/images/emoji/twitter/yin_yang.png b/public/images/emoji/twitter/yin_yang.png new file mode 100644 index 0000000000..beb2a87dc3 Binary files /dev/null and b/public/images/emoji/twitter/yin_yang.png differ diff --git a/public/images/emoji/twitter/zipper_mouth.png b/public/images/emoji/twitter/zipper_mouth.png new file mode 100644 index 0000000000..d59236821b Binary files /dev/null and b/public/images/emoji/twitter/zipper_mouth.png differ diff --git a/script/import_scripts/phpbb3/importer.rb b/script/import_scripts/phpbb3/importer.rb index f2c1dc9de1..9f88a73b2b 100644 --- a/script/import_scripts/phpbb3/importer.rb +++ b/script/import_scripts/phpbb3/importer.rb @@ -108,6 +108,29 @@ module ImportScripts::PhpBB3 end end + # uncomment below lines to create permalink for categories + # def create_category(opts, import_id) + # new_category = super + # url = "viewforum.php?f=#{import_id}" + # if !Permalink.find_by(url: url) + # Permalink.create(url: url, category_id: new_category.id) + # end + # new_category + # end + + # uncomment below lines to create permalink for topics + # def create_post(opts, import_id) + # post = super + # if post && (topic = post.topic) && (category = topic.category) + # url = "viewtopic.php?f=#{category.custom_fields["import_id"]}&t=#{opts[:import_topic_id]}" + + # if !Permalink.find_by(url: url) + # Permalink.create(url: url, topic_id: topic.id) + # end + # end + # post + # end + def import_private_messages if @settings.fix_private_messages puts '', 'fixing private messages' diff --git a/script/import_scripts/phpbb3/importers/post_importer.rb b/script/import_scripts/phpbb3/importers/post_importer.rb index b6de98622f..a00335232c 100644 --- a/script/import_scripts/phpbb3/importers/post_importer.rb +++ b/script/import_scripts/phpbb3/importers/post_importer.rb @@ -28,7 +28,8 @@ module ImportScripts::PhpBB3 id: row[:post_id], user_id: user_id, created_at: Time.zone.at(row[:post_time]), - raw: @text_processor.process_post(row[:post_text], attachments) + raw: @text_processor.process_post(row[:post_text], attachments), + import_topic_id: row[:topic_id] } if is_first_post diff --git a/script/import_scripts/phpbb3/importers/user_importer.rb b/script/import_scripts/phpbb3/importers/user_importer.rb index f1958ef147..ca50197a95 100644 --- a/script/import_scripts/phpbb3/importers/user_importer.rb +++ b/script/import_scripts/phpbb3/importers/user_importer.rb @@ -91,10 +91,12 @@ module ImportScripts::PhpBB3 end if disable_email - user.email_digests = false - user.email_private_messages = false - user.email_direct = false - user.email_always = false + user_option = user.user_option + user_option.email_digests = false + user_option.email_private_messages = false + user_option.email_direct = false + user_option.email_always = false + user_option.save! end if user.save diff --git a/script/import_scripts/phpbb3/support/smiley_processor.rb b/script/import_scripts/phpbb3/support/smiley_processor.rb index 0b0785fd3f..342cadfaab 100644 --- a/script/import_scripts/phpbb3/support/smiley_processor.rb +++ b/script/import_scripts/phpbb3/support/smiley_processor.rb @@ -28,7 +28,7 @@ module ImportScripts::PhpBB3 def add_default_smilies { [':D', ':-D', ':grin:'] => ':smiley:', - [':)', ':-)', ':smile:'] => ':slightly_smiling:', + [':)', ':-)', ':smile:'] => ':slight_smile:', [';)', ';-)', ':wink:'] => ':wink:', [':(', ':-(', ':sad:'] => ':frowning:', [':o', ':-o', ':eek:'] => ':astonished:', diff --git a/script/import_scripts/sourceforge.rb b/script/import_scripts/sourceforge.rb new file mode 100644 index 0000000000..d1b85366f4 --- /dev/null +++ b/script/import_scripts/sourceforge.rb @@ -0,0 +1,137 @@ +require_relative 'base.rb' + +# Import script for SourceForge discussions. +# +# See the following instructions on how to export your discussions from SourceForge: +# https://sourceforge.net/p/forge/documentation/Project%20Data%20Export/ +# +# Change the constants (PROJECT_NAME and JSON_FILE) before running the importer! +# +# Use the following command to run the importer within the Docker container: +# su discourse -c 'ruby /var/www/discourse/script/import_scripts/sourceforge.rb' + +class ImportScripts::Sourceforge < ImportScripts::Base + # When the URL of your project is https://sourceforge.net/projects/foo/ + # than the value of PROJECT_NAME is 'foo' + PROJECT_NAME = 'project_name' + + # This is the path to the discussion.json that you exported from SourceForge. + JSON_FILE = '/path/to/discussion.json' + + def initialize + super + + @system_user = Discourse.system_user + end + + def execute + puts '', 'Importing from SourceForge...' + + load_json + + import_categories + import_topics + end + + def load_json + @json = MultiJson.load(File.read(JSON_FILE), :symbolize_keys => true) + end + + def import_categories + puts '', 'importing categories' + + create_categories(@json[:forums]) do |forum| + { + id: forum[:shortname], + name: forum[:name], + post_create_action: proc do |category| + changes = {raw: forum[:description]} + opts = {revised_at: Time.now, bypass_bump: true} + + post = category.topic.first_post + post.revise(@system_user, changes, opts) + end + } + end + end + + def import_topics + puts '', 'importing posts' + imported_post_count = 0 + total_post_count = count_posts + + @json[:forums].each do |forum| + imported_category_id = @lookup.category_id_from_imported_category_id(forum[:shortname]) + + forum[:threads].each do |thread| + posts = thread[:posts] + next if posts.size == 0 + + first_post = posts[0] + first_post_id = post_id_of(thread, first_post) + imported_topic = nil + + create_posts(posts, total: total_post_count, offset: imported_post_count) do |post| + mapped = { + id: "#{thread[:_id]}_#{post[:slug]}", + user_id: @system_user, + created_at: Time.zone.parse(post[:timestamp]), + raw: process_post_text(forum, thread, post) + } + + if post == first_post + mapped[:category] = imported_category_id + mapped[:title] = thread[:subject][0...255] + else + if imported_topic.nil? + imported_topic = @lookup.topic_lookup_from_imported_post_id(first_post_id) + end + + mapped[:topic_id] = imported_topic[:topic_id] + end + + imported_post_count += 1 + mapped + end + end + end + end + + def count_posts + total_count = 0 + + @json[:forums].each do |forum| + forum[:threads].each do |thread| + total_count += thread[:posts].size + end + end + + total_count + end + + def post_id_of(thread, post) + "#{thread[:_id]}_#{post[:slug]}" + end + + def process_post_text(forum, thread, post) + text = post[:text] + text.gsub!(/~{3,}/, '```') # Discourse doesn't recognize ~~~ as beginning/end of code blocks + + # SourceForge doesn't allow symbols in usernames, so we are safe here. + # Well, unless it's the anonymous user, which has an evil asterisk in the JSON file... + username = post[:author] + username = 'anonymous' if username == '*anonymous' + + # anonymous and nobody are nonexistent users. Make sure we don't create links for them. + user_without_profile = username == 'anonymous' || username == 'nobody' + user_link = user_without_profile ? username : "[#{username}](https://sourceforge.net/u/#{username}/)" + + # Create a nice looking header for each imported post that links to the author's user profile and the old post. + post_date = Time.zone.parse(post[:timestamp]).strftime('%A, %B %d, %Y') + post_url = "https://sourceforge.net/p/#{PROJECT_NAME}/discussion/#{forum[:shortname]}/thread/#{thread[:_id]}/##{post[:slug]}" + + "**#{user_link}** wrote on [#{post_date}](#{post_url}):\n\n#{text}" + end +end + +ImportScripts::Sourceforge.new.perform diff --git a/spec/components/active_record/connection_adapters/postgresql_fallback_adapter_spec.rb b/spec/components/active_record/connection_adapters/postgresql_fallback_adapter_spec.rb index 35a3487d26..0456f616d4 100644 --- a/spec/components/active_record/connection_adapters/postgresql_fallback_adapter_spec.rb +++ b/spec/components/active_record/connection_adapters/postgresql_fallback_adapter_spec.rb @@ -3,10 +3,10 @@ require_dependency 'active_record/connection_adapters/postgresql_fallback_adapte describe ActiveRecord::ConnectionHandling do let(:replica_host) { "1.1.1.1" } - let(:replica_port) { "6432" } + let(:replica_port) { 6432 } let(:config) do - ActiveRecord::Base.configurations["test"].merge({ + ActiveRecord::Base.configurations[Rails.env].merge({ "adapter" => "postgresql_fallback", "replica_host" => replica_host, "replica_port" => replica_port @@ -14,8 +14,7 @@ describe ActiveRecord::ConnectionHandling do end after do - Discourse.disable_readonly_mode - ::PostgreSQLFallbackHandler.instance.master = true + ::PostgreSQLFallbackHandler.instance.setup! end describe "#postgresql_fallback_connection" do @@ -25,17 +24,39 @@ describe ActiveRecord::ConnectionHandling do end context 'when master server is down' do + let(:multisite_db) { "database_2" } + + let(:multisite_config) do + { + host: 'localhost1', + port: 5432, + replica_host: replica_host, + replica_port: replica_port + } + end + before do @replica_connection = mock('replica_connection') end - it 'should failover to a replica server' do - ActiveRecord::Base.expects(:postgresql_connection).with(config).raises(PG::ConnectionBad) - ActiveRecord::Base.expects(:verify_replica).with(@replica_connection) + after do + with_multisite_db(multisite_db) { Discourse.disable_readonly_mode } + Discourse.disable_readonly_mode + ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[Rails.env]) + end - ActiveRecord::Base.expects(:postgresql_connection).with(config.merge({ - host: replica_host, port: replica_port - })).returns(@replica_connection) + it 'should failover to a replica server' do + RailsMultisite::ConnectionManagement.stubs(:all_dbs).returns(['default', multisite_db]) + ::PostgreSQLFallbackHandler.instance.setup! + + [config, multisite_config].each do |configuration| + ActiveRecord::Base.expects(:postgresql_connection).with(configuration).raises(PG::ConnectionBad) + ActiveRecord::Base.expects(:verify_replica).with(@replica_connection) + + ActiveRecord::Base.expects(:postgresql_connection).with(configuration.merge({ + host: replica_host, port: replica_port + })).returns(@replica_connection) + end expect { ActiveRecord::Base.postgresql_fallback_connection(config) } .to raise_error(PG::ConnectionBad) @@ -43,6 +64,14 @@ describe ActiveRecord::ConnectionHandling do expect{ ActiveRecord::Base.postgresql_fallback_connection(config) } .to change{ Discourse.readonly_mode? }.from(false).to(true) + with_multisite_db(multisite_db) do + expect { ActiveRecord::Base.postgresql_fallback_connection(multisite_config) } + .to raise_error(PG::ConnectionBad) + + expect{ ActiveRecord::Base.postgresql_fallback_connection(multisite_config) } + .to change{ Discourse.readonly_mode? }.from(false).to(true) + end + ActiveRecord::Base.unstub(:postgresql_connection) current_threads = Thread.list @@ -59,7 +88,7 @@ describe ActiveRecord::ConnectionHandling do end # Wait for the thread to finish execution - threads = (Thread.list - current_threads).each(&:join) + (Thread.list - current_threads).each(&:join) expect(Discourse.readonly_mode?).to eq(false) @@ -72,7 +101,11 @@ describe ActiveRecord::ConnectionHandling do context 'when both master and replica server is down' do it 'should raise the right error' do - ActiveRecord::Base.expects(:postgresql_connection).raises(PG::ConnectionBad).twice + ActiveRecord::Base.expects(:postgresql_connection).with(config).raises(PG::ConnectionBad).once + + ActiveRecord::Base.expects(:postgresql_connection).with(config.dup.merge({ + host: replica_host, port: replica_port + })).raises(PG::ConnectionBad).once 2.times do expect { ActiveRecord::Base.postgresql_fallback_connection(config) } @@ -81,4 +114,10 @@ describe ActiveRecord::ConnectionHandling do end end end + + def with_multisite_db(dbname) + RailsMultisite::ConnectionManagement.expects(:current_db).returns(dbname).at_least_once + yield + RailsMultisite::ConnectionManagement.unstub(:current_db) + end end diff --git a/spec/components/discourse_i18n_spec.rb b/spec/components/discourse_i18n_spec.rb index 40dbf4a2ef..f41b9caafa 100644 --- a/spec/components/discourse_i18n_spec.rb +++ b/spec/components/discourse_i18n_spec.rb @@ -15,6 +15,7 @@ describe I18n::Backend::DiscourseI18n do end after do + I18n.locale = :en I18n.reload! end @@ -40,6 +41,11 @@ describe I18n::Backend::DiscourseI18n do expect(results['items.other']).to eq('%{count} items') end + it 'uses fallback locales for searching' do + expect(backend.search(:de, 'bar')).to eq({'bar' => 'Bar in :de'}) + expect(backend.search(:de, 'foo')).to eq({'foo' => 'Foo in :en'}) + end + describe '#exists?' do it 'returns true when a key is given that exists' do expect(backend.exists?(:de, :bar)).to eq(true) @@ -73,15 +79,23 @@ describe I18n::Backend::DiscourseI18n do end describe 'with overrides' do - it 'returns the overriden key' do + it 'returns the overridden key' do TranslationOverride.upsert!('en', 'foo', 'Overwritten foo') expect(I18n.translate('foo')).to eq('Overwritten foo') TranslationOverride.upsert!('en', 'foo', 'new value') - I18n.reload! expect(I18n.translate('foo')).to eq('new value') end + it 'returns the overridden key after switching the locale' do + TranslationOverride.upsert!('en', 'foo', 'Overwritten foo in EN') + TranslationOverride.upsert!('de', 'foo', 'Overwritten foo in DE') + + expect(I18n.translate('foo')).to eq('Overwritten foo in EN') + I18n.locale = :de + expect(I18n.translate('foo')).to eq('Overwritten foo in DE') + end + it "can be searched" do TranslationOverride.upsert!('en', 'wat', 'Overwritten value') expect(I18n.search('wat', backend: backend)).to eq({'wat' => 'Overwritten value'}) diff --git a/spec/components/discourse_spec.rb b/spec/components/discourse_spec.rb index a66cecda46..b8b108519e 100644 --- a/spec/components/discourse_spec.rb +++ b/spec/components/discourse_spec.rb @@ -111,8 +111,12 @@ describe Discourse do end it "returns true when the key is present in redis" do - $redis.expects(:get).with(Discourse.readonly_mode_key).returns("1") - expect(Discourse.readonly_mode?).to eq(true) + begin + $redis.set(Discourse.readonly_mode_key, 1) + expect(Discourse.readonly_mode?).to eq(true) + ensure + $redis.del(Discourse.readonly_mode_key) + end end it "returns true when Discourse is recently read only" do @@ -121,6 +125,13 @@ describe Discourse do end end + context ".received_readonly!" do + it "sets the right time" do + time = Discourse.received_readonly! + expect(Discourse.last_read_only['default']).to eq(time) + end + end + context "#handle_exception" do class TempSidekiqLogger < Sidekiq::ExceptionHandler::Logger diff --git a/spec/components/email/receiver_spec.rb b/spec/components/email/receiver_spec.rb index 236c372046..734276c6a7 100644 --- a/spec/components/email/receiver_spec.rb +++ b/spec/components/email/receiver_spec.rb @@ -131,6 +131,11 @@ describe Email::Receiver do expect(topic.posts.last.raw).to eq("Do you like liquorice?\n\nI really like them. One could even say that I am *addicted* to liquorice. Anf if\nyou can mix it up with some anise, then I'm in heaven ;)") end + it "handles invalid from header" do + expect { process(:invalid_from) }.to change { topic.posts.count } + expect(topic.posts.last.raw).to eq("This email was sent with an invalid from header field.") + end + describe 'Unsubscribing via email' do let(:last_email) { ActionMailer::Base.deliveries.last } @@ -218,7 +223,7 @@ describe Email::Receiver do context "new message to a group" do - let!(:group) { Fabricate(:group, incoming_email: "team@bar.com") } + let!(:group) { Fabricate(:group, incoming_email: "team@bar.com|meat@bar.com") } it "handles encoded display names" do expect { process(:encoded_display_name) }.to change(Topic, :count) @@ -266,38 +271,45 @@ describe Email::Receiver do expect { process(:email_reply_4) }.to change { topic.posts.count } end + it "supports any kind of attachments when 'allow_all_attachments_for_group_messages' is enabled" do + SiteSetting.allow_all_attachments_for_group_messages = true + expect { process(:attached_rb_file) }.to change(Topic, :count) + expect(Post.last.raw).to match(/discourse\.rb/) + end + end context "new topic in a category" do - let!(:category) { Fabricate(:category, email_in: "category@bar.com", email_in_allow_strangers: false) } + let!(:category) { Fabricate(:category, email_in: "category@bar.com|category@foo.com", email_in_allow_strangers: false) } it "raises a StrangersNotAllowedError when 'email_in_allow_strangers' is disabled" do - expect { process(:stranger_not_allowed) }.to raise_error(Email::Receiver::StrangersNotAllowedError) + expect { process(:new_user) }.to raise_error(Email::Receiver::StrangersNotAllowedError) end it "raises an InsufficientTrustLevelError when user's trust level isn't enough" do + Fabricate(:user, email: "existing@bar.com", trust_level: 3) SiteSetting.email_in_min_trust = 4 - Fabricate(:user, email: "insufficient@bar.com", trust_level: 3) - expect { process(:insufficient_trust_level) }.to raise_error(Email::Receiver::InsufficientTrustLevelError) + expect { process(:existing_user) }.to raise_error(Email::Receiver::InsufficientTrustLevelError) end - it "raises an InvalidAccess when the user is part of a readonly group" do - user = Fabricate(:user, email: "readonly@bar.com", trust_level: SiteSetting.email_in_min_trust) + it "works" do + user = Fabricate(:user, email: "existing@bar.com", trust_level: SiteSetting.email_in_min_trust) group = Fabricate(:group) group.add(user) group.save - category.set_permissions(group => :readonly) + category.set_permissions(group => :create_post) category.save - expect { process(:readonly) }.to raise_error(Discourse::InvalidAccess) - end + # raises an InvalidAccess when the user doesn't have the privileges to create a topic + expect { process(:existing_user) }.to raise_error(Discourse::InvalidAccess) - it "works" do - Fabricate(:user, email: "sufficient@bar.com", trust_level: SiteSetting.email_in_min_trust) - expect { process(:sufficient_trust_level) }.to change(Topic, :count) + category.update_columns(email_in_allow_strangers: true) + + # allows new user to create a topic + expect { process(:new_user) }.to change(Topic, :count) end end diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb index 14db91210f..7951409e00 100644 --- a/spec/components/guardian_spec.rb +++ b/spec/components/guardian_spec.rb @@ -370,6 +370,57 @@ describe Guardian do end end + describe 'a Category' do + + it 'allows public categories' do + public_category = build(:category, read_restricted: false) + expect(Guardian.new.can_see?(public_category)).to be_truthy + end + + it 'correctly handles secure categories' do + normal_user = build(:user) + staged_user = build(:user, staged: true) + admin_user = build(:user, admin: true) + + secure_category = build(:category, read_restricted: true) + expect(Guardian.new(normal_user).can_see?(secure_category)).to be_falsey + expect(Guardian.new(staged_user).can_see?(secure_category)).to be_falsey + expect(Guardian.new(admin_user).can_see?(secure_category)).to be_truthy + + secure_category = build(:category, read_restricted: true, email_in: "foo@bar.com") + expect(Guardian.new(normal_user).can_see?(secure_category)).to be_falsey + expect(Guardian.new(staged_user).can_see?(secure_category)).to be_falsey + expect(Guardian.new(admin_user).can_see?(secure_category)).to be_truthy + + secure_category = build(:category, read_restricted: true, email_in_allow_strangers: true) + expect(Guardian.new(normal_user).can_see?(secure_category)).to be_falsey + expect(Guardian.new(staged_user).can_see?(secure_category)).to be_falsey + expect(Guardian.new(admin_user).can_see?(secure_category)).to be_truthy + + secure_category = build(:category, read_restricted: true, email_in: "foo@bar.com", email_in_allow_strangers: true) + expect(Guardian.new(normal_user).can_see?(secure_category)).to be_falsey + expect(Guardian.new(staged_user).can_see?(secure_category)).to be_truthy + expect(Guardian.new(admin_user).can_see?(secure_category)).to be_truthy + end + + it 'allows members of an authorized group' do + user = Fabricate(:user) + group = Fabricate(:group) + + secure_category = Fabricate(:category) + secure_category.set_permissions(group => :readonly) + secure_category.save + + expect(Guardian.new(user).can_see?(secure_category)).to be_falsey + + group.add(user) + group.save + + expect(Guardian.new(user).can_see?(secure_category)).to be_truthy + end + + end + describe 'a Topic' do it 'allows non logged in users to view topics' do expect(Guardian.new.can_see?(topic)).to be_truthy diff --git a/spec/components/new_post_manager_spec.rb b/spec/components/new_post_manager_spec.rb index 57be6bfe3b..955292e7b3 100644 --- a/spec/components/new_post_manager_spec.rb +++ b/spec/components/new_post_manager_spec.rb @@ -69,9 +69,10 @@ describe NewPostManager do end end - context 'with a high approval post count' do + context 'with a high approval post count and TL0' do before do SiteSetting.approve_post_count = 100 + topic.user.trust_level = 0 end it "will return an enqueue result" do result = NewPostManager.default_handler(manager) @@ -80,6 +81,29 @@ describe NewPostManager do end end + context 'with a high approval post count and TL1' do + before do + SiteSetting.approve_post_count = 100 + topic.user.trust_level = 1 + end + it "will return an enqueue result" do + result = NewPostManager.default_handler(manager) + expect(NewPostManager.queue_enabled?).to eq(true) + expect(result.action).to eq(:enqueued) + end + end + + context 'with a high approval post count, but TL2' do + before do + SiteSetting.approve_post_count = 100 + topic.user.trust_level = 2 + end + it "will return an enqueue result" do + result = NewPostManager.default_handler(manager) + expect(result).to be_nil + end + end + context 'with a high trust level setting' do before do SiteSetting.approve_unless_trust_level = 4 diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb index 0cca316e1b..94fe6437f0 100644 --- a/spec/components/pretty_text_spec.rb +++ b/spec/components/pretty_text_spec.rb @@ -48,6 +48,11 @@ HTML expect(PrettyText.cook('@hello @hello @hello')).to match_html "

@hello @hello @hello

" end + it "should handle group mentions with a hyphen and without" do + expect(PrettyText.cook('@hello @hello-hello')).to match_html "

@hello @hello-hello

" + end + + it "should sanitize the html" do expect(PrettyText.cook("")).to match_html "

" end @@ -390,8 +395,16 @@ HTML expect(PrettyText.cook("💣")).to match(/\:bomb\:/) end + it "doesn't replace emoji in inline code blocks with our emoji sets if emoji is enabled" do + expect(PrettyText.cook("`💣`")).not_to match(/\:bomb\:/) + end + + it "doesn't replace emoji in code blocks with our emoji sets if emoji is enabled" do + expect(PrettyText.cook("```\n💣`\n```\n")).not_to match(/\:bomb\:/) + end + it "replaces some glyphs that are not in the emoji range" do - expect(PrettyText.cook("☺")).to match(/\:slightly_smiling\:/) + expect(PrettyText.cook("☺")).to match(/\:slight_smile\:/) end it "doesn't replace unicode emoji if emoji is disabled" do diff --git a/spec/components/topic_query_spec.rb b/spec/components/topic_query_spec.rb index fad4faaea0..276ee76567 100644 --- a/spec/components/topic_query_spec.rb +++ b/spec/components/topic_query_spec.rb @@ -232,6 +232,33 @@ describe TopicQuery do # returns the topics in reverse posters order if requested" do expect(ids_in_order('posters', false)).to eq([archived_topic, closed_topic, invisible_topic, future_topic, regular_topic, pinned_topic].map(&:id)) + + # sets a custom field for each topic to emulate a plugin + regular_topic.custom_fields["sheep"] = 26 + pinned_topic.custom_fields["sheep"] = 47 + archived_topic.custom_fields["sheep"] = 69 + invisible_topic.custom_fields["sheep"] = 12 + closed_topic.custom_fields["sheep"] = 31 + future_topic.custom_fields["sheep"] = 53 + + regular_topic.save + pinned_topic.save + archived_topic.save + invisible_topic.save + closed_topic.save + future_topic.save + + # adds the custom field as a viable sort option + class ::TopicQuery + SORTABLE_MAPPING["sheep"] = "custom_fields.sheep" + end + # returns the topics in the sheep order if requested" do + expect(ids_in_order('sheep')).to eq([archived_topic, future_topic, pinned_topic, closed_topic, regular_topic, invisible_topic].map(&:id)) + + # returns the topics in reverse sheep order if requested" do + expect(ids_in_order('sheep', false)).to eq([invisible_topic, regular_topic, closed_topic, pinned_topic, future_topic, archived_topic].map(&:id)) + + end end diff --git a/spec/components/validators/password_validator_spec.rb b/spec/components/validators/password_validator_spec.rb index d95c0d5505..3cfe4f4357 100644 --- a/spec/components/validators/password_validator_spec.rb +++ b/spec/components/validators/password_validator_spec.rb @@ -40,6 +40,15 @@ describe PasswordValidator do validate expect(record.errors[:password]).to be_present end + + it "adds an error when user is admin and password is less than 15 chars" do + SiteSetting.min_admin_password_length = 15 + + @password = "12345678912" + record.admin = true + validate + expect(record.errors[:password]).to be_present + end end context "min password length is 12" do @@ -55,6 +64,7 @@ describe PasswordValidator do context "password is commonly used" do before do + SiteSetting.stubs(:min_password_length).returns(8) CommonPasswords.stubs(:common_password?).returns(true) end @@ -74,7 +84,7 @@ describe PasswordValidator do end it "adds an error when password is the same as the username" do - @password = "porkchops1" + @password = "porkchops1234" record.username = @password validate expect(record.errors[:password]).to be_present diff --git a/spec/controllers/admin/groups_controller_spec.rb b/spec/controllers/admin/groups_controller_spec.rb index 028945d226..96fb3d229a 100644 --- a/spec/controllers/admin/groups_controller_spec.rb +++ b/spec/controllers/admin/groups_controller_spec.rb @@ -33,7 +33,8 @@ describe Admin::GroupsController do "grant_trust_level"=>nil, "incoming_email"=>nil, "notification_level"=>2, - "has_messages"=>false + "has_messages"=>false, + "mentionable"=>false }]) end diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb index 48a217039c..49ddc8f814 100644 --- a/spec/controllers/application_controller_spec.rb +++ b/spec/controllers/application_controller_spec.rb @@ -13,6 +13,10 @@ describe TopicsController do request.env['HTTP_REFERER'] = ref end + def set_accept_language(locale) + request.env['HTTP_ACCEPT_LANGUAGE'] = locale + end + it "doesn't store an incoming link when there's no referer" do expect { get :show, id: topic.id @@ -33,7 +37,7 @@ describe TopicsController do end it "uses the application layout even with an escaped fragment param" do - get :show, {'topic_id' => topic.id, 'slug' => topic.slug, '_escaped_fragment_' => 'true'} + get :show, {'topic_id' => topic.id, 'slug' => topic.slug, '_escaped_fragment_' => 'true'} expect(response).to render_template(layout: 'application') assert_select "meta[name=fragment]", false, "it doesn't have the meta tag" end @@ -51,7 +55,7 @@ describe TopicsController do end it "uses the crawler layout when there's an _escaped_fragment_ param" do - get :show, topic_id: topic.id, slug: topic.slug, _escaped_fragment_: 'true' + get :show, topic_id: topic.id, slug: topic.slug, _escaped_fragment_: 'true' expect(response).to render_template(layout: 'crawler') assert_select "meta[name=fragment]", false, "it doesn't have the meta tag" end @@ -114,25 +118,87 @@ describe TopicsController do end end - describe 'set_locale' do - it 'sets the one the user prefers' do - SiteSetting.stubs(:allow_user_locale).returns(true) + describe "set_locale" do + context "allow_user_locale disabled" do + context "accept-language header differs from default locale" do + before do + SiteSetting.stubs(:allow_user_locale).returns(false) + SiteSetting.stubs(:default_locale).returns("en") + set_accept_language("fr") + end - user = Fabricate(:user, locale: :fr) - log_in_user(user) + context "with an anonymous user" do + it "uses the default locale" do + get :show, {topic_id: topic.id} - get :show, {topic_id: topic.id} + expect(I18n.locale).to eq(:en) + end + end - expect(I18n.locale).to eq(:fr) + context "with a logged in user" do + it "it uses the default locale" do + user = Fabricate(:user, locale: :fr) + log_in_user(user) + + get :show, {topic_id: topic.id} + + expect(I18n.locale).to eq(:en) + end + end + end end - it 'is sets the default locale when the setting not enabled' do - user = Fabricate(:user, locale: :fr) - log_in_user(user) + context "allow_user_locale enabled" do + context "accept-language header differs from default locale" do + before do + SiteSetting.stubs(:allow_user_locale).returns(true) + SiteSetting.stubs(:default_locale).returns("en") + set_accept_language("fr") + end - get :show, {topic_id: topic.id} + context "with an anonymous user" do + it "uses the locale from the headers" do + get :show, {topic_id: topic.id} - expect(I18n.locale).to eq(:en) + expect(I18n.locale).to eq(:fr) + end + end + + context "with a logged in user" do + it "uses the user's preferred locale" do + user = Fabricate(:user, locale: :fr) + log_in_user(user) + + get :show, {topic_id: topic.id} + + expect(I18n.locale).to eq(:fr) + end + end + end + + context "the preferred locale includes a region" do + it "returns the locale and region separated by an underscore" do + SiteSetting.stubs(:allow_user_locale).returns(true) + SiteSetting.stubs(:default_locale).returns("en") + set_accept_language("zh-CN") + + get :show, {topic_id: topic.id} + + expect(I18n.locale).to eq(:zh_CN) + end + end + + context 'accept-language header is not set' do + it 'uses the site default locale' do + SiteSetting.stubs(:allow_user_locale).returns(true) + SiteSetting.stubs(:default_locale).returns('en') + set_accept_language('') + + get :show, {topic_id: topic.id} + + expect(I18n.locale).to eq(:en) + end + end end end diff --git a/spec/controllers/embed_controller_spec.rb b/spec/controllers/embed_controller_spec.rb index 52a6387b31..9539666d6c 100644 --- a/spec/controllers/embed_controller_spec.rb +++ b/spec/controllers/embed_controller_spec.rb @@ -4,6 +4,7 @@ describe EmbedController do let(:host) { "eviltrout.com" } let(:embed_url) { "http://eviltrout.com/2013/02/10/why-discourse-uses-emberjs.html" } + let(:discourse_username) { "eviltrout" } it "is 404 without an embed_url" do get :comments @@ -94,6 +95,12 @@ describe EmbedController do TopicView.expects(:new).with(123, nil, {limit: 100, exclude_first: true, exclude_deleted_users: true}) get :comments, embed_url: embed_url end + + it "provides the topic retriever with the discourse username when provided" do + TopicRetriever.expects(:new).with(embed_url, has_entry({author_username: discourse_username})) + get :comments, embed_url: embed_url, discourse_username: discourse_username + end + end end diff --git a/spec/controllers/invites_controller_spec.rb b/spec/controllers/invites_controller_spec.rb index ca0d4823eb..745c781f9c 100644 --- a/spec/controllers/invites_controller_spec.rb +++ b/spec/controllers/invites_controller_spec.rb @@ -218,6 +218,16 @@ describe InvitesController do end end + context 'user is already logged in' do + let!(:user) { log_in } + let(:topic) { Fabricate(:topic) } + let(:invite) { topic.invite_by_email(topic.user, "iceking@adventuretime.ooo") } + + it "doesn't redeem the invite" do + Invite.any_instance.stubs(:redeem).never + get :show, id: invite.invite_key + end + end end context '.create_disposable_invite' do diff --git a/spec/controllers/topics_controller_spec.rb b/spec/controllers/topics_controller_spec.rb index 69281fca35..92f36ba5f8 100644 --- a/spec/controllers/topics_controller_spec.rb +++ b/spec/controllers/topics_controller_spec.rb @@ -563,6 +563,11 @@ describe TopicsController do expect(response).to redirect_to(topic.relative_url + "/42?page=123") end + it 'does not accept page params as an array' do + xhr :get, :show, id: topic.slug, post_number: 42, page: [2] + expect(response).to redirect_to("#{topic.relative_url}/42?page=1") + end + it 'returns 404 when an invalid slug is given and no id' do xhr :get, :show, id: 'nope-nope' expect(response.status).to eq(404) diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index 651bf03087..8bc4130839 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -333,7 +333,7 @@ describe UsersController do old_token = user.auth_token get :password_reset, token: token - put :password_reset, token: token, password: 'newpassword' + put :password_reset, token: token, password: 'hg9ow8yhg98o' expect(response).to be_success expect(assigns[:error]).to be_blank @@ -372,14 +372,14 @@ describe UsersController do end it "logs in the user" do - put :password_reset, token: token, password: 'newpassword' + put :password_reset, token: token, password: 'ksjafh928r' expect(assigns(:user).errors).to be_blank expect(session[:current_user_id]).to be_present end it "doesn't log in the user when not approved" do SiteSetting.expects(:must_approve_users?).returns(true) - put :password_reset, token: token, password: 'newpassword' + put :password_reset, token: token, password: 'ksjafh928r' expect(assigns(:user).errors).to be_blank expect(session[:current_user_id]).to be_blank end @@ -479,6 +479,15 @@ describe UsersController do email: @user.email end + context 'when creating a user' do + it 'sets the user locale to I18n.locale' do + SiteSetting.stubs(:default_locale).returns('en') + I18n.stubs(:locale).returns(:fr) + post_user + expect(User.find_by(username: @user.username).locale).to eq('fr') + end + end + context 'when creating a non active user (unconfirmed email)' do it 'returns a 500 when local logins are disabled' do @@ -723,7 +732,7 @@ describe UsersController do context "with values for the fields" do let(:create_params) { { name: @user.name, - password: 'watwatwat', + password: 'watwatwatwat', username: @user.username, email: @user.email, user_fields: { @@ -773,7 +782,7 @@ describe UsersController do context "without values for the fields" do let(:create_params) { { name: @user.name, - password: 'watwatwat', + password: 'watwatwatwat', username: @user.username, email: @user.email, } } @@ -793,7 +802,7 @@ describe UsersController do let!(:staged) { Fabricate(:staged, email: "staged@account.com") } it "succeeds" do - xhr :post, :create, email: staged.email, username: "zogstrip", password: "P4ssw0rd" + xhr :post, :create, email: staged.email, username: "zogstrip", password: "P4ssw0rd$$" result = ::JSON.parse(response.body) expect(result["success"]).to eq(true) expect(User.find_by(email: staged.email).staged).to eq(false) @@ -1181,6 +1190,19 @@ describe UsersController do end + context 'a locale is chosen that differs from I18n.locale' do + it "updates the user's locale" do + I18n.stubs(:locale).returns('fr') + + put :update, + username: user.username, + locale: :fa_IR + + expect(User.find_by(username: user.username).locale).to eq('fa_IR') + end + + end + context "with user fields" do context "an editable field" do let!(:user_field) { Fabricate(:user_field) } @@ -1229,9 +1251,7 @@ describe UsersController do it 'does not allow the update' do user = Fabricate(:user, name: 'Billy Bob') log_in_user(user) - guardian = Guardian.new(user) - guardian.stubs(:ensure_can_edit!).with(user).raises(Discourse::InvalidAccess.new) - Guardian.stubs(new: guardian).with(user) + Guardian.any_instance.expects(:can_edit?).with(user).returns(false) put :update, username: user.username, name: 'Jim Tom' diff --git a/spec/fixtures/emails/attached_rb_file.eml b/spec/fixtures/emails/attached_rb_file.eml new file mode 100644 index 0000000000..960b3e6d67 --- /dev/null +++ b/spec/fixtures/emails/attached_rb_file.eml @@ -0,0 +1,31 @@ +Return-Path: +From: Foo Bar +To: team@bar.com +Date: Mon, 29 Feb 2016 21:54:01 +0100 +Message-ID: <56d4afe991ed0_3ab83fdf94441a20677f0@HAL.lan.mail> +Subject: Email with .rb file attached +Mime-Version: 1.0 +Content-Type: multipart/mixed; + boundary="--==_mimepart_56d4afe991d17_3ab83fdf94441a206765"; + charset=UTF-8 +Content-Transfer-Encoding: 7bit + + +----==_mimepart_56d4afe991d17_3ab83fdf94441a206765 +Content-Type: text/plain; + charset=UTF-8 +Content-Transfer-Encoding: 7bit + +Please find the source code of Discourse attached. +----==_mimepart_56d4afe991d17_3ab83fdf94441a206765 +Content-Type: application/x-ruby; + charset=UTF-8; + filename=discourse.rb +Content-Transfer-Encoding: base64 +Content-Disposition: attachment; + filename=discourse.rb +Content-ID: <56d4afe992cb6_3ab83fdf94441a20678c3@HAL.lan.mail> + +cHV0cyAiSGVsbG8gRGlzY291cnNlIgo= + +----==_mimepart_56d4afe991d17_3ab83fdf94441a206765-- diff --git a/spec/fixtures/emails/encoded_display_name.eml b/spec/fixtures/emails/encoded_display_name.eml index cf31f703ef..1b5d6bb3a1 100644 --- a/spec/fixtures/emails/encoded_display_name.eml +++ b/spec/fixtures/emails/encoded_display_name.eml @@ -1,6 +1,6 @@ Return-Path: From: =?UTF-8?B?0KHQu9GD0YfQsNC50L3QsNGP?= =?UTF-8?B?INCY0LzRjw==?= -To: team@bar.com +To: meat@bar.com Subject: I need help Date: Fri, 15 Jan 2016 00:12:43 +0100 Message-ID: <29@foo.bar.mail> diff --git a/spec/fixtures/emails/insufficient_trust_level.eml b/spec/fixtures/emails/existing_user.eml similarity index 52% rename from spec/fixtures/emails/insufficient_trust_level.eml rename to spec/fixtures/emails/existing_user.eml index 4800b432be..db41b91ac5 100644 --- a/spec/fixtures/emails/insufficient_trust_level.eml +++ b/spec/fixtures/emails/existing_user.eml @@ -1,11 +1,11 @@ -Return-Path: -From: Foo Bar +Return-Path: +From: Foo Bar To: category@bar.com -Subject: This is a topic from a complete stranger +Subject: This is a topic from an existing user Date: Fri, 15 Jan 2016 00:12:43 +0100 Message-ID: <32@foo.bar.mail> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable -Hey, this is a topic from a complete stranger ;) +Hey, this is a topic from an existing user ;) diff --git a/spec/fixtures/emails/invalid_from.eml b/spec/fixtures/emails/invalid_from.eml new file mode 100644 index 0000000000..38dc0fbc8e --- /dev/null +++ b/spec/fixtures/emails/invalid_from.eml @@ -0,0 +1,9 @@ +Return-Path: +From: Foo Bar [THIS IS INVALID] +To: reply+4f97315cc828096c9cb34c6f1a0d6fe8@bar.com +Date: Fri, 15 Jan 2016 00:12:43 +0100 +Message-ID: <41@foo.bar.mail> +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 + +This email was sent with an invalid from header field. diff --git a/spec/fixtures/emails/stranger_not_allowed.eml b/spec/fixtures/emails/new_user.eml similarity index 94% rename from spec/fixtures/emails/stranger_not_allowed.eml rename to spec/fixtures/emails/new_user.eml index 1464e8ddd8..fdae501ab9 100644 --- a/spec/fixtures/emails/stranger_not_allowed.eml +++ b/spec/fixtures/emails/new_user.eml @@ -1,6 +1,6 @@ Return-Path: From: Foo Bar -To: category@bar.com +To: category@foo.com Subject: This is a topic from a complete stranger Date: Fri, 15 Jan 2016 00:12:43 +0100 Message-ID: <31@foo.bar.mail> diff --git a/spec/fixtures/emails/no_subject.eml b/spec/fixtures/emails/no_subject.eml index 5804109647..ccfd9ea599 100644 --- a/spec/fixtures/emails/no_subject.eml +++ b/spec/fixtures/emails/no_subject.eml @@ -1,5 +1,5 @@ From: Some One -To: team@bar.com +To: meat@bar.com Date: Mon, 1 Feb 2016 00:12:43 +0100 Message-ID: <40@foo.bar.mail> Mime-Version: 1.0 diff --git a/spec/fixtures/emails/sufficient_trust_level.eml b/spec/fixtures/emails/sufficient_trust_level.eml deleted file mode 100644 index cee56f11be..0000000000 --- a/spec/fixtures/emails/sufficient_trust_level.eml +++ /dev/null @@ -1,11 +0,0 @@ -Return-Path: -From: Foo Bar -To: category@bar.com -Subject: This is a topic from a know user -Date: Fri, 15 Jan 2016 00:12:43 +0100 -Message-ID: <33@foo.bar.mail> -Mime-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: quoted-printable - -Hey, this is a topic from a known user ;) diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index fb97b0454c..5931ec0d3a 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -84,5 +84,16 @@ describe ApplicationHelper do end end + describe '#rtl_class' do + it "returns 'rtl' when the I18n.locale is rtl" do + I18n.stubs(:locale).returns(:he) + expect(helper.rtl_class).to eq('rtl') + end + + it 'returns an empty string when the I18n.locale is not rtl' do + I18n.stubs(:locale).returns(:zh_TW) + expect(helper.rtl_class).to eq('') + end + end end diff --git a/spec/jobs/user_email_spec.rb b/spec/jobs/user_email_spec.rb index 5cce202fe3..5054089b5d 100644 --- a/spec/jobs/user_email_spec.rb +++ b/spec/jobs/user_email_spec.rb @@ -200,6 +200,12 @@ describe Jobs::UserEmail do Jobs::UserEmail.new.execute(type: :user_mentioned, user_id: user.id, notification_id: notification.id, post_id: post.id) # other times, we only pass the type of notification Jobs::UserEmail.new.execute(type: :user_mentioned, user_id: user.id, notification_type: "posted", post_id: post.id) + # When post is nil + Jobs::UserEmail.new.execute(type: :user_mentioned, user_id: user.id, notification_type: "posted") + # When post does not have a topic + post = Fabricate(:post) + post.topic.destroy + Jobs::UserEmail.new.execute(type: :user_mentioned, user_id: user.id, notification_type: "posted", post_id: post) end it "doesn't send the email if the post has been user deleted" do diff --git a/spec/mailers/user_notifications_spec.rb b/spec/mailers/user_notifications_spec.rb index a58c2d16f5..a309290979 100644 --- a/spec/mailers/user_notifications_spec.rb +++ b/spec/mailers/user_notifications_spec.rb @@ -15,11 +15,16 @@ describe UserNotifications do _post7 = Fabricate(:post, topic: post1.topic, post_type: Post.types[:whisper]) last = Fabricate(:post, topic: post1.topic) + post1.user.user_option.email_previous_replies = UserOption.previous_replies_type[:always] + # default is only post #1 - expect(UserNotifications.get_context_posts(last, nil).count).to eq(1) + expect(UserNotifications.get_context_posts(last, nil, post1.user).count).to eq(1) # staff members can also see the whisper - tu = TopicUser.new(topic: post1.topic, user: build(:moderator)) - expect(UserNotifications.get_context_posts(last, tu).count).to eq(2) + moderator = build(:moderator) + moderator.user_option = UserOption.new + moderator.user_option.email_previous_replies = UserOption.previous_replies_type[:always] + tu = TopicUser.new(topic: post1.topic, user: moderator) + expect(UserNotifications.get_context_posts(last, tu, tu.user).count).to eq(2) end it "allows users to control context" do @@ -32,13 +37,15 @@ describe UserNotifications do topic_user = TopicUser.find_by(user_id: user.id, topic_id: post1.topic_id) # to avoid reloads after update_columns user = topic_user.user - expect(UserNotifications.get_context_posts(post3, topic_user).count).to eq(1) + user.user_option.update_columns(email_previous_replies: UserOption.previous_replies_type[:unless_emailed]) + + expect(UserNotifications.get_context_posts(post3, topic_user, user).count).to eq(1) user.user_option.update_columns(email_previous_replies: UserOption.previous_replies_type[:never]) - expect(UserNotifications.get_context_posts(post3, topic_user).count).to eq(0) + expect(UserNotifications.get_context_posts(post3, topic_user, user).count).to eq(0) user.user_option.update_columns(email_previous_replies: UserOption.previous_replies_type[:always]) - expect(UserNotifications.get_context_posts(post3, topic_user).count).to eq(2) + expect(UserNotifications.get_context_posts(post3, topic_user, user).count).to eq(2) end end @@ -110,12 +117,14 @@ describe UserNotifications do let(:response_by_user) { Fabricate(:user, name: "John Doe") } let(:category) { Fabricate(:category, name: 'India') } let(:topic) { Fabricate(:topic, category: category) } - let(:post) { Fabricate(:post, topic: topic) } - let(:response) { Fabricate(:post, topic: post.topic, user: response_by_user)} + let(:post) { Fabricate(:post, topic: topic, raw: 'This is My super duper cool topic') } + let(:response) { Fabricate(:post, reply_to_post_number: 1, topic: post.topic, user: response_by_user)} let(:user) { Fabricate(:user) } let(:notification) { Fabricate(:notification, user: user) } it 'generates a correct email' do + + # Fabricator is not fabricating this ... SiteSetting.enable_names = true SiteSetting.display_name_on_posts = true mail = UserNotifications.user_replied(response.user, @@ -123,25 +132,41 @@ describe UserNotifications do notification_type: notification.notification_type, notification_data_hash: notification.data_hash ) - # from should include full user name expect(mail[:from].display_names).to eql(['John Doe']) # subject should include category name expect(mail.subject).to match(/India/) + mail_html = mail.html_part.to_s + + expect(mail_html.scan(/My super duper cool topic/).count).to eq(1) + expect(mail_html.scan(/In Reply To/).count).to eq(1) + # 2 "visit topic" link - expect(mail.html_part.to_s.scan(/Visit Topic/).count).to eq(2) + expect(mail_html.scan(/Visit Topic/).count).to eq(2) # 2 respond to links cause we have 1 context post - expect(mail.html_part.to_s.scan(/to respond/).count).to eq(2) + expect(mail_html.scan(/to respond/).count).to eq(2) # 1 unsubscribe - expect(mail.html_part.to_s.scan(/To unsubscribe/).count).to eq(1) + expect(mail_html.scan(/To unsubscribe/).count).to eq(1) # side effect, topic user is updated with post number tu = TopicUser.get(post.topic_id, response.user) expect(tu.last_emailed_post_number).to eq(response.post_number) + + + # no In Reply To if user opts out + response.user.user_option.email_in_reply_to = false + mail = UserNotifications.user_replied(response.user, + post: response, + notification_type: notification.notification_type, + notification_data_hash: notification.data_hash + ) + + + expect(mail.html_part.to_s.scan(/In Reply To/).count).to eq(0) end end @@ -169,8 +194,8 @@ describe UserNotifications do # subject should not include category name expect(mail.subject).not_to match(/Uncategorized/) - # 2 respond to links cause we have 1 context post - expect(mail.html_part.to_s.scan(/to respond/).count).to eq(2) + # 1 respond to links as no context by default + expect(mail.html_part.to_s.scan(/to respond/).count).to eq(1) # 1 unsubscribe link expect(mail.html_part.to_s.scan(/To unsubscribe/).count).to eq(1) @@ -243,6 +268,15 @@ describe UserNotifications do end end + # The parts of emails that are derived from templates are translated + shared_examples "sets user locale" do + context "set locale for translating templates" do + it "sets the locale" do + expects_build_with(has_key(:locale)) + end + end + end + shared_examples "notification email building" do let(:post) { Fabricate(:post, user: user) } let(:mail_type) { "user_#{notification_type}"} @@ -316,6 +350,7 @@ describe UserNotifications do include_examples "notification email building" do let(:notification_type) { :mentioned } include_examples "supports reply by email" + include_examples "sets user locale" end end @@ -323,6 +358,7 @@ describe UserNotifications do include_examples "notification email building" do let(:notification_type) { :replied } include_examples "supports reply by email" + include_examples "sets user locale" end end @@ -330,6 +366,7 @@ describe UserNotifications do include_examples "notification email building" do let(:notification_type) { :quoted } include_examples "supports reply by email" + include_examples "sets user locale" end end @@ -337,6 +374,7 @@ describe UserNotifications do include_examples "notification email building" do let(:notification_type) { :posted } include_examples "supports reply by email" + include_examples "sets user locale" end end @@ -344,6 +382,7 @@ describe UserNotifications do include_examples "notification email building" do let(:notification_type) { :invited_to_private_message } include_examples "no reply by email" + include_examples "sets user locale" end end @@ -351,7 +390,58 @@ describe UserNotifications do include_examples "notification email building" do let(:notification_type) { :invited_to_topic } include_examples "no reply by email" + include_examples "sets user locale" end end + # notification emails derived from templates are translated into the user's locale + shared_examples "notification derived from template" do + let(:user) { Fabricate(:user, locale: locale) } + let(:mail_type) { mail_type } + let(:notification) { Fabricate(:notification, user: user) } + end + + describe "notifications from template" do + + context "user locale has been set" do + + %w(signup signup_after_approval authorize_email forgot_password admin_login account_created).each do |mail_type| + include_examples "notification derived from template" do + SiteSetting.default_locale = "en" + let(:locale) { "fr" } + let(:mail_type) { mail_type } + it "sets the locale" do + expects_build_with(has_entry(:locale, "fr")) + end + end + end + end + + context "user locale has not been set" do + %w(signup signup_after_approval authorize_email forgot_password admin_login account_created).each do |mail_type| + include_examples "notification derived from template" do + SiteSetting.default_locale = "en" + let(:locale) { nil } + let(:mail_type) { mail_type } + it "sets the locale" do + expects_build_with(has_entry(:locale, nil)) + end + end + end + end + + context "user locale is an empty string" do + %w(signup signup_after_approval authorize_email forgot_password admin_login account_created).each do |mail_type| + include_examples "notification derived from template" do + SiteSetting.default_locale = "en" + let(:locale) { "" } + let(:mail_type) { mail_type } + it "sets the locale" do + expects_build_with(has_entry(:locale, nil)) + end + end + end + end + + end end diff --git a/spec/models/digest_email_site_setting_spec.rb b/spec/models/digest_email_site_setting_spec.rb index 5eb899928a..cebcfb2342 100644 --- a/spec/models/digest_email_site_setting_spec.rb +++ b/spec/models/digest_email_site_setting_spec.rb @@ -3,11 +3,11 @@ require 'rails_helper' describe DigestEmailSiteSetting do describe 'valid_value?' do it 'returns true for a valid value as an int' do - expect(DigestEmailSiteSetting.valid_value?(1)).to eq true + expect(DigestEmailSiteSetting.valid_value?(1440)).to eq true end it 'returns true for a valid value as a string' do - expect(DigestEmailSiteSetting.valid_value?('1')).to eq true + expect(DigestEmailSiteSetting.valid_value?('1440')).to eq true end it 'returns false for an invalid value' do diff --git a/spec/models/directory_item_spec.rb b/spec/models/directory_item_spec.rb index d19be0af82..6612686e3f 100644 --- a/spec/models/directory_item_spec.rb +++ b/spec/models/directory_item_spec.rb @@ -19,13 +19,17 @@ describe DirectoryItem do end context 'refresh' do - let!(:post) { Fabricate(:post) } + before do + ActiveRecord::Base.observers.enable :all + end + + let!(:post) { create_post } it "creates the record for the user" do DirectoryItem.refresh! expect(DirectoryItem.where(period_type: DirectoryItem.period_types[:all]) .where(user_id: post.user.id) - .exists?).to be_truthy + .where(topic_count: 1).count).to eq(1) end end diff --git a/spec/models/incoming_links_report_spec.rb b/spec/models/incoming_links_report_spec.rb index d85e4bd7cb..1ed432f745 100644 --- a/spec/models/incoming_links_report_spec.rb +++ b/spec/models/incoming_links_report_spec.rb @@ -40,8 +40,8 @@ describe IncomingLinksReport do r = IncomingLinksReport.find('top_referrers').as_json expect(r[:data]).to eq [ - {username: p1.user.username, num_clicks: 7 + 2, num_topics: 2}, - {username: p2.user.username, num_clicks: 3, num_topics: 1} + {username: p1.user.username, user_id: p1.user.id, num_clicks: 7 + 2, num_topics: 2}, + {username: p2.user.username, user_id: p2.user.id, num_clicks: 3, num_topics: 1} ] r = IncomingLinksReport.find('top_traffic_sources').as_json @@ -98,8 +98,8 @@ describe IncomingLinksReport do Fabricate(:incoming_link, user: bob, post: post1).save end - expect(top_referrers[:data][0]).to eq({username: 'amy', num_clicks: 3, num_topics: 2}) - expect(top_referrers[:data][1]).to eq({username: 'bob', num_clicks: 2, num_topics: 1}) + expect(top_referrers[:data][0]).to eq({username: 'amy', user_id: amy.id, num_clicks: 3, num_topics: 2}) + expect(top_referrers[:data][1]).to eq({username: 'bob', user_id: bob.id, num_clicks: 2, num_topics: 1}) end end diff --git a/spec/models/post_action_spec.rb b/spec/models/post_action_spec.rb index 9146ad19e7..e7a906bc60 100644 --- a/spec/models/post_action_spec.rb +++ b/spec/models/post_action_spec.rb @@ -12,6 +12,24 @@ describe PostAction do let(:second_post) { Fabricate(:post, topic_id: post.topic_id) } let(:bookmark) { PostAction.new(user_id: post.user_id, post_action_type_id: PostActionType.types[:bookmark] , post_id: post.id) } + describe "rate limits" do + + it "limits redo/undo" do + + RateLimiter.stubs(:disabled?).returns(false) + + PostAction.act(eviltrout, post, PostActionType.types[:like]) + PostAction.remove_act(eviltrout, post, PostActionType.types[:like]) + PostAction.act(eviltrout, post, PostActionType.types[:like]) + PostAction.remove_act(eviltrout, post, PostActionType.types[:like]) + + expect { + PostAction.act(eviltrout, post, PostActionType.types[:like]) + }.to raise_error + + end + end + describe "messaging" do it "doesn't generate title longer than 255 characters" do @@ -464,8 +482,6 @@ describe PostAction do end it "prevents user to act twice at the same time" do - post = Fabricate(:post) - # flags are already being tested all_types_except_flags = PostActionType.types.except(PostActionType.flag_types) all_types_except_flags.values.each do |action| diff --git a/spec/models/post_alert_observer_spec.rb b/spec/models/post_alert_observer_spec.rb index c4de604173..be6f8c7876 100644 --- a/spec/models/post_alert_observer_spec.rb +++ b/spec/models/post_alert_observer_spec.rb @@ -21,11 +21,8 @@ describe PostAlertObserver do end context 'when removing a liked post' do - before do - PostAction.act(evil_trout, post, PostActionType.types[:like]) - end - it 'removes a notification' do + PostAction.act(evil_trout, post, PostActionType.types[:like]) expect { PostAction.remove_act(evil_trout, post, PostActionType.types[:like]) }.to change(Notification, :count).by(-1) diff --git a/spec/models/post_analyzer_spec.rb b/spec/models/post_analyzer_spec.rb index 57e68ee88a..3940fa73d8 100644 --- a/spec/models/post_analyzer_spec.rb +++ b/spec/models/post_analyzer_spec.rb @@ -206,6 +206,11 @@ describe PostAnalyzer do expect(post_analyzer.raw_mentions).to eq(['jake', 'finn', 'jake_old']) end + it "handles hyphen in groupname" do + post_analyzer = PostAnalyzer.new("@org-board", default_topic_id) + expect(post_analyzer.raw_mentions).to eq(['org-board']) + end + it "ignores emails" do post_analyzer = PostAnalyzer.new("1@test.com 1@best.com @best @not", default_topic_id) expect(post_analyzer.raw_mentions).to eq(['best', 'not']) diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb index c7a6ead930..369763284e 100644 --- a/spec/models/post_spec.rb +++ b/spec/models/post_spec.rb @@ -426,6 +426,11 @@ describe Post do expect(post.raw_mentions).to eq(['jake', 'finn', 'jake_old']) end + it "handles hyphen in groupname" do + post = Fabricate.build(:post, post_args.merge(raw: "@org-board")) + expect(post.raw_mentions).to eq(['org-board']) + end + end context "max mentions" do diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index dfbabbe039..35a9e72725 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -1157,7 +1157,7 @@ describe User do context "when user preferences are overriden" do before do - SiteSetting.default_email_digest_frequency = 1 # daily + SiteSetting.default_email_digest_frequency = 1440 # daily SiteSetting.default_email_private_messages = false SiteSetting.default_email_direct = false SiteSetting.default_email_mailing_list_mode = true @@ -1183,7 +1183,7 @@ describe User do options = user.user_option expect(options.email_always).to eq(true) expect(options.mailing_list_mode).to eq(true) - expect(options.digest_after_days).to eq(1) + expect(options.digest_after_minutes).to eq(1440) expect(options.email_private_messages).to eq(false) expect(options.external_links_in_new_tab).to eq(true) expect(options.enable_quoting).to eq(false) diff --git a/spec/services/post_alerter_spec.rb b/spec/services/post_alerter_spec.rb index 882e680dc8..f029469692 100644 --- a/spec/services/post_alerter_spec.rb +++ b/spec/services/post_alerter_spec.rb @@ -3,6 +3,7 @@ require 'rails_helper' describe PostAlerter do let!(:evil_trout) { Fabricate(:evil_trout) } + let(:user) { Fabricate(:user) } def create_post_with_alerts(args={}) post = Fabricate(:post, args) @@ -23,20 +24,115 @@ describe PostAlerter do end end - context 'likes' do - it 'does not double notify users on likes' do + context 'edits' do + it 'notifies correctly on edits' do + ActiveRecord::Base.observers.enable :all post = Fabricate(:post, raw: 'I love waffles') - PostAction.act(evil_trout, post, PostActionType.types[:like]) admin = Fabricate(:admin) post.revise(admin, {raw: 'I made a revision'}) + # skip this notification cause we already notified on a similar edit + Timecop.freeze(2.hours.from_now) do + post.revise(admin, {raw: 'I made another revision'}) + end + + post.revise(Fabricate(:admin), {raw: 'I made a revision'}) + + Timecop.freeze(4.hours.from_now) do + post.revise(admin, {raw: 'I made another revision'}) + end + + expect(Notification.count(post_number: 1, topic_id: post.topic_id)).to eq(3) + end + end + + context 'likes' do + + it 'notifies on likes after an undo' do + ActiveRecord::Base.observers.enable :all + + post = Fabricate(:post, raw: 'I love waffles') + + PostAction.act(evil_trout, post, PostActionType.types[:like]) + PostAction.remove_act(evil_trout, post, PostActionType.types[:like]) + PostAction.act(evil_trout, post, PostActionType.types[:like]) + + expect(Notification.count(post_number: 1, topic_id: post.topic_id)).to eq(1) + end + + it 'notifies on does not notify when never is selected' do + ActiveRecord::Base.observers.enable :all + + post = Fabricate(:post, raw: 'I love waffles') + + post.user.user_option.update_columns(like_notification_frequency: + UserOption.like_notification_frequency_type[:never]) + + PostAction.act(evil_trout, post, PostActionType.types[:like]) + + + expect(Notification.count(post_number: 1, topic_id: post.topic_id)).to eq(0) + end + + it 'notifies on likes correctly' do + ActiveRecord::Base.observers.enable :all + + post = Fabricate(:post, raw: 'I love waffles') + + PostAction.act(evil_trout, post, PostActionType.types[:like]) + admin = Fabricate(:admin) PostAction.act(admin, post, PostActionType.types[:like]) - # one like and one edit notification + # one like + expect(Notification.count(post_number: 1, topic_id: post.topic_id)).to eq(1) + + + post.user.user_option.update_columns(like_notification_frequency: + UserOption.like_notification_frequency_type[:always]) + + admin2 = Fabricate(:admin) + PostAction.act(admin2, post, PostActionType.types[:like]) + expect(Notification.count(post_number: 1, topic_id: post.topic_id)).to eq(1) + + # adds info to the notification + notification = Notification.find_by(post_number: 1, + topic_id: post.topic_id) + + + expect(notification.data_hash["count"].to_i).to eq(2) + expect(notification.data_hash["username2"]).to eq(evil_trout.username) + + # this is a tricky thing ... removing a like should fix up the notifications + PostAction.remove_act(evil_trout, post, PostActionType.types[:like]) + + # rebuilds the missing notification + expect(Notification.count(post_number: 1, topic_id: post.topic_id)).to eq(1) + notification = Notification.find_by(post_number: 1, + topic_id: post.topic_id) + + expect(notification.data_hash["count"]).to eq(2) + expect(notification.data_hash["username"]).to eq(admin2.username) + expect(notification.data_hash["username2"]).to eq(admin.username) + + + post.user.user_option.update_columns(like_notification_frequency: + UserOption.like_notification_frequency_type[:first_time_and_daily]) + + # this gets skipped + admin3 = Fabricate(:admin) + PostAction.act(admin3, post, PostActionType.types[:like]) + + Timecop.freeze(2.days.from_now) do + admin4 = Fabricate(:admin) + PostAction.act(admin4, post, PostActionType.types[:like]) + end + + # first happend within the same day, no need to notify expect(Notification.count(post_number: 1, topic_id: post.topic_id)).to eq(2) + end end @@ -112,19 +208,25 @@ describe PostAlerter do expect(GroupMention.count).to eq(1) - group.update_columns(alias_level: Group::ALIAS_LEVELS[:members_mods_and_admins]) + Fabricate(:group, name: 'group-alt', alias_level: Group::ALIAS_LEVELS[:everyone]) + expect { + create_post_with_alerts(raw: "Hello, @group-alt should not trigger a notification?") + }.to change(evil_trout.notifications, :count).by(0) + + expect(GroupMention.count).to eq(2) + + group.update_columns(alias_level: Group::ALIAS_LEVELS[:members_mods_and_admins]) expect { create_post_with_alerts(raw: "Hello @group you are not mentionable") }.to change(evil_trout.notifications, :count).by(0) - expect(GroupMention.count).to eq(2) + expect(GroupMention.count).to eq(3) end end context '@mentions' do - let(:user) { Fabricate(:user) } let(:mention_post) { create_post_with_alerts(user: user, raw: 'Hello @eviltrout')} let(:topic) { mention_post.topic } @@ -150,4 +252,32 @@ describe PostAlerter do end end + + describe ".create_notification" do + let(:topic) { Fabricate(:private_message_topic, user: user, created_at: 1.hour.ago) } + let(:post) { Fabricate(:post, topic: topic, created_at: 1.hour.ago) } + + it "creates a notification for PMs" do + post.revise(user, { raw: 'This is the revised post' }, revised_at: Time.zone.now) + + expect { + PostAlerter.new.create_notification(user, Notification.types[:private_message], post) + }.to change { user.notifications.count }.by(1) + + expect(user.notifications.last.data_hash["topic_title"]).to eq(topic.title) + end + + it "keeps the original title for PMs" do + original_title = topic.title + + post.revise(user, { title: "This is the revised title" }, revised_at: Time.now) + + expect { + PostAlerter.new.create_notification(user, Notification.types[:private_message], post) + }.to change { user.notifications.count }.by(1) + + expect(user.notifications.last.data_hash["topic_title"]).to eq(original_title) + end + end + end diff --git a/spec/services/random_topic_selector_spec.rb b/spec/services/random_topic_selector_spec.rb index dd2d1cccb3..d57f5519d2 100644 --- a/spec/services/random_topic_selector_spec.rb +++ b/spec/services/random_topic_selector_spec.rb @@ -11,8 +11,15 @@ describe RandomTopicSelector do $redis.rpush key, t end + expect(RandomTopicSelector.next(0)).to eq([]) expect(RandomTopicSelector.next(2)).to eq([0,1]) + + $redis.expects(:multi).returns(Discourse.received_readonly!) expect(RandomTopicSelector.next(2)).to eq([2,3]) + $redis.unstub(:multi) + + expect(RandomTopicSelector.next(2)).to eq([2,3]) + expect(RandomTopicSelector.next(2)).to eq([]) end it 'can correctly backfill' do diff --git a/spec/services/user_updater_spec.rb b/spec/services/user_updater_spec.rb index 7866206bfe..d061509025 100644 --- a/spec/services/user_updater_spec.rb +++ b/spec/services/user_updater_spec.rb @@ -46,18 +46,20 @@ describe UserUpdater do updater.update(bio_raw: 'my new bio', email_always: 'true', mailing_list_mode: true, - digest_after_days: "8", + digest_after_minutes: "45", new_topic_duration_minutes: 100, - auto_track_topics_after_msecs: 101 + auto_track_topics_after_msecs: 101, + email_in_reply_to: false ) user.reload expect(user.user_profile.bio_raw).to eq 'my new bio' expect(user.user_option.email_always).to eq true expect(user.user_option.mailing_list_mode).to eq true - expect(user.user_option.digest_after_days).to eq 8 + expect(user.user_option.digest_after_minutes).to eq 45 expect(user.user_option.new_topic_duration_minutes).to eq 100 expect(user.user_option.auto_track_topics_after_msecs).to eq 101 + expect(user.user_option.email_in_reply_to).to eq false end context 'when update succeeds' do diff --git a/test/javascripts/acceptance/composer-test.js.es6 b/test/javascripts/acceptance/composer-test.js.es6 index e8d8e8dbf5..38789579c1 100644 --- a/test/javascripts/acceptance/composer-test.js.es6 +++ b/test/javascripts/acceptance/composer-test.js.es6 @@ -192,8 +192,8 @@ test("Edit the first post", () => { ok(!exists('.topic-post:eq(0) .post-info.edits'), 'it has no edits icon at first'); - click('.topic-post:eq(0) button[data-action=showMoreActions]'); - click('.topic-post:eq(0) button[data-action=edit]'); + click('.topic-post:eq(0) button.show-more-actions'); + click('.topic-post:eq(0) button.edit'); andThen(() => { equal(find('.d-editor-input').val().indexOf('Any plans to support'), 0, 'it populates the input with the post text'); }); @@ -212,11 +212,11 @@ test("Edit the first post", () => { test("Composer can switch between edits", () => { visit("/t/this-is-a-test-topic/9"); - click('.topic-post:eq(0) button[data-action=edit]'); + click('.topic-post:eq(0) button.edit'); andThen(() => { equal(find('.d-editor-input').val().indexOf('This is the first post.'), 0, 'it populates the input with the post text'); }); - click('.topic-post:eq(1) button[data-action=edit]'); + click('.topic-post:eq(1) button.edit'); andThen(() => { equal(find('.d-editor-input').val().indexOf('This is the second post.'), 0, 'it populates the input with the post text'); }); @@ -225,9 +225,9 @@ test("Composer can switch between edits", () => { test("Composer with dirty edit can toggle to another edit", () => { visit("/t/this-is-a-test-topic/9"); - click('.topic-post:eq(0) button[data-action=edit]'); + click('.topic-post:eq(0) button.edit'); fillIn('.d-editor-input', 'This is a dirty reply'); - click('.topic-post:eq(1) button[data-action=edit]'); + click('.topic-post:eq(1) button.edit'); andThen(() => { ok(exists('.bootbox.modal'), 'it pops up a confirmation dialog'); }); @@ -240,15 +240,15 @@ test("Composer with dirty edit can toggle to another edit", () => { test("Composer can toggle between edit and reply", () => { visit("/t/this-is-a-test-topic/9"); - click('.topic-post:eq(0) button[data-action=edit]'); + click('.topic-post:eq(0) button.edit'); andThen(() => { equal(find('.d-editor-input').val().indexOf('This is the first post.'), 0, 'it populates the input with the post text'); }); - click('.topic-post:eq(0) button[data-action=reply]'); + click('.topic-post:eq(0) button.reply'); andThen(() => { equal(find('.d-editor-input').val(), "", 'it clears the input'); }); - click('.topic-post:eq(0) button[data-action=edit]'); + click('.topic-post:eq(0) button.edit'); andThen(() => { equal(find('.d-editor-input').val().indexOf('This is the first post.'), 0, 'it populates the input with the post text'); }); @@ -257,9 +257,9 @@ test("Composer can toggle between edit and reply", () => { test("Composer with dirty reply can toggle to edit", () => { visit("/t/this-is-a-test-topic/9"); - click('.topic-post:eq(0) button[data-action=reply]'); + click('.topic-post:eq(0) button.reply'); fillIn('.d-editor-input', 'This is a dirty reply'); - click('.topic-post:eq(0) button[data-action=edit]'); + click('.topic-post:eq(0) button.edit'); andThen(() => { ok(exists('.bootbox.modal'), 'it pops up a confirmation dialog'); }); @@ -272,10 +272,10 @@ test("Composer with dirty reply can toggle to edit", () => { test("Composer draft with dirty reply can toggle to edit", () => { visit("/t/this-is-a-test-topic/9"); - click('.topic-post:eq(0) button[data-action=reply]'); + click('.topic-post:eq(0) button.reply'); fillIn('.d-editor-input', 'This is a dirty reply'); click('.toggler'); - click('.topic-post:eq(0) button[data-action=edit]'); + click('.topic-post:eq(0) button.edit'); andThen(() => { ok(exists('.bootbox.modal'), 'it pops up a confirmation dialog'); }); diff --git a/test/javascripts/components/d-editor-test.js.es6 b/test/javascripts/components/d-editor-test.js.es6 index ecb486f3a5..d8985c19c7 100644 --- a/test/javascripts/components/d-editor-test.js.es6 +++ b/test/javascripts/components/d-editor-test.js.es6 @@ -1,5 +1,5 @@ import componentTest from 'helpers/component-test'; -import { onToolbarCreate } from 'discourse/components/d-editor'; +import { withPluginApi } from 'discourse/lib/plugin-api'; moduleForComponent('d-editor', {integration: true}); @@ -540,12 +540,14 @@ componentTest('emoji', { template: '{{d-editor value=value}}', setup() { // Test adding a custom button - onToolbarCreate(toolbar => { - toolbar.addButton({ - id: 'emoji', - group: 'extras', - icon: 'smile-o', - action: 'emoji' + withPluginApi('0.1', api => { + api.onToolbarCreate(toolbar => { + toolbar.addButton({ + id: 'emoji', + group: 'extras', + icon: 'smile-o', + action: 'emoji' + }); }); }); this.set('value', 'hello world.'); diff --git a/test/javascripts/components/post-menu-test.js.es6 b/test/javascripts/components/post-menu-test.js.es6 deleted file mode 100644 index a027bb660f..0000000000 --- a/test/javascripts/components/post-menu-test.js.es6 +++ /dev/null @@ -1,52 +0,0 @@ -import componentTest from 'helpers/component-test'; - -moduleForComponent('post-menu', {integration: true}); - -function setup(store) { - const topic = store.createRecord('topic', {id: 123}); - const post = store.createRecord('post', { - id: 1, - post_number: 1, - topic, - like_count: 3, - actions_summary: [ - {id: 2, count: 3, hidden: false, can_act: true} - ] - }); - - this.on('toggleLike', function() { - post.toggleProperty('likeAction.acted'); - }); - - this.set('post', post); -} - -componentTest('basic render', { - template: '{{post-menu post=post}}', - setup, - test(assert) { - assert.ok(!!this.$('.post-menu-area').length, 'it renders a post menu'); - assert.ok(!!this.$('.actions button[data-share-url]').length, 'it renders a share button'); - } -}); - -componentTest('liking', { - template: '{{post-menu post=post toggleLike="toggleLike"}}', - setup, - test(assert) { - assert.ok(!!this.$('.actions button.like').length); - assert.ok(!!this.$('.actions button.like-count').length); - - click('.actions button.like'); - andThen(() => { - assert.ok(!this.$('.actions button.like').length); - assert.ok(!!this.$('.actions button.has-like').length); - }); - - click('.actions button.has-like'); - andThen(() => { - assert.ok(!!this.$('.actions button.like').length); - assert.ok(!this.$('.actions button.has-like').length); - }); - } -}); diff --git a/test/javascripts/controllers/create-account-test.js.es6 b/test/javascripts/controllers/create-account-test.js.es6 index 4c202880aa..0f7284be6f 100644 --- a/test/javascripts/controllers/create-account-test.js.es6 +++ b/test/javascripts/controllers/create-account-test.js.es6 @@ -28,11 +28,11 @@ test('passwordValidation', function() { var controller = subject(); controller.set('passwordRequired', true); - controller.set('accountEmail', 'pork@chops.com'); - controller.set('accountUsername', 'porkchops'); + controller.set('accountEmail', 'pork@chops.com'); + controller.set('accountUsername', 'porkchops'); controller.set('prefilledUsername', 'porkchops'); - controller.set('accountPassword', 'b4fcdae11f9167'); + controller.set('accountPassword', 'b4fcdae11f9167'); equal(controller.get('passwordValidation.ok'), true, 'Password is ok'); equal(controller.get('passwordValidation.reason'), I18n.t('user.password.ok'), 'Password is valid'); diff --git a/test/javascripts/controllers/topic-test.js.es6 b/test/javascripts/controllers/topic-test.js.es6 index 13fdc144eb..48f0bcdbd0 100644 --- a/test/javascripts/controllers/topic-test.js.es6 +++ b/test/javascripts/controllers/topic-test.js.es6 @@ -6,6 +6,7 @@ moduleFor('controller:topic', 'controller:topic', { }); import Topic from 'discourse/models/topic'; +import AppEvents from 'discourse/lib/app-events'; var buildTopic = function() { return Topic.create({ @@ -62,7 +63,7 @@ test("toggledSelectedPost", function() { }); test("selectAll", function() { - var tc = this.subject({model: buildTopic()}), + var tc = this.subject({model: buildTopic(), appEvents: AppEvents.create()}), post = Discourse.Post.create({id: 123, post_number: 2}), postStream = tc.get('model.postStream'); diff --git a/test/javascripts/ember/resolver-test.js.es6 b/test/javascripts/ember/resolver-test.js.es6 index 948add12d8..1e5ad1ea59 100644 --- a/test/javascripts/ember/resolver-test.js.es6 +++ b/test/javascripts/ember/resolver-test.js.es6 @@ -1,7 +1,7 @@ import DiscourseResolver from 'discourse/ember/resolver'; -var originalTemplates, originalMobileViewFlag; -var resolver = DiscourseResolver.create(); +let originalTemplates; +let resolver; function lookupTemplate(name, expectedTemplate, message) { var parseName = resolver.parseName(name); @@ -20,13 +20,11 @@ module("lib:resolver", { originalTemplates = Ember.TEMPLATES; Ember.TEMPLATES = {}; - originalMobileViewFlag = Discourse.Mobile.mobileView; - Discourse.Mobile.mobileView = false; + resolver = DiscourseResolver.create(); }, teardown: function() { Ember.TEMPLATES = originalTemplates; - Discourse.Mobile.mobileView = originalMobileViewFlag; } }); @@ -92,7 +90,7 @@ test("resolves mobile templates to 'mobile/' namespace", function() { "baz" ]); - Discourse.Mobile.mobileView = true; + resolver.mobileView = true; lookupTemplate("template:foo", "mobile/foo", "finding mobile version even if normal one is not present"); lookupTemplate("template:bar", "mobile/bar", "preferring mobile version when both mobile and normal versions are present"); diff --git a/test/javascripts/fixtures/site-fixtures.js.es6 b/test/javascripts/fixtures/site-fixtures.js.es6 index 9e29ee832f..81ce4b8697 100644 --- a/test/javascripts/fixtures/site-fixtures.js.es6 +++ b/test/javascripts/fixtures/site-fixtures.js.es6 @@ -19,7 +19,8 @@ export default { "post_types":{ "regular":1, "moderator_action":2, - "small_action":3 + "small_action":3, + "whisper":4 }, "group_names":[ "admins", diff --git a/test/javascripts/fixtures/user_fixtures.js.es6 b/test/javascripts/fixtures/user_fixtures.js.es6 index c18d6f2fe9..c123605c3a 100644 --- a/test/javascripts/fixtures/user_fixtures.js.es6 +++ b/test/javascripts/fixtures/user_fixtures.js.es6 @@ -1,6 +1,6 @@ /*jshint maxlen:10000000 */ export default { -"/users/eviltrout.json": {"user_badges":[{"id":5870,"granted_at":"2014-05-16T02:39:38.388Z","badge_id":4,"user_id":19,"granted_by_id":-1},{"id":40673,"granted_at":"2014-03-31T14:23:18.060Z","post_id":7241,"post_number":19,"badge_id":23,"user_id":19,"granted_by_id":-1,"topic_id":3153},{"id":5868,"granted_at":"2014-05-16T02:39:38.380Z","badge_id":3,"user_id":19,"granted_by_id":-1}],"badges":[{"id":4,"name":"Leader","description":null,"grant_count":7,"allow_title":true,"multiple_grant":false,"icon":"fa-user","image":null,"listable":true,"enabled":true,"badge_grouping_id":4,"system":true,"badge_type_id":1},{"id":23,"name":"Great Share","description":null,"grant_count":14,"allow_title":false,"multiple_grant":true,"icon":"fa-certificate","image":null,"listable":true,"enabled":true,"badge_grouping_id":2,"system":true,"badge_type_id":1},{"id":3,"name":"Regular","description":null,"grant_count":30,"allow_title":true,"multiple_grant":false,"icon":"fa-user","image":null,"listable":true,"enabled":true,"badge_grouping_id":4,"system":true,"badge_type_id":2}],"badge_types":[{"id":1,"name":"Gold","sort_order":9},{"id":2,"name":"Silver","sort_order":8},{"id":3,"name":"Bronze","sort_order":7}],"users":[{"id":19,"username":"eviltrout","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/eviltrout/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png"},{"id":-1,"username":"system","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/system/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png"}],"topics":[{"id":3153,"title":"Is it better for Discourse to use JavaScript or CoffeeScript?","fancy_title":"Is it better for Discourse to use JavaScript or CoffeeScript?","slug":"is-it-better-for-discourse-to-use-javascript-or-coffeescript","posts_count":56}],"user":{"user_option":{},"id":19,"username":"eviltrout","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/eviltrout/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png","name":"Robin Ward","email":"robin.ward@gmail.com","last_posted_at":"2015-05-07T15:23:35.074Z","last_seen_at":"2015-05-13T14:34:23.188Z","bio_raw":"Co-founder of Discourse. Previously, I created Forumwarz. Follow me on Twitter.","bio_cooked":"

Co-founder of Discourse. Previously, I created Forumwarz. Follow me on Twitter.

","created_at":"2013-02-03T15:19:22.704Z","website":"http://eviltrout.com","location":"Toronto","can_edit":false,"can_edit_username":true,"can_edit_email":true,"can_edit_name":true,"stats":[{"action_type":13,"count":342,"id":null},{"action_type":12,"count":109,"id":null},{"action_type":4,"count":27,"id":null},{"action_type":5,"count":1607,"id":null},{"action_type":6,"count":771,"id":null},{"action_type":1,"count":333,"id":null},{"action_type":2,"count":2671,"id":null},{"action_type":7,"count":949,"id":null},{"action_type":9,"count":42,"id":null},{"action_type":3,"count":8,"id":null},{"action_type":11,"count":20,"id":null}],"can_send_private_messages":true,"can_send_private_message_to_user":false,"bio_excerpt":"Co-founder of Discourse. Previously, I created Forumwarz. Follow me on Twitter.","trust_level":4,"moderator":true,"admin":true,"title":"co-founder","badge_count":23,"notification_count":3244,"has_title_badges":true,"custom_fields":{},"user_fields":{"1":"33"},"pending_count":0,"post_count":1987,"can_be_deleted":false,"can_delete_all_posts":false,"locale":"","email_digests":true,"email_private_messages":true,"email_direct":true,"email_always":true,"digest_after_days":7,"mailing_list_mode":false,"auto_track_topics_after_msecs":60000,"new_topic_duration_minutes":1440,"external_links_in_new_tab":false,"dynamic_favicon":true,"enable_quoting":true,"muted_category_ids":[],"tracked_category_ids":[],"watched_category_ids":[3],"private_messages_stats":{"all":101,"mine":13,"unread":3},"disable_jump_reply":false,"gravatar_avatar_upload_id":5275,"custom_avatar_upload_id":1573,"card_image_badge":"https://meta-discourse.global.ssl.fastly.net/uploads/default/36220/15b19c80dd99d5a5.png","card_image_badge_id":120,"muted_usernames":[],"invited_by":{"id":1,"username":"sam","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/sam/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png"},"custom_groups":[{"id":44,"automatic":false,"name":"ubuntu","user_count":11,"alias_level":0,"visible":true,"automatic_membership_email_domains":null,"automatic_membership_retroactive":false,"primary_group":false,"title":null},{"id":47,"automatic":false,"name":"discourse","user_count":7,"alias_level":0,"visible":true,"automatic_membership_email_domains":null,"automatic_membership_retroactive":false,"primary_group":false,"title":null}],"featured_user_badge_ids":[5870,40673,5868],"card_badge":{"id":120,"name":"Garbage Man","description":"This Discourse developer successfully called something \"garbage!\"","grant_count":3,"allow_title":false,"multiple_grant":false,"icon":"https://meta-discourse.global.ssl.fastly.net/uploads/default/36220/15b19c80dd99d5a5.png","image":"https://meta-discourse.global.ssl.fastly.net/uploads/default/36220/15b19c80dd99d5a5.png","listable":false,"enabled":false,"badge_grouping_id":8,"system":false,"badge_type_id":3}}}, +"/users/eviltrout.json": {"user_badges":[{"id":5870,"granted_at":"2014-05-16T02:39:38.388Z","badge_id":4,"user_id":19,"granted_by_id":-1},{"id":40673,"granted_at":"2014-03-31T14:23:18.060Z","post_id":7241,"post_number":19,"badge_id":23,"user_id":19,"granted_by_id":-1,"topic_id":3153},{"id":5868,"granted_at":"2014-05-16T02:39:38.380Z","badge_id":3,"user_id":19,"granted_by_id":-1}],"badges":[{"id":4,"name":"Leader","description":null,"grant_count":7,"allow_title":true,"multiple_grant":false,"icon":"fa-user","image":null,"listable":true,"enabled":true,"badge_grouping_id":4,"system":true,"badge_type_id":1},{"id":23,"name":"Great Share","description":null,"grant_count":14,"allow_title":false,"multiple_grant":true,"icon":"fa-certificate","image":null,"listable":true,"enabled":true,"badge_grouping_id":2,"system":true,"badge_type_id":1},{"id":3,"name":"Regular","description":null,"grant_count":30,"allow_title":true,"multiple_grant":false,"icon":"fa-user","image":null,"listable":true,"enabled":true,"badge_grouping_id":4,"system":true,"badge_type_id":2}],"badge_types":[{"id":1,"name":"Gold","sort_order":9},{"id":2,"name":"Silver","sort_order":8},{"id":3,"name":"Bronze","sort_order":7}],"users":[{"id":19,"username":"eviltrout","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/eviltrout/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png"},{"id":-1,"username":"system","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/system/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png"}],"topics":[{"id":3153,"title":"Is it better for Discourse to use JavaScript or CoffeeScript?","fancy_title":"Is it better for Discourse to use JavaScript or CoffeeScript?","slug":"is-it-better-for-discourse-to-use-javascript-or-coffeescript","posts_count":56}],"user":{"user_option":{},"id":19,"username":"eviltrout","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/eviltrout/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png","name":"Robin Ward","email":"robin.ward@gmail.com","last_posted_at":"2015-05-07T15:23:35.074Z","last_seen_at":"2015-05-13T14:34:23.188Z","bio_raw":"Co-founder of Discourse. Previously, I created Forumwarz. Follow me on Twitter.","bio_cooked":"

Co-founder of Discourse. Previously, I created Forumwarz. Follow me on Twitter.

","created_at":"2013-02-03T15:19:22.704Z","website":"http://eviltrout.com","location":"Toronto","can_edit":false,"can_edit_username":true,"can_edit_email":true,"can_edit_name":true,"stats":[{"action_type":13,"count":342,"id":null},{"action_type":12,"count":109,"id":null},{"action_type":4,"count":27,"id":null},{"action_type":5,"count":1607,"id":null},{"action_type":6,"count":771,"id":null},{"action_type":1,"count":333,"id":null},{"action_type":2,"count":2671,"id":null},{"action_type":7,"count":949,"id":null},{"action_type":9,"count":42,"id":null},{"action_type":3,"count":8,"id":null},{"action_type":11,"count":20,"id":null}],"can_send_private_messages":true,"can_send_private_message_to_user":false,"bio_excerpt":"Co-founder of Discourse. Previously, I created Forumwarz. Follow me on Twitter.","trust_level":4,"moderator":true,"admin":true,"title":"co-founder","badge_count":23,"notification_count":3244,"has_title_badges":true,"custom_fields":{},"user_fields":{"1":"33"},"pending_count":0,"post_count":1987,"can_be_deleted":false,"can_delete_all_posts":false,"locale":"","email_digests":true,"email_private_messages":true,"email_direct":true,"email_always":true,"digest_after_minutes":10080,"mailing_list_mode":false,"auto_track_topics_after_msecs":60000,"new_topic_duration_minutes":1440,"external_links_in_new_tab":false,"dynamic_favicon":true,"enable_quoting":true,"muted_category_ids":[],"tracked_category_ids":[],"watched_category_ids":[3],"private_messages_stats":{"all":101,"mine":13,"unread":3},"disable_jump_reply":false,"gravatar_avatar_upload_id":5275,"custom_avatar_upload_id":1573,"card_image_badge":"https://meta-discourse.global.ssl.fastly.net/uploads/default/36220/15b19c80dd99d5a5.png","card_image_badge_id":120,"muted_usernames":[],"invited_by":{"id":1,"username":"sam","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/sam/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png"},"custom_groups":[{"id":44,"automatic":false,"name":"ubuntu","user_count":11,"alias_level":0,"visible":true,"automatic_membership_email_domains":null,"automatic_membership_retroactive":false,"primary_group":false,"title":null},{"id":47,"automatic":false,"name":"discourse","user_count":7,"alias_level":0,"visible":true,"automatic_membership_email_domains":null,"automatic_membership_retroactive":false,"primary_group":false,"title":null}],"featured_user_badge_ids":[5870,40673,5868],"card_badge":{"id":120,"name":"Garbage Man","description":"This Discourse developer successfully called something \"garbage!\"","grant_count":3,"allow_title":false,"multiple_grant":false,"icon":"https://meta-discourse.global.ssl.fastly.net/uploads/default/36220/15b19c80dd99d5a5.png","image":"https://meta-discourse.global.ssl.fastly.net/uploads/default/36220/15b19c80dd99d5a5.png","listable":false,"enabled":false,"badge_grouping_id":8,"system":false,"badge_type_id":3}}}, "/user_actions.json": {"user_actions":[{"action_type":7,"created_at":"2014-01-16T14:13:05Z","excerpt":"So again, \n\nWhat is the problem?\n\nI need to check user_trust_level , i get the 'username' from a form via ajax, i need to check what level he is on discourse \n\nAlso, if possible, i would like to get other details as well, like email address etc. \n\nI took a look at : https://github.com/discourse/dis…","avatar_template":"//www.gravatar.com/avatar/bdab7e61b3191e483492fd680f563fed.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/bdab7e61b3191e483492fd680f563fed.png?s={size}&r=pg&d=identicon","slug":"how-to-check-the-user-level-via-ajax","topic_id":11993,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":1,"reply_to_post_number":null,"username":"Abhishek_Gupta","name":"Abhishek Gupta","user_id":8021,"acting_username":"Abhishek_Gupta","acting_name":"Abhishek Gupta","acting_user_id":8021,"title":"How to check the user level via ajax?","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-15T16:53:49Z","excerpt":"A good fix would be to have the ERB template do an if statement. We'd happily accept a PR that did this if you feel up to it: \n\n <% if SiteSetting.logo_url.present? %>\n display logo html\n<% else %>\n display title html\n<% end %>","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"users-activate-account-pulling-blank-logo-instead-of-defaulting-to-h2","topic_id":10911,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":3,"reply_to_post_number":2,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"/users/activate-account pulling blank logo instead of defaulting to h2","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-15T15:21:37Z","excerpt":"A good fix would be to have the ERB template do an if statement. We'd happily accept a PR that did this if you feel up to it: \n\n <% if SiteSetting.logo_url.present? %>\n display logo html\n<% else %>\n display title html\n<% end %>","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"users-activate-account-pulling-blank-logo-instead-of-defaulting-to-h2","topic_id":10911,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":3,"reply_to_post_number":2,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"/users/activate-account pulling blank logo instead of defaulting to h2","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":6,"created_at":"2014-01-15T12:22:12Z","excerpt":"OK - i see what you mean. From the piwik code I should add: \n\n_paq.push(["setDocumentTitle", document.domain + "/" + document.title]);\n\n? \n\nUnfortunately I have had to give up on Piwik for now because I have switched the forum to SSL on a free cert and have used up the free subdomain for the forum. …","avatar_template":"//localhost:3000/uploads/default/avatars/2a8/a3c/8fddcac642/{size}.jpg","acting_avatar_template":"//localhost:3000/uploads/default/avatars/2a8/a3c/8fddcac642/{size}.jpg","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","topic_id":7512,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":26,"reply_to_post_number":25,"username":"citkane","name":"Michael Jonker","user_id":7604,"acting_username":"citkane","acting_name":"Michael Jonker","acting_user_id":7604,"title":"Support for Piwik Analytics as an alternative to Google Analytics","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-15T11:16:36Z","excerpt":"@eviltrout recently added support for multiple API keys [wink] \n\n[]","avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","slug":"allow-for-multiple-api-keys","topic_id":7444,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":3,"reply_to_post_number":null,"username":"zogstrip","name":"Régis Hanol","user_id":1995,"acting_username":"zogstrip","acting_name":"Régis Hanol","acting_user_id":1995,"title":"Allow for multiple API Keys","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-15T10:58:46Z","excerpt":"@eviltrout added a tooltip when you click on the user's avatar which allows you to show the posts made by that user \n\n[image]","avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","slug":"to-group-posts-by-a-user","topic_id":7412,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":4,"reply_to_post_number":3,"username":"zogstrip","name":"Régis Hanol","user_id":1995,"acting_username":"zogstrip","acting_name":"Régis Hanol","acting_user_id":1995,"title":"To group posts by a user","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-15T10:36:15Z","excerpt":"@eviltrout implemented per-user API key a while ago [wink] \n\n [image]\nTopics_-_Discourse_Meta-5.png884x339 29.6 KB\n","avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","slug":"auth-using-rest-api","topic_id":5937,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":3,"reply_to_post_number":2,"username":"zogstrip","name":"Régis Hanol","user_id":1995,"acting_username":"zogstrip","acting_name":"Régis Hanol","acting_user_id":1995,"title":"Auth using REST API?","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-15T09:55:17Z","excerpt":"@eviltrout has recently introduced this feature and has even blogged about it: \n\n \n \n \n \n eviltrout.com\n \n \n \n \n \n Hiding Offscreen Content in Ember.js - Evil Trout's Blog","avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","slug":"infinite-scrolling-reusing-dom-nodes","topic_id":5186,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":3,"reply_to_post_number":null,"username":"zogstrip","name":"Régis Hanol","user_id":1995,"acting_username":"zogstrip","acting_name":"Régis Hanol","acting_user_id":1995,"title":"Infinite scrolling: Reusing DOM nodes","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-15T00:54:32Z","excerpt":"You can retrieve a user's JSON by making a call to /users/username.json but that assumes you know the user's username. If that's impossible, I would be happy to accept a PR that would return the current user JSON from /session/current-user or something like that. \n\nAdditionally, if you're looking to…","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/035d12bad251759d8fbc9fb10574d1f6.png?s={size}&r=pg&d=identicon","slug":"get-current-user-information-via-json","topic_id":11959,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":2,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"watchmanmonitor","acting_name":"Watchman Monitoring","acting_user_id":8085,"title":"Get current user information via JSON","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-14T21:59:51Z","excerpt":"You can retrieve a user's JSON by making a call to /users/username.json but that assumes you know the user's username. If that's impossible, I would be happy to accept a PR that would return the current user JSON from /session/current-user or something like that. \n\nAdditionally, if you're looking to…","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/9cfd2536afac32d209335b092094c12c.png?s={size}&r=pg&d=identicon","slug":"get-current-user-information-via-json","topic_id":11959,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":2,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"znation","acting_name":"znation","acting_user_id":8163,"title":"Get current user information via JSON","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-14T21:46:50Z","excerpt":"Okay I've fixed the https [point_right] http links on the server side and in the Javascript click tracking as @BhaelOchon pointed out. \n\nLet me know if you find anything else broken.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"broken-links-possibly-related-to-https","topic_id":11831,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":18,"reply_to_post_number":16,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"Broken links, possibly related to HTTPS","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":6,"created_at":"2014-01-14T21:43:28Z","excerpt":"Thanks for your help @eviltrout! I will consider making that change and sending a pull request. I may not get to it for a while. \n\nI am embedding Discourse on another site and it is mostly going well. I have indeed been using your blog for inspiration.","avatar_template":"//www.gravatar.com/avatar/9cfd2536afac32d209335b092094c12c.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/9cfd2536afac32d209335b092094c12c.png?s={size}&r=pg&d=identicon","slug":"get-current-user-information-via-json","topic_id":11959,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":3,"reply_to_post_number":2,"username":"znation","name":"znation","user_id":8163,"acting_username":"znation","acting_name":"znation","acting_user_id":8163,"title":"Get current user information via JSON","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-14T21:21:52Z","excerpt":"Okay I've fixed the https [point_right] http links on the server side and in the Javascript click tracking as @BhaelOchon pointed out. \n\nLet me know if you find anything else broken.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","slug":"broken-links-possibly-related-to-https","topic_id":11831,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":18,"reply_to_post_number":16,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"zogstrip","acting_name":"Régis Hanol","acting_user_id":1995,"title":"Broken links, possibly related to HTTPS","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-14T21:03:07Z","excerpt":"Okay I've fixed the https [point_right] http links on the server side and in the Javascript click tracking as @BhaelOchon pointed out. \n\nLet me know if you find anything else broken.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"broken-links-possibly-related-to-https","topic_id":11831,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":18,"reply_to_post_number":16,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Broken links, possibly related to HTTPS","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-14T20:42:51Z","excerpt":"You can retrieve a user's JSON by making a call to /users/username.json but that assumes you know the user's username. If that's impossible, I would be happy to accept a PR that would return the current user JSON from /session/current-user or something like that. \n\nAdditionally, if you're looking to…","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"get-current-user-information-via-json","topic_id":11959,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":2,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"Get current user information via JSON","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-14T20:29:23Z","excerpt":"You can retrieve a user's JSON by making a call to /users/username.json but that assumes you know the user's username. If that's impossible, I would be happy to accept a PR that would return the current user JSON from /session/current-user or something like that. \n\nAdditionally, if you're looking to…","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"get-current-user-information-via-json","topic_id":11959,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":2,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Get current user information via JSON","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-14T19:20:28Z","excerpt":"Perhaps the ['trackpageView'] is not the correct API call? We can probably send more information across such as the URL.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","topic_id":7512,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":25,"reply_to_post_number":24,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Support for Piwik Analytics as an alternative to Google Analytics","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-14T19:19:46Z","excerpt":"Nope but I bet you can find one!","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"how-far-to-take-user-documentation","topic_id":11943,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":4,"reply_to_post_number":3,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"How far to take user documentation?","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":6,"created_at":"2014-01-14T18:37:05Z","excerpt":"I'd be glad to write a pull request to take use there. Is there a specific part of their documentation you have in mind?","avatar_template":"//www.gravatar.com/avatar/035d12bad251759d8fbc9fb10574d1f6.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/035d12bad251759d8fbc9fb10574d1f6.png?s={size}&r=pg&d=identicon","slug":"how-far-to-take-user-documentation","topic_id":11943,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":3,"reply_to_post_number":2,"username":"watchmanmonitor","name":"Watchman Monitoring","user_id":8085,"acting_username":"watchmanmonitor","acting_name":"Watchman Monitoring","acting_user_id":8085,"title":"How far to take user documentation?","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":6,"created_at":"2014-01-14T16:04:28Z","excerpt":"Thanks @eviltrout , the code in the 'bottom of pages' now reads: \n\n<script type="text/javascript">\nDiscourse.PageTracker.current().on('change', function() {\n console.log('tracked!')\n _paq.push(['trackPageView']);\n});\n</script>\n\nThe console is logging 'tracked!' and piwik is logging for each page c…","avatar_template":"//localhost:3000/uploads/default/avatars/2a8/a3c/8fddcac642/{size}.jpg","acting_avatar_template":"//localhost:3000/uploads/default/avatars/2a8/a3c/8fddcac642/{size}.jpg","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","topic_id":7512,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":23,"reply_to_post_number":22,"username":"citkane","name":"Michael Jonker","user_id":7604,"acting_username":"citkane","acting_name":"Michael Jonker","acting_user_id":7604,"title":"Support for Piwik Analytics as an alternative to Google Analytics","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-14T15:58:27Z","excerpt":"This topic is now archived. It is frozen and cannot be changed in any way.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"regression-cannot-sort-topic-list","topic_id":11944,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":4,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Regression: Cannot sort topic list","deleted":false,"hidden":false,"moderator_action":true,"edit_reason":null},{"action_type":5,"created_at":"2014-01-14T15:26:57Z","excerpt":"I do think that leading them into the official rails documentation at that point is not a bad idea. Like "congratulations, everything is ready but now you'll need to understand the platform we built it in to be productive."","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"how-far-to-take-user-documentation","topic_id":11943,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":2,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"How far to take user documentation?","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-14T08:28:00Z","excerpt":"I've just added the ability to list reply counts on your blog index and archive pages as you can see here. \n\nIt works with a similar API to embedding comments: \n\n <script type="text/javascript">\n var discourseUrl = "http://fishtank.eviltrout.com/";\n\n (function() {\n var d = document.createEleme…","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","slug":"discourse-plugin-for-static-site-generators-like-jekyll-or-octopress","topic_id":7965,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":98,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"sam","acting_name":"Sam Saffron","acting_user_id":1,"title":"Discourse plugin for static site generators like Jekyll or Octopress","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-14T00:21:26Z","excerpt":"In pull request 1821, @eviltrout asked: \n\n "About rails s: I wouldn't be against adding it but at what point do we stop holding their hand and expect them to know how rails works? I'm sure rails documentation could do a better job than us. Actually maybe we should just link to that? \n\nWhat point to …","avatar_template":"//www.gravatar.com/avatar/035d12bad251759d8fbc9fb10574d1f6.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/035d12bad251759d8fbc9fb10574d1f6.png?s={size}&r=pg&d=identicon","slug":"how-far-to-take-user-documentation","topic_id":11943,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":1,"reply_to_post_number":null,"username":"watchmanmonitor","name":"Watchman Monitoring","user_id":8085,"acting_username":"watchmanmonitor","acting_name":"Watchman Monitoring","acting_user_id":8085,"title":"How far to take user documentation?","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":6,"created_at":"2014-01-13T21:58:28Z","excerpt":"It looks uneeded, but you need to review a fair amount of code to confirm it is not needed. \n\nI am going to keep it for now cause its safer under some weird edge conditions.","avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","slug":"ruby-question-about-use-of-klass-self-in-the-site-customization-rb","topic_id":11889,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":3,"reply_to_post_number":2,"username":"sam","name":"Sam Saffron","user_id":1,"acting_username":"sam","acting_name":"Sam Saffron","acting_user_id":1,"title":"Ruby question about use of klass=self in the site_customization.rb","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-13T21:11:32Z","excerpt":"I had to fix an issue with Google analytics so I added a new API hook that can be used. \n\nIf you add the following it should work: \n\n Discourse.PageTracker.current().on('change', function() {\n _paq.push(['trackPageView']);\n});","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","topic_id":7512,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":22,"reply_to_post_number":16,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"sam","acting_name":"Sam Saffron","acting_user_id":1,"title":"Support for Piwik Analytics as an alternative to Google Analytics","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":6,"created_at":"2014-01-13T21:10:57Z","excerpt":"Having a look, the fix is a bit scary imho, we should fix the root issue.","avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","slug":"error-after-update-to-0-9-8-1","topic_id":11903,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":11,"reply_to_post_number":10,"username":"sam","name":"Sam Saffron","user_id":1,"acting_username":"sam","acting_name":"Sam Saffron","acting_user_id":1,"title":"Error after update to 0.9.8.1","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-13T20:50:34Z","excerpt":"I've just added the ability to list reply counts on your blog index and archive pages as you can see here. \n\nIt works with a similar API to embedding comments: \n\n <script type="text/javascript">\n var discourseUrl = "http://fishtank.eviltrout.com/";\n\n (function() {\n var d = document.createEleme…","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//localhost:3000/uploads/default/avatars/527/614/d16e1504d9/{size}.jpg","slug":"discourse-plugin-for-static-site-generators-like-jekyll-or-octopress","topic_id":7965,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":98,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"trident","acting_name":"Ben T","acting_user_id":5707,"title":"Discourse plugin for static site generators like Jekyll or Octopress","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-13T20:44:56Z","excerpt":"I had to fix an issue with Google analytics so I added a new API hook that can be used. \n\nIf you add the following it should work: \n\n Discourse.PageTracker.current().on('change', function() {\n _paq.push(['trackPageView']);\n});","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","topic_id":7512,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":22,"reply_to_post_number":16,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"zogstrip","acting_name":"Régis Hanol","acting_user_id":1995,"title":"Support for Piwik Analytics as an alternative to Google Analytics","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-13T20:40:21Z","excerpt":"I had to fix an issue with Google analytics so I added a new API hook that can be used. \n\nIf you add the following it should work: \n\n Discourse.PageTracker.current().on('change', function() {\n _paq.push(['trackPageView']);\n});","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","topic_id":7512,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":22,"reply_to_post_number":16,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Support for Piwik Analytics as an alternative to Google Analytics","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-13T19:52:04Z","excerpt":"@Sam do you have any idea why only some people are getting this issue? I dont' mind the proposed fix but I'd prefer to know why it happens in the first place.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","slug":"error-after-update-to-0-9-8-1","topic_id":11903,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":10,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"sam","acting_name":"Sam Saffron","acting_user_id":1,"title":"Error after update to 0.9.8.1","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-13T19:01:19Z","excerpt":"I've just added the ability to list reply counts on your blog index and archive pages as you can see here. \n\nIt works with a similar API to embedding comments: \n\n <script type="text/javascript">\n var discourseUrl = "http://fishtank.eviltrout.com/";\n\n (function() {\n var d = document.createEleme…","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"discourse-plugin-for-static-site-generators-like-jekyll-or-octopress","topic_id":7965,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":98,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"Discourse plugin for static site generators like Jekyll or Octopress","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-13T18:50:14Z","excerpt":"I've just added the ability to list reply counts on your blog index and archive pages as you can see here. \n\nIt works with a similar API to embedding comments: \n\n <script type="text/javascript">\n var discourseUrl = "http://fishtank.eviltrout.com/";\n\n (function() {\n var d = document.createEleme…","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","slug":"discourse-plugin-for-static-site-generators-like-jekyll-or-octopress","topic_id":7965,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":98,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"zogstrip","acting_name":"Régis Hanol","acting_user_id":1995,"title":"Discourse plugin for static site generators like Jekyll or Octopress","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-13T18:47:33Z","excerpt":"I am pretty sure that the denizens of SO are correct and the variable is unneeded. @sam can confirm but it seems like it was once needed for something that has since been removed and the variable declaration was left intact.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"ruby-question-about-use-of-klass-self-in-the-site-customization-rb","topic_id":11889,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":2,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Ruby question about use of klass=self in the site_customization.rb","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-13T18:45:41Z","excerpt":"I've just added the ability to list reply counts on your blog index and archive pages as you can see here. \n\nIt works with a similar API to embedding comments: \n\n <script type="text/javascript">\n var discourseUrl = "http://fishtank.eviltrout.com/";\n\n (function() {\n var d = document.createEleme…","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"discourse-plugin-for-static-site-generators-like-jekyll-or-octopress","topic_id":7965,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":98,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Discourse plugin for static site generators like Jekyll or Octopress","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-13T17:19:08Z","excerpt":"@Sam do you have any idea why only some people are getting this issue? I dont' mind the proposed fix but I'd prefer to know why it happens in the first place.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/5120fc4e345db0d1a964888272073819.png?s={size}&r=pg&d=identicon","slug":"error-after-update-to-0-9-8-1","topic_id":11903,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":10,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"riking","acting_name":"Kane York","acting_user_id":6626,"title":"Error after update to 0.9.8.1","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-13T16:41:31Z","excerpt":"I'd love to see API support. @sam and @eviltrout, I can facilitate an intro to the piwik guys if you want—I've written about them before and they're typically super-responsive. Because I know you guys are totally hunting for new stuff to do [wink]","avatar_template":"//localhost:3000/uploads/default/avatars/95a/06d/c337428568/{size}.png","acting_avatar_template":"//localhost:3000/uploads/default/avatars/95a/06d/c337428568/{size}.png","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","topic_id":7512,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":20,"reply_to_post_number":null,"username":"Lee_Ars","name":"Lee_Ars","user_id":4457,"acting_username":"Lee_Ars","acting_name":"Lee_Ars","acting_user_id":4457,"title":"Support for Piwik Analytics as an alternative to Google Analytics","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-13T16:15:51Z","excerpt":"The code looks okay but it's hard to debug this way. \n\nOne thing you could do is add a: console.log('tracked!') just before line 8. Then open a developer console and see if the javascript is running properly.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","topic_id":7512,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":18,"reply_to_post_number":16,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"Support for Piwik Analytics as an alternative to Google Analytics","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-13T15:10:41Z","excerpt":"This is really interesting. I'd like to hear your findings.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"focus-events-track-which-window-is-the-last-active-instance-of-a-forum-edit","topic_id":11872,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":9,"reply_to_post_number":8,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Focus events: Track which window is the last active instance of a forum Edit","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-13T15:02:45Z","excerpt":"The code looks okay but it's hard to debug this way. \n\nOne thing you could do is add a: console.log('tracked!') just before line 8. Then open a developer console and see if the javascript is running properly.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","topic_id":7512,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":18,"reply_to_post_number":16,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Support for Piwik Analytics as an alternative to Google Analytics","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-13T14:53:13Z","excerpt":"@Sam do you have any idea why only some people are getting this issue? I dont' mind the proposed fix but I'd prefer to know why it happens in the first place.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"error-after-update-to-0-9-8-1","topic_id":11903,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":10,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Error after update to 0.9.8.1","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-13T06:27:26Z","excerpt":"Can this be archived @eviltrout?","avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"search-not-working-for-staff-users","topic_id":11371,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":13,"reply_to_post_number":null,"username":"codinghorror","name":"Jeff Atwood","user_id":32,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"Search not working for Staff users","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-13T05:32:46Z","excerpt":"When you navigate to another topic using the "suggested topics" area we are not registering a page view with Google. \n\n@eviltrout perhaps we should do this from discourse location instead of application controller?","avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","slug":"google-analytics-is-not-registering-page-views","topic_id":11914,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":1,"reply_to_post_number":null,"username":"sam","name":"Sam Saffron","user_id":1,"acting_username":"sam","acting_name":"Sam Saffron","acting_user_id":1,"title":"Google analytics is not registering page views","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-13T02:50:25Z","excerpt":"@eviltrout any ideas here, the code seems correct","avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","topic_id":7512,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":17,"reply_to_post_number":16,"username":"sam","name":"Sam Saffron","user_id":1,"acting_username":"sam","acting_name":"Sam Saffron","acting_user_id":1,"title":"Support for Piwik Analytics as an alternative to Google Analytics","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-12T22:31:35Z","excerpt":"This is an interesting approach an an interesting feature. @eviltrout your thoughts. Essentially allows us to have notifications cross tabs.","avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","slug":"focus-events-track-which-window-is-the-last-active-instance-of-a-forum-edit","topic_id":11872,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":4,"reply_to_post_number":1,"username":"sam","name":"Sam Saffron","user_id":1,"acting_username":"sam","acting_name":"Sam Saffron","acting_user_id":1,"title":"Focus events: Track which window is the last active instance of a forum Edit","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-12T18:01:04Z","excerpt":"This was the link \n\nmetric_fu \n\n[metric_fu](https://github.com/metricfu/metric_fu/blob/b1bf8feb921916fc265f041efa3157a6a6530a9b/lib/metric_fu/logging/mf_debugger.rb#L24)\n\nSeems to work fine now that @eviltrout worked so hard to get us MDTest 1.1 compliant.","avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"underscores-in-linked-text-can-cause-markdown-bug","topic_id":10848,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":3,"reply_to_post_number":null,"username":"codinghorror","name":"Jeff Atwood","user_id":32,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"Underscores in linked text can cause markdown bug","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":6,"created_at":"2014-01-12T04:14:06Z","excerpt":"Awesome plugin, but doesn't seem to work out of the box with images \n\nhttps://github.com/discourse/discourse-spoiler-alert/issues/2","avatar_template":"//localhost:3000/uploads/default/avatars/276/f19/3826efe463/{size}.jpg","acting_avatar_template":"//localhost:3000/uploads/default/avatars/276/f19/3826efe463/{size}.jpg","slug":"brand-new-plugin-interface","topic_id":8793,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":64,"reply_to_post_number":44,"username":"xrvk","name":"Eero Heikkinen","user_id":8068,"acting_username":"xrvk","acting_name":"Eero Heikkinen","acting_user_id":8068,"title":"Brand new plugin interface","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-11T23:36:11Z","excerpt":"A few things, \n\n@eviltrout myself and many others have discourse_docker hosted on DigitalOcean, my user cpu is usually around 2% I have plenty of capacity. \n\nI know that stonehearth and other larger scale discourse work on DigitalOcean fine. Officially we strongly recommend a 2GB instance, thoug…","avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","slug":"performance-issue-on-digital-ocean-with-discourse-docker","topic_id":11895,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":2,"reply_to_post_number":null,"username":"sam","name":"Sam Saffron","user_id":1,"acting_username":"sam","acting_name":"Sam Saffron","acting_user_id":1,"title":"Performance issue on DigitalOcean with discourse_docker","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-11T00:58:23Z","excerpt":"Confirmed on try.discourse.org, this is still an issue. \n\n@eviltrout can you add that to your list -- unless you are a staff member you should not be able to delete (your own) posts from an archived topic.","avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"archived-discussions-still-allow-posts-to-be-deleted","topic_id":6479,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":3,"reply_to_post_number":null,"username":"codinghorror","name":"Jeff Atwood","user_id":32,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"Archived discussions still allow posts to be deleted","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-11T00:35:38Z","excerpt":"Agree, @eviltrout can you make sure the usercard is using the same logic as the user page in displaying profile info?","avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"usercard-does-not-resize-for-obnoxiously-large-images","topic_id":11007,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":5,"reply_to_post_number":4,"username":"codinghorror","name":"Jeff Atwood","user_id":32,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"Usercard does not resize for obnoxiously large images","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-11T00:34:06Z","excerpt":"@eviltrout can you make sure the "import post" button is suppressed on the user page when editing "about me"? \n\n(I agree it is like a "lose all my work" button on that page if you happen to press it..) \n\nThen I can archive this.","avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"quote-post-button-should-be-disabled-or-raise-an-error-when-creating-a-new-topic","topic_id":834,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":5,"reply_to_post_number":4,"username":"codinghorror","name":"Jeff Atwood","user_id":32,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"\"Quote Post\" button should be disabled or raise an error when creating a new topic","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-10T21:00:11Z","excerpt":">\n\nLooks good now. Thanks for these fixes @eviltrout, we (and markdown-js) are now MDTest 1.1 compliant!","avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"text-editor-issue-with-the-code-block","topic_id":10050,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":5,"reply_to_post_number":null,"username":"codinghorror","name":"Jeff Atwood","user_id":32,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"Text Editor issue with the code block","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":1,"created_at":"2014-01-10T20:07:46Z","excerpt":"We can't repro that one, also seems a bit obscure. But thank you very much for all the reports, whenever I see a bug entry from YOU I always know it is going to be a good one based on experience here and elsewhere. [trophy]","avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"security-error-on-console-noticed-on-meta","topic_id":11825,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":12,"reply_to_post_number":11,"username":"codinghorror","name":"Jeff Atwood","user_id":32,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Security Error on console (noticed on meta)","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-10T19:48:08Z","excerpt":"Thanks for letting us know. It turns out that by using minutely(5) instead of minutely causes ice_cube to peg a core at 100% usage. I've pushed out a fix in master.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"sidekiq-cpu-load-since-latest-release","topic_id":9515,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":22,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"Sidekiq CPU load since latest release","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-10T19:47:17Z","excerpt":"Thanks for letting us know. It turns out that by using minutely(5) instead of minutely causes ice_cube to peg a core at 100% usage. I've pushed out a fix in master.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/42776c4982dff1fa45ee8248532f8ad0.png?s={size}&r=pg&d=identicon","slug":"sidekiq-cpu-load-since-latest-release","topic_id":9515,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":22,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"neil","acting_name":"Neil","acting_user_id":2,"title":"Sidekiq CPU load since latest release","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-10T17:39:24Z","excerpt":"We should consider doing what Google Drive does: they intercept cmd-f and pop up a box that allows you to dynamically search.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/5120fc4e345db0d1a964888272073819.png?s={size}&r=pg&d=identicon","slug":"ctrl-f-search-is-interrupted-by-quotation-popup","topic_id":7114,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":12,"reply_to_post_number":11,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"riking","acting_name":"Kane York","acting_user_id":6626,"title":"Ctrl+F search is interrupted by quotation popup","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-10T17:29:15Z","excerpt":"Thanks for letting us know. It turns out that by using minutely(5) instead of minutely causes ice_cube to peg a core at 100% usage. I've pushed out a fix in master.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/5120fc4e345db0d1a964888272073819.png?s={size}&r=pg&d=identicon","slug":"sidekiq-cpu-load-since-latest-release","topic_id":9515,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":22,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"riking","acting_name":"Kane York","acting_user_id":6626,"title":"Sidekiq CPU load since latest release","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-10T17:24:37Z","excerpt":"Thanks for letting us know. It turns out that by using minutely(5) instead of minutely causes ice_cube to peg a core at 100% usage. I've pushed out a fix in master.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","slug":"sidekiq-cpu-load-since-latest-release","topic_id":9515,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":22,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"zogstrip","acting_name":"Régis Hanol","acting_user_id":1995,"title":"Sidekiq CPU load since latest release","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":6,"created_at":"2014-01-10T17:02:35Z","excerpt":"Fixed [smile] \n\ntop - 12:02:00 up 12 days, 2:16, 1 user, load average: 0.28, 0.92, 0.97\nTasks: 115 total, 1 running, 114 sleeping, 0 stopped, 0 zombie\nCpu0 : 0.7%us, 0.3%sy, 0.0%ni, 99.0%id, 0.0%wa, 0.0%hi, 0.0%si, 0.0%st\nCpu1 : 0.7%us, 0.3%sy, 0.0%ni, 99.0%id, 0.0%wa, 0.0%hi,…","avatar_template":"//localhost:3000/uploads/default/avatars/886/ea8/e533d87fd9/{size}.png","acting_avatar_template":"//localhost:3000/uploads/default/avatars/886/ea8/e533d87fd9/{size}.png","slug":"sidekiq-cpu-load-since-latest-release","topic_id":9515,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":23,"reply_to_post_number":22,"username":"michaeld","name":"Michael","user_id":6548,"acting_username":"michaeld","acting_name":"Michael","acting_user_id":6548,"title":"Sidekiq CPU load since latest release","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-10T16:58:12Z","excerpt":"Thanks for letting us know. It turns out that by using minutely(5) instead of minutely causes ice_cube to peg a core at 100% usage. I've pushed out a fix in master.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//localhost:3000/uploads/default/avatars/527/614/d16e1504d9/{size}.jpg","slug":"sidekiq-cpu-load-since-latest-release","topic_id":9515,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":22,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"trident","acting_name":"Ben T","acting_user_id":5707,"title":"Sidekiq CPU load since latest release","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null}]}, "/topics/created-by/eviltrout.json": {"users":[{"id":19,"username":"eviltrout","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon"},{"id":5460,"username":"ned","avatar_template":"//localhost:3000/uploads/default/avatars/06b/90d/3b3ea7e56b/{size}.png"},{"id":402,"username":"thebrianbarlow","avatar_template":"//www.gravatar.com/avatar/5ddf2459e8edd6cf52dfff6cb41ca70d.png?s={size}&r=pg&d=identicon"},{"id":5707,"username":"trident","avatar_template":"//localhost:3000/uploads/default/avatars/527/614/d16e1504d9/{size}.jpg"},{"id":32,"username":"codinghorror","avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon"},{"id":1995,"username":"zogstrip","avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon"},{"id":2702,"username":"ryanflorence","avatar_template":"//www.gravatar.com/avatar/749001c9fe6927c4b069a45c2a3d68f7.png?s={size}&r=pg&d=identicon"},{"id":9,"username":"tms","avatar_template":"//www.gravatar.com/avatar/3981cd271c302f5cba628c6b6d2b32ee.png?s={size}&r=pg&d=identicon"},{"id":1,"username":"sam","avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon"},{"id":2636,"username":"lonnon","avatar_template":"//www.gravatar.com/avatar/9489ef302fbff6c19bba507d09f8cd1d.png?s={size}&r=pg&d=identicon"}],"topic_list":{"can_create_topic":false,"draft":null,"draft_key":"new_topic","draft_sequence":null,"topics":[{"id":7764,"title":"New: Reply via Email Support!","fancy_title":"New: Reply via Email Support!","slug":"new-reply-via-email-support","posts_count":32,"reply_count":24,"highest_post_number":35,"image_url":"/uploads/meta_discourse/1227/8f4e5818dfaa56c7.png","created_at":"2013-06-25T11:58:39.000-04:00","last_posted_at":"2014-01-09T18:53:06.000-05:00","bumped":true,"bumped_at":"2014-01-09T17:09:40.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":2201,"like_count":46,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":19},{"extras":null,"description":"Most Posts","user_id":5460},{"extras":null,"description":"Frequent Poster","user_id":402},{"extras":null,"description":"Frequent Poster","user_id":5707},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":9318,"title":"Discourse has a new Markdown Parser!","fancy_title":"Discourse has a new Markdown Parser!","slug":"discourse-has-a-new-markdown-parser","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2013-08-24T14:08:06.000-04:00","last_posted_at":"2013-08-24T14:08:06.000-04:00","bumped":true,"bumped_at":"2013-08-24T14:13:25.000-04:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":812,"like_count":13,"has_summary":false,"archetype":"regular","last_poster_username":"eviltrout","category_id":7,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":19}]},{"id":7019,"title":"Discourse Ember Refactorings","fancy_title":"Discourse Ember Refactorings","slug":"discourse-ember-refactorings","posts_count":5,"reply_count":3,"highest_post_number":5,"image_url":null,"created_at":"2013-05-30T11:16:36.000-04:00","last_posted_at":"2013-06-02T11:22:58.000-04:00","bumped":true,"bumped_at":"2013-06-02T11:22:58.000-04:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":1075,"like_count":15,"has_summary":false,"archetype":"regular","last_poster_username":"eviltrout","category_id":7,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":19},{"extras":null,"description":"Most Posts","user_id":1995},{"extras":null,"description":"Frequent Poster","user_id":2702}]},{"id":4650,"title":"Migrating off Active Record Observers","fancy_title":"Migrating off Active Record Observers","slug":"migrating-off-active-record-observers","posts_count":8,"reply_count":7,"highest_post_number":8,"image_url":null,"created_at":"2013-03-11T11:26:13.000-04:00","last_posted_at":"2013-05-14T18:40:16.000-04:00","bumped":true,"bumped_at":"2013-05-14T18:40:16.000-04:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":377,"like_count":3,"has_summary":false,"archetype":"regular","last_poster_username":"sam","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":19},{"extras":null,"description":"Most Posts","user_id":9},{"extras":null,"description":"Frequent Poster","user_id":1995},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":1}]},{"id":4960,"title":"Vagrant Updates!","fancy_title":"Vagrant Updates!","slug":"vagrant-updates","posts_count":5,"reply_count":3,"highest_post_number":5,"image_url":"/plugins/emoji/images/fish.png","created_at":"2013-03-20T22:29:22.000-04:00","last_posted_at":"2013-03-21T19:06:40.000-04:00","bumped":true,"bumped_at":"2013-03-21T19:06:40.000-04:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":500,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"zogstrip","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":19},{"extras":null,"description":"Most Posts","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":1995}]},{"id":2918,"title":"New: Updated Docs","fancy_title":"New: Updated Docs","slug":"new-updated-docs","posts_count":3,"reply_count":2,"highest_post_number":3,"image_url":null,"created_at":"2013-02-12T12:13:02.000-05:00","last_posted_at":"2013-02-15T17:57:19.000-05:00","bumped":true,"bumped_at":"2013-02-15T17:57:19.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":457,"like_count":10,"has_summary":false,"archetype":"regular","last_poster_username":"eviltrout","category_id":10,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":19},{"extras":null,"description":"Most Posts","user_id":2636}]}]}} }; diff --git a/test/javascripts/helpers/component-test.js.es6 b/test/javascripts/helpers/component-test.js.es6 index 3ff28d3c94..0fd3c8d6b2 100644 --- a/test/javascripts/helpers/component-test.js.es6 +++ b/test/javascripts/helpers/component-test.js.es6 @@ -6,20 +6,27 @@ export default function(name, opts) { opts = opts || {}; test(name, function(assert) { - if (opts.setup) { - const store = createStore(); - opts.setup.call(this, store); - } const appEvents = AppEvents.create(); - - loadAllHelpers(); - this.container.register('site-settings:main', Discourse.SiteSettings, { instantiate: false }); this.container.register('app-events:main', appEvents, { instantiate: false }); this.container.register('capabilities:main', Ember.Object); + this.container.register('site:main', Discourse.Site.current(), { instantiate: false }); this.container.injection('component', 'siteSettings', 'site-settings:main'); this.container.injection('component', 'appEvents', 'app-events:main'); this.container.injection('component', 'capabilities', 'capabilities:main'); + this.container.injection('component', 'site', 'site:main'); + + this.siteSettings = Discourse.SiteSettings; + + loadAllHelpers(); + + if (opts.setup) { + const store = createStore(); + this.currentUser = Discourse.User.create(); + this.container.register('store:main', store, { instantiate: false }); + this.container.register('current-user:main', this.currentUser, { instantiate: false }); + opts.setup.call(this, store); + } andThen(() => this.render(opts.template)); andThen(() => opts.test.call(this, assert)); diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6 index fca63e935b..0aaad1ff90 100644 --- a/test/javascripts/helpers/create-pretender.js.es6 +++ b/test/javascripts/helpers/create-pretender.js.es6 @@ -85,7 +85,23 @@ export default function() { this.get('/users/:username/staff-info.json', () => response({})); - this.put('/categories/:category_id', function(request) { + this.get('/post_action_users', () => { + return response({ + post_action_users: [ + {id: 1, username: 'eviltrout', avatar_template: '/user_avatar/default/eviltrout/{size}/1.png', username_lower: 'eviltrout' } + ] + }); + }); + + this.get('/post_replies', () => { + return response({ post_replies: [{ id: 1234, cooked: 'wat' }] }); + }); + + this.get('/post_reply_histories', () => { + return response({ post_reply_histories: [{ id: 1234, cooked: 'wat' }] }); + }); + + this.put('/categories/:category_id', request => { const category = parsePostData(request.requestBody); return response({category}); }); @@ -132,6 +148,7 @@ export default function() { this.delete('/posts/:post_id', success); this.put('/posts/:post_id/recover', success); + this.get('/posts/:post_id/expand-embed', success); this.put('/posts/:post_id', request => { const data = parsePostData(request.requestBody); diff --git a/test/javascripts/helpers/qunit-helpers.js.es6 b/test/javascripts/helpers/qunit-helpers.js.es6 index 44812f7ec6..c690585661 100644 --- a/test/javascripts/helpers/qunit-helpers.js.es6 +++ b/test/javascripts/helpers/qunit-helpers.js.es6 @@ -41,7 +41,6 @@ function acceptance(name, options) { Discourse.Utilities.avatarImg = () => ""; // For now don't do scrolling stuff in Test Mode - Ember.CloakedCollectionView.scrolled = Ember.K; HeaderView.reopen({examineDockHeader: Ember.K}); var siteJson = siteFixtures['site.json'].site; diff --git a/test/javascripts/helpers/widget-test.js.es6 b/test/javascripts/helpers/widget-test.js.es6 new file mode 100644 index 0000000000..d30170ff1d --- /dev/null +++ b/test/javascripts/helpers/widget-test.js.es6 @@ -0,0 +1,9 @@ +import componentTest from 'helpers/component-test'; + +export function moduleForWidget(name) { + moduleForComponent(name, `widget:${name}`, { integration: true }); +} + +export function widgetTest(name, opts) { + return componentTest(name, opts); +} diff --git a/test/javascripts/lib/emoji-test.js.es6 b/test/javascripts/lib/emoji-test.js.es6 index e1bb18777a..4f3ba3c8e7 100644 --- a/test/javascripts/lib/emoji-test.js.es6 +++ b/test/javascripts/lib/emoji-test.js.es6 @@ -8,22 +8,24 @@ var testUnescape = function(input, expected, description) { test("Emoji.unescape", function(){ + const v = Discourse.Emoji.ImageVersion; + testUnescape("Not emoji :O) :frog) :smile)", "Not emoji :O) :frog) :smile)", "title without emoji"); testUnescape("Not emoji :frog :smile", "Not emoji :frog :smile", "end colon is not optional"); - testUnescape("emoticons :)", "emoticons slightly_smiling", "emoticons are still supported"); + testUnescape("emoticons :)", "emoticons slight_smile", "emoticons are still supported"); testUnescape("With emoji :O: :frog: :smile:", - "With emoji O frog smile", + `With emoji O frog smile`, "title with emoji"); testUnescape("a:smile:a", "a:smile:a", "word characters not allowed next to emoji"); - testUnescape("(:frog:) :)", "(frog) slightly_smiling", "non-word characters allowed next to emoji"); - testUnescape(":smile: hi", "smile hi", "start of line"); - testUnescape("hi :smile:", "hi smile", "end of line"); + testUnescape("(:frog:) :)", `(frog) slight_smile`, "non-word characters allowed next to emoji"); + testUnescape(":smile: hi", `smile hi`, "start of line"); + testUnescape("hi :smile:", `hi smile`, "end of line"); }); test("Emoji.search", function(){ // able to find an alias - equal(Discourse.Emoji.search("coll").length, 1); + equal(Discourse.Emoji.search("+1").length, 1); }); diff --git a/test/javascripts/models/post-stream-test.js.es6 b/test/javascripts/models/post-stream-test.js.es6 index 41098560ad..0b9a7d3dfa 100644 --- a/test/javascripts/models/post-stream-test.js.es6 +++ b/test/javascripts/models/post-stream-test.js.es6 @@ -27,40 +27,6 @@ test('defaults', function() { present(postStream.get('topic')); }); -test('daysSincePrevious when appending', function(assert) { - const postStream = buildStream(10000001, [1,2,3]); - const store = postStream.store; - - const p1 = store.createRecord('post', {id: 1, post_number: 1, created_at: "2015-05-29T18:17:35.868Z"}), - p2 = store.createRecord('post', {id: 2, post_number: 2, created_at: "2015-06-01T01:07:25.761Z"}), - p3 = store.createRecord('post', {id: 3, post_number: 3, created_at: "2015-06-02T01:07:25.761Z"}); - - postStream.appendPost(p1); - postStream.appendPost(p2); - postStream.appendPost(p3); - - assert.ok(!p1.get('daysSincePrevious')); - assert.equal(p2.get('daysSincePrevious'), 2); - assert.equal(p3.get('daysSincePrevious'), 1); -}); - -test('daysSincePrevious when prepending', function(assert) { - const postStream = buildStream(10000001, [1,2,3]); - const store = postStream.store; - - const p1 = store.createRecord('post', {id: 1, post_number: 1, created_at: "2015-05-29T18:17:35.868Z"}), - p2 = store.createRecord('post', {id: 2, post_number: 2, created_at: "2015-06-01T01:07:25.761Z"}), - p3 = store.createRecord('post', {id: 3, post_number: 3, created_at: "2015-06-02T01:07:25.761Z"}); - - postStream.prependPost(p3); - postStream.prependPost(p2); - postStream.prependPost(p1); - - assert.ok(!p1.get('daysSincePrevious')); - assert.equal(p2.get('daysSincePrevious'), 2); - assert.equal(p3.get('daysSincePrevious'), 1); -}); - test('appending posts', function() { const postStream = buildStream(4567, [1, 3, 4]); const store = postStream.store; @@ -320,17 +286,6 @@ test("loadIntoIdentityMap with post ids", function() { }); }); -test("loading a post's history", function() { - const postStream = buildStream(1234); - const store = postStream.store; - const post = store.createRecord('post', {id: 4321}); - - postStream.findReplyHistory(post).then(function() { - present(postStream.findLoadedPost(2222), "it stores the returned post in the identity map"); - present(post.get('replyHistory'), "it sets the replyHistory attribute for the post"); - }); -}); - test("staging and undoing a new post", function() { const postStream = buildStream(10101, [1]); const store = postStream.store; diff --git a/test/javascripts/models/post-test.js.es6 b/test/javascripts/models/post-test.js.es6 index 7736577500..1f881df120 100644 --- a/test/javascripts/models/post-test.js.es6 +++ b/test/javascripts/models/post-test.js.es6 @@ -14,7 +14,6 @@ test('defaults', function() { var post = Discourse.Post.create({id: 1}); blank(post.get('deleted_at'), "it has no deleted_at by default"); blank(post.get('deleted_by'), "there is no deleted_by by default"); - equal(post.get('replyHistory.length'), 0, "there is no reply history by default"); }); test('new_user', function() { @@ -47,16 +46,6 @@ test('updateFromPost', function() { equal(post.get('raw'), "different raw", "raw field updated"); }); -test('hasHistory', function() { - var post = Discourse.Post.create({id: 1}); - ok(!post.get('hasHistory'), 'posts without versions have no history'); - post.set('version', 1); - ok(!post.get('hasHistory'), 'posts with one version have no history'); - post.set('version', 2); - ok(post.get('hasHistory'), 'posts with more than one version have a history'); -}); - - test('destroy by staff', function() { var user = Discourse.User.create({username: 'staff', staff: true}), post = buildPost({user: user}); diff --git a/test/javascripts/models/topic-test.js.es6 b/test/javascripts/models/topic-test.js.es6 index d377008b6b..f1d2469b43 100644 --- a/test/javascripts/models/topic-test.js.es6 +++ b/test/javascripts/models/topic-test.js.es6 @@ -75,7 +75,9 @@ test("recover", function() { test('fancyTitle', function() { var topic = Topic.create({ fancy_title: ":smile: with all :) the emojis :pear::peach:" }); + const v = Discourse.Emoji.ImageVersion; + equal(topic.get('fancyTitle'), - "smile with all slightly_smiling the emojis pearpeach", + `smile with all slight_smile the emojis pearpeach`, "supports emojis"); }); diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js index 08f9256f6f..99efffb5ef 100644 --- a/test/javascripts/test_helper.js +++ b/test/javascripts/test_helper.js @@ -41,6 +41,8 @@ // //= require ../../public/javascripts/jquery.magnific-popup-min.js +window.inTestEnv = true; + window.assetPath = function(url) { if (url.indexOf('defer') === 0) { return "/assets/" + url; @@ -111,9 +113,6 @@ QUnit.testStart(function(ctx) { } }); -// Don't cloak in testing -Ember.CloakedCollectionView = Ember.CollectionView; - QUnit.testDone(function() { Ember.run.debounce = origDebounce; window.sandbox.restore(); diff --git a/test/javascripts/widgets/actions-summary-test.js.es6 b/test/javascripts/widgets/actions-summary-test.js.es6 new file mode 100644 index 0000000000..8d549ff499 --- /dev/null +++ b/test/javascripts/widgets/actions-summary-test.js.es6 @@ -0,0 +1,80 @@ +import { moduleForWidget, widgetTest } from 'helpers/widget-test'; + +moduleForWidget('actions-summary'); + +widgetTest('listing actions', { + template: '{{mount-widget widget="actions-summary" args=args}}', + setup() { + this.set('args', { + actionsSummary: [ + {action: 'off_topic', description: 'very off topic'}, + {action: 'spam', description: 'suspicious message'} + ] + }); + }, + test(assert) { + assert.equal(this.$('.post-actions .post-action').length, 2); + + click('.post-action:eq(0) .action-link a'); + andThen(() => { + assert.equal(this.$('.post-action:eq(0) img.avatar').length, 1, 'clicking it shows the user'); + }); + } +}); + +widgetTest('undo', { + template: '{{mount-widget widget="actions-summary" args=args undoPostAction="undoPostAction"}}', + setup() { + this.set('args', { + actionsSummary: [ + {action: 'off_topic', description: 'very off topic', canUndo: true}, + ] + }); + + this.on('undoPostAction', () => this.undid = true); + }, + test(assert) { + assert.equal(this.$('.post-actions .post-action').length, 1); + + click('.action-link.undo'); + andThen(() => { + assert.ok(this.undid, 'it triggered the action'); + }); + } +}); + +widgetTest('deferFlags', { + template: '{{mount-widget widget="actions-summary" args=args deferPostActionFlags="deferPostActionFlags"}}', + setup() { + this.set('args', { + actionsSummary: [ + {action: 'off_topic', description: 'very off topic', canDeferFlags: true, count: 1}, + ] + }); + + this.on('deferPostActionFlags', () => this.deferred = true); + }, + test(assert) { + assert.equal(this.$('.post-actions .post-action').length, 1); + + click('.action-link.defer-flags'); + andThen(() => { + assert.ok(this.deferred, 'it triggered the action'); + }); + } +}); + +widgetTest('post deleted', { + template: '{{mount-widget widget="actions-summary" args=args}}', + setup() { + this.set('args', { + deleted_at: "2016-01-01", + deletedByUsername: 'eviltrout', + deletedByAvatarTemplate: '/images/avatar.png' + }); + }, + test(assert) { + assert.ok(this.$('.post-action .fa-trash-o').length === 1, 'it has the deleted icon'); + assert.ok(this.$('.avatar[title=eviltrout]').length === 1, 'it has the deleted by avatar'); + } +}); diff --git a/test/javascripts/widgets/post-gutter-test.js.es6 b/test/javascripts/widgets/post-gutter-test.js.es6 new file mode 100644 index 0000000000..55c4152cb2 --- /dev/null +++ b/test/javascripts/widgets/post-gutter-test.js.es6 @@ -0,0 +1,54 @@ +import { moduleForWidget, widgetTest } from 'helpers/widget-test'; + +moduleForWidget('post-gutter'); + +widgetTest("duplicate links", { + template: '{{mount-widget widget="post-gutter" args=args}}', + setup() { + this.set('args', { + links: [ + { title: "Evil Trout Link", url: "http://eviltrout.com" }, + { title: "Evil Trout Link", url: "http://dupe.eviltrout.com" } + ] + }); + }, + test(assert) { + assert.equal(this.$('.post-links a.track-link').length, 1, 'it hides the dupe link'); + } +}); + +widgetTest("collapsed links", { + template: '{{mount-widget widget="post-gutter" args=args}}', + setup() { + this.set('args', { + links: [ + { title: "Link 1", url: "http://eviltrout.com?1" }, + { title: "Link 2", url: "http://eviltrout.com?2" }, + { title: "Link 3", url: "http://eviltrout.com?3" }, + { title: "Link 4", url: "http://eviltrout.com?4" }, + { title: "Link 5", url: "http://eviltrout.com?5" }, + { title: "Link 6", url: "http://eviltrout.com?6" }, + { title: "Link 7", url: "http://eviltrout.com?7" }, + ] + }); + }, + test(assert) { + assert.equal(this.$('.post-links a.track-link').length, 5, 'collapses by default'); + click('a.toggle-more'); + andThen(() => { + assert.equal(this.$('.post-links a.track-link').length, 7); + }); + } +}); + +widgetTest("reply as new topic", { + template: '{{mount-widget widget="post-gutter" args=args newTopicAction="newTopicAction"}}', + setup() { + this.set('args', { canReplyAsNewTopic: true }); + this.on('newTopicAction', () => this.newTopicTriggered = true); + }, + test(assert) { + click('a.reply-new'); + andThen(() => assert.ok(this.newTopicTriggered)); + } +}); diff --git a/test/javascripts/widgets/post-stream-test.js.es6 b/test/javascripts/widgets/post-stream-test.js.es6 new file mode 100644 index 0000000000..396ae206c0 --- /dev/null +++ b/test/javascripts/widgets/post-stream-test.js.es6 @@ -0,0 +1,66 @@ +import { moduleForWidget, widgetTest } from 'helpers/widget-test'; +import Topic from 'discourse/models/topic'; +import Post from 'discourse/models/post'; + +moduleForWidget('post-stream'); + +function postStreamTest(name, attrs) { + widgetTest(name, { + template: `{{mount-widget widget="post-stream" args=(as-hash posts=posts)}}`, + setup() { + this.set('posts', attrs.posts.call(this)); + }, + test: attrs.test + }); +} + +postStreamTest('basics', { + posts() { + const site = this.container.lookup('site:main'); + const topic = Topic.create({ details: { created_by: { id: 123 } } }); + return [ + Post.create({ topic, id: 1, post_number: 1, user_id: 123, primary_group_name: 'trout', + avatar_template: '/images/avatar.png' }), + Post.create({ topic, id: 2, post_number: 2, post_type: site.get('post_types.moderator_action') }), + Post.create({ topic, id: 3, post_number: 3, hidden: true }), + Post.create({ topic, id: 4, post_number: 4, post_type: site.get('post_types.whisper') }), + Post.create({ topic, id: 5, post_number: 5, wiki: true, via_email: true }) + ]; + }, + + test(assert) { + assert.equal(this.$('.post-stream').length, 1); + assert.equal(this.$('.topic-post').length, 5, 'renders all posts'); + + // look for special class bindings + assert.equal(this.$('.topic-post:eq(0).topic-owner').length, 1, 'it applies the topic owner class'); + assert.equal(this.$('.topic-post:eq(0).group-trout').length, 1, 'it applies the primary group class'); + assert.equal(this.$('.topic-post:eq(0).regular').length, 1, 'it applies the regular class'); + assert.equal(this.$('.topic-post:eq(1).moderator').length, 1, 'it applies the moderator class'); + assert.equal(this.$('.topic-post:eq(2).post-hidden').length, 1, 'it applies the hidden class'); + assert.equal(this.$('.topic-post:eq(3).whisper').length, 1, 'it applies the whisper class'); + assert.equal(this.$('.topic-post:eq(4).wiki').length, 1, 'it applies the wiki class'); + + // it renders an article for the body with appropriate attributes + assert.equal(this.$('article#post_2').length, 1); + assert.equal(this.$('article[data-user-id=123]').length, 1); + assert.equal(this.$('article[data-post-id=3]').length, 1); + assert.equal(this.$('article#post_5.via-email').length, 1); + + assert.equal(this.$('article:eq(0) .main-avatar').length, 1, 'renders the main avatar'); + } +}); + +postStreamTest('deleted posts', { + posts() { + const topic = Topic.create({ details: { created_by: { id: 123 } } }); + return [ + Post.create({ topic, id: 1, post_number: 1, deleted_at: new Date().toString() }), + ]; + }, + + test(assert) { + assert.equal(this.$('.topic-post.deleted').length, 1, 'it applies the deleted class'); + assert.equal(this.$('.deleted-user-avatar').length, 1, 'it has the trash avatar'); + } +}); diff --git a/test/javascripts/widgets/post-test.js.es6 b/test/javascripts/widgets/post-test.js.es6 new file mode 100644 index 0000000000..5c853c0dd6 --- /dev/null +++ b/test/javascripts/widgets/post-test.js.es6 @@ -0,0 +1,784 @@ +import { moduleForWidget, widgetTest } from 'helpers/widget-test'; + +moduleForWidget('post'); + +widgetTest('basic elements', { + template: '{{mount-widget widget="post" args=args}}', + setup() { + this.set('args', { shareUrl: '/example', post_number: 1 }); + }, + test(assert) { + assert.ok(this.$('.names').length, 'includes poster name'); + + assert.ok(this.$('a.post-date').length, 'includes post date'); + assert.ok(this.$('a.post-date[data-share-url]').length); + assert.ok(this.$('a.post-date[data-post-number]').length); + } +}); + +widgetTest('wiki', { + template: '{{mount-widget widget="post" args=args editPost="editPost"}}', + setup() { + this.set('args', { wiki: true }); + this.on('editPost', () => this.editPostCalled = true); + }, + test(assert) { + click('.post-info.wiki'); + andThen(() => { + assert.ok(this.editPostCalled, 'clicking the wiki icon edits the post'); + }); + } +}); + +widgetTest('via-email', { + template: '{{mount-widget widget="post" args=args showRawEmail="showRawEmail"}}', + setup() { + this.set('args', { via_email: true, canViewRawEmail: true }); + this.on('showRawEmail', () => this.rawEmailShown = true); + }, + test(assert) { + click('.post-info.via-email'); + andThen(() => { + assert.ok(this.rawEmailShown, 'clicking the enveloppe shows the raw email'); + }); + } +}); + +widgetTest('via-email without permission', { + template: '{{mount-widget widget="post" args=args showRawEmail="showRawEmail"}}', + setup() { + this.set('args', { via_email: true, canViewRawEmail: false }); + this.on('showRawEmail', () => this.rawEmailShown = true); + }, + test(assert) { + click('.post-info.via-email'); + andThen(() => { + assert.ok(!this.rawEmailShown, `clicking the enveloppe doesn't show the raw email`); + }); + } +}); + +widgetTest('history', { + template: '{{mount-widget widget="post" args=args showHistory="showHistory"}}', + setup() { + this.set('args', { version: 3, canViewEditHistory: true }); + this.on('showHistory', () => this.historyShown = true); + }, + test(assert) { + click('.post-info.edits'); + andThen(() => { + assert.ok(this.historyShown, 'clicking the pencil shows the history'); + }); + } +}); + +widgetTest('history without view permission', { + template: '{{mount-widget widget="post" args=args showHistory="showHistory"}}', + setup() { + this.set('args', { version: 3, canViewEditHistory: false }); + this.on('showHistory', () => this.historyShown = true); + }, + test(assert) { + click('.post-info.edits'); + andThen(() => { + assert.ok(!this.historyShown, `clicking the pencil doesn't show the history`); + }); + } +}); + +widgetTest('whisper', { + template: '{{mount-widget widget="post" args=args}}', + setup() { + this.set('args', { isWhisper: true }); + }, + test(assert) { + assert.ok(this.$('.topic-post.whisper').length === 1); + assert.ok(this.$('.post-info.whisper').length === 1); + } +}); + +widgetTest('like count button', { + template: '{{mount-widget widget="post" model=post args=args}}', + setup(store) { + const topic = store.createRecord('topic', {id: 123}); + const post = store.createRecord('post', { + id: 1, + post_number: 1, + topic, + like_count: 3, + actions_summary: [ {id: 2, count: 1, hidden: false, can_act: true} ] + }); + this.set('post', post); + this.set('args', { likeCount: 1 }); + }, + test(assert) { + assert.ok(this.$('button.like-count').length === 1); + assert.ok(this.$('.who-liked').length === 0); + + // toggle it on + click('button.like-count'); + andThen(() => { + assert.ok(this.$('.who-liked').length === 1); + assert.ok(this.$('.who-liked a.trigger-user-card').length === 1); + }); + + // toggle it off + click('button.like-count'); + andThen(() => { + assert.ok(this.$('.who-liked').length === 0); + assert.ok(this.$('.who-liked a.trigger-user-card').length === 0); + }); + } +}); + +widgetTest(`like count with no likes`, { + template: '{{mount-widget widget="post" model=post args=args}}', + setup() { + this.set('args', { likeCount: 0 }); + }, + test(assert) { + assert.ok(this.$('button.like-count').length === 0); + } +}); + +widgetTest('share button', { + template: '{{mount-widget widget="post" args=args}}', + setup() { + this.set('args', { shareUrl: 'http://share-me.example.com' }); + }, + test(assert) { + assert.ok(!!this.$('.actions button[data-share-url]').length, 'it renders a share button'); + } +}); + +widgetTest('liking', { + template: '{{mount-widget widget="post-menu" args=args toggleLike="toggleLike"}}', + setup() { + const args = { showLike: true, canToggleLike: true }; + this.set('args', args); + this.on('toggleLike', () => { + args.liked = !args.liked; + args.likeCount = args.liked ? 1 : 0; + }); + }, + test(assert) { + assert.ok(!!this.$('.actions button.like').length); + assert.ok(this.$('.actions button.like-count').length === 0); + + click('.actions button.like'); + andThen(() => { + assert.ok(!this.$('.actions button.like').length); + assert.ok(!!this.$('.actions button.has-like').length); + assert.ok(this.$('.actions button.like-count').length === 1); + }); + + click('.actions button.has-like'); + andThen(() => { + assert.ok(!!this.$('.actions button.like').length); + assert.ok(!this.$('.actions button.has-like').length); + assert.ok(this.$('.actions button.like-count').length === 0); + }); + } +}); + +widgetTest('edit button', { + template: '{{mount-widget widget="post" args=args editPost="editPost"}}', + setup() { + this.set('args', { canEdit: true }); + this.on('editPost', () => this.editPostCalled = true); + }, + test(assert) { + click('button.edit'); + andThen(() => { + assert.ok(this.editPostCalled, 'it triggered the edit action'); + }); + } +}); + +widgetTest(`edit button - can't edit`, { + template: '{{mount-widget widget="post" args=args editPost="editPost"}}', + setup() { + this.set('args', { canEdit: false }); + }, + test(assert) { + assert.equal(this.$('button.edit').length, 0, `button is not displayed`); + } +}); + +widgetTest('recover button', { + template: '{{mount-widget widget="post" args=args deletePost="deletePost"}}', + setup() { + this.set('args', { canDelete: true }); + this.on('deletePost', () => this.deletePostCalled = true); + }, + test(assert) { + click('button.delete'); + andThen(() => { + assert.ok(this.deletePostCalled, 'it triggered the delete action'); + }); + } +}); + +widgetTest('delete topic button', { + template: '{{mount-widget widget="post" args=args deletePost="deletePost"}}', + setup() { + this.set('args', { canDeleteTopic: true }); + this.on('deletePost', () => this.deletePostCalled = true); + }, + test(assert) { + click('button.delete'); + andThen(() => { + assert.ok(this.deletePostCalled, 'it triggered the delete action'); + }); + } +}); + +widgetTest(`delete topic button - can't delete`, { + template: '{{mount-widget widget="post" args=args deletePost="deletePost"}}', + setup() { + this.set('args', { canDeleteTopic: false }); + }, + test(assert) { + assert.equal(this.$('button.delete').length, 0, `button is not displayed`); + } +}); + +widgetTest('recover topic button', { + template: '{{mount-widget widget="post" args=args recoverPost="recoverPost"}}', + setup() { + this.set('args', { canRecoverTopic: true }); + this.on('recoverPost', () => this.recovered = true); + }, + test(assert) { + click('button.recover'); + andThen(() => assert.ok(this.recovered)); + } +}); + +widgetTest(`recover topic button - can't recover`, { + template: '{{mount-widget widget="post" args=args deletePost="deletePost"}}', + setup() { + this.set('args', { canRecoverTopic: false }); + }, + test(assert) { + assert.equal(this.$('button.recover').length, 0, `button is not displayed`); + } +}); + +widgetTest('delete post button', { + template: '{{mount-widget widget="post" args=args deletePost="deletePost"}}', + setup() { + this.set('args', { canDelete: true }); + this.on('deletePost', () => this.deletePostCalled = true); + }, + test(assert) { + click('button.delete'); + andThen(() => { + assert.ok(this.deletePostCalled, 'it triggered the delete action'); + }); + } +}); + +widgetTest(`delete post button - can't delete`, { + template: '{{mount-widget widget="post" args=args}}', + setup() { + this.set('args', { canDelete: false }); + }, + test(assert) { + assert.equal(this.$('button.delete').length, 0, `button is not displayed`); + } +}); + +widgetTest('recover post button', { + template: '{{mount-widget widget="post" args=args recoverPost="recoverPost"}}', + setup() { + this.set('args', { canRecover: true }); + this.on('recoverPost', () => this.recovered = true); + }, + test(assert) { + click('button.recover'); + andThen(() => assert.ok(this.recovered)); + } +}); + +widgetTest(`recover post button - can't recover`, { + template: '{{mount-widget widget="post" args=args deletePost="deletePost"}}', + setup() { + this.set('args', { canRecover: false }); + }, + test(assert) { + assert.equal(this.$('button.recover').length, 0, `button is not displayed`); + } +}); + +widgetTest(`flagging`, { + template: '{{mount-widget widget="post" args=args showFlags="showFlags"}}', + setup() { + this.set('args', { canFlag: true }); + this.on('showFlags', () => this.flagsShown = true); + }, + test(assert) { + assert.ok(this.$('button.create-flag').length === 1); + + click('button.create-flag'); + andThen(() => { + assert.ok(this.flagsShown, 'it triggered the action'); + }); + } +}); + +widgetTest(`flagging: can't flag`, { + template: '{{mount-widget widget="post" args=args}}', + setup() { + this.set('args', { canFlag: false }); + }, + test(assert) { + assert.ok(this.$('button.create-flag').length === 0); + } +}); + +widgetTest(`read indicator`, { + template: '{{mount-widget widget="post" args=args}}', + setup() { + this.set('args', { read: true }); + }, + test(assert) { + assert.ok(this.$('.read-state.read').length); + } +}); + +widgetTest(`unread indicator`, { + template: '{{mount-widget widget="post" args=args}}', + setup() { + this.set('args', { read: false }); + }, + test(assert) { + assert.ok(this.$('.read-state').length); + } +}); + +widgetTest("reply directly above (supressed)", { + template: '{{mount-widget widget="post" args=args}}', + setup() { + this.set('args', { + replyToUsername: 'eviltrout', + replyToAvatarTemplate: '/images/avatar.png', + replyDirectlyAbove: true + }); + }, + test(assert) { + assert.equal(this.$('a.reply-to-tab').length, 0, 'hides the tab'); + assert.equal(this.$('.avoid-tab').length, 0, "doesn't have the avoid tab class"); + } +}); + +widgetTest("reply a few posts above (supressed)", { + template: '{{mount-widget widget="post" args=args}}', + setup() { + this.set('args', { + replyToUsername: 'eviltrout', + replyToAvatarTemplate: '/images/avatar.png', + replyDirectlyAbove: false + }); + }, + test(assert) { + assert.ok(this.$('a.reply-to-tab').length, 'shows the tab'); + assert.equal(this.$('.avoid-tab').length, 1, "has the avoid tab class"); + } +}); + +widgetTest("reply directly above", { + template: '{{mount-widget widget="post" args=args}}', + setup() { + this.set('args', { + replyToUsername: 'eviltrout', + replyToAvatarTemplate: '/images/avatar.png', + replyDirectlyAbove: true + }); + this.siteSettings.suppress_reply_directly_above = false; + }, + test(assert) { + assert.equal(this.$('.avoid-tab').length, 1, "has the avoid tab class"); + click('a.reply-to-tab'); + andThen(() => { + assert.equal(this.$('section.embedded-posts.top .cooked').length, 1); + assert.equal(this.$('section.embedded-posts i.fa-arrow-up').length, 1); + }); + } +}); + +widgetTest("cooked content hidden", { + template: '{{mount-widget widget="post" args=args expandHidden="expandHidden"}}', + setup() { + this.set('args', { cooked_hidden: true }); + this.on('expandHidden', () => this.unhidden = true); + }, + test(assert) { + click('.topic-body .expand-hidden'); + andThen(() => { + assert.ok(this.unhidden, 'triggers the action'); + }); + } +}); + +widgetTest("expand first post", { + template: '{{mount-widget widget="post" model=post args=args}}', + setup(store) { + this.set('args', { expandablePost: true }); + this.set('post', store.createRecord('post', { id: 1234 })); + }, + test(assert) { + click('.topic-body .expand-post'); + andThen(() => { + assert.equal(this.$('.expand-post').length, 0, 'button is gone'); + }); + } +}); + +widgetTest("can't bookmark", { + template: '{{mount-widget widget="post" args=args}}', + setup() { + this.set('args', { canBookmark: false }); + }, + test(assert) { + assert.equal(this.$('button.bookmark').length, 0); + assert.equal(this.$('button.bookmarked').length, 0); + } +}); + +widgetTest("bookmark", { + template: '{{mount-widget widget="post" args=args toggleBookmark="toggleBookmark"}}', + setup() { + const args = { canBookmark: true }; + + this.set('args', args); + this.on('toggleBookmark', () => args.bookmarked = true); + }, + test(assert) { + assert.equal(this.$('.post-menu-area .bookmark').length, 1); + assert.equal(this.$('button.bookmarked').length, 0); + + click('button.bookmark'); + andThen(() => { + assert.equal(this.$('button.bookmarked').length, 1); + }); + } +}); + +widgetTest("can't show admin menu when you can't manage", { + template: '{{mount-widget widget="post" args=args}}', + setup() { + this.set('args', { canManage: false }); + }, + test(assert) { + assert.equal(this.$('.post-menu-area .show-post-admin-menu').length, 0); + } +}); + +widgetTest("show admin menu", { + template: '{{mount-widget widget="post" args=args}}', + setup() { + this.set('args', { canManage: true }); + }, + test(assert) { + assert.equal(this.$('.post-admin-menu').length, 0); + click('.post-menu-area .show-post-admin-menu'); + andThen(() => { + assert.equal(this.$('.post-admin-menu').length, 1, 'it shows the popup'); + }); + click('.post-menu-area'); + andThen(() => { + assert.equal(this.$('.post-admin-menu').length, 0, 'clicking outside clears the popup'); + }); + } +}); + +widgetTest("toggle moderator post", { + template: '{{mount-widget widget="post" args=args togglePostType="togglePostType"}}', + setup() { + this.set('args', { canManage: true }); + this.on('togglePostType', () => this.toggled = true); + }, + test(assert) { + click('.post-menu-area .show-post-admin-menu'); + click('.post-admin-menu .toggle-post-type'); + andThen(() => { + assert.ok(this.toggled); + assert.equal(this.$('.post-admin-menu').length, 0, 'also hides the menu'); + }); + } +}); +widgetTest("toggle moderator post", { + template: '{{mount-widget widget="post" args=args togglePostType="togglePostType"}}', + setup() { + this.set('args', { canManage: true }); + this.on('togglePostType', () => this.toggled = true); + }, + test(assert) { + click('.post-menu-area .show-post-admin-menu'); + click('.post-admin-menu .toggle-post-type'); + andThen(() => { + assert.ok(this.toggled); + assert.equal(this.$('.post-admin-menu').length, 0, 'also hides the menu'); + }); + } +}); + +widgetTest("rebake post", { + template: '{{mount-widget widget="post" args=args rebakePost="rebakePost"}}', + setup() { + this.set('args', { canManage: true }); + this.on('rebakePost', () => this.baked = true); + }, + test(assert) { + click('.post-menu-area .show-post-admin-menu'); + click('.post-admin-menu .rebuild-html'); + andThen(() => { + assert.ok(this.baked); + assert.equal(this.$('.post-admin-menu').length, 0, 'also hides the menu'); + }); + } +}); + +widgetTest("unhide post", { + template: '{{mount-widget widget="post" args=args unhidePost="unhidePost"}}', + setup() { + this.set('args', { canManage: true, hidden: true }); + this.on('unhidePost', () => this.unhidden = true); + }, + test(assert) { + click('.post-menu-area .show-post-admin-menu'); + click('.post-admin-menu .unhide-post'); + andThen(() => { + assert.ok(this.unhidden); + assert.equal(this.$('.post-admin-menu').length, 0, 'also hides the menu'); + }); + } +}); + +widgetTest("change owner", { + template: '{{mount-widget widget="post" args=args changePostOwner="changePostOwner"}}', + setup() { + this.currentUser.admin = true; + this.set('args', { canManage: true }); + this.on('changePostOwner', () => this.owned = true); + }, + test(assert) { + click('.post-menu-area .show-post-admin-menu'); + click('.post-admin-menu .change-owner'); + andThen(() => { + assert.ok(this.owned); + assert.equal(this.$('.post-admin-menu').length, 0, 'also hides the menu'); + }); + } +}); + +widgetTest("reply", { + template: '{{mount-widget widget="post" args=args replyToPost="replyToPost"}}', + setup() { + this.set('args', { canCreatePost: true }); + this.on('replyToPost', () => this.replied = true); + }, + test(assert) { + click('.post-controls .create'); + andThen(() => { + assert.ok(this.replied); + }); + } +}); + +widgetTest("reply - without permissions", { + template: '{{mount-widget widget="post" args=args}}', + setup() { + this.set('args', { canCreatePost: false }); + }, + test(assert) { + assert.equal(this.$('.post-controls .create').length, 0); + } +}); + +widgetTest("replies - no replies", { + template: '{{mount-widget widget="post" args=args}}', + setup() { + this.set('args', {replyCount: 0}); + }, + test(assert) { + assert.equal(this.$('button.show-replies').length, 0); + } +}); + +widgetTest("replies - multiple replies", { + template: '{{mount-widget widget="post" args=args}}', + setup() { + this.siteSettings.suppress_reply_directly_below = true; + this.set('args', {replyCount: 2, replyDirectlyBelow: true}); + }, + test(assert) { + assert.equal(this.$('button.show-replies').length, 1); + } +}); + +widgetTest("replies - one below, suppressed", { + template: '{{mount-widget widget="post" args=args}}', + setup() { + this.siteSettings.suppress_reply_directly_below = true; + this.set('args', {replyCount: 1, replyDirectlyBelow: true}); + }, + test(assert) { + assert.equal(this.$('button.show-replies').length, 0); + } +}); + +widgetTest("replies - one below, not suppressed", { + template: '{{mount-widget widget="post" args=args}}', + setup() { + this.siteSettings.suppress_reply_directly_below = false; + this.set('args', {id: 6654, replyCount: 1, replyDirectlyBelow: true}); + }, + test(assert) { + click('button.show-replies'); + andThen(() => { + assert.equal(this.$('section.embedded-posts.bottom .cooked').length, 1); + assert.equal(this.$('section.embedded-posts i.fa-arrow-down').length, 1); + }); + } +}); + +widgetTest("topic map not shown", { + template: '{{mount-widget widget="post" args=args}}', + setup() { + this.set('args', { showTopicMap: false }); + }, + test(assert) { + assert.equal(this.$('.topic-map').length, 0); + } +}); + +widgetTest("topic map - few posts", { + template: '{{mount-widget widget="post" args=args}}', + setup() { + this.set('args', { + showTopicMap: true, + topicPostsCount: 2, + participants: [ + {username: 'eviltrout'}, + {username: 'codinghorror'}, + ] + }); + }, + test(assert) { + assert.equal(this.$('li.avatars a.poster').length, 0, 'shows no participants when collapsed'); + + click('nav.buttons button'); + andThen(() => { + assert.equal(this.$('.topic-map-expanded a.poster').length, 2, 'shows all when expanded'); + }); + } +}); + +widgetTest("topic map - participants", { + template: '{{mount-widget widget="post" args=args toggleParticipant="toggleParticipant"}}', + setup() { + this.set('args', { + showTopicMap: true, + topicPostsCount: 10, + participants: [ + {username: 'eviltrout'}, + {username: 'codinghorror'}, + {username: 'sam'}, + {username: 'ZogStrIP'}, + ], + userFilters: ['sam', 'codinghorror'] + }); + + this.on('toggleParticipant', () => this.participantToggled = true); + }, + test(assert) { + assert.equal(this.$('li.avatars a.poster').length, 3, 'limits to three participants'); + + click('nav.buttons button'); + andThen(() => { + assert.equal(this.$('li.avatars a.poster').length, 0); + assert.equal(this.$('.topic-map-expanded a.poster').length, 4, 'shows all when expanded'); + assert.equal(this.$('a.poster.toggled').length, 2, 'two are toggled'); + }); + + click('.topic-map-expanded a.poster:eq(0)'); + andThen(() => assert.ok(this.participantToggled)); + } +}); + +widgetTest("topic map - links", { + template: '{{mount-widget widget="post" args=args}}', + setup() { + this.set('args', { + showTopicMap: true, + topicLinks: [ + {url: 'http://link1.example.com', clicks: 0}, + {url: 'http://link2.example.com', clicks: 0}, + {url: 'http://link3.example.com', clicks: 0}, + {url: 'http://link4.example.com', clicks: 0}, + {url: 'http://link5.example.com', clicks: 0}, + {url: 'http://link6.example.com', clicks: 0}, + ] + }); + }, + test(assert) { + assert.equal(this.$('.topic-map').length, 1); + assert.equal(this.$('.map.map-collapsed').length, 1); + assert.equal(this.$('.topic-map-expanded').length, 0); + + click('nav.buttons button'); + andThen(() => { + assert.equal(this.$('.map.map-collapsed').length, 0); + assert.equal(this.$('.topic-map i.fa-chevron-up').length, 1); + assert.equal(this.$('.topic-map-expanded').length, 1); + assert.equal(this.$('.topic-map-expanded .topic-link').length, 5, 'it limits the links displayed'); + }); + + click('.link-summary a'); + andThen(() => { + assert.equal(this.$('.topic-map-expanded .topic-link').length, 6, 'all links now shown'); + }); + } +}); + +widgetTest("topic map - no summary", { + template: '{{mount-widget widget="post" args=args}}', + setup() { + this.set('args', { showTopicMap: true }); + }, + test(assert) { + assert.equal(this.$('.toggle-summary').length, 0); + } +}); + +widgetTest("topic map - has summary", { + template: '{{mount-widget widget="post" args=args toggleSummary="toggleSummary"}}', + setup() { + this.set('args', { showTopicMap: true, hasTopicSummary: true }); + this.on('toggleSummary', () => this.summaryToggled = true); + }, + test(assert) { + assert.equal(this.$('.toggle-summary').length, 1); + + click('.toggle-summary button'); + andThen(() => assert.ok(this.summaryToggled)); + } +}); + +widgetTest("pm map", { + template: '{{mount-widget widget="post" args=args}}', + setup() { + this.set('args', { + showTopicMap: true, + showPMMap: true, + allowedGroups: [], + allowedUsers: [ Ember.Object.create({ username: 'eviltrout' }) ] + }); + }, + test(assert) { + assert.equal(this.$('.private-message-map').length, 1); + assert.equal(this.$('.private-message-map .user').length, 1); + } +}); diff --git a/test/javascripts/widgets/poster-name-test.js.es6 b/test/javascripts/widgets/poster-name-test.js.es6 new file mode 100644 index 0000000000..5e6782625a --- /dev/null +++ b/test/javascripts/widgets/poster-name-test.js.es6 @@ -0,0 +1,67 @@ +import { moduleForWidget, widgetTest } from 'helpers/widget-test'; + +moduleForWidget('poster-name'); + +widgetTest('basic rendering', { + template: '{{mount-widget widget="poster-name" args=args}}', + setup() { + this.set('args', { + username: 'eviltrout', + usernameUrl: '/users/eviltrout', + name: 'Robin Ward', + user_title: 'Trout Master' }); + }, + test(assert) { + assert.ok(this.$('.names').length); + assert.ok(this.$('span.username').length); + assert.ok(this.$('a[data-auto-route=true]').length); + assert.ok(this.$('a[data-user-card=eviltrout]').length); + assert.equal(this.$('.username a').text(), 'eviltrout'); + assert.equal(this.$('.full-name a').text(), 'Robin Ward'); + assert.equal(this.$('.user-title').text(), 'Trout Master'); + } +}); + +widgetTest('extra classes and glyphs', { + template: '{{mount-widget widget="poster-name" args=args}}', + setup() { + this.set('args', { + username: 'eviltrout', + usernameUrl: '/users/eviltrout', + staff: true, + admin: true, + moderator: true, + new_user: true, + primary_group_name: 'fish' + }); + }, + test(assert) { + assert.ok(this.$('span.staff').length); + assert.ok(this.$('span.admin').length); + assert.ok(this.$('span.moderator').length); + assert.ok(this.$('i.fa-shield').length); + assert.ok(this.$('span.new-user').length); + assert.ok(this.$('span.fish').length); + } +}); + +widgetTest('disable display name on posts', { + template: '{{mount-widget widget="poster-name" args=args}}', + setup() { + this.siteSettings.display_name_on_posts = false; + this.set('args', { username: 'eviltrout', name: 'Robin Ward' }); + }, + test(assert) { + assert.equal(this.$('.full-name').length, 0); + } +}); + +widgetTest("doesn't render a name if it's similar to the username", { + template: '{{mount-widget widget="poster-name" args=args}}', + setup() { + this.set('args', { username: 'eviltrout', name: 'evil-trout' }); + }, + test(assert) { + assert.equal(this.$('.full-name').length, 0); + } +}); diff --git a/test/javascripts/widgets/widget-test.js.es6 b/test/javascripts/widgets/widget-test.js.es6 new file mode 100644 index 0000000000..5680516f6b --- /dev/null +++ b/test/javascripts/widgets/widget-test.js.es6 @@ -0,0 +1,245 @@ +import { moduleForWidget, widgetTest } from 'helpers/widget-test'; +import { createWidget } from 'discourse/widgets/widget'; +import { withPluginApi } from 'discourse/lib/plugin-api'; + +moduleForWidget('base'); + +widgetTest('widget attributes are passed in via args', { + template: `{{mount-widget widget="hello-test" args=args}}`, + + setup() { + createWidget('hello-test', { + tagName: 'div.test', + + html(attrs) { + return `Hello ${attrs.name}`; + }, + }); + + this.set('args', { name: 'Robin' }); + }, + + test(assert) { + assert.equal(this.$('.test').text(), "Hello Robin"); + } +}); + +widgetTest('buildClasses', { + template: `{{mount-widget widget="classname-test" args=args}}`, + + setup() { + createWidget('classname-test', { + tagName: 'div.test', + + buildClasses(attrs) { + return ['static', attrs.dynamic]; + } + }); + + this.set('args', { dynamic: 'cool-class' }); + }, + + test(assert) { + assert.ok(this.$('.test.static.cool-class').length, 'it has all the classes'); + } +}); + +widgetTest('buildAttributes', { + template: `{{mount-widget widget="attributes-test" args=args}}`, + + setup() { + createWidget('attributes-test', { + tagName: 'div.test', + + buildAttributes(attrs) { + return { "data-evil": 'trout', "aria-label": attrs.label }; + } + }); + + this.set('args', { label: 'accessibility' }); + }, + + test(assert) { + assert.ok(this.$('.test[data-evil=trout]').length); + assert.ok(this.$('.test[aria-label=accessibility]').length); + } +}); + +widgetTest('buildId', { + template: `{{mount-widget widget="id-test" args=args}}`, + + setup() { + createWidget('id-test', { + buildId(attrs) { + return `test-${attrs.id}`; + } + }); + + this.set('args', { id: 1234 }); + }, + + test(assert) { + assert.ok(this.$('#test-1234').length); + } +}); + +widgetTest('widget state', { + template: `{{mount-widget widget="state-test"}}`, + + setup() { + createWidget('state-test', { + tagName: 'button.test', + + defaultState() { + return { clicks: 0 }; + }, + + html(attrs, state) { + return `${state.clicks} clicks`; + }, + + click() { + this.state.clicks++; + } + }); + }, + + test(assert) { + assert.ok(this.$('button.test').length, 'it renders the button'); + assert.equal(this.$('button.test').text(), "0 clicks"); + + click(this.$('button')); + andThen(() => { + assert.equal(this.$('button.test').text(), "1 clicks"); + }); + } +}); + +widgetTest('widget update with promise', { + template: `{{mount-widget widget="promise-test"}}`, + + setup() { + createWidget('promise-test', { + tagName: 'button.test', + + html(attrs, state) { + return state.name || "No name"; + }, + + click() { + return new Ember.RSVP.Promise(resolve => { + Ember.run.next(() => { + this.state.name = "Robin"; + resolve(); + }); + }); + } + }); + }, + + test(assert) { + assert.equal(this.$('button.test').text(), "No name"); + + click(this.$('button')); + andThen(() => { + assert.equal(this.$('button.test').text(), "Robin"); + }); + } +}); + +widgetTest('widget attaching', { + template: `{{mount-widget widget="attach-test"}}`, + + setup() { + createWidget('test-embedded', { tagName: 'div.embedded' }); + + createWidget('attach-test', { + tagName: 'div.container', + html() { + return this.attach('test-embedded'); + }, + }); + }, + + test(assert) { + assert.ok(this.$('.container').length, "renders container"); + assert.ok(this.$('.container .embedded').length, "renders attached"); + } +}); + +widgetTest('widget decorating', { + template: `{{mount-widget widget="decorate-test"}}`, + + setup() { + createWidget('decorate-test', { + tagName: 'div.decorate', + html() { + return "main content"; + }, + }); + + withPluginApi('0.1', api => { + api.decorateWidget('decorate-test:before', dec => { + return dec.h('b', 'before'); + }); + + api.decorateWidget('decorate-test:after', dec => { + return dec.h('i', 'after'); + }); + }); + }, + + test(assert) { + assert.ok(this.$('.decorate').length); + assert.equal(this.$('.decorate b').text(), 'before'); + assert.equal(this.$('.decorate i').text(), 'after'); + } +}); + +widgetTest('widget settings', { + template: `{{mount-widget widget="settings-test"}}`, + + setup() { + createWidget('settings-test', { + tagName: 'div.settings', + + settings: { + age: 36 + }, + + html() { + return `age is ${this.settings.age}`; + }, + }); + }, + + test(assert) { + assert.equal(this.$('.settings').text(), 'age is 36'); + } +}); + +widgetTest('override settings', { + template: `{{mount-widget widget="ov-settings-test"}}`, + + setup() { + createWidget('ov-settings-test', { + tagName: 'div.settings', + + settings: { + age: 36 + }, + + html() { + return `age is ${this.settings.age}`; + }, + }); + + withPluginApi('0.1', api => { + api.changeWidgetSetting('ov-settings-test', 'age', 37); + }); + }, + + test(assert) { + assert.equal(this.$('.settings').text(), 'age is 37'); + } +}); diff --git a/app/assets/javascripts/discourse/lib/highlight.js b/vendor/assets/javascripts/highlight.js similarity index 100% rename from app/assets/javascripts/discourse/lib/highlight.js rename to vendor/assets/javascripts/highlight.js diff --git a/vendor/assets/javascripts/jquery.debug.js b/vendor/assets/javascripts/jquery.debug.js index 79d631ff46..1e0ba99740 100644 --- a/vendor/assets/javascripts/jquery.debug.js +++ b/vendor/assets/javascripts/jquery.debug.js @@ -1,15 +1,15 @@ /*! - * jQuery JavaScript Library v2.1.3 + * jQuery JavaScript Library v2.2.0 * http://jquery.com/ * * Includes Sizzle.js * http://sizzlejs.com/ * - * Copyright 2005, 2014 jQuery Foundation, Inc. and other contributors + * Copyright jQuery Foundation and other contributors * Released under the MIT license * http://jquery.org/license * - * Date: 2014-12-18T15:11Z + * Date: 2016-01-08T20:02Z */ (function( global, factory ) { @@ -41,10 +41,11 @@ // Can't be in strict mode, several libs including ASP.NET trace // the stack via arguments.caller.callee and Firefox dies if // you try to trace through "use strict" call chains. (#13335) -// - +//"use strict"; var arr = []; +var document = window.document; + var slice = arr.slice; var concat = arr.concat; @@ -64,13 +65,11 @@ var support = {}; var - // Use the correct document accordingly with window argument (sandbox) - document = window.document, - - version = "2.1.3", + version = "2.2.0", // Define a local copy of jQuery jQuery = function( selector, context ) { + // The jQuery object is actually just the init constructor 'enhanced' // Need init if jQuery is called (just allow error to be thrown if not included) return new jQuery.fn.init( selector, context ); @@ -90,6 +89,7 @@ var }; jQuery.fn = jQuery.prototype = { + // The current version of jQuery being used jquery: version, @@ -133,16 +133,14 @@ jQuery.fn = jQuery.prototype = { }, // Execute a callback for every element in the matched set. - // (You can seed the arguments with an array of args, but this is - // only used internally.) - each: function( callback, args ) { - return jQuery.each( this, callback, args ); + each: function( callback ) { + return jQuery.each( this, callback ); }, map: function( callback ) { - return this.pushStack( jQuery.map(this, function( elem, i ) { + return this.pushStack( jQuery.map( this, function( elem, i ) { return callback.call( elem, i, elem ); - })); + } ) ); }, slice: function() { @@ -160,11 +158,11 @@ jQuery.fn = jQuery.prototype = { eq: function( i ) { var len = this.length, j = +i + ( i < 0 ? len : 0 ); - return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] ); + return this.pushStack( j >= 0 && j < len ? [ this[ j ] ] : [] ); }, end: function() { - return this.prevObject || this.constructor(null); + return this.prevObject || this.constructor(); }, // For internal use only. @@ -176,7 +174,7 @@ jQuery.fn = jQuery.prototype = { jQuery.extend = jQuery.fn.extend = function() { var options, name, src, copy, copyIsArray, clone, - target = arguments[0] || {}, + target = arguments[ 0 ] || {}, i = 1, length = arguments.length, deep = false; @@ -191,7 +189,7 @@ jQuery.extend = jQuery.fn.extend = function() { } // Handle case when target is a string or something (possible in deep copy) - if ( typeof target !== "object" && !jQuery.isFunction(target) ) { + if ( typeof target !== "object" && !jQuery.isFunction( target ) ) { target = {}; } @@ -202,8 +200,10 @@ jQuery.extend = jQuery.fn.extend = function() { } for ( ; i < length; i++ ) { + // Only deal with non-null/undefined values - if ( (options = arguments[ i ]) != null ) { + if ( ( options = arguments[ i ] ) != null ) { + // Extend the base object for ( name in options ) { src = target[ name ]; @@ -215,13 +215,15 @@ jQuery.extend = jQuery.fn.extend = function() { } // Recurse if we're merging plain objects or arrays - if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) { + if ( deep && copy && ( jQuery.isPlainObject( copy ) || + ( copyIsArray = jQuery.isArray( copy ) ) ) ) { + if ( copyIsArray ) { copyIsArray = false; - clone = src && jQuery.isArray(src) ? src : []; + clone = src && jQuery.isArray( src ) ? src : []; } else { - clone = src && jQuery.isPlainObject(src) ? src : {}; + clone = src && jQuery.isPlainObject( src ) ? src : {}; } // Never move original objects, clone them @@ -239,7 +241,8 @@ jQuery.extend = jQuery.fn.extend = function() { return target; }; -jQuery.extend({ +jQuery.extend( { + // Unique for each copy of jQuery on the page expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ), @@ -253,7 +256,7 @@ jQuery.extend({ noop: function() {}, isFunction: function( obj ) { - return jQuery.type(obj) === "function"; + return jQuery.type( obj ) === "function"; }, isArray: Array.isArray, @@ -263,14 +266,17 @@ jQuery.extend({ }, isNumeric: function( obj ) { + // parseFloat NaNs numeric-cast false positives (null|true|false|"") // ...but misinterprets leading-number strings, particularly hex literals ("0x...") // subtraction forces infinities to NaN // adding 1 corrects loss of precision from parseFloat (#15100) - return !jQuery.isArray( obj ) && (obj - parseFloat( obj ) + 1) >= 0; + var realStringObj = obj && obj.toString(); + return !jQuery.isArray( obj ) && ( realStringObj - parseFloat( realStringObj ) + 1 ) >= 0; }, isPlainObject: function( obj ) { + // Not plain objects: // - Any object or value whose internal [[Class]] property is not "[object Object]" // - DOM nodes @@ -301,9 +307,10 @@ jQuery.extend({ if ( obj == null ) { return obj + ""; } + // Support: Android<4.0, iOS<6 (functionish RegExp) return typeof obj === "object" || typeof obj === "function" ? - class2type[ toString.call(obj) ] || "object" : + class2type[ toString.call( obj ) ] || "object" : typeof obj; }, @@ -315,16 +322,19 @@ jQuery.extend({ code = jQuery.trim( code ); if ( code ) { + // If the code includes a valid, prologue position // strict mode pragma, execute code by injecting a // script tag into the document. - if ( code.indexOf("use strict") === 1 ) { - script = document.createElement("script"); + if ( code.indexOf( "use strict" ) === 1 ) { + script = document.createElement( "script" ); script.text = code; document.head.appendChild( script ).parentNode.removeChild( script ); } else { - // Otherwise, avoid the DOM node creation, insertion - // and removal by using an indirect global eval + + // Otherwise, avoid the DOM node creation, insertion + // and removal by using an indirect global eval + indirect( code ); } } @@ -341,49 +351,20 @@ jQuery.extend({ return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase(); }, - // args is for internal usage only - each: function( obj, callback, args ) { - var value, - i = 0, - length = obj.length, - isArray = isArraylike( obj ); + each: function( obj, callback ) { + var length, i = 0; - if ( args ) { - if ( isArray ) { - for ( ; i < length; i++ ) { - value = callback.apply( obj[ i ], args ); - - if ( value === false ) { - break; - } - } - } else { - for ( i in obj ) { - value = callback.apply( obj[ i ], args ); - - if ( value === false ) { - break; - } + if ( isArrayLike( obj ) ) { + length = obj.length; + for ( ; i < length; i++ ) { + if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) { + break; } } - - // A special, fast, case for the most common use of each } else { - if ( isArray ) { - for ( ; i < length; i++ ) { - value = callback.call( obj[ i ], i, obj[ i ] ); - - if ( value === false ) { - break; - } - } - } else { - for ( i in obj ) { - value = callback.call( obj[ i ], i, obj[ i ] ); - - if ( value === false ) { - break; - } + for ( i in obj ) { + if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) { + break; } } } @@ -403,7 +384,7 @@ jQuery.extend({ var ret = results || []; if ( arr != null ) { - if ( isArraylike( Object(arr) ) ) { + if ( isArrayLike( Object( arr ) ) ) { jQuery.merge( ret, typeof arr === "string" ? [ arr ] : arr @@ -455,14 +436,13 @@ jQuery.extend({ // arg is for internal usage only map: function( elems, callback, arg ) { - var value, + var length, value, i = 0, - length = elems.length, - isArray = isArraylike( elems ), ret = []; // Go through the array, translating each of the items to their new values - if ( isArray ) { + if ( isArrayLike( elems ) ) { + length = elems.length; for ( ; i < length; i++ ) { value = callback( elems[ i ], i, arg ); @@ -523,38 +503,50 @@ jQuery.extend({ // jQuery.support is not used in Core but other projects attach their // properties to it so it needs to exist. support: support -}); +} ); + +// JSHint would error on this code due to the Symbol not being defined in ES5. +// Defining this global in .jshintrc would create a danger of using the global +// unguarded in another place, it seems safer to just disable JSHint for these +// three lines. +/* jshint ignore: start */ +if ( typeof Symbol === "function" ) { + jQuery.fn[ Symbol.iterator ] = arr[ Symbol.iterator ]; +} +/* jshint ignore: end */ // Populate the class2type map -jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) { +jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ), +function( i, name ) { class2type[ "[object " + name + "]" ] = name.toLowerCase(); -}); +} ); -function isArraylike( obj ) { - var length = obj.length, +function isArrayLike( obj ) { + + // Support: iOS 8.2 (not reproducible in simulator) + // `in` check used to prevent JIT error (gh-2145) + // hasOwn isn't used here due to false negatives + // regarding Nodelist length in IE + var length = !!obj && "length" in obj && obj.length, type = jQuery.type( obj ); if ( type === "function" || jQuery.isWindow( obj ) ) { return false; } - if ( obj.nodeType === 1 && length ) { - return true; - } - return type === "array" || length === 0 || typeof length === "number" && length > 0 && ( length - 1 ) in obj; } var Sizzle = /*! - * Sizzle CSS Selector Engine v2.2.0-pre + * Sizzle CSS Selector Engine v2.2.1 * http://sizzlejs.com/ * - * Copyright 2008, 2014 jQuery Foundation, Inc. and other contributors + * Copyright jQuery Foundation and other contributors * Released under the MIT license * http://jquery.org/license * - * Date: 2014-12-16 + * Date: 2015-10-17 */ (function( window ) { @@ -622,25 +614,21 @@ var i, // Regular expressions - // Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace + // http://www.w3.org/TR/css3-selectors/#whitespace whitespace = "[\\x20\\t\\r\\n\\f]", - // http://www.w3.org/TR/css3-syntax/#characters - characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+", - // Loosely modeled on CSS identifier characters - // An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors - // Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier - identifier = characterEncoding.replace( "w", "w#" ), + // http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier + identifier = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+", // Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors - attributes = "\\[" + whitespace + "*(" + characterEncoding + ")(?:" + whitespace + + attributes = "\\[" + whitespace + "*(" + identifier + ")(?:" + whitespace + // Operator (capture 2) "*([*^$|!~]?=)" + whitespace + // "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]" "*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace + "*\\]", - pseudos = ":(" + characterEncoding + ")(?:\\((" + + pseudos = ":(" + identifier + ")(?:\\((" + // To reduce the number of selectors needing tokenize in the preFilter, prefer arguments: // 1. quoted (capture 3; capture 4 or capture 5) "('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" + @@ -663,9 +651,9 @@ var i, ridentifier = new RegExp( "^" + identifier + "$" ), matchExpr = { - "ID": new RegExp( "^#(" + characterEncoding + ")" ), - "CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ), - "TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ), + "ID": new RegExp( "^#(" + identifier + ")" ), + "CLASS": new RegExp( "^\\.(" + identifier + ")" ), + "TAG": new RegExp( "^(" + identifier + "|[*])" ), "ATTR": new RegExp( "^" + attributes ), "PSEUDO": new RegExp( "^" + pseudos ), "CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace + @@ -743,103 +731,129 @@ try { } function Sizzle( selector, context, results, seed ) { - var match, elem, m, nodeType, - // QSA vars - i, groups, old, nid, newContext, newSelector; + var m, i, elem, nid, nidselect, match, groups, newSelector, + newContext = context && context.ownerDocument, - if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) { - setDocument( context ); - } + // nodeType defaults to 9, since context defaults to document + nodeType = context ? context.nodeType : 9; - context = context || document; results = results || []; - nodeType = context.nodeType; + // Return early from calls with invalid selector or context if ( typeof selector !== "string" || !selector || nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) { return results; } - if ( !seed && documentIsHTML ) { + // Try to shortcut find operations (as opposed to filters) in HTML documents + if ( !seed ) { + + if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) { + setDocument( context ); + } + context = context || document; + + if ( documentIsHTML ) { + + // If the selector is sufficiently simple, try using a "get*By*" DOM method + // (excepting DocumentFragment context, where the methods don't exist) + if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) { + + // ID selector + if ( (m = match[1]) ) { + + // Document context + if ( nodeType === 9 ) { + if ( (elem = context.getElementById( m )) ) { + + // Support: IE, Opera, Webkit + // TODO: identify versions + // getElementById can match elements by name instead of ID + if ( elem.id === m ) { + results.push( elem ); + return results; + } + } else { + return results; + } + + // Element context + } else { + + // Support: IE, Opera, Webkit + // TODO: identify versions + // getElementById can match elements by name instead of ID + if ( newContext && (elem = newContext.getElementById( m )) && + contains( context, elem ) && + elem.id === m ) { - // Try to shortcut find operations when possible (e.g., not under DocumentFragment) - if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) { - // Speed-up: Sizzle("#ID") - if ( (m = match[1]) ) { - if ( nodeType === 9 ) { - elem = context.getElementById( m ); - // Check parentNode to catch when Blackberry 4.6 returns - // nodes that are no longer in the document (jQuery #6963) - if ( elem && elem.parentNode ) { - // Handle the case where IE, Opera, and Webkit return items - // by name instead of ID - if ( elem.id === m ) { results.push( elem ); return results; } - } else { - return results; } - } else { - // Context is not a document - if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) && - contains( context, elem ) && elem.id === m ) { - results.push( elem ); - return results; - } - } - // Speed-up: Sizzle("TAG") - } else if ( match[2] ) { - push.apply( results, context.getElementsByTagName( selector ) ); - return results; - - // Speed-up: Sizzle(".CLASS") - } else if ( (m = match[3]) && support.getElementsByClassName ) { - push.apply( results, context.getElementsByClassName( m ) ); - return results; - } - } - - // QSA path - if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) { - nid = old = expando; - newContext = context; - newSelector = nodeType !== 1 && selector; - - // qSA works strangely on Element-rooted queries - // We can work around this by specifying an extra ID on the root - // and working up from there (Thanks to Andrew Dupont for the technique) - // IE 8 doesn't work on object elements - if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) { - groups = tokenize( selector ); - - if ( (old = context.getAttribute("id")) ) { - nid = old.replace( rescape, "\\$&" ); - } else { - context.setAttribute( "id", nid ); - } - nid = "[id='" + nid + "'] "; - - i = groups.length; - while ( i-- ) { - groups[i] = nid + toSelector( groups[i] ); - } - newContext = rsibling.test( selector ) && testContext( context.parentNode ) || context; - newSelector = groups.join(","); - } - - if ( newSelector ) { - try { - push.apply( results, - newContext.querySelectorAll( newSelector ) - ); + // Type selector + } else if ( match[2] ) { + push.apply( results, context.getElementsByTagName( selector ) ); return results; - } catch(qsaError) { - } finally { - if ( !old ) { - context.removeAttribute("id"); + + // Class selector + } else if ( (m = match[3]) && support.getElementsByClassName && + context.getElementsByClassName ) { + + push.apply( results, context.getElementsByClassName( m ) ); + return results; + } + } + + // Take advantage of querySelectorAll + if ( support.qsa && + !compilerCache[ selector + " " ] && + (!rbuggyQSA || !rbuggyQSA.test( selector )) ) { + + if ( nodeType !== 1 ) { + newContext = context; + newSelector = selector; + + // qSA looks outside Element context, which is not what we want + // Thanks to Andrew Dupont for this workaround technique + // Support: IE <=8 + // Exclude object elements + } else if ( context.nodeName.toLowerCase() !== "object" ) { + + // Capture the context ID, setting it first if necessary + if ( (nid = context.getAttribute( "id" )) ) { + nid = nid.replace( rescape, "\\$&" ); + } else { + context.setAttribute( "id", (nid = expando) ); + } + + // Prefix every selector in the list + groups = tokenize( selector ); + i = groups.length; + nidselect = ridentifier.test( nid ) ? "#" + nid : "[id='" + nid + "']"; + while ( i-- ) { + groups[i] = nidselect + " " + toSelector( groups[i] ); + } + newSelector = groups.join( "," ); + + // Expand context for sibling selectors + newContext = rsibling.test( selector ) && testContext( context.parentNode ) || + context; + } + + if ( newSelector ) { + try { + push.apply( results, + newContext.querySelectorAll( newSelector ) + ); + return results; + } catch ( qsaError ) { + } finally { + if ( nid === expando ) { + context.removeAttribute( "id" ); + } } } } @@ -852,7 +866,7 @@ function Sizzle( selector, context, results, seed ) { /** * Create key-value caches of limited size - * @returns {Function(string, Object)} Returns the Object data after storing it on itself with + * @returns {function(string, object)} Returns the Object data after storing it on itself with * property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength) * deleting the oldest entry */ @@ -907,7 +921,7 @@ function assert( fn ) { */ function addHandle( attrs, handler ) { var arr = attrs.split("|"), - i = attrs.length; + i = arr.length; while ( i-- ) { Expr.attrHandle[ arr[i] ] = handler; @@ -1020,33 +1034,29 @@ setDocument = Sizzle.setDocument = function( node ) { var hasCompare, parent, doc = node ? node.ownerDocument || node : preferredDoc; - // If no document and documentElement is available, return + // Return early if doc is invalid or already selected if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) { return document; } - // Set our document + // Update global variables document = doc; - docElem = doc.documentElement; - parent = doc.defaultView; + docElem = document.documentElement; + documentIsHTML = !isXML( document ); - // Support: IE>8 - // If iframe document is assigned to "document" variable and if iframe has been reloaded, - // IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936 - // IE6-8 do not support the defaultView property so parent will be undefined - if ( parent && parent !== parent.top ) { - // IE11 does not have attachEvent, so all must suffer + // Support: IE 9-11, Edge + // Accessing iframe documents after unload throws "permission denied" errors (jQuery #13936) + if ( (parent = document.defaultView) && parent.top !== parent ) { + // Support: IE 11 if ( parent.addEventListener ) { parent.addEventListener( "unload", unloadHandler, false ); + + // Support: IE 9 - 10 only } else if ( parent.attachEvent ) { parent.attachEvent( "onunload", unloadHandler ); } } - /* Support tests - ---------------------------------------------------------------------- */ - documentIsHTML = !isXML( doc ); - /* Attributes ---------------------------------------------------------------------- */ @@ -1063,12 +1073,12 @@ setDocument = Sizzle.setDocument = function( node ) { // Check if getElementsByTagName("*") returns only elements support.getElementsByTagName = assert(function( div ) { - div.appendChild( doc.createComment("") ); + div.appendChild( document.createComment("") ); return !div.getElementsByTagName("*").length; }); // Support: IE<9 - support.getElementsByClassName = rnative.test( doc.getElementsByClassName ); + support.getElementsByClassName = rnative.test( document.getElementsByClassName ); // Support: IE<10 // Check if getElementById returns elements by name @@ -1076,7 +1086,7 @@ setDocument = Sizzle.setDocument = function( node ) { // so use a roundabout getElementsByName test support.getById = assert(function( div ) { docElem.appendChild( div ).id = expando; - return !doc.getElementsByName || !doc.getElementsByName( expando ).length; + return !document.getElementsByName || !document.getElementsByName( expando ).length; }); // ID find and filter @@ -1084,9 +1094,7 @@ setDocument = Sizzle.setDocument = function( node ) { Expr.find["ID"] = function( id, context ) { if ( typeof context.getElementById !== "undefined" && documentIsHTML ) { var m = context.getElementById( id ); - // Check parentNode to catch when Blackberry 4.6 returns - // nodes that are no longer in the document #6963 - return m && m.parentNode ? [ m ] : []; + return m ? [ m ] : []; } }; Expr.filter["ID"] = function( id ) { @@ -1103,7 +1111,8 @@ setDocument = Sizzle.setDocument = function( node ) { Expr.filter["ID"] = function( id ) { var attrId = id.replace( runescape, funescape ); return function( elem ) { - var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id"); + var node = typeof elem.getAttributeNode !== "undefined" && + elem.getAttributeNode("id"); return node && node.value === attrId; }; }; @@ -1143,7 +1152,7 @@ setDocument = Sizzle.setDocument = function( node ) { // Class Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) { - if ( documentIsHTML ) { + if ( typeof context.getElementsByClassName !== "undefined" && documentIsHTML ) { return context.getElementsByClassName( className ); } }; @@ -1163,7 +1172,7 @@ setDocument = Sizzle.setDocument = function( node ) { // See http://bugs.jquery.com/ticket/13378 rbuggyQSA = []; - if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) { + if ( (support.qsa = rnative.test( document.querySelectorAll )) ) { // Build QSA regex // Regex strategy adopted from Diego Perini assert(function( div ) { @@ -1173,7 +1182,7 @@ setDocument = Sizzle.setDocument = function( node ) { // since its presence should be enough // http://bugs.jquery.com/ticket/12359 docElem.appendChild( div ).innerHTML = "" + - "" + ""; // Support: IE8, Opera 11-12.16 @@ -1190,7 +1199,7 @@ setDocument = Sizzle.setDocument = function( node ) { rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" ); } - // Support: Chrome<29, Android<4.2+, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.7+ + // Support: Chrome<29, Android<4.4, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.8+ if ( !div.querySelectorAll( "[id~=" + expando + "-]" ).length ) { rbuggyQSA.push("~="); } @@ -1213,7 +1222,7 @@ setDocument = Sizzle.setDocument = function( node ) { assert(function( div ) { // Support: Windows 8 Native Apps // The type and name attributes are restricted during .innerHTML assignment - var input = doc.createElement("input"); + var input = document.createElement("input"); input.setAttribute( "type", "hidden" ); div.appendChild( input ).setAttribute( "name", "D" ); @@ -1261,7 +1270,7 @@ setDocument = Sizzle.setDocument = function( node ) { hasCompare = rnative.test( docElem.compareDocumentPosition ); // Element contains another - // Purposefully does not implement inclusive descendent + // Purposefully self-exclusive // As in, an element does not contain itself contains = hasCompare || rnative.test( docElem.contains ) ? function( a, b ) { @@ -1315,10 +1324,10 @@ setDocument = Sizzle.setDocument = function( node ) { (!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) { // Choose the first element that is related to our preferred document - if ( a === doc || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) { + if ( a === document || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) { return -1; } - if ( b === doc || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) { + if ( b === document || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) { return 1; } @@ -1346,8 +1355,8 @@ setDocument = Sizzle.setDocument = function( node ) { // Parentless nodes are either documents or disconnected if ( !aup || !bup ) { - return a === doc ? -1 : - b === doc ? 1 : + return a === document ? -1 : + b === document ? 1 : aup ? -1 : bup ? 1 : sortInput ? @@ -1384,7 +1393,7 @@ setDocument = Sizzle.setDocument = function( node ) { 0; }; - return doc; + return document; }; Sizzle.matches = function( expr, elements ) { @@ -1401,6 +1410,7 @@ Sizzle.matchesSelector = function( elem, expr ) { expr = expr.replace( rattributeQuotes, "='$1']" ); if ( support.matchesSelector && documentIsHTML && + !compilerCache[ expr + " " ] && ( !rbuggyMatches || !rbuggyMatches.test( expr ) ) && ( !rbuggyQSA || !rbuggyQSA.test( expr ) ) ) { @@ -1674,11 +1684,12 @@ Expr = Sizzle.selectors = { } : function( elem, context, xml ) { - var cache, outerCache, node, diff, nodeIndex, start, + var cache, uniqueCache, outerCache, node, nodeIndex, start, dir = simple !== forward ? "nextSibling" : "previousSibling", parent = elem.parentNode, name = ofType && elem.nodeName.toLowerCase(), - useCache = !xml && !ofType; + useCache = !xml && !ofType, + diff = false; if ( parent ) { @@ -1687,7 +1698,10 @@ Expr = Sizzle.selectors = { while ( dir ) { node = elem; while ( (node = node[ dir ]) ) { - if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) { + if ( ofType ? + node.nodeName.toLowerCase() === name : + node.nodeType === 1 ) { + return false; } } @@ -1701,11 +1715,21 @@ Expr = Sizzle.selectors = { // non-xml :nth-child(...) stores cache data on `parent` if ( forward && useCache ) { + // Seek `elem` from a previously-cached index - outerCache = parent[ expando ] || (parent[ expando ] = {}); - cache = outerCache[ type ] || []; - nodeIndex = cache[0] === dirruns && cache[1]; - diff = cache[0] === dirruns && cache[2]; + + // ...in a gzip-friendly way + node = parent; + outerCache = node[ expando ] || (node[ expando ] = {}); + + // Support: IE <9 only + // Defend against cloned attroperties (jQuery gh-1709) + uniqueCache = outerCache[ node.uniqueID ] || + (outerCache[ node.uniqueID ] = {}); + + cache = uniqueCache[ type ] || []; + nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ]; + diff = nodeIndex && cache[ 2 ]; node = nodeIndex && parent.childNodes[ nodeIndex ]; while ( (node = ++nodeIndex && node && node[ dir ] || @@ -1715,29 +1739,55 @@ Expr = Sizzle.selectors = { // When found, cache indexes on `parent` and break if ( node.nodeType === 1 && ++diff && node === elem ) { - outerCache[ type ] = [ dirruns, nodeIndex, diff ]; + uniqueCache[ type ] = [ dirruns, nodeIndex, diff ]; break; } } - // Use previously-cached element index if available - } else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) { - diff = cache[1]; - - // xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...) } else { - // Use the same loop as above to seek `elem` from the start - while ( (node = ++nodeIndex && node && node[ dir ] || - (diff = nodeIndex = 0) || start.pop()) ) { + // Use previously-cached element index if available + if ( useCache ) { + // ...in a gzip-friendly way + node = elem; + outerCache = node[ expando ] || (node[ expando ] = {}); - if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) { - // Cache the index of each encountered element - if ( useCache ) { - (node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ]; - } + // Support: IE <9 only + // Defend against cloned attroperties (jQuery gh-1709) + uniqueCache = outerCache[ node.uniqueID ] || + (outerCache[ node.uniqueID ] = {}); - if ( node === elem ) { - break; + cache = uniqueCache[ type ] || []; + nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ]; + diff = nodeIndex; + } + + // xml :nth-child(...) + // or :nth-last-child(...) or :nth(-last)?-of-type(...) + if ( diff === false ) { + // Use the same loop as above to seek `elem` from the start + while ( (node = ++nodeIndex && node && node[ dir ] || + (diff = nodeIndex = 0) || start.pop()) ) { + + if ( ( ofType ? + node.nodeName.toLowerCase() === name : + node.nodeType === 1 ) && + ++diff ) { + + // Cache the index of each encountered element + if ( useCache ) { + outerCache = node[ expando ] || (node[ expando ] = {}); + + // Support: IE <9 only + // Defend against cloned attroperties (jQuery gh-1709) + uniqueCache = outerCache[ node.uniqueID ] || + (outerCache[ node.uniqueID ] = {}); + + uniqueCache[ type ] = [ dirruns, diff ]; + } + + if ( node === elem ) { + break; + } } } } @@ -2099,10 +2149,10 @@ function addCombinator( matcher, combinator, base ) { // Check against all ancestor/preceding elements function( elem, context, xml ) { - var oldCache, outerCache, + var oldCache, uniqueCache, outerCache, newCache = [ dirruns, doneName ]; - // We can't set arbitrary data on XML nodes, so they don't benefit from dir caching + // We can't set arbitrary data on XML nodes, so they don't benefit from combinator caching if ( xml ) { while ( (elem = elem[ dir ]) ) { if ( elem.nodeType === 1 || checkNonElements ) { @@ -2115,14 +2165,19 @@ function addCombinator( matcher, combinator, base ) { while ( (elem = elem[ dir ]) ) { if ( elem.nodeType === 1 || checkNonElements ) { outerCache = elem[ expando ] || (elem[ expando ] = {}); - if ( (oldCache = outerCache[ dir ]) && + + // Support: IE <9 only + // Defend against cloned attroperties (jQuery gh-1709) + uniqueCache = outerCache[ elem.uniqueID ] || (outerCache[ elem.uniqueID ] = {}); + + if ( (oldCache = uniqueCache[ dir ]) && oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) { // Assign to newCache so results back-propagate to previous elements return (newCache[ 2 ] = oldCache[ 2 ]); } else { // Reuse newcache so results back-propagate to previous elements - outerCache[ dir ] = newCache; + uniqueCache[ dir ] = newCache; // A match means we're done; a fail means we have to keep checking if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) { @@ -2347,18 +2402,21 @@ function matcherFromGroupMatchers( elementMatchers, setMatchers ) { len = elems.length; if ( outermost ) { - outermostContext = context !== document && context; + outermostContext = context === document || context || outermost; } // Add elements passing elementMatchers directly to results - // Keep `i` a string if there are no elements so `matchedCount` will be "00" below // Support: IE<9, Safari // Tolerate NodeList properties (IE: "length"; Safari: ) matching elements by id for ( ; i !== len && (elem = elems[i]) != null; i++ ) { if ( byElement && elem ) { j = 0; + if ( !context && elem.ownerDocument !== document ) { + setDocument( elem ); + xml = !documentIsHTML; + } while ( (matcher = elementMatchers[j++]) ) { - if ( matcher( elem, context, xml ) ) { + if ( matcher( elem, context || document, xml) ) { results.push( elem ); break; } @@ -2382,8 +2440,17 @@ function matcherFromGroupMatchers( elementMatchers, setMatchers ) { } } - // Apply set filters to unmatched elements + // `i` is now the count of elements visited above, and adding it to `matchedCount` + // makes the latter nonnegative. matchedCount += i; + + // Apply set filters to unmatched elements + // NOTE: This can be skipped if there are no unmatched elements (i.e., `matchedCount` + // equals `i`), unless we didn't visit _any_ elements in the above loop because we have + // no element matchers and no seed. + // Incrementing an initially-string "0" `i` allows `i` to remain a string only in that + // case, which will result in a "00" `matchedCount` that differs from `i` but is also + // numerically zero. if ( bySet && i !== matchedCount ) { j = 0; while ( (matcher = setMatchers[j++]) ) { @@ -2475,10 +2542,11 @@ select = Sizzle.select = function( selector, context, results, seed ) { results = results || []; - // Try to minimize operations if there is no seed and only one group + // Try to minimize operations if there is only one selector in the list and no seed + // (the latter of which guarantees us context) if ( match.length === 1 ) { - // Take a shortcut and set the context if the root selector is an ID + // Reduce context if the leading compound selector is an ID tokens = match[0] = match[0].slice( 0 ); if ( tokens.length > 2 && (token = tokens[0]).type === "ID" && support.getById && context.nodeType === 9 && documentIsHTML && @@ -2533,7 +2601,7 @@ select = Sizzle.select = function( selector, context, results, seed ) { context, !documentIsHTML, results, - rsibling.test( selector ) && testContext( context.parentNode ) || context + !context || rsibling.test( selector ) && testContext( context.parentNode ) || context ); return results; }; @@ -2609,17 +2677,46 @@ return Sizzle; jQuery.find = Sizzle; jQuery.expr = Sizzle.selectors; -jQuery.expr[":"] = jQuery.expr.pseudos; -jQuery.unique = Sizzle.uniqueSort; +jQuery.expr[ ":" ] = jQuery.expr.pseudos; +jQuery.uniqueSort = jQuery.unique = Sizzle.uniqueSort; jQuery.text = Sizzle.getText; jQuery.isXMLDoc = Sizzle.isXML; jQuery.contains = Sizzle.contains; +var dir = function( elem, dir, until ) { + var matched = [], + truncate = until !== undefined; + + while ( ( elem = elem[ dir ] ) && elem.nodeType !== 9 ) { + if ( elem.nodeType === 1 ) { + if ( truncate && jQuery( elem ).is( until ) ) { + break; + } + matched.push( elem ); + } + } + return matched; +}; + + +var siblings = function( n, elem ) { + var matched = []; + + for ( ; n; n = n.nextSibling ) { + if ( n.nodeType === 1 && n !== elem ) { + matched.push( n ); + } + } + + return matched; +}; + + var rneedsContext = jQuery.expr.match.needsContext; -var rsingleTag = (/^<(\w+)\s*\/?>(?:<\/\1>|)$/); +var rsingleTag = ( /^<([\w-]+)\s*\/?>(?:<\/\1>|)$/ ); @@ -2631,14 +2728,14 @@ function winnow( elements, qualifier, not ) { return jQuery.grep( elements, function( elem, i ) { /* jshint -W018 */ return !!qualifier.call( elem, i, elem ) !== not; - }); + } ); } if ( qualifier.nodeType ) { return jQuery.grep( elements, function( elem ) { return ( elem === qualifier ) !== not; - }); + } ); } @@ -2651,8 +2748,8 @@ function winnow( elements, qualifier, not ) { } return jQuery.grep( elements, function( elem ) { - return ( indexOf.call( qualifier, elem ) >= 0 ) !== not; - }); + return ( indexOf.call( qualifier, elem ) > -1 ) !== not; + } ); } jQuery.filter = function( expr, elems, not ) { @@ -2666,10 +2763,10 @@ jQuery.filter = function( expr, elems, not ) { jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] : jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) { return elem.nodeType === 1; - })); + } ) ); }; -jQuery.fn.extend({ +jQuery.fn.extend( { find: function( selector ) { var i, len = this.length, @@ -2677,13 +2774,13 @@ jQuery.fn.extend({ self = this; if ( typeof selector !== "string" ) { - return this.pushStack( jQuery( selector ).filter(function() { + return this.pushStack( jQuery( selector ).filter( function() { for ( i = 0; i < len; i++ ) { if ( jQuery.contains( self[ i ], this ) ) { return true; } } - }) ); + } ) ); } for ( i = 0; i < len; i++ ) { @@ -2696,10 +2793,10 @@ jQuery.fn.extend({ return ret; }, filter: function( selector ) { - return this.pushStack( winnow(this, selector || [], false) ); + return this.pushStack( winnow( this, selector || [], false ) ); }, not: function( selector ) { - return this.pushStack( winnow(this, selector || [], true) ); + return this.pushStack( winnow( this, selector || [], true ) ); }, is: function( selector ) { return !!winnow( @@ -2713,7 +2810,7 @@ jQuery.fn.extend({ false ).length; } -}); +} ); // Initialize a jQuery object @@ -2727,7 +2824,7 @@ var rootjQuery, // Strict HTML recognition (#11290: must start with <) rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/, - init = jQuery.fn.init = function( selector, context ) { + init = jQuery.fn.init = function( selector, context, root ) { var match, elem; // HANDLE: $(""), $(null), $(undefined), $(false) @@ -2735,9 +2832,16 @@ var rootjQuery, return this; } + // Method init() accepts an alternate rootjQuery + // so migrate can support jQuery.sub (gh-2101) + root = root || rootjQuery; + // Handle HTML strings if ( typeof selector === "string" ) { - if ( selector[0] === "<" && selector[ selector.length - 1 ] === ">" && selector.length >= 3 ) { + if ( selector[ 0 ] === "<" && + selector[ selector.length - 1 ] === ">" && + selector.length >= 3 ) { + // Assume that strings that start and end with <> are HTML and skip the regex check match = [ null, selector, null ]; @@ -2746,23 +2850,24 @@ var rootjQuery, } // Match html or make sure no context is specified for #id - if ( match && (match[1] || !context) ) { + if ( match && ( match[ 1 ] || !context ) ) { // HANDLE: $(html) -> $(array) - if ( match[1] ) { - context = context instanceof jQuery ? context[0] : context; + if ( match[ 1 ] ) { + context = context instanceof jQuery ? context[ 0 ] : context; // Option to run scripts is true for back-compat // Intentionally let the error be thrown if parseHTML is not present jQuery.merge( this, jQuery.parseHTML( - match[1], + match[ 1 ], context && context.nodeType ? context.ownerDocument || context : document, true ) ); // HANDLE: $(html, props) - if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) { + if ( rsingleTag.test( match[ 1 ] ) && jQuery.isPlainObject( context ) ) { for ( match in context ) { + // Properties of context are called as methods if possible if ( jQuery.isFunction( this[ match ] ) ) { this[ match ]( context[ match ] ); @@ -2778,14 +2883,15 @@ var rootjQuery, // HANDLE: $(#id) } else { - elem = document.getElementById( match[2] ); + elem = document.getElementById( match[ 2 ] ); // Support: Blackberry 4.6 // gEBID returns nodes no longer in the document (#6963) if ( elem && elem.parentNode ) { + // Inject the element directly into the jQuery object this.length = 1; - this[0] = elem; + this[ 0 ] = elem; } this.context = document; @@ -2795,7 +2901,7 @@ var rootjQuery, // HANDLE: $(expr, $(...)) } else if ( !context || context.jquery ) { - return ( context || rootjQuery ).find( selector ); + return ( context || root ).find( selector ); // HANDLE: $(expr, context) // (which is just equivalent to: $(context).find(expr) @@ -2805,15 +2911,16 @@ var rootjQuery, // HANDLE: $(DOMElement) } else if ( selector.nodeType ) { - this.context = this[0] = selector; + this.context = this[ 0 ] = selector; this.length = 1; return this; // HANDLE: $(function) // Shortcut for document ready } else if ( jQuery.isFunction( selector ) ) { - return typeof rootjQuery.ready !== "undefined" ? - rootjQuery.ready( selector ) : + return root.ready !== undefined ? + root.ready( selector ) : + // Execute immediately if ready is not present selector( jQuery ); } @@ -2834,6 +2941,7 @@ rootjQuery = jQuery( document ); var rparentsprev = /^(?:parents|prev(?:Until|All))/, + // Methods guaranteed to produce a unique set when starting from a unique set guaranteedUnique = { children: true, @@ -2842,48 +2950,19 @@ var rparentsprev = /^(?:parents|prev(?:Until|All))/, prev: true }; -jQuery.extend({ - dir: function( elem, dir, until ) { - var matched = [], - truncate = until !== undefined; - - while ( (elem = elem[ dir ]) && elem.nodeType !== 9 ) { - if ( elem.nodeType === 1 ) { - if ( truncate && jQuery( elem ).is( until ) ) { - break; - } - matched.push( elem ); - } - } - return matched; - }, - - sibling: function( n, elem ) { - var matched = []; - - for ( ; n; n = n.nextSibling ) { - if ( n.nodeType === 1 && n !== elem ) { - matched.push( n ); - } - } - - return matched; - } -}); - -jQuery.fn.extend({ +jQuery.fn.extend( { has: function( target ) { var targets = jQuery( target, this ), l = targets.length; - return this.filter(function() { + return this.filter( function() { var i = 0; for ( ; i < l; i++ ) { - if ( jQuery.contains( this, targets[i] ) ) { + if ( jQuery.contains( this, targets[ i ] ) ) { return true; } } - }); + } ); }, closest: function( selectors, context ) { @@ -2896,14 +2975,15 @@ jQuery.fn.extend({ 0; for ( ; i < l; i++ ) { - for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) { + for ( cur = this[ i ]; cur && cur !== context; cur = cur.parentNode ) { + // Always skip document fragments - if ( cur.nodeType < 11 && (pos ? - pos.index(cur) > -1 : + if ( cur.nodeType < 11 && ( pos ? + pos.index( cur ) > -1 : // Don't pass non-elements to Sizzle cur.nodeType === 1 && - jQuery.find.matchesSelector(cur, selectors)) ) { + jQuery.find.matchesSelector( cur, selectors ) ) ) { matched.push( cur ); break; @@ -2911,7 +2991,7 @@ jQuery.fn.extend({ } } - return this.pushStack( matched.length > 1 ? jQuery.unique( matched ) : matched ); + return this.pushStack( matched.length > 1 ? jQuery.uniqueSort( matched ) : matched ); }, // Determine the position of an element within the set @@ -2937,7 +3017,7 @@ jQuery.fn.extend({ add: function( selector, context ) { return this.pushStack( - jQuery.unique( + jQuery.uniqueSort( jQuery.merge( this.get(), jQuery( selector, context ) ) ) ); @@ -2945,26 +3025,26 @@ jQuery.fn.extend({ addBack: function( selector ) { return this.add( selector == null ? - this.prevObject : this.prevObject.filter(selector) + this.prevObject : this.prevObject.filter( selector ) ); } -}); +} ); function sibling( cur, dir ) { - while ( (cur = cur[dir]) && cur.nodeType !== 1 ) {} + while ( ( cur = cur[ dir ] ) && cur.nodeType !== 1 ) {} return cur; } -jQuery.each({ +jQuery.each( { parent: function( elem ) { var parent = elem.parentNode; return parent && parent.nodeType !== 11 ? parent : null; }, parents: function( elem ) { - return jQuery.dir( elem, "parentNode" ); + return dir( elem, "parentNode" ); }, parentsUntil: function( elem, i, until ) { - return jQuery.dir( elem, "parentNode", until ); + return dir( elem, "parentNode", until ); }, next: function( elem ) { return sibling( elem, "nextSibling" ); @@ -2973,22 +3053,22 @@ jQuery.each({ return sibling( elem, "previousSibling" ); }, nextAll: function( elem ) { - return jQuery.dir( elem, "nextSibling" ); + return dir( elem, "nextSibling" ); }, prevAll: function( elem ) { - return jQuery.dir( elem, "previousSibling" ); + return dir( elem, "previousSibling" ); }, nextUntil: function( elem, i, until ) { - return jQuery.dir( elem, "nextSibling", until ); + return dir( elem, "nextSibling", until ); }, prevUntil: function( elem, i, until ) { - return jQuery.dir( elem, "previousSibling", until ); + return dir( elem, "previousSibling", until ); }, siblings: function( elem ) { - return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem ); + return siblings( ( elem.parentNode || {} ).firstChild, elem ); }, children: function( elem ) { - return jQuery.sibling( elem.firstChild ); + return siblings( elem.firstChild ); }, contents: function( elem ) { return elem.contentDocument || jQuery.merge( [], elem.childNodes ); @@ -3006,9 +3086,10 @@ jQuery.each({ } if ( this.length > 1 ) { + // Remove duplicates if ( !guaranteedUnique[ name ] ) { - jQuery.unique( matched ); + jQuery.uniqueSort( matched ); } // Reverse order for parents* and prev-derivatives @@ -3019,20 +3100,17 @@ jQuery.each({ return this.pushStack( matched ); }; -}); -var rnotwhite = (/\S+/g); +} ); +var rnotwhite = ( /\S+/g ); -// String to Object options format cache -var optionsCache = {}; - -// Convert String-formatted options into Object-formatted ones and store in cache +// Convert String-formatted options into Object-formatted ones function createOptions( options ) { - var object = optionsCache[ options ] = {}; + var object = {}; jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) { object[ flag ] = true; - }); + } ); return object; } @@ -3063,156 +3141,186 @@ jQuery.Callbacks = function( options ) { // Convert options from String-formatted to Object-formatted if needed // (we check in cache first) options = typeof options === "string" ? - ( optionsCache[ options ] || createOptions( options ) ) : + createOptions( options ) : jQuery.extend( {}, options ); - var // Last fire value (for non-forgettable lists) + var // Flag to know if list is currently firing + firing, + + // Last fire value for non-forgettable lists memory, + // Flag to know if list was already fired fired, - // Flag to know if list is currently firing - firing, - // First callback to fire (used internally by add and fireWith) - firingStart, - // End of the loop when firing - firingLength, - // Index of currently firing callback (modified by remove if needed) - firingIndex, + + // Flag to prevent firing + locked, + // Actual callback list list = [], - // Stack of fire calls for repeatable lists - stack = !options.once && [], + + // Queue of execution data for repeatable lists + queue = [], + + // Index of currently firing callback (modified by add/remove as needed) + firingIndex = -1, + // Fire callbacks - fire = function( data ) { - memory = options.memory && data; - fired = true; - firingIndex = firingStart || 0; - firingStart = 0; - firingLength = list.length; - firing = true; - for ( ; list && firingIndex < firingLength; firingIndex++ ) { - if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) { - memory = false; // To prevent further calls using add - break; + fire = function() { + + // Enforce single-firing + locked = options.once; + + // Execute callbacks for all pending executions, + // respecting firingIndex overrides and runtime changes + fired = firing = true; + for ( ; queue.length; firingIndex = -1 ) { + memory = queue.shift(); + while ( ++firingIndex < list.length ) { + + // Run callback and check for early termination + if ( list[ firingIndex ].apply( memory[ 0 ], memory[ 1 ] ) === false && + options.stopOnFalse ) { + + // Jump to end and forget the data so .add doesn't re-fire + firingIndex = list.length; + memory = false; + } } } + + // Forget the data if we're done with it + if ( !options.memory ) { + memory = false; + } + firing = false; - if ( list ) { - if ( stack ) { - if ( stack.length ) { - fire( stack.shift() ); - } - } else if ( memory ) { + + // Clean up if we're done firing for good + if ( locked ) { + + // Keep an empty list if we have data for future add calls + if ( memory ) { list = []; + + // Otherwise, this object is spent } else { - self.disable(); + list = ""; } } }, + // Actual Callbacks object self = { + // Add a callback or a collection of callbacks to the list add: function() { if ( list ) { - // First, we save the current length - var start = list.length; - (function add( args ) { + + // If we have memory from a past run, we should fire after adding + if ( memory && !firing ) { + firingIndex = list.length - 1; + queue.push( memory ); + } + + ( function add( args ) { jQuery.each( args, function( _, arg ) { - var type = jQuery.type( arg ); - if ( type === "function" ) { + if ( jQuery.isFunction( arg ) ) { if ( !options.unique || !self.has( arg ) ) { list.push( arg ); } - } else if ( arg && arg.length && type !== "string" ) { + } else if ( arg && arg.length && jQuery.type( arg ) !== "string" ) { + // Inspect recursively add( arg ); } - }); - })( arguments ); - // Do we need to add the callbacks to the - // current firing batch? - if ( firing ) { - firingLength = list.length; - // With memory, if we're not firing then - // we should call right away - } else if ( memory ) { - firingStart = start; - fire( memory ); + } ); + } )( arguments ); + + if ( memory && !firing ) { + fire(); } } return this; }, + // Remove a callback from the list remove: function() { - if ( list ) { - jQuery.each( arguments, function( _, arg ) { - var index; - while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) { - list.splice( index, 1 ); - // Handle firing indexes - if ( firing ) { - if ( index <= firingLength ) { - firingLength--; - } - if ( index <= firingIndex ) { - firingIndex--; - } - } + jQuery.each( arguments, function( _, arg ) { + var index; + while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) { + list.splice( index, 1 ); + + // Handle firing indexes + if ( index <= firingIndex ) { + firingIndex--; } - }); - } + } + } ); return this; }, + // Check if a given callback is in the list. // If no argument is given, return whether or not list has callbacks attached. has: function( fn ) { - return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length ); + return fn ? + jQuery.inArray( fn, list ) > -1 : + list.length > 0; }, + // Remove all callbacks from the list empty: function() { - list = []; - firingLength = 0; - return this; - }, - // Have the list do nothing anymore - disable: function() { - list = stack = memory = undefined; - return this; - }, - // Is it disabled? - disabled: function() { - return !list; - }, - // Lock the list in its current state - lock: function() { - stack = undefined; - if ( !memory ) { - self.disable(); + if ( list ) { + list = []; } return this; }, - // Is it locked? - locked: function() { - return !stack; + + // Disable .fire and .add + // Abort any current/pending executions + // Clear all callbacks and values + disable: function() { + locked = queue = []; + list = memory = ""; + return this; }, + disabled: function() { + return !list; + }, + + // Disable .fire + // Also disable .add unless we have memory (since it would have no effect) + // Abort any pending executions + lock: function() { + locked = queue = []; + if ( !memory ) { + list = memory = ""; + } + return this; + }, + locked: function() { + return !!locked; + }, + // Call all callbacks with the given context and arguments fireWith: function( context, args ) { - if ( list && ( !fired || stack ) ) { + if ( !locked ) { args = args || []; args = [ context, args.slice ? args.slice() : args ]; - if ( firing ) { - stack.push( args ); - } else { - fire( args ); + queue.push( args ); + if ( !firing ) { + fire(); } } return this; }, + // Call all the callbacks with the given arguments fire: function() { self.fireWith( this, arguments ); return this; }, + // To know if the callbacks have already been called at least once fired: function() { return !!fired; @@ -3223,14 +3331,15 @@ jQuery.Callbacks = function( options ) { }; -jQuery.extend({ +jQuery.extend( { Deferred: function( func ) { var tuples = [ + // action, add listener, listener list, final state - [ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ], - [ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ], - [ "notify", "progress", jQuery.Callbacks("memory") ] + [ "resolve", "done", jQuery.Callbacks( "once memory" ), "resolved" ], + [ "reject", "fail", jQuery.Callbacks( "once memory" ), "rejected" ], + [ "notify", "progress", jQuery.Callbacks( "memory" ) ] ], state = "pending", promise = { @@ -3243,25 +3352,30 @@ jQuery.extend({ }, then: function( /* fnDone, fnFail, fnProgress */ ) { var fns = arguments; - return jQuery.Deferred(function( newDefer ) { + return jQuery.Deferred( function( newDefer ) { jQuery.each( tuples, function( i, tuple ) { var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ]; + // deferred[ done | fail | progress ] for forwarding actions to newDefer - deferred[ tuple[1] ](function() { + deferred[ tuple[ 1 ] ]( function() { var returned = fn && fn.apply( this, arguments ); if ( returned && jQuery.isFunction( returned.promise ) ) { returned.promise() + .progress( newDefer.notify ) .done( newDefer.resolve ) - .fail( newDefer.reject ) - .progress( newDefer.notify ); + .fail( newDefer.reject ); } else { - newDefer[ tuple[ 0 ] + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments ); + newDefer[ tuple[ 0 ] + "With" ]( + this === promise ? newDefer.promise() : this, + fn ? [ returned ] : arguments + ); } - }); - }); + } ); + } ); fns = null; - }).promise(); + } ).promise(); }, + // Get a promise for this deferred // If obj is provided, the promise aspect is added to the object promise: function( obj ) { @@ -3279,11 +3393,12 @@ jQuery.extend({ stateString = tuple[ 3 ]; // promise[ done | fail | progress ] = list.add - promise[ tuple[1] ] = list.add; + promise[ tuple[ 1 ] ] = list.add; // Handle state if ( stateString ) { - list.add(function() { + list.add( function() { + // state = [ resolved | rejected ] state = stateString; @@ -3292,12 +3407,12 @@ jQuery.extend({ } // deferred[ resolve | reject | notify ] - deferred[ tuple[0] ] = function() { - deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments ); + deferred[ tuple[ 0 ] ] = function() { + deferred[ tuple[ 0 ] + "With" ]( this === deferred ? promise : this, arguments ); return this; }; - deferred[ tuple[0] + "With" ] = list.fireWith; - }); + deferred[ tuple[ 0 ] + "With" ] = list.fireWith; + } ); // Make the deferred a promise promise.promise( deferred ); @@ -3318,9 +3433,11 @@ jQuery.extend({ length = resolveValues.length, // the count of uncompleted subordinates - remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0, + remaining = length !== 1 || + ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0, - // the master Deferred. If resolveValues consist of only a single Deferred, just use that. + // the master Deferred. + // If resolveValues consist of only a single Deferred, just use that. deferred = remaining === 1 ? subordinate : jQuery.Deferred(), // Update function for both resolve and progress values @@ -3346,9 +3463,9 @@ jQuery.extend({ for ( ; i < length; i++ ) { if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) { resolveValues[ i ].promise() + .progress( updateFunc( i, progressContexts, progressValues ) ) .done( updateFunc( i, resolveContexts, resolveValues ) ) - .fail( deferred.reject ) - .progress( updateFunc( i, progressContexts, progressValues ) ); + .fail( deferred.reject ); } else { --remaining; } @@ -3362,20 +3479,22 @@ jQuery.extend({ return deferred.promise(); } -}); +} ); // The deferred used on DOM ready var readyList; jQuery.fn.ready = function( fn ) { + // Add the callback jQuery.ready.promise().done( fn ); return this; }; -jQuery.extend({ +jQuery.extend( { + // Is the DOM ready to be used? Set to true once it occurs. isReady: false, @@ -3417,14 +3536,14 @@ jQuery.extend({ jQuery( document ).off( "ready" ); } } -}); +} ); /** * The ready event handler and self cleanup method */ function completed() { - document.removeEventListener( "DOMContentLoaded", completed, false ); - window.removeEventListener( "load", completed, false ); + document.removeEventListener( "DOMContentLoaded", completed ); + window.removeEventListener( "load", completed ); jQuery.ready(); } @@ -3433,20 +3552,23 @@ jQuery.ready.promise = function( obj ) { readyList = jQuery.Deferred(); - // Catch cases where $(document).ready() is called after the browser event has already occurred. - // We once tried to use readyState "interactive" here, but it caused issues like the one - // discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15 - if ( document.readyState === "complete" ) { + // Catch cases where $(document).ready() is called + // after the browser event has already occurred. + // Support: IE9-10 only + // Older IE sometimes signals "interactive" too soon + if ( document.readyState === "complete" || + ( document.readyState !== "loading" && !document.documentElement.doScroll ) ) { + // Handle it asynchronously to allow scripts the opportunity to delay ready - setTimeout( jQuery.ready ); + window.setTimeout( jQuery.ready ); } else { // Use the handy event callback - document.addEventListener( "DOMContentLoaded", completed, false ); + document.addEventListener( "DOMContentLoaded", completed ); // A fallback to window.onload, that will always work - window.addEventListener( "load", completed, false ); + window.addEventListener( "load", completed ); } } return readyList.promise( obj ); @@ -3460,7 +3582,7 @@ jQuery.ready.promise(); // Multifunctional method to get and set values of a collection // The value/s can optionally be executed if it's a function -var access = jQuery.access = function( elems, fn, key, value, chainable, emptyGet, raw ) { +var access = function( elems, fn, key, value, chainable, emptyGet, raw ) { var i = 0, len = elems.length, bulk = key == null; @@ -3469,7 +3591,7 @@ var access = jQuery.access = function( elems, fn, key, value, chainable, emptyGe if ( jQuery.type( key ) === "object" ) { chainable = true; for ( i in key ) { - jQuery.access( elems, fn, i, key[i], true, emptyGet, raw ); + access( elems, fn, i, key[ i ], true, emptyGet, raw ); } // Sets one value @@ -3481,6 +3603,7 @@ var access = jQuery.access = function( elems, fn, key, value, chainable, emptyGe } if ( bulk ) { + // Bulk operations run against the entire set if ( raw ) { fn.call( elems, value ); @@ -3497,7 +3620,11 @@ var access = jQuery.access = function( elems, fn, key, value, chainable, emptyGe if ( fn ) { for ( ; i < len; i++ ) { - fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) ); + fn( + elems[ i ], key, raw ? + value : + value.call( elems[ i ], i, fn( elems[ i ], key ) ) + ); } } } @@ -3508,14 +3635,10 @@ var access = jQuery.access = function( elems, fn, key, value, chainable, emptyGe // Gets bulk ? fn.call( elems ) : - len ? fn( elems[0], key ) : emptyGet; + len ? fn( elems[ 0 ], key ) : emptyGet; }; +var acceptData = function( owner ) { - -/** - * Determines whether an object can have data - */ -jQuery.acceptData = function( owner ) { // Accepts only: // - Node // - Node.ELEMENT_NODE @@ -3527,66 +3650,79 @@ jQuery.acceptData = function( owner ) { }; -function Data() { - // Support: Android<4, - // Old WebKit does not have Object.preventExtensions/freeze method, - // return new empty object instead with no [[set]] accessor - Object.defineProperty( this.cache = {}, 0, { - get: function() { - return {}; - } - }); + +function Data() { this.expando = jQuery.expando + Data.uid++; } Data.uid = 1; -Data.accepts = jQuery.acceptData; Data.prototype = { - key: function( owner ) { + + register: function( owner, initial ) { + var value = initial || {}; + + // If it is a node unlikely to be stringify-ed or looped over + // use plain assignment + if ( owner.nodeType ) { + owner[ this.expando ] = value; + + // Otherwise secure it in a non-enumerable, non-writable property + // configurability must be true to allow the property to be + // deleted with the delete operator + } else { + Object.defineProperty( owner, this.expando, { + value: value, + writable: true, + configurable: true + } ); + } + return owner[ this.expando ]; + }, + cache: function( owner ) { + // We can accept data for non-element nodes in modern browsers, // but we should not, see #8335. - // Always return the key for a frozen object. - if ( !Data.accepts( owner ) ) { - return 0; + // Always return an empty object. + if ( !acceptData( owner ) ) { + return {}; } - var descriptor = {}, - // Check if the owner object already has a cache key - unlock = owner[ this.expando ]; + // Check if the owner object already has a cache + var value = owner[ this.expando ]; // If not, create one - if ( !unlock ) { - unlock = Data.uid++; + if ( !value ) { + value = {}; - // Secure it in a non-enumerable, non-writable property - try { - descriptor[ this.expando ] = { value: unlock }; - Object.defineProperties( owner, descriptor ); + // We can accept data for non-element nodes in modern browsers, + // but we should not, see #8335. + // Always return an empty object. + if ( acceptData( owner ) ) { - // Support: Android<4 - // Fallback to a less secure definition - } catch ( e ) { - descriptor[ this.expando ] = unlock; - jQuery.extend( owner, descriptor ); + // If it is a node unlikely to be stringify-ed or looped over + // use plain assignment + if ( owner.nodeType ) { + owner[ this.expando ] = value; + + // Otherwise secure it in a non-enumerable property + // configurable must be true to allow the property to be + // deleted when data is removed + } else { + Object.defineProperty( owner, this.expando, { + value: value, + configurable: true + } ); + } } } - // Ensure the cache object - if ( !this.cache[ unlock ] ) { - this.cache[ unlock ] = {}; - } - - return unlock; + return value; }, set: function( owner, data, value ) { var prop, - // There may be an unlock assigned to this node, - // if there is no entry for this "owner", create one inline - // and set the unlock as though an owner entry had always existed - unlock = this.key( owner ), - cache = this.cache[ unlock ]; + cache = this.cache( owner ); // Handle: [ owner, key, value ] args if ( typeof data === "string" ) { @@ -3594,30 +3730,22 @@ Data.prototype = { // Handle: [ owner, { properties } ] args } else { - // Fresh assignments by object are shallow copied - if ( jQuery.isEmptyObject( cache ) ) { - jQuery.extend( this.cache[ unlock ], data ); - // Otherwise, copy the properties one-by-one to the cache object - } else { - for ( prop in data ) { - cache[ prop ] = data[ prop ]; - } + + // Copy the properties one-by-one to the cache object + for ( prop in data ) { + cache[ prop ] = data[ prop ]; } } return cache; }, get: function( owner, key ) { - // Either a valid cache is found, or will be created. - // New caches will be created and the unlock returned, - // allowing direct access to the newly created - // empty data object. A valid owner object must be provided. - var cache = this.cache[ this.key( owner ) ]; - return key === undefined ? - cache : cache[ key ]; + this.cache( owner ) : + owner[ this.expando ] && owner[ this.expando ][ key ]; }, access: function( owner, key, value ) { var stored; + // In cases where either: // // 1. No key was specified @@ -3630,15 +3758,15 @@ Data.prototype = { // 2. The data stored at the key // if ( key === undefined || - ((key && typeof key === "string") && value === undefined) ) { + ( ( key && typeof key === "string" ) && value === undefined ) ) { stored = this.get( owner, key ); return stored !== undefined ? - stored : this.get( owner, jQuery.camelCase(key) ); + stored : this.get( owner, jQuery.camelCase( key ) ); } - // [*]When the key is not a string, or both a key and value + // When the key is not a string, or both a key and value // are specified, set or extend (existing objects) with either: // // 1. An object of properties @@ -3652,15 +3780,20 @@ Data.prototype = { }, remove: function( owner, key ) { var i, name, camel, - unlock = this.key( owner ), - cache = this.cache[ unlock ]; + cache = owner[ this.expando ]; + + if ( cache === undefined ) { + return; + } if ( key === undefined ) { - this.cache[ unlock ] = {}; + this.register( owner ); } else { + // Support array or space separated string of keys if ( jQuery.isArray( key ) ) { + // If "name" is an array of keys... // When data is initially created, via ("key", "val") signature, // keys will be converted to camelCase. @@ -3670,10 +3803,12 @@ Data.prototype = { name = key.concat( key.map( jQuery.camelCase ) ); } else { camel = jQuery.camelCase( key ); + // Try the string as a key before any manipulation if ( key in cache ) { name = [ key, camel ]; } else { + // If a key with the spaces exists, use it. // Otherwise, create an array by matching non-whitespace name = camel; @@ -3683,25 +3818,34 @@ Data.prototype = { } i = name.length; + while ( i-- ) { delete cache[ name[ i ] ]; } } + + // Remove the expando if there's no more data + if ( key === undefined || jQuery.isEmptyObject( cache ) ) { + + // Support: Chrome <= 35-45+ + // Webkit & Blink performance suffers when deleting properties + // from DOM nodes, so set to undefined instead + // https://code.google.com/p/chromium/issues/detail?id=378607 + if ( owner.nodeType ) { + owner[ this.expando ] = undefined; + } else { + delete owner[ this.expando ]; + } + } }, hasData: function( owner ) { - return !jQuery.isEmptyObject( - this.cache[ owner[ this.expando ] ] || {} - ); - }, - discard: function( owner ) { - if ( owner[ this.expando ] ) { - delete this.cache[ owner[ this.expando ] ]; - } + var cache = owner[ this.expando ]; + return cache !== undefined && !jQuery.isEmptyObject( cache ); } }; -var data_priv = new Data(); +var dataPriv = new Data(); -var data_user = new Data(); +var dataUser = new Data(); @@ -3716,7 +3860,7 @@ var data_user = new Data(); // 6. Provide a clear path for implementation upgrade to WeakMap in 2014 var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/, - rmultiDash = /([A-Z])/g; + rmultiDash = /[A-Z]/g; function dataAttr( elem, key, data ) { var name; @@ -3724,7 +3868,7 @@ function dataAttr( elem, key, data ) { // If nothing was found internally, try to fetch any // data from the HTML5 data-* attribute if ( data === undefined && elem.nodeType === 1 ) { - name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase(); + name = "data-" + key.replace( rmultiDash, "-$&" ).toLowerCase(); data = elem.getAttribute( name ); if ( typeof data === "string" ) { @@ -3732,14 +3876,15 @@ function dataAttr( elem, key, data ) { data = data === "true" ? true : data === "false" ? false : data === "null" ? null : + // Only convert to a number if it doesn't change the string +data + "" === data ? +data : rbrace.test( data ) ? jQuery.parseJSON( data ) : data; - } catch( e ) {} + } catch ( e ) {} // Make sure we set the data so it isn't changed later - data_user.set( elem, key, data ); + dataUser.set( elem, key, data ); } else { data = undefined; } @@ -3747,31 +3892,31 @@ function dataAttr( elem, key, data ) { return data; } -jQuery.extend({ +jQuery.extend( { hasData: function( elem ) { - return data_user.hasData( elem ) || data_priv.hasData( elem ); + return dataUser.hasData( elem ) || dataPriv.hasData( elem ); }, data: function( elem, name, data ) { - return data_user.access( elem, name, data ); + return dataUser.access( elem, name, data ); }, removeData: function( elem, name ) { - data_user.remove( elem, name ); + dataUser.remove( elem, name ); }, // TODO: Now that all calls to _data and _removeData have been replaced - // with direct calls to data_priv methods, these can be deprecated. + // with direct calls to dataPriv methods, these can be deprecated. _data: function( elem, name, data ) { - return data_priv.access( elem, name, data ); + return dataPriv.access( elem, name, data ); }, _removeData: function( elem, name ) { - data_priv.remove( elem, name ); + dataPriv.remove( elem, name ); } -}); +} ); -jQuery.fn.extend({ +jQuery.fn.extend( { data: function( key, value ) { var i, name, data, elem = this[ 0 ], @@ -3780,9 +3925,9 @@ jQuery.fn.extend({ // Gets all values if ( key === undefined ) { if ( this.length ) { - data = data_user.get( elem ); + data = dataUser.get( elem ); - if ( elem.nodeType === 1 && !data_priv.get( elem, "hasDataAttrs" ) ) { + if ( elem.nodeType === 1 && !dataPriv.get( elem, "hasDataAttrs" ) ) { i = attrs.length; while ( i-- ) { @@ -3791,12 +3936,12 @@ jQuery.fn.extend({ if ( attrs[ i ] ) { name = attrs[ i ].name; if ( name.indexOf( "data-" ) === 0 ) { - name = jQuery.camelCase( name.slice(5) ); + name = jQuery.camelCase( name.slice( 5 ) ); dataAttr( elem, name, data[ name ] ); } } } - data_priv.set( elem, "hasDataAttrs", true ); + dataPriv.set( elem, "hasDataAttrs", true ); } } @@ -3805,14 +3950,13 @@ jQuery.fn.extend({ // Sets multiple values if ( typeof key === "object" ) { - return this.each(function() { - data_user.set( this, key ); - }); + return this.each( function() { + dataUser.set( this, key ); + } ); } return access( this, function( value ) { - var data, - camelKey = jQuery.camelCase( key ); + var data, camelKey; // The calling jQuery object (element matches) is not empty // (and therefore has an element appears at this[ 0 ]) and the @@ -3820,16 +3964,24 @@ jQuery.fn.extend({ // will result in `undefined` for elem = this[ 0 ] which will // throw an exception if an attempt to read a data cache is made. if ( elem && value === undefined ) { + // Attempt to get data from the cache // with the key as-is - data = data_user.get( elem, key ); + data = dataUser.get( elem, key ) || + + // Try to find dashed key if it exists (gh-2779) + // This is for 2.2.x only + dataUser.get( elem, key.replace( rmultiDash, "-$&" ).toLowerCase() ); + if ( data !== undefined ) { return data; } + camelKey = jQuery.camelCase( key ); + // Attempt to get data from the cache // with the key camelized - data = data_user.get( elem, camelKey ); + data = dataUser.get( elem, camelKey ); if ( data !== undefined ) { return data; } @@ -3846,46 +3998,48 @@ jQuery.fn.extend({ } // Set the data... - this.each(function() { + camelKey = jQuery.camelCase( key ); + this.each( function() { + // First, attempt to store a copy or reference of any // data that might've been store with a camelCased key. - var data = data_user.get( this, camelKey ); + var data = dataUser.get( this, camelKey ); // For HTML5 data-* attribute interop, we have to // store property names with dashes in a camelCase form. // This might not apply to all properties...* - data_user.set( this, camelKey, value ); + dataUser.set( this, camelKey, value ); // *... In the case of properties that might _actually_ // have dashes, we need to also store a copy of that // unchanged property. - if ( key.indexOf("-") !== -1 && data !== undefined ) { - data_user.set( this, key, value ); + if ( key.indexOf( "-" ) > -1 && data !== undefined ) { + dataUser.set( this, key, value ); } - }); + } ); }, null, value, arguments.length > 1, null, true ); }, removeData: function( key ) { - return this.each(function() { - data_user.remove( this, key ); - }); + return this.each( function() { + dataUser.remove( this, key ); + } ); } -}); +} ); -jQuery.extend({ +jQuery.extend( { queue: function( elem, type, data ) { var queue; if ( elem ) { type = ( type || "fx" ) + "queue"; - queue = data_priv.get( elem, type ); + queue = dataPriv.get( elem, type ); // Speed up dequeue by getting out quickly if this is just a lookup if ( data ) { if ( !queue || jQuery.isArray( data ) ) { - queue = data_priv.access( elem, type, jQuery.makeArray(data) ); + queue = dataPriv.access( elem, type, jQuery.makeArray( data ) ); } else { queue.push( data ); } @@ -3932,15 +4086,15 @@ jQuery.extend({ // Not public - generate a queueHooks object, or return the current one _queueHooks: function( elem, type ) { var key = type + "queueHooks"; - return data_priv.get( elem, key ) || data_priv.access( elem, key, { - empty: jQuery.Callbacks("once memory").add(function() { - data_priv.remove( elem, [ type + "queue", key ] ); - }) - }); + return dataPriv.get( elem, key ) || dataPriv.access( elem, key, { + empty: jQuery.Callbacks( "once memory" ).add( function() { + dataPriv.remove( elem, [ type + "queue", key ] ); + } ) + } ); } -}); +} ); -jQuery.fn.extend({ +jQuery.fn.extend( { queue: function( type, data ) { var setter = 2; @@ -3951,30 +4105,31 @@ jQuery.fn.extend({ } if ( arguments.length < setter ) { - return jQuery.queue( this[0], type ); + return jQuery.queue( this[ 0 ], type ); } return data === undefined ? this : - this.each(function() { + this.each( function() { var queue = jQuery.queue( this, type, data ); // Ensure a hooks for this queue jQuery._queueHooks( this, type ); - if ( type === "fx" && queue[0] !== "inprogress" ) { + if ( type === "fx" && queue[ 0 ] !== "inprogress" ) { jQuery.dequeue( this, type ); } - }); + } ); }, dequeue: function( type ) { - return this.each(function() { + return this.each( function() { jQuery.dequeue( this, type ); - }); + } ); }, clearQueue: function( type ) { return this.queue( type || "fx", [] ); }, + // Get a promise resolved when queues of a certain type // are emptied (fx is the type by default) promise: function( type, obj ) { @@ -3996,7 +4151,7 @@ jQuery.fn.extend({ type = type || "fx"; while ( i-- ) { - tmp = data_priv.get( elements[ i ], type + "queueHooks" ); + tmp = dataPriv.get( elements[ i ], type + "queueHooks" ); if ( tmp && tmp.empty ) { count++; tmp.empty.add( resolve ); @@ -4005,28 +4160,243 @@ jQuery.fn.extend({ resolve(); return defer.promise( obj ); } -}); -var pnum = (/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/).source; +} ); +var pnum = ( /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/ ).source; + +var rcssNum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" ); + var cssExpand = [ "Top", "Right", "Bottom", "Left" ]; var isHidden = function( elem, el ) { + // isHidden might be called from jQuery#filter function; // in that case, element will be second argument elem = el || elem; - return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem ); + return jQuery.css( elem, "display" ) === "none" || + !jQuery.contains( elem.ownerDocument, elem ); }; -var rcheckableType = (/^(?:checkbox|radio)$/i); + + +function adjustCSS( elem, prop, valueParts, tween ) { + var adjusted, + scale = 1, + maxIterations = 20, + currentValue = tween ? + function() { return tween.cur(); } : + function() { return jQuery.css( elem, prop, "" ); }, + initial = currentValue(), + unit = valueParts && valueParts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ), + + // Starting value computation is required for potential unit mismatches + initialInUnit = ( jQuery.cssNumber[ prop ] || unit !== "px" && +initial ) && + rcssNum.exec( jQuery.css( elem, prop ) ); + + if ( initialInUnit && initialInUnit[ 3 ] !== unit ) { + + // Trust units reported by jQuery.css + unit = unit || initialInUnit[ 3 ]; + + // Make sure we update the tween properties later on + valueParts = valueParts || []; + + // Iteratively approximate from a nonzero starting point + initialInUnit = +initial || 1; + + do { + + // If previous iteration zeroed out, double until we get *something*. + // Use string for doubling so we don't accidentally see scale as unchanged below + scale = scale || ".5"; + + // Adjust and apply + initialInUnit = initialInUnit / scale; + jQuery.style( elem, prop, initialInUnit + unit ); + + // Update scale, tolerating zero or NaN from tween.cur() + // Break the loop if scale is unchanged or perfect, or if we've just had enough. + } while ( + scale !== ( scale = currentValue() / initial ) && scale !== 1 && --maxIterations + ); + } + + if ( valueParts ) { + initialInUnit = +initialInUnit || +initial || 0; + + // Apply relative offset (+=/-=) if specified + adjusted = valueParts[ 1 ] ? + initialInUnit + ( valueParts[ 1 ] + 1 ) * valueParts[ 2 ] : + +valueParts[ 2 ]; + if ( tween ) { + tween.unit = unit; + tween.start = initialInUnit; + tween.end = adjusted; + } + } + return adjusted; +} +var rcheckableType = ( /^(?:checkbox|radio)$/i ); + +var rtagName = ( /<([\w:-]+)/ ); + +var rscriptType = ( /^$|\/(?:java|ecma)script/i ); -(function() { +// We have to close these tags to support XHTML (#13200) +var wrapMap = { + + // Support: IE9 + option: [ 1, "" ], + + // XHTML parsers do not magically insert elements in the + // same way that tag soup parsers do. So we cannot shorten + // this by omitting or other required elements. + thead: [ 1, "", "
" ], + col: [ 2, "", "
" ], + tr: [ 2, "", "
" ], + td: [ 3, "", "
" ], + + _default: [ 0, "", "" ] +}; + +// Support: IE9 +wrapMap.optgroup = wrapMap.option; + +wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; +wrapMap.th = wrapMap.td; + + +function getAll( context, tag ) { + + // Support: IE9-11+ + // Use typeof to avoid zero-argument method invocation on host objects (#15151) + var ret = typeof context.getElementsByTagName !== "undefined" ? + context.getElementsByTagName( tag || "*" ) : + typeof context.querySelectorAll !== "undefined" ? + context.querySelectorAll( tag || "*" ) : + []; + + return tag === undefined || tag && jQuery.nodeName( context, tag ) ? + jQuery.merge( [ context ], ret ) : + ret; +} + + +// Mark scripts as having already been evaluated +function setGlobalEval( elems, refElements ) { + var i = 0, + l = elems.length; + + for ( ; i < l; i++ ) { + dataPriv.set( + elems[ i ], + "globalEval", + !refElements || dataPriv.get( refElements[ i ], "globalEval" ) + ); + } +} + + +var rhtml = /<|&#?\w+;/; + +function buildFragment( elems, context, scripts, selection, ignored ) { + var elem, tmp, tag, wrap, contains, j, + fragment = context.createDocumentFragment(), + nodes = [], + i = 0, + l = elems.length; + + for ( ; i < l; i++ ) { + elem = elems[ i ]; + + if ( elem || elem === 0 ) { + + // Add nodes directly + if ( jQuery.type( elem ) === "object" ) { + + // Support: Android<4.1, PhantomJS<2 + // push.apply(_, arraylike) throws on ancient WebKit + jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem ); + + // Convert non-html into a text node + } else if ( !rhtml.test( elem ) ) { + nodes.push( context.createTextNode( elem ) ); + + // Convert html into DOM nodes + } else { + tmp = tmp || fragment.appendChild( context.createElement( "div" ) ); + + // Deserialize a standard representation + tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase(); + wrap = wrapMap[ tag ] || wrapMap._default; + tmp.innerHTML = wrap[ 1 ] + jQuery.htmlPrefilter( elem ) + wrap[ 2 ]; + + // Descend through wrappers to the right content + j = wrap[ 0 ]; + while ( j-- ) { + tmp = tmp.lastChild; + } + + // Support: Android<4.1, PhantomJS<2 + // push.apply(_, arraylike) throws on ancient WebKit + jQuery.merge( nodes, tmp.childNodes ); + + // Remember the top-level container + tmp = fragment.firstChild; + + // Ensure the created nodes are orphaned (#12392) + tmp.textContent = ""; + } + } + } + + // Remove wrapper from fragment + fragment.textContent = ""; + + i = 0; + while ( ( elem = nodes[ i++ ] ) ) { + + // Skip elements already in the context collection (trac-4087) + if ( selection && jQuery.inArray( elem, selection ) > -1 ) { + if ( ignored ) { + ignored.push( elem ); + } + continue; + } + + contains = jQuery.contains( elem.ownerDocument, elem ); + + // Append to fragment + tmp = getAll( fragment.appendChild( elem ), "script" ); + + // Preserve script evaluation history + if ( contains ) { + setGlobalEval( tmp ); + } + + // Capture executables + if ( scripts ) { + j = 0; + while ( ( elem = tmp[ j++ ] ) ) { + if ( rscriptType.test( elem.type || "" ) ) { + scripts.push( elem ); + } + } + } + } + + return fragment; +} + + +( function() { var fragment = document.createDocumentFragment(), div = fragment.appendChild( document.createElement( "div" ) ), input = document.createElement( "input" ); - // Support: Safari<=5.1 + // Support: Android 4.0-4.3, Safari<=5.1 // Check state lost if the name is set (#11217) // Support: Windows Web Apps (WWA) // `name` and `type` must use .setAttribute for WWA (#14901) @@ -4044,19 +4414,13 @@ var rcheckableType = (/^(?:checkbox|radio)$/i); // Make sure textarea (and checkbox) defaultValue is properly cloned div.innerHTML = ""; support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue; -})(); -var strundefined = typeof undefined; - - - -support.focusinBubbles = "onfocusin" in window; +} )(); var rkeyEvent = /^key/, - rmouseEvent = /^(?:mouse|pointer|contextmenu)|click/, - rfocusMorph = /^(?:focusinfocus|focusoutblur)$/, - rtypenamespace = /^([^.]*)(?:\.(.+)|)$/; + rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/, + rtypenamespace = /^([^.]*)(?:\.(.+)|)/; function returnTrue() { return true; @@ -4066,12 +4430,75 @@ function returnFalse() { return false; } +// Support: IE9 +// See #13393 for more info function safeActiveElement() { try { return document.activeElement; } catch ( err ) { } } +function on( elem, types, selector, data, fn, one ) { + var origFn, type; + + // Types can be a map of types/handlers + if ( typeof types === "object" ) { + + // ( types-Object, selector, data ) + if ( typeof selector !== "string" ) { + + // ( types-Object, data ) + data = data || selector; + selector = undefined; + } + for ( type in types ) { + on( elem, type, selector, data, types[ type ], one ); + } + return elem; + } + + if ( data == null && fn == null ) { + + // ( types, fn ) + fn = selector; + data = selector = undefined; + } else if ( fn == null ) { + if ( typeof selector === "string" ) { + + // ( types, selector, fn ) + fn = data; + data = undefined; + } else { + + // ( types, data, fn ) + fn = data; + data = selector; + selector = undefined; + } + } + if ( fn === false ) { + fn = returnFalse; + } else if ( !fn ) { + return this; + } + + if ( one === 1 ) { + origFn = fn; + fn = function( event ) { + + // Can use an empty set, since event contains the info + jQuery().off( event ); + return origFn.apply( this, arguments ); + }; + + // Use same guid so caller can remove using origFn + fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ ); + } + return elem.each( function() { + jQuery.event.add( this, types, fn, data, selector ); + } ); +} + /* * Helper functions for managing events -- not part of the public interface. * Props to Dean Edwards' addEvent library for many of the ideas. @@ -4085,7 +4512,7 @@ jQuery.event = { var handleObjIn, eventHandle, tmp, events, t, handleObj, special, handlers, type, namespaces, origType, - elemData = data_priv.get( elem ); + elemData = dataPriv.get( elem ); // Don't attach events to noData or text/comment nodes (but allow plain objects) if ( !elemData ) { @@ -4105,14 +4532,15 @@ jQuery.event = { } // Init the element's event structure and main handler, if this is the first - if ( !(events = elemData.events) ) { + if ( !( events = elemData.events ) ) { events = elemData.events = {}; } - if ( !(eventHandle = elemData.handle) ) { + if ( !( eventHandle = elemData.handle ) ) { eventHandle = elemData.handle = function( e ) { + // Discard the second event of a jQuery.event.trigger() and // when an event is called after a page has unloaded - return typeof jQuery !== strundefined && jQuery.event.triggered !== e.type ? + return typeof jQuery !== "undefined" && jQuery.event.triggered !== e.type ? jQuery.event.dispatch.apply( elem, arguments ) : undefined; }; } @@ -4121,9 +4549,9 @@ jQuery.event = { types = ( types || "" ).match( rnotwhite ) || [ "" ]; t = types.length; while ( t-- ) { - tmp = rtypenamespace.exec( types[t] ) || []; - type = origType = tmp[1]; - namespaces = ( tmp[2] || "" ).split( "." ).sort(); + tmp = rtypenamespace.exec( types[ t ] ) || []; + type = origType = tmp[ 1 ]; + namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort(); // There *must* be a type, no attaching namespace-only handlers if ( !type ) { @@ -4140,7 +4568,7 @@ jQuery.event = { special = jQuery.event.special[ type ] || {}; // handleObj is passed to all event handlers - handleObj = jQuery.extend({ + handleObj = jQuery.extend( { type: type, origType: origType, data: data, @@ -4148,18 +4576,20 @@ jQuery.event = { guid: handler.guid, selector: selector, needsContext: selector && jQuery.expr.match.needsContext.test( selector ), - namespace: namespaces.join(".") + namespace: namespaces.join( "." ) }, handleObjIn ); // Init the event handler queue if we're the first - if ( !(handlers = events[ type ]) ) { + if ( !( handlers = events[ type ] ) ) { handlers = events[ type ] = []; handlers.delegateCount = 0; // Only use addEventListener if the special events handler returns false - if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) { + if ( !special.setup || + special.setup.call( elem, data, namespaces, eventHandle ) === false ) { + if ( elem.addEventListener ) { - elem.addEventListener( type, eventHandle, false ); + elem.addEventListener( type, eventHandle ); } } } @@ -4191,9 +4621,9 @@ jQuery.event = { var j, origCount, tmp, events, t, handleObj, special, handlers, type, namespaces, origType, - elemData = data_priv.hasData( elem ) && data_priv.get( elem ); + elemData = dataPriv.hasData( elem ) && dataPriv.get( elem ); - if ( !elemData || !(events = elemData.events) ) { + if ( !elemData || !( events = elemData.events ) ) { return; } @@ -4201,9 +4631,9 @@ jQuery.event = { types = ( types || "" ).match( rnotwhite ) || [ "" ]; t = types.length; while ( t-- ) { - tmp = rtypenamespace.exec( types[t] ) || []; - type = origType = tmp[1]; - namespaces = ( tmp[2] || "" ).split( "." ).sort(); + tmp = rtypenamespace.exec( types[ t ] ) || []; + type = origType = tmp[ 1 ]; + namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort(); // Unbind all events (on this namespace, if provided) for the element if ( !type ) { @@ -4216,7 +4646,8 @@ jQuery.event = { special = jQuery.event.special[ type ] || {}; type = ( selector ? special.delegateType : special.bindType ) || type; handlers = events[ type ] || []; - tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ); + tmp = tmp[ 2 ] && + new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" ); // Remove matching events origCount = j = handlers.length; @@ -4226,7 +4657,8 @@ jQuery.event = { if ( ( mappedTypes || origType === handleObj.origType ) && ( !handler || handler.guid === handleObj.guid ) && ( !tmp || tmp.test( handleObj.namespace ) ) && - ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) { + ( !selector || selector === handleObj.selector || + selector === "**" && handleObj.selector ) ) { handlers.splice( j, 1 ); if ( handleObj.selector ) { @@ -4241,7 +4673,9 @@ jQuery.event = { // Remove generic event handler if we removed something and no more handlers exist // (avoids potential for endless recursion during removal of special event handlers) if ( origCount && !handlers.length ) { - if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) { + if ( !special.teardown || + special.teardown.call( elem, namespaces, elemData.handle ) === false ) { + jQuery.removeEvent( elem, type, elemData.handle ); } @@ -4249,145 +4683,12 @@ jQuery.event = { } } - // Remove the expando if it's no longer used + // Remove data and the expando if it's no longer used if ( jQuery.isEmptyObject( events ) ) { - delete elemData.handle; - data_priv.remove( elem, "events" ); + dataPriv.remove( elem, "handle events" ); } }, - trigger: function( event, data, elem, onlyHandlers ) { - - var i, cur, tmp, bubbleType, ontype, handle, special, - eventPath = [ elem || document ], - type = hasOwn.call( event, "type" ) ? event.type : event, - namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : []; - - cur = tmp = elem = elem || document; - - // Don't do events on text and comment nodes - if ( elem.nodeType === 3 || elem.nodeType === 8 ) { - return; - } - - // focus/blur morphs to focusin/out; ensure we're not firing them right now - if ( rfocusMorph.test( type + jQuery.event.triggered ) ) { - return; - } - - if ( type.indexOf(".") >= 0 ) { - // Namespaced trigger; create a regexp to match event type in handle() - namespaces = type.split("."); - type = namespaces.shift(); - namespaces.sort(); - } - ontype = type.indexOf(":") < 0 && "on" + type; - - // Caller can pass in a jQuery.Event object, Object, or just an event type string - event = event[ jQuery.expando ] ? - event : - new jQuery.Event( type, typeof event === "object" && event ); - - // Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true) - event.isTrigger = onlyHandlers ? 2 : 3; - event.namespace = namespaces.join("."); - event.namespace_re = event.namespace ? - new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) : - null; - - // Clean up the event in case it is being reused - event.result = undefined; - if ( !event.target ) { - event.target = elem; - } - - // Clone any incoming data and prepend the event, creating the handler arg list - data = data == null ? - [ event ] : - jQuery.makeArray( data, [ event ] ); - - // Allow special events to draw outside the lines - special = jQuery.event.special[ type ] || {}; - if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) { - return; - } - - // Determine event propagation path in advance, per W3C events spec (#9951) - // Bubble up to document, then to window; watch for a global ownerDocument var (#9724) - if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) { - - bubbleType = special.delegateType || type; - if ( !rfocusMorph.test( bubbleType + type ) ) { - cur = cur.parentNode; - } - for ( ; cur; cur = cur.parentNode ) { - eventPath.push( cur ); - tmp = cur; - } - - // Only add window if we got to document (e.g., not plain obj or detached DOM) - if ( tmp === (elem.ownerDocument || document) ) { - eventPath.push( tmp.defaultView || tmp.parentWindow || window ); - } - } - - // Fire handlers on the event path - i = 0; - while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) { - - event.type = i > 1 ? - bubbleType : - special.bindType || type; - - // jQuery handler - handle = ( data_priv.get( cur, "events" ) || {} )[ event.type ] && data_priv.get( cur, "handle" ); - if ( handle ) { - handle.apply( cur, data ); - } - - // Native handler - handle = ontype && cur[ ontype ]; - if ( handle && handle.apply && jQuery.acceptData( cur ) ) { - event.result = handle.apply( cur, data ); - if ( event.result === false ) { - event.preventDefault(); - } - } - } - event.type = type; - - // If nobody prevented the default action, do it now - if ( !onlyHandlers && !event.isDefaultPrevented() ) { - - if ( (!special._default || special._default.apply( eventPath.pop(), data ) === false) && - jQuery.acceptData( elem ) ) { - - // Call a native DOM method on the target with the same name name as the event. - // Don't do default actions on window, that's where global variables be (#6170) - if ( ontype && jQuery.isFunction( elem[ type ] ) && !jQuery.isWindow( elem ) ) { - - // Don't re-trigger an onFOO event when we call its FOO() method - tmp = elem[ ontype ]; - - if ( tmp ) { - elem[ ontype ] = null; - } - - // Prevent re-triggering of the same event, since we already bubbled it above - jQuery.event.triggered = type; - elem[ type ](); - jQuery.event.triggered = undefined; - - if ( tmp ) { - elem[ ontype ] = tmp; - } - } - } - } - - return event.result; - }, - dispatch: function( event ) { // Make a writable jQuery.Event from the native event object @@ -4396,11 +4697,11 @@ jQuery.event = { var i, j, ret, matched, handleObj, handlerQueue = [], args = slice.call( arguments ), - handlers = ( data_priv.get( this, "events" ) || {} )[ event.type ] || [], + handlers = ( dataPriv.get( this, "events" ) || {} )[ event.type ] || [], special = jQuery.event.special[ event.type ] || {}; // Use the fix-ed jQuery.Event rather than the (read-only) native event - args[0] = event; + args[ 0 ] = event; event.delegateTarget = this; // Call the preDispatch hook for the mapped type, and let it bail if desired @@ -4413,24 +4714,25 @@ jQuery.event = { // Run delegates first; they may want to stop propagation beneath us i = 0; - while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) { + while ( ( matched = handlerQueue[ i++ ] ) && !event.isPropagationStopped() ) { event.currentTarget = matched.elem; j = 0; - while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) { + while ( ( handleObj = matched.handlers[ j++ ] ) && + !event.isImmediatePropagationStopped() ) { // Triggered event must either 1) have no namespace, or 2) have namespace(s) // a subset or equal to those in the bound event (both can have no namespace). - if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) { + if ( !event.rnamespace || event.rnamespace.test( handleObj.namespace ) ) { event.handleObj = handleObj; event.data = handleObj.data; - ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler ) - .apply( matched.elem, args ); + ret = ( ( jQuery.event.special[ handleObj.origType ] || {} ).handle || + handleObj.handler ).apply( matched.elem, args ); if ( ret !== undefined ) { - if ( (event.result = ret) === false ) { + if ( ( event.result = ret ) === false ) { event.preventDefault(); event.stopPropagation(); } @@ -4453,15 +4755,20 @@ jQuery.event = { delegateCount = handlers.delegateCount, cur = event.target; + // Support (at least): Chrome, IE9 // Find delegate handlers // Black-hole SVG instance trees (#13180) - // Avoid non-left-click bubbling in Firefox (#3861) - if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) { + // + // Support: Firefox<=42+ + // Avoid non-left-click in FF but don't block IE radio events (#3861, gh-2343) + if ( delegateCount && cur.nodeType && + ( event.type !== "click" || isNaN( event.button ) || event.button < 1 ) ) { for ( ; cur !== this; cur = cur.parentNode || this ) { + // Don't check non-elements (#13208) // Don't process clicks on disabled elements (#6911, #8165, #11382, #11764) - if ( cur.disabled !== true || event.type !== "click" ) { + if ( cur.nodeType === 1 && ( cur.disabled !== true || event.type !== "click" ) ) { matches = []; for ( i = 0; i < delegateCount; i++ ) { handleObj = handlers[ i ]; @@ -4471,7 +4778,7 @@ jQuery.event = { if ( matches[ sel ] === undefined ) { matches[ sel ] = handleObj.needsContext ? - jQuery( sel, this ).index( cur ) >= 0 : + jQuery( sel, this ).index( cur ) > -1 : jQuery.find( sel, this, null, [ cur ] ).length; } if ( matches[ sel ] ) { @@ -4479,7 +4786,7 @@ jQuery.event = { } } if ( matches.length ) { - handlerQueue.push({ elem: cur, handlers: matches }); + handlerQueue.push( { elem: cur, handlers: matches } ); } } } @@ -4487,19 +4794,20 @@ jQuery.event = { // Add the remaining (directly-bound) handlers if ( delegateCount < handlers.length ) { - handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) }); + handlerQueue.push( { elem: this, handlers: handlers.slice( delegateCount ) } ); } return handlerQueue; }, // Includes some event props shared by KeyEvent and MouseEvent - props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "), + props: ( "altKey bubbles cancelable ctrlKey currentTarget detail eventPhase " + + "metaKey relatedTarget shiftKey target timeStamp view which" ).split( " " ), fixHooks: {}, keyHooks: { - props: "char charCode key keyCode".split(" "), + props: "char charCode key keyCode".split( " " ), filter: function( event, original ) { // Add which for key events @@ -4512,7 +4820,8 @@ jQuery.event = { }, mouseHooks: { - props: "button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "), + props: ( "button buttons clientX clientY offsetX offsetY pageX pageY " + + "screenX screenY toElement" ).split( " " ), filter: function( event, original ) { var eventDoc, doc, body, button = original.button; @@ -4523,8 +4832,12 @@ jQuery.event = { doc = eventDoc.documentElement; body = eventDoc.body; - event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 ); - event.pageY = original.clientY + ( doc && doc.scrollTop || body && body.scrollTop || 0 ) - ( doc && doc.clientTop || body && body.clientTop || 0 ); + event.pageX = original.clientX + + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - + ( doc && doc.clientLeft || body && body.clientLeft || 0 ); + event.pageY = original.clientY + + ( doc && doc.scrollTop || body && body.scrollTop || 0 ) - + ( doc && doc.clientTop || body && body.clientTop || 0 ); } // Add which for click: 1 === left; 2 === middle; 3 === right @@ -4581,10 +4894,12 @@ jQuery.event = { special: { load: { + // Prevent triggered image.load events from bubbling to window.load noBubble: true }, focus: { + // Fire native event if possible so blur/focus sequence is correct trigger: function() { if ( this !== safeActiveElement() && this.focus ) { @@ -4604,6 +4919,7 @@ jQuery.event = { delegateType: "focusout" }, click: { + // For checkbox, fire native event so checked state will be right trigger: function() { if ( this.type === "checkbox" && this.click && jQuery.nodeName( this, "input" ) ) { @@ -4628,41 +4944,21 @@ jQuery.event = { } } } - }, - - simulate: function( type, elem, event, bubble ) { - // Piggyback on a donor event to simulate a different one. - // Fake originalEvent to avoid donor's stopPropagation, but if the - // simulated event prevents default then we do the same on the donor. - var e = jQuery.extend( - new jQuery.Event(), - event, - { - type: type, - isSimulated: true, - originalEvent: {} - } - ); - if ( bubble ) { - jQuery.event.trigger( e, null, elem ); - } else { - jQuery.event.dispatch.call( elem, e ); - } - if ( e.isDefaultPrevented() ) { - event.preventDefault(); - } } }; jQuery.removeEvent = function( elem, type, handle ) { + + // This "if" is needed for plain objects if ( elem.removeEventListener ) { - elem.removeEventListener( type, handle, false ); + elem.removeEventListener( type, handle ); } }; jQuery.Event = function( src, props ) { + // Allow instantiation without the 'new' keyword - if ( !(this instanceof jQuery.Event) ) { + if ( !( this instanceof jQuery.Event ) ) { return new jQuery.Event( src, props ); } @@ -4675,6 +4971,7 @@ jQuery.Event = function( src, props ) { // by a handler lower down the tree; reflect the correct value. this.isDefaultPrevented = src.defaultPrevented || src.defaultPrevented === undefined && + // Support: Android<4.0 src.returnValue === false ? returnTrue : @@ -4700,6 +4997,7 @@ jQuery.Event = function( src, props ) { // jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding // http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html jQuery.Event.prototype = { + constructor: jQuery.Event, isDefaultPrevented: returnFalse, isPropagationStopped: returnFalse, isImmediatePropagationStopped: returnFalse, @@ -4709,7 +5007,7 @@ jQuery.Event.prototype = { this.isDefaultPrevented = returnTrue; - if ( e && e.preventDefault ) { + if ( e ) { e.preventDefault(); } }, @@ -4718,7 +5016,7 @@ jQuery.Event.prototype = { this.isPropagationStopped = returnTrue; - if ( e && e.stopPropagation ) { + if ( e ) { e.stopPropagation(); } }, @@ -4727,7 +5025,7 @@ jQuery.Event.prototype = { this.isImmediatePropagationStopped = returnTrue; - if ( e && e.stopImmediatePropagation ) { + if ( e ) { e.stopImmediatePropagation(); } @@ -4736,8 +5034,14 @@ jQuery.Event.prototype = { }; // Create mouseenter/leave events using mouseover/out and event-time checks -// Support: Chrome 15+ -jQuery.each({ +// so that event delegation works in jQuery. +// Do the same for pointerenter/pointerleave and pointerover/pointerout +// +// Support: Safari 7 only +// Safari sends mouseenter too often; see: +// https://code.google.com/p/chromium/issues/detail?id=470258 +// for the description of the bug (it existed in older Chrome versions as well). +jQuery.each( { mouseenter: "mouseover", mouseleave: "mouseout", pointerenter: "pointerover", @@ -4753,9 +5057,9 @@ jQuery.each({ related = event.relatedTarget, handleObj = event.handleObj; - // For mousenter/leave call the handler if related is outside the target. + // For mouseenter/leave call the handler if related is outside the target. // NB: No relatedTarget if the mouse left/entered the browser window - if ( !related || (related !== target && !jQuery.contains( target, related )) ) { + if ( !related || ( related !== target && !jQuery.contains( target, related ) ) ) { event.type = handleObj.origType; ret = handleObj.handler.apply( this, arguments ); event.type = fix; @@ -4763,115 +5067,32 @@ jQuery.each({ return ret; } }; -}); +} ); -// Support: Firefox, Chrome, Safari -// Create "bubbling" focus and blur events -if ( !support.focusinBubbles ) { - jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) { - - // Attach a single capturing handler on the document while someone wants focusin/focusout - var handler = function( event ) { - jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true ); - }; - - jQuery.event.special[ fix ] = { - setup: function() { - var doc = this.ownerDocument || this, - attaches = data_priv.access( doc, fix ); - - if ( !attaches ) { - doc.addEventListener( orig, handler, true ); - } - data_priv.access( doc, fix, ( attaches || 0 ) + 1 ); - }, - teardown: function() { - var doc = this.ownerDocument || this, - attaches = data_priv.access( doc, fix ) - 1; - - if ( !attaches ) { - doc.removeEventListener( orig, handler, true ); - data_priv.remove( doc, fix ); - - } else { - data_priv.access( doc, fix, attaches ); - } - } - }; - }); -} - -jQuery.fn.extend({ - - on: function( types, selector, data, fn, /*INTERNAL*/ one ) { - var origFn, type; - - // Types can be a map of types/handlers - if ( typeof types === "object" ) { - // ( types-Object, selector, data ) - if ( typeof selector !== "string" ) { - // ( types-Object, data ) - data = data || selector; - selector = undefined; - } - for ( type in types ) { - this.on( type, selector, data, types[ type ], one ); - } - return this; - } - - if ( data == null && fn == null ) { - // ( types, fn ) - fn = selector; - data = selector = undefined; - } else if ( fn == null ) { - if ( typeof selector === "string" ) { - // ( types, selector, fn ) - fn = data; - data = undefined; - } else { - // ( types, data, fn ) - fn = data; - data = selector; - selector = undefined; - } - } - if ( fn === false ) { - fn = returnFalse; - } else if ( !fn ) { - return this; - } - - if ( one === 1 ) { - origFn = fn; - fn = function( event ) { - // Can use an empty set, since event contains the info - jQuery().off( event ); - return origFn.apply( this, arguments ); - }; - // Use same guid so caller can remove using origFn - fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ ); - } - return this.each( function() { - jQuery.event.add( this, types, fn, data, selector ); - }); +jQuery.fn.extend( { + on: function( types, selector, data, fn ) { + return on( this, types, selector, data, fn ); }, one: function( types, selector, data, fn ) { - return this.on( types, selector, data, fn, 1 ); + return on( this, types, selector, data, fn, 1 ); }, off: function( types, selector, fn ) { var handleObj, type; if ( types && types.preventDefault && types.handleObj ) { + // ( event ) dispatched jQuery.Event handleObj = types.handleObj; jQuery( types.delegateTarget ).off( - handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType, + handleObj.namespace ? + handleObj.origType + "." + handleObj.namespace : + handleObj.origType, handleObj.selector, handleObj.handler ); return this; } if ( typeof types === "object" ) { + // ( types-object [, selector] ) for ( type in types ) { this.off( type, selector, types[ type ] ); @@ -4879,6 +5100,7 @@ jQuery.fn.extend({ return this; } if ( selector === false || typeof selector === "function" ) { + // ( types [, fn] ) fn = selector; selector = undefined; @@ -4886,70 +5108,39 @@ jQuery.fn.extend({ if ( fn === false ) { fn = returnFalse; } - return this.each(function() { + return this.each( function() { jQuery.event.remove( this, types, fn, selector ); - }); - }, - - trigger: function( type, data ) { - return this.each(function() { - jQuery.event.trigger( type, data, this ); - }); - }, - triggerHandler: function( type, data ) { - var elem = this[0]; - if ( elem ) { - return jQuery.event.trigger( type, data, elem, true ); - } + } ); } -}); +} ); var - rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi, - rtagName = /<([\w:]+)/, - rhtml = /<|&#?\w+;/, - rnoInnerhtml = /<(?:script|style|link)/i, + rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi, + + // Support: IE 10-11, Edge 10240+ + // In IE/Edge using regex groups here causes severe slowdowns. + // See https://connect.microsoft.com/IE/feedback/details/1736512/ + rnoInnerhtml = /\s*$/g, + rcleanScript = /^\s*\s*$/g; - // We have to close these tags to support XHTML (#13200) - wrapMap = { - - // Support: IE9 - option: [ 1, "" ], - - thead: [ 1, "", "
" ], - col: [ 2, "", "
" ], - tr: [ 2, "", "
" ], - td: [ 3, "", "
" ], - - _default: [ 0, "", "" ] - }; - -// Support: IE9 -wrapMap.optgroup = wrapMap.option; - -wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; -wrapMap.th = wrapMap.td; - -// Support: 1.x compatibility -// Manipulating tables requires a tbody function manipulationTarget( elem, content ) { - return jQuery.nodeName( elem, "table" ) && - jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ? + if ( jQuery.nodeName( elem, "table" ) && + jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ) { - elem.getElementsByTagName("tbody")[0] || - elem.appendChild( elem.ownerDocument.createElement("tbody") ) : - elem; + return elem.getElementsByTagName( "tbody" )[ 0 ] || elem; + } + + return elem; } // Replace/restore the type attribute of script elements for safe DOM manipulation function disableScript( elem ) { - elem.type = (elem.getAttribute("type") !== null) + "/" + elem.type; + elem.type = ( elem.getAttribute( "type" ) !== null ) + "/" + elem.type; return elem; } function restoreScript( elem ) { @@ -4958,24 +5149,12 @@ function restoreScript( elem ) { if ( match ) { elem.type = match[ 1 ]; } else { - elem.removeAttribute("type"); + elem.removeAttribute( "type" ); } return elem; } -// Mark scripts as having already been evaluated -function setGlobalEval( elems, refElements ) { - var i = 0, - l = elems.length; - - for ( ; i < l; i++ ) { - data_priv.set( - elems[ i ], "globalEval", !refElements || data_priv.get( refElements[ i ], "globalEval" ) - ); - } -} - function cloneCopyEvent( src, dest ) { var i, l, type, pdataOld, pdataCur, udataOld, udataCur, events; @@ -4984,9 +5163,9 @@ function cloneCopyEvent( src, dest ) { } // 1. Copy private data: events, handlers, etc. - if ( data_priv.hasData( src ) ) { - pdataOld = data_priv.access( src ); - pdataCur = data_priv.set( dest, pdataOld ); + if ( dataPriv.hasData( src ) ) { + pdataOld = dataPriv.access( src ); + pdataCur = dataPriv.set( dest, pdataOld ); events = pdataOld.events; if ( events ) { @@ -5002,24 +5181,14 @@ function cloneCopyEvent( src, dest ) { } // 2. Copy user data - if ( data_user.hasData( src ) ) { - udataOld = data_user.access( src ); + if ( dataUser.hasData( src ) ) { + udataOld = dataUser.access( src ); udataCur = jQuery.extend( {}, udataOld ); - data_user.set( dest, udataCur ); + dataUser.set( dest, udataCur ); } } -function getAll( context, tag ) { - var ret = context.getElementsByTagName ? context.getElementsByTagName( tag || "*" ) : - context.querySelectorAll ? context.querySelectorAll( tag || "*" ) : - []; - - return tag === undefined || tag && jQuery.nodeName( context, tag ) ? - jQuery.merge( [ context ], ret ) : - ret; -} - // Fix IE bugs, see support tests function fixInput( src, dest ) { var nodeName = dest.nodeName.toLowerCase(); @@ -5034,7 +5203,122 @@ function fixInput( src, dest ) { } } -jQuery.extend({ +function domManip( collection, args, callback, ignored ) { + + // Flatten any nested arrays + args = concat.apply( [], args ); + + var fragment, first, scripts, hasScripts, node, doc, + i = 0, + l = collection.length, + iNoClone = l - 1, + value = args[ 0 ], + isFunction = jQuery.isFunction( value ); + + // We can't cloneNode fragments that contain checked, in WebKit + if ( isFunction || + ( l > 1 && typeof value === "string" && + !support.checkClone && rchecked.test( value ) ) ) { + return collection.each( function( index ) { + var self = collection.eq( index ); + if ( isFunction ) { + args[ 0 ] = value.call( this, index, self.html() ); + } + domManip( self, args, callback, ignored ); + } ); + } + + if ( l ) { + fragment = buildFragment( args, collection[ 0 ].ownerDocument, false, collection, ignored ); + first = fragment.firstChild; + + if ( fragment.childNodes.length === 1 ) { + fragment = first; + } + + // Require either new content or an interest in ignored elements to invoke the callback + if ( first || ignored ) { + scripts = jQuery.map( getAll( fragment, "script" ), disableScript ); + hasScripts = scripts.length; + + // Use the original fragment for the last item + // instead of the first because it can end up + // being emptied incorrectly in certain situations (#8070). + for ( ; i < l; i++ ) { + node = fragment; + + if ( i !== iNoClone ) { + node = jQuery.clone( node, true, true ); + + // Keep references to cloned scripts for later restoration + if ( hasScripts ) { + + // Support: Android<4.1, PhantomJS<2 + // push.apply(_, arraylike) throws on ancient WebKit + jQuery.merge( scripts, getAll( node, "script" ) ); + } + } + + callback.call( collection[ i ], node, i ); + } + + if ( hasScripts ) { + doc = scripts[ scripts.length - 1 ].ownerDocument; + + // Reenable scripts + jQuery.map( scripts, restoreScript ); + + // Evaluate executable scripts on first document insertion + for ( i = 0; i < hasScripts; i++ ) { + node = scripts[ i ]; + if ( rscriptType.test( node.type || "" ) && + !dataPriv.access( node, "globalEval" ) && + jQuery.contains( doc, node ) ) { + + if ( node.src ) { + + // Optional AJAX dependency, but won't run scripts if not present + if ( jQuery._evalUrl ) { + jQuery._evalUrl( node.src ); + } + } else { + jQuery.globalEval( node.textContent.replace( rcleanScript, "" ) ); + } + } + } + } + } + } + + return collection; +} + +function remove( elem, selector, keepData ) { + var node, + nodes = selector ? jQuery.filter( selector, elem ) : elem, + i = 0; + + for ( ; ( node = nodes[ i ] ) != null; i++ ) { + if ( !keepData && node.nodeType === 1 ) { + jQuery.cleanData( getAll( node ) ); + } + + if ( node.parentNode ) { + if ( keepData && jQuery.contains( node.ownerDocument, node ) ) { + setGlobalEval( getAll( node, "script" ) ); + } + node.parentNode.removeChild( node ); + } + } + + return elem; +} + +jQuery.extend( { + htmlPrefilter: function( html ) { + return html.replace( rxhtmlTag, "<$1>" ); + }, + clone: function( elem, dataAndEvents, deepDataAndEvents ) { var i, l, srcElements, destElements, clone = elem.cloneNode( true ), @@ -5077,102 +5361,14 @@ jQuery.extend({ return clone; }, - buildFragment: function( elems, context, scripts, selection ) { - var elem, tmp, tag, wrap, contains, j, - fragment = context.createDocumentFragment(), - nodes = [], - i = 0, - l = elems.length; - - for ( ; i < l; i++ ) { - elem = elems[ i ]; - - if ( elem || elem === 0 ) { - - // Add nodes directly - if ( jQuery.type( elem ) === "object" ) { - // Support: QtWebKit, PhantomJS - // push.apply(_, arraylike) throws on ancient WebKit - jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem ); - - // Convert non-html into a text node - } else if ( !rhtml.test( elem ) ) { - nodes.push( context.createTextNode( elem ) ); - - // Convert html into DOM nodes - } else { - tmp = tmp || fragment.appendChild( context.createElement("div") ); - - // Deserialize a standard representation - tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase(); - wrap = wrapMap[ tag ] || wrapMap._default; - tmp.innerHTML = wrap[ 1 ] + elem.replace( rxhtmlTag, "<$1>" ) + wrap[ 2 ]; - - // Descend through wrappers to the right content - j = wrap[ 0 ]; - while ( j-- ) { - tmp = tmp.lastChild; - } - - // Support: QtWebKit, PhantomJS - // push.apply(_, arraylike) throws on ancient WebKit - jQuery.merge( nodes, tmp.childNodes ); - - // Remember the top-level container - tmp = fragment.firstChild; - - // Ensure the created nodes are orphaned (#12392) - tmp.textContent = ""; - } - } - } - - // Remove wrapper from fragment - fragment.textContent = ""; - - i = 0; - while ( (elem = nodes[ i++ ]) ) { - - // #4087 - If origin and destination elements are the same, and this is - // that element, do not do anything - if ( selection && jQuery.inArray( elem, selection ) !== -1 ) { - continue; - } - - contains = jQuery.contains( elem.ownerDocument, elem ); - - // Append to fragment - tmp = getAll( fragment.appendChild( elem ), "script" ); - - // Preserve script evaluation history - if ( contains ) { - setGlobalEval( tmp ); - } - - // Capture executables - if ( scripts ) { - j = 0; - while ( (elem = tmp[ j++ ]) ) { - if ( rscriptType.test( elem.type || "" ) ) { - scripts.push( elem ); - } - } - } - } - - return fragment; - }, - cleanData: function( elems ) { - var data, elem, type, key, + var data, elem, type, special = jQuery.event.special, i = 0; - for ( ; (elem = elems[ i ]) !== undefined; i++ ) { - if ( jQuery.acceptData( elem ) ) { - key = elem[ data_priv.expando ]; - - if ( key && (data = data_priv.cache[ key ]) ) { + for ( ; ( elem = elems[ i ] ) !== undefined; i++ ) { + if ( acceptData( elem ) ) { + if ( ( data = elem[ dataPriv.expando ] ) ) { if ( data.events ) { for ( type in data.events ) { if ( special[ type ] ) { @@ -5184,91 +5380,86 @@ jQuery.extend({ } } } - if ( data_priv.cache[ key ] ) { - // Discard any remaining `private` data - delete data_priv.cache[ key ]; - } + + // Support: Chrome <= 35-45+ + // Assign undefined instead of using delete, see Data#remove + elem[ dataPriv.expando ] = undefined; + } + if ( elem[ dataUser.expando ] ) { + + // Support: Chrome <= 35-45+ + // Assign undefined instead of using delete, see Data#remove + elem[ dataUser.expando ] = undefined; } } - // Discard any remaining `user` data - delete data_user.cache[ elem[ data_user.expando ] ]; } } -}); +} ); + +jQuery.fn.extend( { + + // Keep domManip exposed until 3.0 (gh-2225) + domManip: domManip, + + detach: function( selector ) { + return remove( this, selector, true ); + }, + + remove: function( selector ) { + return remove( this, selector ); + }, -jQuery.fn.extend({ text: function( value ) { return access( this, function( value ) { return value === undefined ? jQuery.text( this ) : - this.empty().each(function() { + this.empty().each( function() { if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { this.textContent = value; } - }); + } ); }, null, value, arguments.length ); }, append: function() { - return this.domManip( arguments, function( elem ) { + return domManip( this, arguments, function( elem ) { if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { var target = manipulationTarget( this, elem ); target.appendChild( elem ); } - }); + } ); }, prepend: function() { - return this.domManip( arguments, function( elem ) { + return domManip( this, arguments, function( elem ) { if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { var target = manipulationTarget( this, elem ); target.insertBefore( elem, target.firstChild ); } - }); + } ); }, before: function() { - return this.domManip( arguments, function( elem ) { + return domManip( this, arguments, function( elem ) { if ( this.parentNode ) { this.parentNode.insertBefore( elem, this ); } - }); + } ); }, after: function() { - return this.domManip( arguments, function( elem ) { + return domManip( this, arguments, function( elem ) { if ( this.parentNode ) { this.parentNode.insertBefore( elem, this.nextSibling ); } - }); - }, - - remove: function( selector, keepData /* Internal Use Only */ ) { - var elem, - elems = selector ? jQuery.filter( selector, this ) : this, - i = 0; - - for ( ; (elem = elems[i]) != null; i++ ) { - if ( !keepData && elem.nodeType === 1 ) { - jQuery.cleanData( getAll( elem ) ); - } - - if ( elem.parentNode ) { - if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) { - setGlobalEval( getAll( elem, "script" ) ); - } - elem.parentNode.removeChild( elem ); - } - } - - return this; + } ); }, empty: function() { var elem, i = 0; - for ( ; (elem = this[i]) != null; i++ ) { + for ( ; ( elem = this[ i ] ) != null; i++ ) { if ( elem.nodeType === 1 ) { // Prevent memory leaks @@ -5286,9 +5477,9 @@ jQuery.fn.extend({ dataAndEvents = dataAndEvents == null ? false : dataAndEvents; deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents; - return this.map(function() { + return this.map( function() { return jQuery.clone( this, dataAndEvents, deepDataAndEvents ); - }); + } ); }, html: function( value ) { @@ -5305,7 +5496,7 @@ jQuery.fn.extend({ if ( typeof value === "string" && !rnoInnerhtml.test( value ) && !wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) { - value = value.replace( rxhtmlTag, "<$1>" ); + value = jQuery.htmlPrefilter( value ); try { for ( ; i < l; i++ ) { @@ -5321,7 +5512,7 @@ jQuery.fn.extend({ elem = 0; // If using innerHTML throws an exception, use the fallback method - } catch( e ) {} + } catch ( e ) {} } if ( elem ) { @@ -5331,115 +5522,25 @@ jQuery.fn.extend({ }, replaceWith: function() { - var arg = arguments[ 0 ]; + var ignored = []; - // Make the changes, replacing each context element with the new content - this.domManip( arguments, function( elem ) { - arg = this.parentNode; + // Make the changes, replacing each non-ignored context element with the new content + return domManip( this, arguments, function( elem ) { + var parent = this.parentNode; - jQuery.cleanData( getAll( this ) ); - - if ( arg ) { - arg.replaceChild( elem, this ); - } - }); - - // Force removal if there was no new content (e.g., from empty arguments) - return arg && (arg.length || arg.nodeType) ? this : this.remove(); - }, - - detach: function( selector ) { - return this.remove( selector, true ); - }, - - domManip: function( args, callback ) { - - // Flatten any nested arrays - args = concat.apply( [], args ); - - var fragment, first, scripts, hasScripts, node, doc, - i = 0, - l = this.length, - set = this, - iNoClone = l - 1, - value = args[ 0 ], - isFunction = jQuery.isFunction( value ); - - // We can't cloneNode fragments that contain checked, in WebKit - if ( isFunction || - ( l > 1 && typeof value === "string" && - !support.checkClone && rchecked.test( value ) ) ) { - return this.each(function( index ) { - var self = set.eq( index ); - if ( isFunction ) { - args[ 0 ] = value.call( this, index, self.html() ); - } - self.domManip( args, callback ); - }); - } - - if ( l ) { - fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, this ); - first = fragment.firstChild; - - if ( fragment.childNodes.length === 1 ) { - fragment = first; - } - - if ( first ) { - scripts = jQuery.map( getAll( fragment, "script" ), disableScript ); - hasScripts = scripts.length; - - // Use the original fragment for the last item instead of the first because it can end up - // being emptied incorrectly in certain situations (#8070). - for ( ; i < l; i++ ) { - node = fragment; - - if ( i !== iNoClone ) { - node = jQuery.clone( node, true, true ); - - // Keep references to cloned scripts for later restoration - if ( hasScripts ) { - // Support: QtWebKit - // jQuery.merge because push.apply(_, arraylike) throws - jQuery.merge( scripts, getAll( node, "script" ) ); - } - } - - callback.call( this[ i ], node, i ); - } - - if ( hasScripts ) { - doc = scripts[ scripts.length - 1 ].ownerDocument; - - // Reenable scripts - jQuery.map( scripts, restoreScript ); - - // Evaluate executable scripts on first document insertion - for ( i = 0; i < hasScripts; i++ ) { - node = scripts[ i ]; - if ( rscriptType.test( node.type || "" ) && - !data_priv.access( node, "globalEval" ) && jQuery.contains( doc, node ) ) { - - if ( node.src ) { - // Optional AJAX dependency, but won't run scripts if not present - if ( jQuery._evalUrl ) { - jQuery._evalUrl( node.src ); - } - } else { - jQuery.globalEval( node.textContent.replace( rcleanScript, "" ) ); - } - } - } + if ( jQuery.inArray( this, ignored ) < 0 ) { + jQuery.cleanData( getAll( this ) ); + if ( parent ) { + parent.replaceChild( elem, this ); } } - } - return this; + // Force callback invocation + }, ignored ); } -}); +} ); -jQuery.each({ +jQuery.each( { appendTo: "append", prependTo: "prepend", insertBefore: "before", @@ -5464,28 +5565,29 @@ jQuery.each({ return this.pushStack( ret ); }; -}); +} ); var iframe, - elemdisplay = {}; + elemdisplay = { + + // Support: Firefox + // We have to pre-define these values for FF (#10227) + HTML: "block", + BODY: "block" + }; /** * Retrieve the actual display of a element * @param {String} name nodeName of the element * @param {Object} doc Document object */ + // Called only from within defaultDisplay function actualDisplay( name, doc ) { - var style, - elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ), + var elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ), - // getDefaultComputedStyle might be reliably used only on attached element - display = window.getDefaultComputedStyle && ( style = window.getDefaultComputedStyle( elem[ 0 ] ) ) ? - - // Use of this method is a temporary fix (more like optimization) until something better comes along, - // since it was removed from specification and supported only in FF - style.display : jQuery.css( elem[ 0 ], "display" ); + display = jQuery.css( elem[ 0 ], "display" ); // We don't have any data stored on the element, // so use "detach" method as fast way to get rid of the element @@ -5509,7 +5611,8 @@ function defaultDisplay( nodeName ) { if ( display === "none" || !display ) { // Use the already-created iframe if possible - iframe = (iframe || jQuery( "