From 983d3606df2879b6cd704bdc654eb784803ff791 Mon Sep 17 00:00:00 2001 From: Rafael dos Santos Silva Date: Thu, 27 Aug 2015 18:37:52 -0300 Subject: [PATCH 001/157] Fix same domains links on subfolder installs isInternal link handling logic needs to test if the link is inside the same subfolder --- app/assets/javascripts/discourse/lib/url.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6 index f94c4c2bd5..b9a56ba4af 100644 --- a/app/assets/javascripts/discourse/lib/url.js.es6 +++ b/app/assets/javascripts/discourse/lib/url.js.es6 @@ -271,7 +271,7 @@ const DiscourseURL = Ember.Object.createWithMixins({ // This has been extracted so it can be tested. origin: function() { - return window.location.origin; + return Discourse.BaseUrl + Discourse.BaseUri; }, /** From 0b20ded4fb3b9e44793a3fcf701856d4bdf9c6e3 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Wed, 2 Sep 2015 17:18:24 +0800 Subject: [PATCH 002/157] FIX: Timegap only shows up for sequential posts. --- .../discourse/components/time-gap.js.es6 | 2 ++ .../discourse/models/post-stream.js.es6 | 17 ++++++----------- .../javascripts/discourse/templates/post.hbs | 2 +- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/app/assets/javascripts/discourse/components/time-gap.js.es6 b/app/assets/javascripts/discourse/components/time-gap.js.es6 index 3cd887ec43..9e410c4b73 100644 --- a/app/assets/javascripts/discourse/components/time-gap.js.es6 +++ b/app/assets/javascripts/discourse/components/time-gap.js.es6 @@ -2,6 +2,8 @@ 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() { diff --git a/app/assets/javascripts/discourse/models/post-stream.js.es6 b/app/assets/javascripts/discourse/models/post-stream.js.es6 index 9f625f3477..b8a71fd651 100644 --- a/app/assets/javascripts/discourse/models/post-stream.js.es6 +++ b/app/assets/javascripts/discourse/models/post-stream.js.es6 @@ -5,18 +5,13 @@ function calcDayDiff(p1, p2) { if (!p1) { return; } const date = p1.get('created_at'); - if (date) { - if (p2) { - const numDiff = p1.get('post_number') - p2.get('post_number'); - if (numDiff === 1) { - 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)); + 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); - } - } + p1.set('daysSincePrevious', days); } } } diff --git a/app/assets/javascripts/discourse/templates/post.hbs b/app/assets/javascripts/discourse/templates/post.hbs index 6790353025..0ea628c93a 100644 --- a/app/assets/javascripts/discourse/templates/post.hbs +++ b/app/assets/javascripts/discourse/templates/post.hbs @@ -1,7 +1,7 @@ {{post-gap post=this postStream=controller.model.postStream before="true"}} {{#if hasTimeGap}} - {{time-gap daysAgo=daysSincePrevious}} + {{time-gap daysAgo=daysSincePrevious postStream=controller.model.postStream}} {{/if}}
From cb787b99bdb7dbf54b3d036838dee867cfa98352 Mon Sep 17 00:00:00 2001 From: scossar Date: Tue, 8 Sep 2015 14:37:07 -0700 Subject: [PATCH 003/157] use outerHeight to calculate menu height --- app/assets/javascripts/discourse/components/menu-panel.js.es6 | 2 +- app/assets/javascripts/discourse/views/header.js.es6 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/components/menu-panel.js.es6 b/app/assets/javascripts/discourse/components/menu-panel.js.es6 index 13330f21a4..8961e9f931 100644 --- a/app/assets/javascripts/discourse/components/menu-panel.js.es6 +++ b/app/assets/javascripts/discourse/components/menu-panel.js.es6 @@ -56,7 +56,7 @@ export default Ember.Component.extend({ } $panelBody.height('100%'); - this.$().css({ left: "auto", top: (menuTop - 2) + "px", height }); + this.$().css({ left: "auto", top: (menuTop) + "px", height }); $('body').removeClass('drop-down-visible'); } diff --git a/app/assets/javascripts/discourse/views/header.js.es6 b/app/assets/javascripts/discourse/views/header.js.es6 index 17062acde2..add2ce107e 100644 --- a/app/assets/javascripts/discourse/views/header.js.es6 +++ b/app/assets/javascripts/discourse/views/header.js.es6 @@ -51,5 +51,5 @@ export function headerHeight() { const $header = $('header.d-header'); const headerOffset = $header.offset(); const headerOffsetTop = (headerOffset) ? headerOffset.top : 0; - return parseInt($header.height() + headerOffsetTop - $(window).scrollTop() + 5); + return parseInt($header.outerHeight() + headerOffsetTop - $(window).scrollTop()); } From 4f890a439cdd113c58bdb379a55381a4738d1a37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Wed, 9 Sep 2015 17:41:34 +0200 Subject: [PATCH 004/157] FIX: automatically load pages of topics list until it fills up the entire screen --- .../discourse/mixins/load-more.js.es6 | 11 ++++--- .../discourse/mixins/scrolling.js.es6 | 24 +++++++------- .../discourse/views/discovery-topics.js.es6 | 33 ++++++++++--------- 3 files changed, 36 insertions(+), 32 deletions(-) diff --git a/app/assets/javascripts/discourse/mixins/load-more.js.es6 b/app/assets/javascripts/discourse/mixins/load-more.js.es6 index d0e63e4ba4..69a7534f70 100644 --- a/app/assets/javascripts/discourse/mixins/load-more.js.es6 +++ b/app/assets/javascripts/discourse/mixins/load-more.js.es6 @@ -1,5 +1,6 @@ import Eyeline from 'discourse/lib/eyeline'; import Scrolling from 'discourse/mixins/scrolling'; +import { on } from 'ember-addons/ember-computed-decorators'; // Provides the ability to load more items for a view which is scrolled to the bottom. export default Ember.Mixin.create(Ember.ViewTargetActionSupport, Scrolling, { @@ -9,15 +10,17 @@ export default Ember.Mixin.create(Ember.ViewTargetActionSupport, Scrolling, { if (eyeline) { eyeline.update(); } }, - _bindEyeline: function() { + @on("didInsertElement") + _bindEyeline() { const eyeline = new Eyeline(this.get('eyelineSelector') + ":last"); this.set('eyeline', eyeline); eyeline.on('sawBottom', () => this.send('loadMore')); this.bindScrolling(); - }.on('didInsertElement'), + }, - _removeEyeline: function() { + @on("willDestroyElement") + _removeEyeline() { this.unbindScrolling(); - }.on('willDestroyElement') + } }); diff --git a/app/assets/javascripts/discourse/mixins/scrolling.js.es6 b/app/assets/javascripts/discourse/mixins/scrolling.js.es6 index ffa40294f0..b9f75d3df1 100644 --- a/app/assets/javascripts/discourse/mixins/scrolling.js.es6 +++ b/app/assets/javascripts/discourse/mixins/scrolling.js.es6 @@ -6,16 +6,16 @@ import debounce from 'discourse/lib/debounce'; easier. **/ const ScrollingDOMMethods = { - bindOnScroll: function(onScrollMethod, name) { + bindOnScroll(onScrollMethod, name) { name = name || 'default'; - $(document).bind('touchmove.discourse-' + name, onScrollMethod); - $(window).bind('scroll.discourse-' + name, onScrollMethod); + $(document).bind(`touchmove.discourse-${name}`, onScrollMethod); + $(window).bind(`scroll.discourse-${name}`, onScrollMethod); }, - unbindOnScroll: function(name) { + unbindOnScroll(name) { name = name || 'default'; - $(window).unbind('scroll.discourse-' + name); - $(document).unbind('touchmove.discourse-' + name); + $(window).unbind(`scroll.discourse-${name}`); + $(document).unbind(`touchmove.discourse-${name}`); } }; @@ -23,16 +23,15 @@ const Scrolling = Ember.Mixin.create({ // Begin watching for scroll events. By default they will be called at max every 100ms. // call with {debounce: N} for a diff time - bindScrolling: function(opts) { - opts = opts || {debounce: 100}; + bindScrolling(opts) { + opts = opts || { debounce: 100 }; // So we can not call the scrolled event while transitioning const router = Discourse.__container__.lookup('router:main').router; - const self = this; - var onScrollMethod = function() { + let onScrollMethod = () => { if (router.activeTransition) { return; } - return Em.run.scheduleOnce('afterRender', self, 'scrolled'); + return Ember.run.scheduleOnce('afterRender', this, 'scrolled'); }; if (opts.debounce) { @@ -40,10 +39,9 @@ const Scrolling = Ember.Mixin.create({ } ScrollingDOMMethods.bindOnScroll(onScrollMethod, opts.name); - Em.run.scheduleOnce('afterRender', onScrollMethod); }, - unbindScrolling: function(name) { + unbindScrolling(name) { ScrollingDOMMethods.unbindOnScroll(name); } }); diff --git a/app/assets/javascripts/discourse/views/discovery-topics.js.es6 b/app/assets/javascripts/discourse/views/discovery-topics.js.es6 index 448db126e5..7a7665d70c 100644 --- a/app/assets/javascripts/discourse/views/discovery-topics.js.es6 +++ b/app/assets/javascripts/discourse/views/discovery-topics.js.es6 @@ -1,5 +1,7 @@ import UrlRefresh from 'discourse/mixins/url-refresh'; import LoadMore from "discourse/mixins/load-more"; +import { on } from "ember-addons/ember-computed-decorators"; +import computed from "ember-addons/ember-computed-decorators"; export default Ember.View.extend(LoadMore, UrlRefresh, { eyelineSelector: '.topic-list-item', @@ -8,30 +10,31 @@ export default Ember.View.extend(LoadMore, UrlRefresh, { loadMore() { const self = this; Discourse.notifyTitle(0); - this.get('controller').loadMoreTopics().then(function (hasMoreResults) { - Em.run.schedule('afterRender', function() { - self.saveScrollPosition(); - }); + this.get('controller').loadMoreTopics().then(hasMoreResults => { + Ember.run.schedule('afterRender', () => self.saveScrollPosition()); if (!hasMoreResults) { - self.get('eyeline').flushRest(); + this.get('eyeline').flushRest(); + } else if ($(window).height() >= $(document).height()) { + this.send("loadMore"); } }); } }, - _readjustScrollPosition: function() { + @on("didInsertElement") + _readjustScrollPosition() { const scrollTo = this.session.get('topicListScrollPosition'); - - if (typeof scrollTo !== "undefined") { - Em.run.schedule('afterRender', function() { - $(window).scrollTop(scrollTo+1); - }); + if (scrollTo && scrollTo >= 0) { + Ember.run.schedule('afterRender', () => $(window).scrollTop(scrollTo + 1)); + } else if ($(window).height() >= $(document).height()) { + this.send("loadMore"); } - }.on('didInsertElement'), + }, - _updateTitle: function() { - Discourse.notifyTitle(this.get('controller.topicTrackingState.incomingCount')); - }.observes('controller.topicTrackingState.incomingCount'), + @computed("controller.topicTrackingState.incomingCount") + _updateTitle(incomingCount) { + Discourse.notifyTitle(incomingCount); + }, // Remember where we were scrolled to saveScrollPosition() { From 5b8917e5780fa68775aaba6ab1c590ccad33640a Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Wed, 9 Sep 2015 11:40:52 -0400 Subject: [PATCH 005/157] Version bump to v1.4.0.beta11 --- lib/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/version.rb b/lib/version.rb index aadc4d2233..f9256e88f2 100644 --- a/lib/version.rb +++ b/lib/version.rb @@ -5,7 +5,7 @@ module Discourse MAJOR = 1 MINOR = 4 TINY = 0 - PRE = 'beta10' + PRE = 'beta11' STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end From 9548876c2d6b5b14fe42c4fb4f5376ae293c880b Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 9 Sep 2015 11:52:25 -0400 Subject: [PATCH 006/157] FIX: Some keyboard commands should not fire when anonymous --- .../discourse/lib/keyboard-shortcuts.js.es6 | 137 +++++++++--------- 1 file changed, 66 insertions(+), 71 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 index 29dbc01d66..0172e8167c 100644 --- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 +++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 @@ -1,62 +1,53 @@ import DiscourseURL from 'discourse/lib/url'; -const PATH_BINDINGS = { - 'g h': '/', - 'g l': '/latest', - 'g n': '/new', - 'g u': '/unread', - 'g c': '/categories', - 'g t': '/top', - 'g b': '/bookmarks', - 'g p': '/my/activity', - 'g m': '/my/messages' - }, - - SELECTED_POST_BINDINGS = { - 'd': 'deletePost', - 'e': 'editPost', - 'l': 'toggleLike', - 'r': 'replyToPost', - '!': 'showFlags', - 't': 'replyAsNewTopic' - }, - - CLICK_BINDINGS = { - 'm m': 'div.notification-options li[data-id="0"] a', // mark topic as muted - 'm r': 'div.notification-options li[data-id="1"] a', // mark topic as regular - 'm t': 'div.notification-options li[data-id="2"] a', // mark topic as tracking - 'm w': 'div.notification-options li[data-id="3"] a', // mark topic as watching - 'x r': '#dismiss-new,#dismiss-new-top,#dismiss-posts,#dismiss-posts-top', // dismiss new/posts - 'x t': '#dismiss-topics,#dismiss-topics-top', // dismiss topics - '.': '.alert.alert-info.clickable', // show incoming/updated topics - 'o,enter': '.topic-list tr.selected a.title', // open selected topic - 'shift+s': '#topic-footer-buttons button.share', // share topic - 's': '.topic-post.selected a.post-date' // share post - }, - - FUNCTION_BINDINGS = { - 'c': 'createTopic', // create new topic - 'home': 'goToFirstPost', - '#': 'toggleProgress', - 'end': 'goToLastPost', - 'shift+j': 'nextSection', - 'j': 'selectDown', - 'shift+k': 'prevSection', - 'shift+p': 'pinUnpinTopic', - 'k': 'selectUp', - 'u': 'goBack', - '/': 'showSearch', - '=': 'toggleHamburgerMenu', - 'p': 'showCurrentUser', // open current user menu - 'ctrl+f': 'showBuiltinSearch', - 'command+f': 'showBuiltinSearch', - '?': 'showHelpModal', // open keyboard shortcut help - 'q': 'quoteReply', - 'b': 'toggleBookmark', - 'f': 'toggleBookmarkTopic', - 'shift+r': 'replyToTopic', - 'shift+z shift+z': 'logout' - }; +const bindings = { + '!': {postAction: 'showFlags'}, + '#': {handler: 'toggleProgress', anonymous: true}, + '/': {handler: 'showSearch', anonymous: true}, + '=': {handler: 'toggleHamburgerMenu', anonymous: true}, + '?': {handler: 'showHelpModal', anonymous: true}, + '.': {click: '.alert.alert-info.clickable', anonymous: true}, // show incoming/updated topics + 'b': {handler: 'toggleBookmark'}, + 'c': {handler: 'createTopic'}, + 'ctrl+f': {handler: 'showBuiltinSearch', anonymous: true}, + 'command+f': {handler: 'showBuiltinSearch', anonymous: true}, + 'd': {postAction: 'deletePost'}, + 'e': {postAction: 'editPost'}, + 'end': {handler: 'goToLastPost', anonymous: true}, + 'f': {handler: 'toggleBookmarkTopic'}, + 'g h': {path: '/', anonymous: true}, + 'g l': {path: '/latest', anonymous: true}, + 'g n': {path: '/new'}, + 'g u': {path: '/unread'}, + 'g c': {path: '/categories', anonymous: true}, + 'g t': {path: '/top', anonymous: true}, + 'g b': {path: '/bookmarks'}, + 'g p': {path: '/my/activity'}, + 'g m': {path: '/my/messages'}, + 'home': {handler: 'goToFirstPost', anonymous: true}, + 'j': {handler: 'selectDown', anonymous: true}, + 'k': {handler: 'selectUp', anonymous: true}, + 'l': {postAction: 'toggleLike'}, + 'm m': {click: 'div.notification-options li[data-id="0"] a'}, // mark topic as muted + 'm r': {click: 'div.notification-options li[data-id="1"] a'}, // mark topic as regular + 'm t': {click: 'div.notification-options li[data-id="2"] a'}, // mark topic as tracking + 'm w': {click: 'div.notification-options li[data-id="3"] a'}, // mark topic as watching + 'o,enter': {click: '.topic-list tr.selected a.title', anonymous: true}, // open selected topic + 'p': {handler: 'showCurrentUser'}, + 'q': {handler: 'quoteReply'}, + 'r': {postAction: 'replyToPost'}, + 's': {click: '.topic-post.selected a.post-date', anonymous: true}, // share post + 'shift+j': {handler: 'nextSection', anonymous: true}, + 'shift+k': {handler: 'prevSection', anonymous: true}, + 'shift+p': {handler: 'pinUnpinTopic'}, + 'shift+r': {handler: 'replyToTopic'}, + 'shift+s': {click: '#topic-footer-buttons button.share', anonymous: true}, // share topic + 'shift+z shift+z': {handler: 'logout'}, + 't': {postAction: 'replyAsNewTopic'}, + 'u': {handler: 'goBack', anonymous: true}, + 'x r': {click: '#dismiss-new,#dismiss-new-top,#dismiss-posts,#dismiss-posts-top'}, // dismiss new/posts + 'x t': {click: '#dismiss-topics,#dismiss-topics-top'} // dismiss topics +}; export default { @@ -65,14 +56,24 @@ export default { this.container = container; this._stopCallback(); - this.searchService = this.container.lookup('search-service:main'); this.appEvents = this.container.lookup('app-events:main'); + this.currentUser = this.container.lookup('current-user:main'); - _.each(PATH_BINDINGS, this._bindToPath, this); - _.each(CLICK_BINDINGS, this._bindToClick, this); - _.each(SELECTED_POST_BINDINGS, this._bindToSelectedPost, this); - _.each(FUNCTION_BINDINGS, this._bindToFunction, this); + Object.keys(bindings).forEach(key => { + const binding = bindings[key]; + if (!binding.anonymous && !this.currentUser) { return; } + + if (binding.path) { + this._bindToPath(binding.path, key); + } else if (binding.handler) { + this._bindToFunction(binding.handler, key); + } else if (binding.postAction) { + this._bindToSelectedPost(binding.postAction, key); + } else if (binding.click) { + this._bindToClick(binding.click, key); + } + }); }, toggleBookmark() { @@ -223,17 +224,11 @@ export default { }, _bindToSelectedPost(action, binding) { - const self = this; - - this.keyTrapper.bind(binding, function() { - self.sendToSelectedPost(action); - }); + this.keyTrapper.bind(binding, () => this.sendToSelectedPost(action)); }, - _bindToPath(path, binding) { - this.keyTrapper.bind(binding, function() { - DiscourseURL.routeTo(path); - }); + _bindToPath(path, key) { + this.keyTrapper.bind(key, () => DiscourseURL.routeTo(path)); }, _bindToClick(selector, binding) { From b3d2982be7d40ff632afcd1c3cbe8c9e78a632be Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 9 Sep 2015 14:06:36 -0400 Subject: [PATCH 007/157] FIX: Allow trailing `_` because we used to. --- app/models/username_validator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/username_validator.rb b/app/models/username_validator.rb index b93ef78a03..ac9adcc95e 100644 --- a/app/models/username_validator.rb +++ b/app/models/username_validator.rb @@ -75,7 +75,7 @@ class UsernameValidator def username_last_char_valid? return unless errors.empty? - if username[-1] =~ /[^A-Za-z0-9]/ + if username[-1] =~ /[^A-Za-z0-9_]/ self.errors << I18n.t(:'user.username.must_end_with_alphanumeric') end end From 74eacba12f7c4ca6103c34a8551da17ff025c865 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Wed, 9 Sep 2015 14:46:40 -0400 Subject: [PATCH 008/157] FIX: long category names overflow outside of box style badges --- app/assets/stylesheets/common/components/badges.css.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/assets/stylesheets/common/components/badges.css.scss b/app/assets/stylesheets/common/components/badges.css.scss index ed6dec22eb..d3bd4a6b28 100644 --- a/app/assets/stylesheets/common/components/badges.css.scss +++ b/app/assets/stylesheets/common/components/badges.css.scss @@ -101,6 +101,8 @@ span { display: block; + overflow: hidden; + text-overflow: ellipsis; &.badge-category-bg, &.badge-category-parent-bg { position: absolute; From 8a11f7f6c166cea3254690244745324b53a624c2 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 9 Sep 2015 15:05:07 -0400 Subject: [PATCH 009/157] Remove `console.log` --- .../javascripts/discourse/templates/components/user-menu.hbs | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/javascripts/discourse/templates/components/user-menu.hbs b/app/assets/javascripts/discourse/templates/components/user-menu.hbs index bba85df8d9..0fa99d740a 100644 --- a/app/assets/javascripts/discourse/templates/components/user-menu.hbs +++ b/app/assets/javascripts/discourse/templates/components/user-menu.hbs @@ -8,7 +8,6 @@ {{/if}}
  • {{d-link path=bookmarksPath title="user.bookmarks" icon="bookmark"}} - {{log siteSettings}} {{#if siteSettings.enable_private_messages}} {{d-link path=messagesPath title="user.private_messages" icon="envelope"}} {{/if}} From 9f826f1ad6b90f5cd4bfd62ed610fa3605a8958e Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 9 Sep 2015 15:18:09 -0400 Subject: [PATCH 010/157] UX: Change style of "New" next to unread FAQ --- .../discourse/templates/components/hamburger-menu.hbs | 4 ++-- app/assets/javascripts/discourse/templates/user-card.hbs | 2 +- config/locales/client.en.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs b/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs index 8daa315a02..ee75d18a76 100644 --- a/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs +++ b/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs @@ -1,10 +1,10 @@ {{#menu-panel visible=visible}} {{#unless currentUser.read_faq}} {{#menu-links}} -
  • +
  • {{#d-link path=faqUrl class="faq-link"}} {{i18n "faq"}} - {{i18n "new_item"}} + {{i18n "new_item"}} {{/d-link}}
    • {{/menu-links}} diff --git a/app/assets/javascripts/discourse/templates/user-card.hbs b/app/assets/javascripts/discourse/templates/user-card.hbs index ce4fdb9281..a6b30ca57e 100644 --- a/app/assets/javascripts/discourse/templates/user-card.hbs +++ b/app/assets/javascripts/discourse/templates/user-card.hbs @@ -16,7 +16,7 @@ {{#if user.title}}

    {{user.title}}

    {{/if}} - + {{plugin-outlet "user-card-post-names"}}
    diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 36c1f56dd3..6c30944c10 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -958,7 +958,7 @@ en: private_messages: "Search messages" hamburger_menu: "go to another topic list or category" - new_item: "New!" + new_item: "new" go_back: 'go back' not_logged_in_user: 'user page with summary of current activity and preferences' current_user: 'go to your user page' From 2922cc3036a4a28f55d50a2777f35fcf66944596 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Wed, 9 Sep 2015 16:05:02 -0400 Subject: [PATCH 011/157] UX: mobile topic list: move post count to right side of topic title --- .../templates/mobile/list/topic_list_item.raw.hbs | 7 +++++-- app/assets/stylesheets/mobile/topic-list.scss | 10 +++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.raw.hbs b/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.raw.hbs index 972acfa16a..01937421ae 100644 --- a/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.raw.hbs +++ b/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.raw.hbs @@ -1,5 +1,5 @@ -
    +
    {{raw "topic-status" topic=content}} {{topic-link content}} {{#if controller.showTopicPostBadges}} @@ -7,6 +7,10 @@ {{/if}} {{raw "list/topic-excerpt" topic=content}}
    +
    + {{raw "list/posts-count-column" topic=content tagName="div"}} +
    +
    {{#unless controller.hideCategory}} @@ -17,7 +21,6 @@ {{plugin-outlet "topic-list-tags"}}
    - {{raw "list/posts-count-column" topic=content tagName="div"}}
    {{content.last_poster_username}} {{raw "list/activity-column" topic=content tagName="span" class="age"}} diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss index 859998d3e5..6922da71c2 100644 --- a/app/assets/stylesheets/mobile/topic-list.scss +++ b/app/assets/stylesheets/mobile/topic-list.scss @@ -350,8 +350,16 @@ button.dismiss-read { // base defines extra padding for easier click/top of title field // this is a bit too much for mobile -td.main-link { +td .main-link { + width: 80%; + display: inline-block; a.title { padding: 5px 10px 5px 0; } } +.topic-list-item { + .posts-map { + font-size: 1.071em; + padding-top: 2px; + } +} From bc52b721452285220aed1d003357b71f92c7b27a Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Wed, 9 Sep 2015 16:20:04 -0400 Subject: [PATCH 012/157] FIX: long category names overflow outside of bullet style category badges --- app/assets/stylesheets/common/components/badges.css.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/assets/stylesheets/common/components/badges.css.scss b/app/assets/stylesheets/common/components/badges.css.scss index d3bd4a6b28..96eefe1577 100644 --- a/app/assets/stylesheets/common/components/badges.css.scss +++ b/app/assets/stylesheets/common/components/badges.css.scss @@ -59,6 +59,8 @@ span.badge-category { color: $primary !important; display: inline-block; + overflow: hidden; + text-overflow: ellipsis; #search-dropdown & { margin-top: -2px; From 3ceadbd5b8e181e539bfbf7f98c0b01d0d31c894 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 9 Sep 2015 16:20:08 -0400 Subject: [PATCH 013/157] FIX: Allow qunit tests to run in browser by stubbing new functionality --- app/assets/javascripts/discourse/mixins/load-more.js.es6 | 6 ++++++ app/assets/javascripts/discourse/mixins/scrolling.js.es6 | 6 ++++++ .../javascripts/discourse/views/discovery-topics.js.es6 | 4 ++-- test/javascripts/test_helper.js | 1 + 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/mixins/load-more.js.es6 b/app/assets/javascripts/discourse/mixins/load-more.js.es6 index 69a7534f70..415c43b5e2 100644 --- a/app/assets/javascripts/discourse/mixins/load-more.js.es6 +++ b/app/assets/javascripts/discourse/mixins/load-more.js.es6 @@ -10,6 +10,12 @@ export default Ember.Mixin.create(Ember.ViewTargetActionSupport, Scrolling, { if (eyeline) { eyeline.update(); } }, + loadMoreUnlessFull() { + if (this.screenNotFull()) { + this.send("loadMore"); + } + }, + @on("didInsertElement") _bindEyeline() { const eyeline = new Eyeline(this.get('eyelineSelector') + ":last"); diff --git a/app/assets/javascripts/discourse/mixins/scrolling.js.es6 b/app/assets/javascripts/discourse/mixins/scrolling.js.es6 index b9f75d3df1..e25af304e4 100644 --- a/app/assets/javascripts/discourse/mixins/scrolling.js.es6 +++ b/app/assets/javascripts/discourse/mixins/scrolling.js.es6 @@ -16,6 +16,10 @@ const ScrollingDOMMethods = { name = name || 'default'; $(window).unbind(`scroll.discourse-${name}`); $(document).unbind(`touchmove.discourse-${name}`); + }, + + screenNotFull() { + return $(window).height() >= $(document).height(); } }; @@ -41,6 +45,8 @@ const Scrolling = Ember.Mixin.create({ ScrollingDOMMethods.bindOnScroll(onScrollMethod, opts.name); }, + screenNotFull: () => ScrollingDOMMethods.screenNotFull(), + unbindScrolling(name) { ScrollingDOMMethods.unbindOnScroll(name); } diff --git a/app/assets/javascripts/discourse/views/discovery-topics.js.es6 b/app/assets/javascripts/discourse/views/discovery-topics.js.es6 index 7a7665d70c..ac6e897d60 100644 --- a/app/assets/javascripts/discourse/views/discovery-topics.js.es6 +++ b/app/assets/javascripts/discourse/views/discovery-topics.js.es6 @@ -26,8 +26,8 @@ export default Ember.View.extend(LoadMore, UrlRefresh, { const scrollTo = this.session.get('topicListScrollPosition'); if (scrollTo && scrollTo >= 0) { Ember.run.schedule('afterRender', () => $(window).scrollTop(scrollTo + 1)); - } else if ($(window).height() >= $(document).height()) { - this.send("loadMore"); + } else { + this.loadMoreUnlessFull(); } }, diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js index 08de7fdce3..5b9a489e06 100644 --- a/test/javascripts/test_helper.js +++ b/test/javascripts/test_helper.js @@ -105,6 +105,7 @@ QUnit.testStart(function(ctx) { PreloadStore.reset(); window.sandbox = sinon.sandbox.create(); + window.sandbox.stub(ScrollingDOMMethods, "screenNotFull"); window.sandbox.stub(ScrollingDOMMethods, "bindOnScroll"); window.sandbox.stub(ScrollingDOMMethods, "unbindOnScroll"); From ca8046c7c3f3d22124a1bd8d34d81ddc6c32a9e2 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 9 Sep 2015 15:51:43 -0400 Subject: [PATCH 014/157] FIX: Switch out topic template if the user hasn't changed it --- .../discourse/models/composer.js.es6 | 50 +++++++++++++++---- 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6 index 8e02989c87..12cba4936a 100644 --- a/app/assets/javascripts/discourse/models/composer.js.es6 +++ b/app/assets/javascripts/discourse/models/composer.js.es6 @@ -3,6 +3,7 @@ import Topic from 'discourse/models/topic'; import { throwAjaxError } from 'discourse/lib/ajax-error'; import Quote from 'discourse/lib/quote'; import Draft from 'discourse/models/draft'; +import computed from 'ember-addons/ember-computed-decorators'; const CLOSED = 'closed', SAVING = 'saving', @@ -35,11 +36,32 @@ const CLOSED = 'closed', }; const Composer = RestModel.extend({ + _categoryId: null, archetypes: function() { return this.site.get('archetypes'); }.property(), + + @computed + categoryId: { + get() { return this._categoryId; }, + + // We wrap categoryId this way so we can fire `applyTopicTemplate` with + // the previous value as well as the new value + set(categoryId) { + const oldCategoryId = this._categoryId; + + if (Ember.isEmpty(categoryId)) { categoryId = null; } + this._categoryId = categoryId; + + if (oldCategoryId !== categoryId) { + this.applyTopicTemplate(oldCategoryId, categoryId); + } + return categoryId; + } + }, + creatingTopic: Em.computed.equal('action', CREATE_TOPIC), creatingPrivateMessage: Em.computed.equal('action', PRIVATE_MESSAGE), notCreatingPrivateMessage: Em.computed.not('creatingPrivateMessage'), @@ -56,6 +78,7 @@ const Composer = RestModel.extend({ viewOpen: Em.computed.equal('composeState', OPEN), viewDraft: Em.computed.equal('composeState', DRAFT), + composeStateChanged: function() { var oldOpen = this.get('composerOpened'); @@ -339,20 +362,24 @@ const Composer = RestModel.extend({ this.keyValueStore.set({ key: 'composer.showPreview', value: this.get('showPreview') }); }, - applyTopicTemplate: function() { + applyTopicTemplate(oldCategoryId, categoryId) { if (this.get('action') !== CREATE_TOPIC) { return; } - if (!Ember.isEmpty(this.get('reply'))) { return; } + let reply = this.get('reply'); - const categoryId = this.get('categoryId'); - const category = this.site.categories.find((c) => c.get('id') === categoryId); - if (category) { - const topicTemplate = category.get('topic_template'); - if (!Ember.isEmpty(topicTemplate)) { - this.set('reply', topicTemplate); + // If the user didn't change the template, clear it + if (oldCategoryId) { + const oldCat = this.site.categories.findProperty('id', oldCategoryId); + if (oldCat && (oldCat.get('topic_template') === reply)) { + reply = ""; } } - }.observes('categoryId'), + if (!Ember.isEmpty(reply)) { return; } + const category = this.site.categories.findProperty('id', categoryId); + if (category) { + this.set('reply', category.get('topic_template') || ""); + } + }, /* Open a composer @@ -397,14 +424,15 @@ const Composer = RestModel.extend({ } } - const categoryId = opts.categoryId || this.get('topic.category.id'); this.setProperties({ - categoryId, archetypeId: opts.archetypeId || this.site.get('default_archetype'), metaData: opts.metaData ? Em.Object.create(opts.metaData) : null, reply: opts.reply || this.get("reply") || "" }); + // We set the category id separately for topic templates on opening of composer + this.set('categoryId', opts.categoryId || this.get('topic.category.id')); + if (opts.postId) { this.set('loading', true); this.store.find('post', opts.postId).then(function(post) { From b34b3293a3e20fb9f968aaa09992baa1e42ff4df Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 9 Sep 2015 17:00:07 -0400 Subject: [PATCH 015/157] FIX: Broken test --- test/javascripts/models/composer-test.js.es6 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/javascripts/models/composer-test.js.es6 b/test/javascripts/models/composer-test.js.es6 index c9c2e1dc87..a31c569cae 100644 --- a/test/javascripts/models/composer-test.js.es6 +++ b/test/javascripts/models/composer-test.js.es6 @@ -176,13 +176,13 @@ test('clearState', function() { test('initial category when uncategorized is allowed', function() { Discourse.SiteSettings.allow_uncategorized_topics = true; const composer = openComposer({action: 'createTopic', draftKey: 'asfd', draftSequence: 1}); - equal(composer.get('categoryId'),undefined,"Uncategorized by default"); + ok(!composer.get('categoryId'), "Uncategorized by default"); }); test('initial category when uncategorized is not allowed', function() { Discourse.SiteSettings.allow_uncategorized_topics = false; const composer = openComposer({action: 'createTopic', draftKey: 'asfd', draftSequence: 1}); - ok(composer.get('categoryId') === undefined, "Uncategorized by default. Must choose a category."); + ok(!composer.get('categoryId'), "Uncategorized by default. Must choose a category."); }); test('showPreview', function() { From 38cb72b3294230caee2ab7f11b8f90c43b68969d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Wed, 9 Sep 2015 23:14:06 +0200 Subject: [PATCH 016/157] FEATURE: upload placeholder --- app/assets/javascripts/discourse/lib/utilities.js | 4 ++++ .../javascripts/discourse/views/composer.js.es6 | 14 ++++++++++++-- config/locales/client.en.yml | 1 + 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/utilities.js b/app/assets/javascripts/discourse/lib/utilities.js index 05ed05cafc..20d9c53f5e 100644 --- a/app/assets/javascripts/discourse/lib/utilities.js +++ b/app/assets/javascripts/discourse/lib/utilities.js @@ -215,6 +215,10 @@ Discourse.Utilities = { } }, + getUploadPlaceholder: function(filename) { + return "[" + I18n.t("uploading_filename", { filename: filename }) + "]() "; + }, + isAnImage: function(path) { return (/\.(png|jpe?g|gif|bmp|tiff?|svg|webp)$/i).test(path); }, diff --git a/app/assets/javascripts/discourse/views/composer.js.es6 b/app/assets/javascripts/discourse/views/composer.js.es6 index b17c9c73ba..d96c6a55a4 100644 --- a/app/assets/javascripts/discourse/views/composer.js.es6 +++ b/app/assets/javascripts/discourse/views/composer.js.es6 @@ -322,8 +322,9 @@ const ComposerView = Ember.View.extend(Ember.Evented, { this.messageBus.subscribe("/uploads/composer", upload => { if (!cancelledByTheUser) { if (upload && upload.url) { - const markdown = Discourse.Utilities.getUploadMarkdown(upload); - this.addMarkdown(markdown + " "); + const old = Discourse.Utilities.getUploadPlaceholder(upload.original_filename), + markdown = Discourse.Utilities.getUploadMarkdown(upload); + this.replaceMarkdown(old, markdown); } else { Discourse.Utilities.displayErrorForUpload(upload); } @@ -350,6 +351,10 @@ const ComposerView = Ember.View.extend(Ember.Evented, { this.get("controller").send("closeModal"); // deal with cancellation cancelledByTheUser = false; + // add upload placeholder + const markdown = Discourse.Utilities.getUploadPlaceholder(data.files[0].name); + this.addMarkdown(markdown); + // if (data["xhr"]) { const jqHXR = data.xhr(); if (jqHXR) { @@ -502,6 +507,11 @@ const ComposerView = Ember.View.extend(Ember.Evented, { }); }, + replaceMarkdown(old, text) { + const reply = this.get("model.reply"); + this.set("model.reply", reply.replace(old, text)); + }, + // Uses javascript to get the image sizes from the preview, if present imageSizes() { const result = {}; diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 6c30944c10..d848566c54 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -245,6 +245,7 @@ en: upload: "Upload" uploading: "Uploading..." + uploading_filename: "Uploading {{filename}}..." uploaded: "Uploaded!" enable: "Enable" From 90ad943dd3bc358ab7fbdf130f91dae5e2677438 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 10 Sep 2015 11:54:17 +1000 Subject: [PATCH 017/157] PERF: skip optimizing large letter avatar makes image bigger --- lib/letter_avatar.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/letter_avatar.rb b/lib/letter_avatar.rb index 4b51056b8c..abde76ec08 100644 --- a/lib/letter_avatar.rb +++ b/lib/letter_avatar.rb @@ -45,6 +45,9 @@ class LetterAvatar fullsize = fullsize_path(identity) generate_fullsize(identity) if !cache || !File.exists?(fullsize) + # Optimizing here is dubious, it can save up to 2x for large images (eg 359px) + # BUT... we are talking 2400 bytes down to 1200 bytes, both fit in one packet + # The cost of this is huge, its a 40% perf hit OptimizedImage.resize(fullsize, filename, size, size) filename @@ -81,8 +84,7 @@ class LetterAvatar `convert #{instructions.join(" ")}` - ImageOptim.new.optimize_image!(filename) rescue nil - + ## do not optimize image, it will end up larger than original filename end From 60b9985158d6d2a6881af3473572e69695cbc78e Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 10 Sep 2015 12:30:21 +0800 Subject: [PATCH 018/157] FIX: Missing avatar in user autocomplete. --- .../discourse/templates/user-selector-autocomplete.raw.hbs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/templates/user-selector-autocomplete.raw.hbs b/app/assets/javascripts/discourse/templates/user-selector-autocomplete.raw.hbs index a1d67ee843..e0f26deae8 100644 --- a/app/assets/javascripts/discourse/templates/user-selector-autocomplete.raw.hbs +++ b/app/assets/javascripts/discourse/templates/user-selector-autocomplete.raw.hbs @@ -2,7 +2,8 @@
      {{#each user in options.users}}
    • - + {{avatar user imageSize="tiny"}} {{user.username}} {{user.name}} From cd8d82aa319532a58e6e78bc6e526bc1643297e6 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 10 Sep 2015 14:37:46 +1000 Subject: [PATCH 019/157] correct file size and add note about impending breakage of image_optim --- Gemfile | 3 ++- Gemfile.lock | 5 ++++- app/models/upload.rb | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index e8b2403e5a..2332689189 100644 --- a/Gemfile +++ b/Gemfile @@ -63,7 +63,8 @@ gem 'email_reply_parser' # note: for image_optim to correctly work you need to follow # https://github.com/toy/image_optim -gem 'image_optim' +# pinned due to https://github.com/toy/image_optim/pull/75, docker image must be upgraded to upgrade +gem 'image_optim', '0.20.2' gem 'multi_json' gem 'mustache' gem 'nokogiri' diff --git a/Gemfile.lock b/Gemfile.lock index 338070cfa7..44397f9df5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -422,7 +422,7 @@ DEPENDENCIES highline hiredis htmlentities - image_optim + image_optim (= 0.20.2) librarian (>= 0.0.25) listen (= 0.7.3) logster @@ -488,3 +488,6 @@ DEPENDENCIES uglifier unf unicorn + +BUNDLED WITH + 1.10.6 diff --git a/app/models/upload.rb b/app/models/upload.rb index 59a647f769..39e5fb94ef 100644 --- a/app/models/upload.rb +++ b/app/models/upload.rb @@ -100,6 +100,10 @@ class Upload < ActiveRecord::Base # optimize image ImageOptim.new.optimize_image!(file.path) rescue nil + + # correct size so it displays the optimized image size which is the only + # one that is stored + filesize = File.size(file.path) end # compute the sha of the file From 9ba5d73ddf3776c53d92316c0cbc79ea4a54e040 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Wed, 9 Sep 2015 22:16:15 -0700 Subject: [PATCH 020/157] omit needless words --- config/locales/client.en.yml | 2 +- config/locales/client.sq.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index d848566c54..7799a82545 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -937,7 +937,7 @@ en: local_tip: "select images from your device" local_tip_with_attachments: "select images or files from your device ({{authorized_extensions}})" hint: "(you can also drag & drop into the editor to upload them)" - hint_for_supported_browsers: "you can also drag and drop or paste images into the editor to upload them" + hint_for_supported_browsers: "you can also drag and drop or paste images into the editor" uploading: "Uploading" select_file: "Select File" image_link: "link your image will point to" diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml index 327fb5acc6..84e72ad583 100644 --- a/config/locales/client.sq.yml +++ b/config/locales/client.sq.yml @@ -787,7 +787,7 @@ sq: local_tip: "select images from your device" local_tip_with_attachments: "select images or files from your device ({{authorized_extensions}})" hint: "(you can also drag & drop into the editor to upload them)" - hint_for_supported_browsers: "you can also drag and drop or paste images into the editor to upload them" + hint_for_supported_browsers: "you can also drag and drop or paste images into the editor" uploading: "Duke ngarkaur" select_file: "Select File" image_link: "link your image will point to" From f6bc46937b4d14a28f9a754dc7ff14b1d8a7c750 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 10 Sep 2015 16:27:04 +1000 Subject: [PATCH 021/157] PERF: one less query --- app/serializers/current_user_serializer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb index 71306753bd..7236c2dc9e 100644 --- a/app/serializers/current_user_serializer.rb +++ b/app/serializers/current_user_serializer.rb @@ -42,7 +42,7 @@ class CurrentUserSerializer < BasicUserSerializer end def topic_count - object.topics.count + object.user_stat.topic_count end def reply_count From 0b9322d16aa730c98f17b158c24e54650cee50e8 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 10 Sep 2015 16:44:42 +1000 Subject: [PATCH 022/157] PERF: remove uneeded data, notification count is pointless Getting notification count is expensive, no point shipping it to clients --- app/assets/javascripts/discourse/templates/user/user.hbs | 1 - app/serializers/user_serializer.rb | 6 ------ 2 files changed, 7 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/user/user.hbs b/app/assets/javascripts/discourse/templates/user/user.hbs index 475708f4ff..28634a17f6 100644 --- a/app/assets/javascripts/discourse/templates/user/user.hbs +++ b/app/assets/javascripts/discourse/templates/user/user.hbs @@ -170,7 +170,6 @@ {{#link-to 'user.notifications'}} {{fa-icon "comment" class="glyph"}} {{i18n 'user.notifications'}} - ({{model.notification_count}}) {{/link-to}} {{/link-to}} {{/if}} diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb index a17dd36d2e..e09c4f8b45 100644 --- a/app/serializers/user_serializer.rb +++ b/app/serializers/user_serializer.rb @@ -60,7 +60,6 @@ class UserSerializer < BasicUserSerializer :suspended_till, :uploaded_avatar_id, :badge_count, - :notification_count, :has_title_badges, :edit_history_public, :custom_fields, @@ -93,7 +92,6 @@ class UserSerializer < BasicUserSerializer :tracked_category_ids, :watched_category_ids, :private_messages_stats, - :notification_count, :disable_jump_reply, :gravatar_avatar_upload_id, :custom_avatar_upload_id, @@ -292,10 +290,6 @@ class UserSerializer < BasicUserSerializer object.badges.where(allow_title: true).count > 0 end - def notification_count - Notification.where(user_id: object.id).count - end - def include_edit_history_public? can_edit && !SiteSetting.edit_history_visible_to_public end From fcb4eebde1781653b3f55f47ddcb2e9326686fe3 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 10 Sep 2015 14:50:18 +0800 Subject: [PATCH 023/157] FEATURE: Add a plugin outlet for custom controls. --- .../javascripts/discourse/templates/user/preferences.hbs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/assets/javascripts/discourse/templates/user/preferences.hbs b/app/assets/javascripts/discourse/templates/user/preferences.hbs index df2418bf39..b8e42444cd 100644 --- a/app/assets/javascripts/discourse/templates/user/preferences.hbs +++ b/app/assets/javascripts/discourse/templates/user/preferences.hbs @@ -246,6 +246,9 @@
    {{i18n 'user.muted_users_instructions'}}
    + + {{plugin-outlet "user-custom-controls"}} +
    {{partial 'user/preferences/save-button'}} From c845fcb1544ed12202a8bf47d68c763420031210 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 10 Sep 2015 17:07:20 +1000 Subject: [PATCH 024/157] PERF: turn 3 queries into 1 --- app/models/user_action.rb | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/app/models/user_action.rb b/app/models/user_action.rb index 9b72a755de..30086d0064 100644 --- a/app/models/user_action.rb +++ b/app/models/user_action.rb @@ -79,12 +79,21 @@ SQL def self.private_messages_stats(user_id, guardian) return unless guardian.can_see_private_messages?(user_id) # list the stats for: all/mine/unread (topic-based) - private_messages = Topic.where("topics.id IN (SELECT topic_id FROM topic_allowed_users WHERE user_id = #{user_id})") - .joins("LEFT OUTER JOIN topic_users AS tu ON (topics.id = tu.topic_id AND tu.user_id = #{user_id})") - .private_messages - all = private_messages.count - mine = private_messages.where(user_id: user_id).count - unread = private_messages.where("tu.last_read_post_number IS NULL OR tu.last_read_post_number < topics.highest_post_number").count + + sql = < Date: Thu, 10 Sep 2015 17:14:34 +1000 Subject: [PATCH 025/157] FIX: no user card for users with . or - in username --- app/assets/javascripts/discourse/controllers/user-card.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/controllers/user-card.js.es6 b/app/assets/javascripts/discourse/controllers/user-card.js.es6 index 1a4c3ad6d1..a7ade2d7f4 100644 --- a/app/assets/javascripts/discourse/controllers/user-card.js.es6 +++ b/app/assets/javascripts/discourse/controllers/user-card.js.es6 @@ -37,7 +37,7 @@ export default Ember.Controller.extend({ show(username, postId, target) { // XSS protection (should be encapsulated) - username = username.toString().replace(/[^A-Za-z0-9_]/g, ""); + username = username.toString().replace(/[^A-Za-z0-9_\.\-]/g, ""); // Don't show on mobile if (Discourse.Mobile.mobileView) { From abeabfb40f9f3e7c207f2337cd1f1ab4cb62557f Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 10 Sep 2015 17:18:43 +1000 Subject: [PATCH 026/157] BUG/PERF: Stop shipping PM stats when not needed --- app/serializers/user_serializer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb index e09c4f8b45..8954539902 100644 --- a/app/serializers/user_serializer.rb +++ b/app/serializers/user_serializer.rb @@ -270,7 +270,7 @@ class UserSerializer < BasicUserSerializer MutedUser.where(user_id: object.id).joins(:muted_user).pluck(:username) end - def include_private_message_stats? + def include_private_messages_stats? can_edit && !(omit_stats == true) end From 354a3f96381f2fc1ce0ef495569c0b0e5ae74bf3 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Thu, 10 Sep 2015 11:17:42 -0400 Subject: [PATCH 027/157] add test for auth_token being cleared by user anonymizer, which it already does --- spec/services/user_anonymizer_spec.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/services/user_anonymizer_spec.rb b/spec/services/user_anonymizer_spec.rb index 2ff90ecf9b..a18086d892 100644 --- a/spec/services/user_anonymizer_spec.rb +++ b/spec/services/user_anonymizer_spec.rb @@ -4,7 +4,7 @@ describe UserAnonymizer do describe "make_anonymous" do let(:admin) { Fabricate(:admin) } - let(:user) { Fabricate(:user, username: "edward") } + let(:user) { Fabricate(:user, username: "edward", auth_token: "mysecretauthtoken") } subject(:make_anonymous) { described_class.make_anonymous(user, admin) } @@ -45,6 +45,7 @@ describe UserAnonymizer do expect(user.name).not_to be_present expect(user.date_of_birth).to eq(nil) expect(user.title).not_to be_present + expect(user.auth_token).to eq(nil) profile = user.user_profile(true) expect(profile.location).to eq(nil) From d2a177f1dd82a999675efaa3aa392526675b8de1 Mon Sep 17 00:00:00 2001 From: scossar Date: Tue, 8 Sep 2015 15:31:44 -0700 Subject: [PATCH 028/157] change menu components position in header --- .../discourse/components/menu-panel.js.es6 | 8 +++----- .../javascripts/discourse/templates/header.hbs | 9 ++++----- app/assets/stylesheets/common/base/menu-panel.scss | 12 ++++-------- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/app/assets/javascripts/discourse/components/menu-panel.js.es6 b/app/assets/javascripts/discourse/components/menu-panel.js.es6 index 8961e9f931..8a5b2ea275 100644 --- a/app/assets/javascripts/discourse/components/menu-panel.js.es6 +++ b/app/assets/javascripts/discourse/components/menu-panel.js.es6 @@ -28,11 +28,9 @@ export default Ember.Component.extend({ const $buttonPanel = $('header ul.icons'); if ($buttonPanel.length === 0) { return; } - const buttonPanelPos = $buttonPanel.offset(); - const posTop = parseInt(buttonPanelPos.top + $buttonPanel.height() - $('header.d-header').offset().top); - const posLeft = parseInt(buttonPanelPos.left + $buttonPanel.width() - width); - - this.$().css({ left: posLeft + "px", top: posTop + "px", height: 'auto' }); + // These values need to be set here, not in the css file - this is to deal with the + // possibility of the window being resized and the menu changing from .slide-in to .drop-down. + this.$().css({ top: '100%', height: 'auto' }); // adjust panel height const fullHeight = parseInt($window.height()); diff --git a/app/assets/javascripts/discourse/templates/header.hbs b/app/assets/javascripts/discourse/templates/header.hbs index 870906119b..ab92b19517 100644 --- a/app/assets/javascripts/discourse/templates/header.hbs +++ b/app/assets/javascripts/discourse/templates/header.hbs @@ -1,8 +1,3 @@ -{{plugin-outlet "header-before-dropdowns"}} -{{user-menu visible=userMenuVisible logoutAction="logout"}} -{{hamburger-menu visible=hamburgerVisible showKeyboardAction="showKeyboardShortcutsHelp"}} -{{search-menu visible=searchVisible}} -
    {{home-logo minimized=showExtraInfo}} @@ -54,6 +49,10 @@ {{/header-dropdown}} {{/if}} + {{plugin-outlet "header-before-dropdowns"}} + {{user-menu visible=userMenuVisible logoutAction="logout"}} + {{hamburger-menu visible=hamburgerVisible showKeyboardAction="showKeyboardShortcutsHelp"}} + {{search-menu visible=searchVisible}}
    {{#if showExtraInfo}} diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss index 9eb96fb380..33d69271cc 100644 --- a/app/assets/stylesheets/common/base/menu-panel.scss +++ b/app/assets/stylesheets/common/base/menu-panel.scss @@ -1,18 +1,15 @@ .menu-panel.slide-in { position: fixed; + // positions are relative to the .d-header .panel div right: 0; top: 0; - - .panel-body { - position: absolute; - top: 3px; - bottom: 37px; - width: 97%; - } } .menu-panel.drop-down { position: absolute; + // positions are relative to the .d-header .panel div + top: 100%; // directly underneath .panel + right: -10px; // 10px to the right of .panel - adjust as needed } .menu-panel { @@ -20,7 +17,6 @@ box-shadow: 0 2px 2px rgba(0,0,0, .25); background-color: $secondary; z-index: 1100; - overflow: none; padding: 0.5em; width: 300px; From 1f8328feb52224c94b1b6d0e3fb2a5b298604fac Mon Sep 17 00:00:00 2001 From: scossar Date: Thu, 10 Sep 2015 09:49:54 -0700 Subject: [PATCH 029/157] add code that was accidentally deleted --- app/assets/stylesheets/common/base/menu-panel.scss | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss index 33d69271cc..85a9869a4f 100644 --- a/app/assets/stylesheets/common/base/menu-panel.scss +++ b/app/assets/stylesheets/common/base/menu-panel.scss @@ -3,6 +3,13 @@ // positions are relative to the .d-header .panel div right: 0; top: 0; + + .panel-body { + position: absolute; + top: 3px; + bottom: 37px; + width: 97%; + } } .menu-panel.drop-down { From 9224afacaf78e116a9e525511f5866ae64a20a0e Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 10 Sep 2015 14:01:23 -0400 Subject: [PATCH 030/157] FIX: Don't put the FAQ as "New" if there is a custom `faq_url` If we do this, it's impossible to ever mark it as read. --- .../discourse/components/hamburger-menu.js.es6 | 6 ++++++ .../discourse/templates/components/hamburger-menu.hbs | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/components/hamburger-menu.js.es6 b/app/assets/javascripts/discourse/components/hamburger-menu.js.es6 index a3c0777488..910b8d661a 100644 --- a/app/assets/javascripts/discourse/components/hamburger-menu.js.es6 +++ b/app/assets/javascripts/discourse/components/hamburger-menu.js.es6 @@ -2,6 +2,12 @@ import computed from 'ember-addons/ember-computed-decorators'; export default Ember.Component.extend({ classNames: ['hamburger-panel'], + @computed('currentUser.read_faq') + prioritizeFaq(readFaq) { + // If it's a custom FAQ never prioritize it + return Ember.isEmpty(this.siteSettings.faq_url) && !readFaq; + }, + @computed() showKeyboardShortcuts() { return !Discourse.Mobile.mobileView && !this.capabilities.touch; diff --git a/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs b/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs index ee75d18a76..fe7050955b 100644 --- a/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs +++ b/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs @@ -1,5 +1,5 @@ {{#menu-panel visible=visible}} - {{#unless currentUser.read_faq}} + {{#if prioritizeFaq}} {{#menu-links}}
  • {{#d-link path=faqUrl class="faq-link"}} @@ -8,7 +8,7 @@ {{/d-link}}
    • {{/menu-links}} - {{/unless}} + {{/if}} {{#if currentUser.staff}} {{#menu-links}} @@ -81,9 +81,9 @@ {{#menu-links omitRule="true"}}
  • {{d-link route="about" class="about-link" label="about.simple_title"}}
    • - {{#if currentUser.read_faq}} + {{#unless prioritizeFaq}}
  • {{d-link path=faqUrl class="faq-link" label="faq"}}
    • - {{/if}} + {{/unless}} {{#if showKeyboardShortcuts}}
  • {{d-link action="keyboardShortcuts" class="keyboard-shortcuts-link" label="keyboard_shortcuts_help.title"}}
    • From c3a5ddac8cf835e59b400121df8fc5d3589b3a51 Mon Sep 17 00:00:00 2001 From: Erlend Sogge Heggen Date: Thu, 10 Sep 2015 20:43:36 +0200 Subject: [PATCH 031/157] Repurposing CONTRIBUTING.md into a link portal, 2nd attempt - Slight changes to the CLA paragraph, making it slightly easier to digest. - Added brief synopsis of the Discourse Development Contribution Guidelines doc - Replaced Bug Report, Feature Request and Contributing (commits) section with outgoing links The aim of this change is to reduce the maintenance burden, since more detailed information about contribution guidelines is more naturally documented and maintained on Discourse Meta. --- CONTRIBUTING.md | 134 ++++++------------------------------------------ 1 file changed, 16 insertions(+), 118 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f00d5d078e..f59bf39dcb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,129 +1,27 @@ # Contributing to Discourse -## Before You Start +## Important note for Developers -Anyone wishing to contribute to the **[Discourse/Discourse](https://github.com/discourse/discourse)** project **MUST read & sign the [Electronic Discourse Forums Contribution License Agreement](http://www.discourse.org/cla)**. The Discourse team is legally prevented from accepting any pull requests from users who have not signed the CLA first. +Anyone wishing to contribute to the [github/discourse/discourse](https://github.com/discourse/discourse) project **must read & sign our [Contribution License Agreement](http://www.discourse.org/cla)**. The Discourse team is legally prevented from accepting any pull requests from users who have not signed the CLA first. -## Reporting Bugs +For more information on -1. Always update to the most recent master release; the bug may already be resolved. +- how to set up your development environment +- first-time project suggestions +- code conventions +- step-by-step guide for GitHub commits -2. Search for similar issues on the [Discourse meta forum][m]; it may already be an identified problem. +**please read our [Discourse Development Contribution Guidelines](https://meta.discourse.org/t/discourse-development-contribution-guidelines/3823)** -3. Make sure you can reproduce your problem on our sandbox at [try.discourse.org](http://try.discourse.org) +## Everything Else -4. If this is a bug or problem that **requires any kind of extended discussion -- open [a topic on meta][m] about it**. +There are many other ways to contribute to Discourse besides code. We've outlined the most common ones below. -5. If possible, submit a Pull Request with a failing test. If you'd rather take matters into your own hands, fix the bug yourself (jump down to the "Contributing (Step-by-step)" section). +- [Reporting Bugs](https://meta.discourse.org/t/how-to-make-bug-reports-for-discourse/33070) +- [Requesting Features](https://meta.discourse.org/t/how-to-request-new-features-for-discourse/32986) +- [Translation](https://meta.discourse.org/t/contribute-a-translation-to-discourse/14882) +- Documentation (TBA) -6. When the bug is fixed, we will do our best to update the Discourse topic. +For anything else, just start a new topic on [Meta](https://meta.discourse.org/) and let us know what you're interested in working on. -## Requesting New Features - -1. Do not submit a feature request on GitHub; all feature requests on GitHub will be closed. Instead, visit the **[Discourse meta forum, features category](http://meta.discourse.org/category/feature)**, and search this list for similar feature requests. It's possible somebody has already asked for this feature or provided a pull request that we're still discussing. - -2. Provide a clear and detailed explanation of the feature you want and why it's important to add. The feature must apply to a wide array of users of Discourse; for smaller, more targeted "one-off" features, you might consider writing a plugin for Discourse. You may also want to provide us with some advance documentation on the feature, which will help the community to better understand where it will fit. - -3. If you're a Rock Star programmer, build the feature yourself (refer to the "Contributing (Step-by-step)" section below). - -## Contributing (Step-by-step) - -1. Clone the Repo: - - git clone git://github.com/discourse/discourse.git - -2. Create a new Branch: - - cd discourse - git checkout -b new_discourse_branch - - > Please keep your code clean: one feature or bug-fix per branch. If you find another bug, you want to fix while being in a new branch, please fix it in a separated branch instead. - -3. Code - * Adhere to common conventions you see in the existing code - * Include tests, and ensure they pass - * Search to see if your new functionality has been discussed on [the Discourse meta forum](http://meta.discourse.org), and include updates as appropriate - -4. Follow the Coding Conventions - * two spaces, no tabs - * no trailing whitespaces, blank lines should have no spaces - * use spaces around operators, after commas, colons, semicolons, around `{` and before `}` - * no space after `(`, `[` or before `]`, `)` - * use Ruby 1.9 hash syntax: prefer `{ a: 1 }` over `{ :a => 1 }` - * prefer `class << self; def method; end` over `def self.method` for class methods - * prefer `{ ... }` over `do ... end` for single-line blocks, avoid using `{ ... }` for multi-line blocks - * avoid `return` when not required - - > However, please note that **pull requests consisting entirely of style changes are not welcome on this project**. Style changes in the context of pull requests that also refactor code, fix bugs, improve functionality *are* welcome. - -5. Commit - - For every commit please write a short (max 72 characters) summary in the first line followed with a blank line and then more detailed descriptions of the change. Use markdown syntax for simple styling. - - **NEVER leave the commit message blank!** Provide a detailed, clear, and complete description of your commit! - - -6. Update your branch - - ``` - git fetch origin - git rebase origin/master - ``` - -7. Fork - - ``` - git remote add mine git@github.com:/discourse.git - ``` - -8. Push to your remote - - ``` - git push mine new_discourse_branch - ``` - -9. Issue a Pull Request - - Before submitting a pull-request, clean up the history, go over your commits and squash together minor changes and fixes into the corresponding commits. You can squash commits with the interactive rebase command: - - ``` - git fetch origin - git checkout new_discourse_branch - git rebase origin/master - git rebase -i - - < the editor opens and allows you to change the commit history > - < follow the instructions on the bottom of the editor > - - git push -f mine new_discourse_branch - ``` - - - In order to make a pull request, - * Navigate to the Discourse repository you just pushed to (e.g. https://github.com/your-user-name/discourse) - * Click "Pull Request". - * Write your branch name in the branch field (this is filled with "master" by default) - * Click "Update Commit Range". - * Ensure the changesets you introduced are included in the "Commits" tab. - * Ensure that the "Files Changed" incorporate all of your changes. - * Fill in some details about your potential patch including a meaningful title. - * Click "Send pull request". - - Thanks for that -- we'll get to your pull request ASAP, we love pull requests! - -10. Responding to Feedback - - The Discourse team may recommend adjustments to your code. Part of interacting with a healthy open-source community requires you to be open to learning new techniques and strategies; *don't get discouraged!* Remember: if the Discourse team suggest changes to your code, **they care enough about your work that they want to include it**, and hope that you can assist by implementing those revisions on your own. - - > Though we ask you to clean your history and squash commit before submitting a pull-request, please do not change any commits you've submitted already (as other work might be build on top). - -## Translations - -Translators can do their work in our [Transifex project](https://www.transifex.com/projects/p/discourse-org/). For more information, please see these how-to topics: - -* [Contributing a translation to Discourse](https://meta.discourse.org/t/contribute-a-translation-to-discourse/14882) -* [How to add a new language](https://meta.discourse.org/t/how-to-add-a-new-language/14970) - - - -[m]: http://meta.discourse.org +*Thanks for contributing!* From ef787b3828f81bbf100ff02eccac549edb9ded83 Mon Sep 17 00:00:00 2001 From: Erlend Sogge Heggen Date: Thu, 10 Sep 2015 20:46:36 +0200 Subject: [PATCH 032/157] GitHub link was missing the .com The whole point of adding github.com to the link in the first place was to leave no room for misinterpretation. --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f59bf39dcb..4ad0aec099 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,7 +2,7 @@ ## Important note for Developers -Anyone wishing to contribute to the [github/discourse/discourse](https://github.com/discourse/discourse) project **must read & sign our [Contribution License Agreement](http://www.discourse.org/cla)**. The Discourse team is legally prevented from accepting any pull requests from users who have not signed the CLA first. +Anyone wishing to contribute to the [github.com/discourse/discourse](https://github.com/discourse/discourse) project **must read & sign our [Contribution License Agreement](http://www.discourse.org/cla)**. The Discourse team is legally prevented from accepting any pull requests from users who have not signed the CLA first. For more information on From ad481b3427a90cacc726a2d78b9d430d615dadb6 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Fri, 11 Sep 2015 00:16:37 +0530 Subject: [PATCH 033/157] FIX: permalinks like read.php should work --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index d2adc0cfdb..66125570f4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -409,7 +409,7 @@ Discourse::Application.routes.draw do end Discourse.filters.each do |filter| - get "#{filter}" => "list##{filter}" + get "#{filter}" => "list##{filter}", constraints: { format: /(json|html)/ } get "c/:category/l/#{filter}" => "list#category_#{filter}", as: "category_#{filter}" get "c/:category/none/l/#{filter}" => "list#category_none_#{filter}", as: "category_none_#{filter}" get "c/:parent_category/:category/l/#{filter}" => "list#parent_category_category_#{filter}", as: "parent_category_category_#{filter}" From 28cd0361d66269e0164886062f27366a54ab9054 Mon Sep 17 00:00:00 2001 From: Erlend Sogge Heggen Date: Thu, 10 Sep 2015 20:49:03 +0200 Subject: [PATCH 034/157] Proper long form for CLA Seems it's most commonly spelled out as "*Contributor* License Agreement", not *Contribution*. --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4ad0aec099..98aa05e4ac 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,7 +2,7 @@ ## Important note for Developers -Anyone wishing to contribute to the [github.com/discourse/discourse](https://github.com/discourse/discourse) project **must read & sign our [Contribution License Agreement](http://www.discourse.org/cla)**. The Discourse team is legally prevented from accepting any pull requests from users who have not signed the CLA first. +Anyone wishing to contribute to the [github.com/discourse/discourse](https://github.com/discourse/discourse) project **must read & sign our [Contributor License Agreement](http://www.discourse.org/cla)**. The Discourse team is legally prevented from accepting any pull requests from users who have not signed the CLA first. For more information on From 20c8bb04943204ce79366961759048a5ced964bd Mon Sep 17 00:00:00 2001 From: scossar Date: Thu, 10 Sep 2015 11:46:02 -0700 Subject: [PATCH 035/157] remove hardcoded left: auto --- app/assets/javascripts/discourse/components/menu-panel.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/components/menu-panel.js.es6 b/app/assets/javascripts/discourse/components/menu-panel.js.es6 index 8a5b2ea275..02304afee7 100644 --- a/app/assets/javascripts/discourse/components/menu-panel.js.es6 +++ b/app/assets/javascripts/discourse/components/menu-panel.js.es6 @@ -54,7 +54,7 @@ export default Ember.Component.extend({ } $panelBody.height('100%'); - this.$().css({ left: "auto", top: (menuTop) + "px", height }); + this.$().css({ top: menuTop + "px", height }); $('body').removeClass('drop-down-visible'); } From b68be6c5deac5e723b4a60f8f17db04f5d8b1671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Thu, 10 Sep 2015 21:56:51 +0200 Subject: [PATCH 036/157] update onebox --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 44397f9df5..e33b7a10e3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -209,7 +209,7 @@ GEM omniauth-twitter (1.0.1) multi_json (~> 1.3) omniauth-oauth (~> 1.0) - onebox (1.5.24) + onebox (1.5.25) moneta (~> 0.8) multi_json (~> 1.11) mustache From 0c5fb207e912bb2b2386824d75a38f2d09237130 Mon Sep 17 00:00:00 2001 From: Kane York Date: Thu, 10 Sep 2015 13:04:25 -0700 Subject: [PATCH 037/157] FIX: Fix behavior of category reorder dialog --- .../controllers/reorder-categories.js.es6 | 79 ++++++++++--------- .../templates/modal/reorder-categories.hbs | 31 ++++---- config/locales/client.en.yml | 2 + 3 files changed, 58 insertions(+), 54 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 b/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 index 0c7ab22cae..f33b5e02a1 100644 --- a/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 +++ b/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 @@ -5,6 +5,8 @@ import { popupAjaxError } from 'discourse/lib/ajax-error'; import computed from "ember-addons/ember-computed-decorators"; import Ember from 'ember'; +const SortableArrayProxy = Ember.ArrayProxy.extend(Ember.SortableMixin); + export default Ember.Controller.extend(ModalFunctionality, Ember.Evented, { @computed("site.categories") @@ -13,24 +15,23 @@ export default Ember.Controller.extend(ModalFunctionality, Ember.Evented, { return categories.map(c => bufProxy.create({ content: c })); }, - // uses propertyDidChange() - @computed('categoriesBuffered') - categoriesGrouped(cats) { - const map = {}; - cats.forEach((cat) => { - const p = cat.get('position') || 0; - if (!map[p]) { - map[p] = {pos: p, cats: [cat]}; - } else { - map[p].cats.push(cat); + categoriesOrdered: function() { + return SortableArrayProxy.create({ + sortProperties: ['content.position'], + content: this.get('categoriesBuffered') + }); + }.property('categoriesBuffered'), + + showFixIndices: function() { + const cats = this.get('categoriesOrdered'); + const len = cats.get('length'); + for (let i = 0; i < len; i++) { + if (cats.objectAt(i).get('position') !== i) { + return true; } - }); - const result = []; - Object.keys(map).map(p => parseInt(p)).sort((a,b) => a-b).forEach(function(pos) { - result.push(map[pos]); - }); - return result; - }, + } + return false; + }.property('categoriesOrdered.@each.position'), showApplyAll: function() { let anyChanged = false; @@ -38,29 +39,22 @@ export default Ember.Controller.extend(ModalFunctionality, Ember.Evented, { return anyChanged; }.property('categoriesBuffered.@each.hasBufferedChanges'), - saveDisabled: Ember.computed.alias('showApplyAll'), + @computed('showApplyAll', 'showFixIndices') + saveDisabled(a, b) { + return a || b; + }, moveDir(cat, dir) { - const grouped = this.get('categoriesGrouped'), - curPos = cat.get('position'), - curGroupIdx = binarySearch(grouped, curPos, "pos"), - curGroup = grouped[curGroupIdx]; - - if (curGroup.cats.length === 1 && ((dir === -1 && curGroupIdx !== 0) || (dir === 1 && curGroupIdx !== (grouped.length - 1)))) { - const nextGroup = grouped[curGroupIdx + dir], - nextPos = nextGroup.pos; - cat.set('position', nextPos); - } else { - cat.set('position', curPos + dir); + const cats = this.get('categoriesOrdered'); + const curIdx = cats.indexOf(cat); + const curPos = cat.get('position'); + const desiredIdx = curIdx + dir; + if (desiredIdx >= 0 && desiredIdx < cats.get('length')) { + cat.set('position', cat.get('position') + dir); + const otherCat = cats.objectAt(desiredIdx); + otherCat.set('position', cat.get('position') - dir); + this.send('commit'); } - cat.applyBufferedChanges(); - Ember.run.next(this, () => { - this.propertyDidChange('categoriesGrouped'); - Ember.run.schedule('afterRender', this, () => { - this.set('scrollIntoViewId', cat.get('id')); - this.trigger('scrollIntoView'); - }); - }); }, actions: { @@ -72,13 +66,22 @@ export default Ember.Controller.extend(ModalFunctionality, Ember.Evented, { this.moveDir(cat, 1); }, + fixIndices() { + const cats = this.get('categoriesOrdered'); + const len = cats.get('length'); + for (let i = 0; i < len; i++) { + cats.objectAt(i).set('position', i); + } + this.send('commit'); + }, + commit() { this.get('categoriesBuffered').forEach(bc => { if (bc.get('hasBufferedChanges')) { bc.applyBufferedChanges(); } }); - this.propertyDidChange('categoriesGrouped'); + this.propertyDidChange('categoriesBuffered'); }, saveOrder() { diff --git a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs index 7a5b3172b6..b23f257292 100644 --- a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs +++ b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs @@ -6,28 +6,27 @@ Position Category - {{#each categoriesGrouped as |group|}} - - {{#each group.cats as |cat|}} - - - {{number-field number=cat.position}} - {{d-button class="no-text" action="moveUp" actionParam=cat icon="arrow-up"}} - {{d-button class="no-text" action="moveDown" actionParam=cat icon="arrow-down"}} - {{#if cat.hasBufferedChanges}} - {{d-button class="no-text" action="commit" icon="check"}} - {{/if}} - - {{category-badge cat allowUncategorized="true"}} - - {{/each}} - + {{#each categoriesOrdered as |cat|}} + + + {{number-field number=cat.position}} + {{d-button class="no-text" action="moveUp" actionParam=cat icon="arrow-up"}} + {{d-button class="no-text" action="moveDown" actionParam=cat icon="arrow-down"}} + {{#if cat.hasBufferedChanges}} + {{d-button class="no-text" action="commit" icon="check"}} + {{/if}} + + {{category-badge cat allowUncategorized="true"}} + {{/each}}
    + {{#if showFixIndices}} + {{d-button action="fixIndices" icon="random" label="categories.reorder.fix_order" title="categories.reorder.fix_order_tooltip"}} + {{/if}} {{#if showApplyAll}} {{d-button action="commit" icon="check" label="categories.reorder.apply_all"}} {{/if}} diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 7799a82545..49a681770b 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -370,6 +370,8 @@ en: category: "Category" reorder: title: "Reorder Categories" + fix_order: "Fix Positions" + fix_order_tooltip: "Not all categories have a unique position number, which may cause unexpected results." save: "Save Order" apply_all: "Apply" posts: "Posts" From c038758f8cfbd1227e566cb4487401d5da09f45f Mon Sep 17 00:00:00 2001 From: Kane York Date: Thu, 10 Sep 2015 13:42:10 -0700 Subject: [PATCH 038/157] FIX: Several fixes related to category reorder - Move "New Category" and "Reorder Categories" into a dropdown - Always show "New Topic" on categories page, even for admins - Make category reorder modal full-height (.full-height-modal) - Move category reorder stylesheet out of admin stylesheet --- .../categories-admin-dropdown.js.es6 | 37 +++++++++++ .../components/dropdown-button.js.es6 | 4 +- .../routes/discovery-categories.js.es6 | 3 +- .../templates/modal/reorder-categories.hbs | 66 +++++++++---------- .../templates/navigation/categories.hbs | 5 +- .../common/{admin => base}/cat_reorder.scss | 3 + app/assets/stylesheets/common/base/modal.scss | 3 + config/locales/client.en.yml | 3 +- 8 files changed, 80 insertions(+), 44 deletions(-) create mode 100644 app/assets/javascripts/discourse/components/categories-admin-dropdown.js.es6 rename app/assets/stylesheets/common/{admin => base}/cat_reorder.scss (92%) diff --git a/app/assets/javascripts/discourse/components/categories-admin-dropdown.js.es6 b/app/assets/javascripts/discourse/components/categories-admin-dropdown.js.es6 new file mode 100644 index 0000000000..ac53485198 --- /dev/null +++ b/app/assets/javascripts/discourse/components/categories-admin-dropdown.js.es6 @@ -0,0 +1,37 @@ +import { iconHTML } from 'discourse/helpers/fa-icon'; +import DropdownButton from 'discourse/components/dropdown-button'; +import computed from "ember-addons/ember-computed-decorators"; + +export default DropdownButton.extend({ + buttonExtraClasses: 'no-text', + title: '', + text: iconHTML('bars') + ' ' + iconHTML('caret-down'), + classNames: ['category-notification-menu', 'category-admin-menu'], + + @computed() + dropDownContent() { + const includeReorder = this.get('siteSettings.fixed_category_positions'); + const items = [ + { id: 'createCategory', + title: I18n.t('category.create'), + description: I18n.t('category.create_long'), + styleClasses: 'fa fa-plus' } + ]; + if (includeReorder) { + items.push({ + id: 'reorderCategories', + title: I18n.t('categories.reorder.title'), + description: I18n.t('categories.reorder.title_long'), + styleClasses: 'fa fa-random' + }); + } + return items; + }, + + // sendAction() is pretty silly if you ask me + actionFor_createCategory: 'createCategory', + actionFor_reorderCategories: 'reorderCategories', + clicked(id) { + this.sendAction('actionFor_' + id); + } +}); diff --git a/app/assets/javascripts/discourse/components/dropdown-button.js.es6 b/app/assets/javascripts/discourse/components/dropdown-button.js.es6 index 99d211bbe3..0037ec17f2 100644 --- a/app/assets/javascripts/discourse/components/dropdown-button.js.es6 +++ b/app/assets/javascripts/discourse/components/dropdown-button.js.es6 @@ -29,9 +29,7 @@ export default Ember.Component.extend(StringBuffer, { buffer.push("

    " + title + "

    "); } - buffer.push(""); + buffer.push(``); buffer.push("
      "); const contents = this.get('dropDownContent'); diff --git a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6 b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6 index 297fc1ac1e..47a04ae92a 100644 --- a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6 +++ b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6 @@ -34,9 +34,8 @@ const DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, { setupController(controller, model) { controller.set("model", model); - // Only show either the Create Category or Create Topic button this.controllerFor("navigation/categories").set("canCreateCategory", model.get("can_create_category")); - this.controllerFor("navigation/categories").set("canCreateTopic", model.get("can_create_topic") && !model.get("can_create_category")); + this.controllerFor("navigation/categories").set("canCreateTopic", model.get("can_create_topic")); this.openTopicDraft(model); }, diff --git a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs index b23f257292..b9ae576799 100644 --- a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs +++ b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs @@ -1,35 +1,33 @@ -
      -
      -
      - - - - - - {{#each categoriesOrdered as |cat|}} - - - - - {{/each}} -
      PositionCategory
      - {{number-field number=cat.position}} - {{d-button class="no-text" action="moveUp" actionParam=cat icon="arrow-up"}} - {{d-button class="no-text" action="moveDown" actionParam=cat icon="arrow-down"}} - {{#if cat.hasBufferedChanges}} - {{d-button class="no-text" action="commit" icon="check"}} - {{/if}} - {{category-badge cat allowUncategorized="true"}}
      -
      -
      - -
      - {{#if showFixIndices}} - {{d-button action="fixIndices" icon="random" label="categories.reorder.fix_order" title="categories.reorder.fix_order_tooltip"}} - {{/if}} - {{#if showApplyAll}} - {{d-button action="commit" icon="check" label="categories.reorder.apply_all"}} - {{/if}} - {{d-button class="btn-primary" disabled=saveDisabled action="saveOrder" label="categories.reorder.save"}} -
      +
      +
      + + + + + + {{#each categoriesOrdered as |cat|}} + + + + + {{/each}} +
      PositionCategory
      + {{number-field number=cat.position}} + {{d-button class="no-text" action="moveUp" actionParam=cat icon="arrow-up"}} + {{d-button class="no-text" action="moveDown" actionParam=cat icon="arrow-down"}} + {{#if cat.hasBufferedChanges}} + {{d-button class="no-text" action="commit" icon="check"}} + {{/if}} + {{category-badge cat allowUncategorized="true"}}
      +
      +
      + +
      + {{#if showFixIndices}} + {{d-button action="fixIndices" icon="random" label="categories.reorder.fix_order" title="categories.reorder.fix_order_tooltip"}} + {{/if}} + {{#if showApplyAll}} + {{d-button action="commit" icon="check" label="categories.reorder.apply_all"}} + {{/if}} + {{d-button class="btn-primary" disabled=saveDisabled action="saveOrder" label="categories.reorder.save"}}
      diff --git a/app/assets/javascripts/discourse/templates/navigation/categories.hbs b/app/assets/javascripts/discourse/templates/navigation/categories.hbs index c6b4c1cbbc..e6a650cfbe 100644 --- a/app/assets/javascripts/discourse/templates/navigation/categories.hbs +++ b/app/assets/javascripts/discourse/templates/navigation/categories.hbs @@ -3,10 +3,7 @@ {{navigation-bar navItems=navItems filterMode=filterMode}} {{#if canCreateCategory}} - {{d-button action="createCategory" icon="plus" label="category.create"}} - {{#if siteSettings.fixed_category_positions}} - {{d-button action="reorderCategories" icon="random" label="category.reorder"}} - {{/if}} + {{categories-admin-dropdown}} {{/if}} {{#if canCreateTopic}} diff --git a/app/assets/stylesheets/common/admin/cat_reorder.scss b/app/assets/stylesheets/common/base/cat_reorder.scss similarity index 92% rename from app/assets/stylesheets/common/admin/cat_reorder.scss rename to app/assets/stylesheets/common/base/cat_reorder.scss index d5619e993c..c1f1ea9943 100644 --- a/app/assets/stylesheets/common/admin/cat_reorder.scss +++ b/app/assets/stylesheets/common/base/cat_reorder.scss @@ -26,3 +26,6 @@ padding-bottom: 150px; } } +.category-admin-menu ul { + width: 320px; +} diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss index 7674cd42f8..74291ab406 100644 --- a/app/assets/stylesheets/common/base/modal.scss +++ b/app/assets/stylesheets/common/base/modal.scss @@ -129,6 +129,9 @@ } .modal-body { + &.full-height-modal { + max-height: calc(100vh - 150px); + } textarea { width: 99%; height: 80px; diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 49a681770b..e3576d8035 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -370,6 +370,7 @@ en: category: "Category" reorder: title: "Reorder Categories" + title_long: "Reorganize the category list" fix_order: "Fix Positions" fix_order_tooltip: "Not all categories have a unique position number, which may cause unexpected results." save: "Save Order" @@ -1519,6 +1520,7 @@ en: topic_template: "Topic Template" delete: 'Delete Category' create: 'New Category' + create_long: 'Create a new category' save: 'Save Category' slug: 'Category Slug' slug_placeholder: '(Optional) dashed-words for url' @@ -1554,7 +1556,6 @@ en: add_permission: "Add Permission" this_year: "this year" position: "position" - reorder: "Reorder" default_position: "Default Position" position_disabled: "Categories will be displayed in order of activity. To control the order of categories in lists, " position_disabled_click: 'enable the "fixed category positions" setting.' From d86d4752cbb68acad381f0b30a6702f04d8726db Mon Sep 17 00:00:00 2001 From: Kane York Date: Thu, 10 Sep 2015 14:04:21 -0700 Subject: [PATCH 039/157] FIX: Don't allow editing seeded category security settings --- .../components/edit-category-security.js.es6 | 16 ++++++++++++---- .../components/edit-category-security.hbs | 9 ++++++++- app/serializers/category_serializer.rb | 6 ++++++ config/locales/client.en.yml | 1 + config/site_settings.yml | 8 +++----- 5 files changed, 30 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/discourse/components/edit-category-security.js.es6 b/app/assets/javascripts/discourse/components/edit-category-security.js.es6 index 593a604e7a..60c3f4ddc1 100644 --- a/app/assets/javascripts/discourse/components/edit-category-security.js.es6 +++ b/app/assets/javascripts/discourse/components/edit-category-security.js.es6 @@ -7,16 +7,24 @@ export default buildCategoryPanel('security', { actions: { editPermissions() { - this.set('editingPermissions', true); + if (!this.get('category.is_special')) { + this.set('editingPermissions', true); + } }, addPermission(group, id) { - this.get('category').addPermission({group_name: group + "", - permission: Discourse.PermissionType.create({id})}); + if (!this.get('category.is_special')) { + this.get('category').addPermission({ + group_name: group + "", + permission: Discourse.PermissionType.create({id}) + }); + } }, removePermission(permission) { - this.get('category').removePermission(permission); + if (!this.get('category.is_special')) { + this.get('category').removePermission(permission); + } }, } }); diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs index 02361e3cf7..d5468a4966 100644 --- a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs +++ b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs @@ -1,4 +1,9 @@
      + {{#if category.is_special}} +

      {{i18n 'category.special_warning'}}

      + {{else}} + + {{/if}}
        {{#each category.permissions as |p|}}
      • @@ -16,6 +21,8 @@ {{view 'select' class="permission-selector" optionValuePath="content.id" optionLabelPath="content.description" content=category.availablePermissions value=selectedPermission}} {{else}} - + {{#unless category.is_special}} + + {{/unless}} {{/if}}
      diff --git a/app/serializers/category_serializer.rb b/app/serializers/category_serializer.rb index 1bf08f89fc..1f8ee5bf88 100644 --- a/app/serializers/category_serializer.rb +++ b/app/serializers/category_serializer.rb @@ -11,6 +11,7 @@ class CategorySerializer < BasicCategorySerializer :suppress_from_homepage, :can_delete, :cannot_delete_reason, + :is_special, :allow_badges, :custom_fields @@ -37,6 +38,11 @@ class CategorySerializer < BasicCategorySerializer true end + def is_special + [SiteSetting.lounge_category_id, SiteSetting.meta_category_id, SiteSetting.staff_category_id, SiteSetting.uncategorized_category_id] + .include? object.id + end + def include_can_delete? scope && scope.can_delete?(object) end diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 7799a82545..bbc1833f03 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1539,6 +1539,7 @@ en: change_in_category_topic: "Edit Description" already_used: 'This color has been used by another category' security: "Security" + special_warning: "Warning: This category is a pre-seeded category and the security settings cannot be edited. If you do not wish to use this category, delete it instead of repurposing it." images: "Images" auto_close_label: "Auto-close topics after:" auto_close_units: "hours" diff --git a/config/site_settings.yml b/config/site_settings.yml index 754e067b82..c6ec254670 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -418,9 +418,6 @@ posting: newuser_max_attachments: client: true default: 0 - uncategorized_category_id: - default: -1 - hidden: true post_excerpt_maxlength: 300 display_name_on_posts: client: true @@ -922,14 +919,15 @@ uncategorized: lounge_category_id: default: -1 hidden: true - meta_category_id: default: -1 hidden: true - staff_category_id: default: -1 hidden: true + uncategorized_category_id: + default: -1 + hidden: true performance_report_topic_id: default: -1 From a9d10f454bf32eaf3c427f3bdb0446987d2e5880 Mon Sep 17 00:00:00 2001 From: Kane York Date: Thu, 10 Sep 2015 14:12:08 -0700 Subject: [PATCH 040/157] Oop --- .../discourse/templates/components/edit-category-security.hbs | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs index d5468a4966..1b323792a9 100644 --- a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs +++ b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs @@ -1,8 +1,6 @@
      {{#if category.is_special}}

      {{i18n 'category.special_warning'}}

      - {{else}} - {{/if}}
        {{#each category.permissions as |p|}} From f36dcb6a62b4b4ab1a4ddc5c8b525cb31cc757a1 Mon Sep 17 00:00:00 2001 From: Kane York Date: Thu, 10 Sep 2015 14:21:36 -0700 Subject: [PATCH 041/157] Fix build --- .../discourse/controllers/reorder-categories.js.es6 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 b/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 index f33b5e02a1..877d948a6d 100644 --- a/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 +++ b/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 @@ -1,6 +1,5 @@ import ModalFunctionality from 'discourse/mixins/modal-functionality'; const BufferedProxy = window.BufferedProxy; // import BufferedProxy from 'ember-buffered-proxy/proxy'; -import binarySearch from 'discourse/lib/binary-search'; import { popupAjaxError } from 'discourse/lib/ajax-error'; import computed from "ember-addons/ember-computed-decorators"; import Ember from 'ember'; @@ -47,12 +46,12 @@ export default Ember.Controller.extend(ModalFunctionality, Ember.Evented, { moveDir(cat, dir) { const cats = this.get('categoriesOrdered'); const curIdx = cats.indexOf(cat); - const curPos = cat.get('position'); const desiredIdx = curIdx + dir; if (desiredIdx >= 0 && desiredIdx < cats.get('length')) { - cat.set('position', cat.get('position') + dir); + const curPos = cat.get('position'); + cat.set('position', curPos + dir); const otherCat = cats.objectAt(desiredIdx); - otherCat.set('position', cat.get('position') - dir); + otherCat.set('position', curPos - dir); this.send('commit'); } }, From cd774657889f38749a23f72d402835c57af8f60e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Fri, 11 Sep 2015 00:11:48 +0200 Subject: [PATCH 042/157] FEATURE: SVG letter avatars (based on @eviltrout's spike) --- .../discourse/lib/avatar-template.js.es6 | 14 +++------- app/controllers/user_avatars_controller.rb | 26 ++++++++++++++++++- app/models/user.rb | 5 ++-- config/locales/server.en.yml | 2 ++ config/routes.rb | 1 + config/site_settings.yml | 3 +++ lib/email/styles.rb | 2 -- lib/letter_avatar.rb | 26 +++++++++---------- 8 files changed, 51 insertions(+), 28 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/avatar-template.js.es6 b/app/assets/javascripts/discourse/lib/avatar-template.js.es6 index 542e979596..15948aba2a 100644 --- a/app/assets/javascripts/discourse/lib/avatar-template.js.es6 +++ b/app/assets/javascripts/discourse/lib/avatar-template.js.es6 @@ -4,6 +4,7 @@ let _splitAvatars; function defaultAvatar(username) { const defaultAvatars = Discourse.SiteSettings.default_avatars; + if (defaultAvatars && defaultAvatars.length) { _splitAvatars = _splitAvatars || defaultAvatars.split("\n"); @@ -13,20 +14,13 @@ function defaultAvatar(username) { } } - return Discourse.getURLWithCDN("/letter_avatar/" + - username.toLowerCase() + - "/{size}/" + - Discourse.LetterAvatarVersion + ".png"); + const extension = Discourse.SiteSettings.svg_letter_avatars ? "svg" : "png"; + return Discourse.getURLWithCDN(`/letter_avatar/${username.toLowerCase()}/{size}/${Discourse.LetterAvatarVersion}.${extension}`); } export default function(username, uploadedAvatarId) { if (uploadedAvatarId) { - return Discourse.getURLWithCDN("/user_avatar/" + - Discourse.BaseUrl + - "/" + - username.toLowerCase() + - "/{size}/" + - uploadedAvatarId + ".png"); + return Discourse.getURLWithCDN(`/user_avatar/${Discourse.BaseUrl}/${username.toLowerCase()}/{size}/${uploadedAvatarId}.png`); } return defaultAvatar(username); } diff --git a/app/controllers/user_avatars_controller.rb b/app/controllers/user_avatars_controller.rb index ed8f31e4af..f1d6e7d1db 100644 --- a/app/controllers/user_avatars_controller.rb +++ b/app/controllers/user_avatars_controller.rb @@ -3,7 +3,7 @@ require_dependency 'letter_avatar' class UserAvatarsController < ApplicationController DOT = Base64.decode64("R0lGODlhAQABALMAAAAAAIAAAACAAICAAAAAgIAAgACAgMDAwICAgP8AAAD/AP//AAAA//8A/wD//wBiZCH5BAEAAA8ALAAAAAABAAEAAAQC8EUAOw==") - skip_before_filter :preload_json, :redirect_to_login_if_required, :check_xhr, :verify_authenticity_token, only: [:show, :show_letter] + skip_before_filter :preload_json, :redirect_to_login_if_required, :check_xhr, :verify_authenticity_token, only: [:show, :show_letter, :show_letter_svg] def refresh_gravatar user = User.find_by(username_lower: params[:username].downcase) @@ -19,6 +19,30 @@ class UserAvatarsController < ApplicationController end end + def show_letter_svg + params.require(:username) + params.require(:version) + params.require(:size) + + no_cookies + + size = params[:size].to_i + username = params[:username] + + identity = LetterAvatar::Identity.from_username(username) + color = identity.color + + svg = <<-SVG + + + #{username[0].capitalize} + + SVG + + expires_in 1.year, public: true + render inline: svg, content_type: "image/svg+xml" + end + def show_letter params.require(:username) params.require(:version) diff --git a/app/models/user.rb b/app/models/user.rb index 2861fff881..cd23445641 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -457,7 +457,7 @@ class User < ActiveRecord::Base avatar_template = split_avatars[hash.abs % split_avatars.size] end else - "#{Discourse.base_uri}/letter_avatar/#{username.downcase}/{size}/#{LetterAvatar.version}.png" + letter_avatar_template(username) end end @@ -469,7 +469,8 @@ class User < ActiveRecord::Base end def self.letter_avatar_template(username) - "#{Discourse.base_uri}/letter_avatar/#{username.downcase}/{size}/#{LetterAvatar.version}.png" + extension = SiteSetting.svg_letter_avatars ? "svg" : "png" + "#{Discourse.base_uri}/letter_avatar/#{username.downcase}/{size}/#{LetterAvatar.version}.#{extension}" end def avatar_template diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index fcd190dc8e..921edd59ed 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -979,6 +979,8 @@ en: avatar_sizes: "List of automatically generated avatar sizes." + svg_letter_avatars: "Use SVG for letter avatars" + 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." diff --git a/config/routes.rb b/config/routes.rb index 66125570f4..f5b5aa1b3d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -299,6 +299,7 @@ Discourse::Application.routes.draw do get "user-badges/:username" => "user_badges#username", constraints: {username: USERNAME_ROUTE_FORMAT} post "user_avatar/:username/refresh_gravatar" => "user_avatars#refresh_gravatar", constraints: {username: USERNAME_ROUTE_FORMAT} + get "letter_avatar/:username/:size/:version.svg" => "user_avatars#show_letter_svg", format: :svg, constraints: { hostname: /[\w\.-]+/, size: /\d+/, username: USERNAME_ROUTE_FORMAT} get "letter_avatar/:username/:size/:version.png" => "user_avatars#show_letter", format: false, constraints: { hostname: /[\w\.-]+/, size: /\d+/, username: USERNAME_ROUTE_FORMAT} get "user_avatar/:hostname/:username/:size/:version.png" => "user_avatars#show", format: false, constraints: { hostname: /[\w\.-]+/, size: /\d+/, username: USERNAME_ROUTE_FORMAT } diff --git a/config/site_settings.yml b/config/site_settings.yml index 754e067b82..0c4950ad84 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -572,6 +572,9 @@ files: avatar_sizes: default: '20|25|32|45|60|120' type: list + svg_letter_avatars: + default: false + client: true trust: default_trust_level: diff --git a/lib/email/styles.rb b/lib/email/styles.rb index 22f9ffe1e8..e82106b96d 100644 --- a/lib/email/styles.rb +++ b/lib/email/styles.rb @@ -30,7 +30,6 @@ module Email # images @fragment.css('img').each do |img| - next if img['class'] == 'site-logo' if img['class'] == "emoji" || img['src'] =~ /plugins\/emoji/ @@ -58,7 +57,6 @@ module Email # attachments @fragment.css('a.attachment').each do |a| - # ensure all urls are absolute if a['href'] =~ /^\/[^\/]/ a['href'] = "#{Discourse.base_url}#{a['href']}" diff --git a/lib/letter_avatar.rb b/lib/letter_avatar.rb index abde76ec08..e49ab6c417 100644 --- a/lib/letter_avatar.rb +++ b/lib/letter_avatar.rb @@ -7,20 +7,20 @@ class LetterAvatar FULLSIZE = 120 * 3 POINTSIZE = 280 - class << self + class Identity + attr_accessor :color, :letter - class Identity - attr_accessor :color, :letter - - def self.from_username(username) - identity = new - identity.color = LetterAvatar::COLORS[ - Digest::MD5.hexdigest(username)[0...15].to_i(16) % LetterAvatar::COLORS.length - ] - identity.letter = username[0].upcase - identity - end + def self.from_username(username) + identity = new + identity.color = LetterAvatar::COLORS[ + Digest::MD5.hexdigest(username)[0...15].to_i(16) % LetterAvatar::COLORS.length + ] + identity.letter = username[0].upcase + identity end + end + + class << self def version "#{VERSION}_#{image_magick_version}" @@ -32,7 +32,7 @@ class LetterAvatar def generate(username, size, opts = nil) DistributedMutex.synchronize("letter_avatar_#{version}_#{username}") do - identity = Identity.from_username(username) + identity = LetterAvatar::Identity.from_username(username) cache = true cache = false if opts && opts[:cache] == false From e43034f08f2961ceddd3801efaca00c904c43d44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Fri, 11 Sep 2015 00:23:52 +0200 Subject: [PATCH 043/157] Revert "FEATURE: SVG letter avatars (based on @eviltrout's spike)" This reverts commit cd774657889f38749a23f72d402835c57af8f60e. --- .../discourse/lib/avatar-template.js.es6 | 14 +++++++--- app/controllers/user_avatars_controller.rb | 26 +---------------- app/models/user.rb | 5 ++-- config/locales/server.en.yml | 2 -- config/routes.rb | 1 - config/site_settings.yml | 3 -- lib/email/styles.rb | 2 ++ lib/letter_avatar.rb | 28 +++++++++---------- 8 files changed, 29 insertions(+), 52 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/avatar-template.js.es6 b/app/assets/javascripts/discourse/lib/avatar-template.js.es6 index 15948aba2a..542e979596 100644 --- a/app/assets/javascripts/discourse/lib/avatar-template.js.es6 +++ b/app/assets/javascripts/discourse/lib/avatar-template.js.es6 @@ -4,7 +4,6 @@ let _splitAvatars; function defaultAvatar(username) { const defaultAvatars = Discourse.SiteSettings.default_avatars; - if (defaultAvatars && defaultAvatars.length) { _splitAvatars = _splitAvatars || defaultAvatars.split("\n"); @@ -14,13 +13,20 @@ function defaultAvatar(username) { } } - const extension = Discourse.SiteSettings.svg_letter_avatars ? "svg" : "png"; - return Discourse.getURLWithCDN(`/letter_avatar/${username.toLowerCase()}/{size}/${Discourse.LetterAvatarVersion}.${extension}`); + return Discourse.getURLWithCDN("/letter_avatar/" + + username.toLowerCase() + + "/{size}/" + + Discourse.LetterAvatarVersion + ".png"); } export default function(username, uploadedAvatarId) { if (uploadedAvatarId) { - return Discourse.getURLWithCDN(`/user_avatar/${Discourse.BaseUrl}/${username.toLowerCase()}/{size}/${uploadedAvatarId}.png`); + return Discourse.getURLWithCDN("/user_avatar/" + + Discourse.BaseUrl + + "/" + + username.toLowerCase() + + "/{size}/" + + uploadedAvatarId + ".png"); } return defaultAvatar(username); } diff --git a/app/controllers/user_avatars_controller.rb b/app/controllers/user_avatars_controller.rb index f1d6e7d1db..ed8f31e4af 100644 --- a/app/controllers/user_avatars_controller.rb +++ b/app/controllers/user_avatars_controller.rb @@ -3,7 +3,7 @@ require_dependency 'letter_avatar' class UserAvatarsController < ApplicationController DOT = Base64.decode64("R0lGODlhAQABALMAAAAAAIAAAACAAICAAAAAgIAAgACAgMDAwICAgP8AAAD/AP//AAAA//8A/wD//wBiZCH5BAEAAA8ALAAAAAABAAEAAAQC8EUAOw==") - skip_before_filter :preload_json, :redirect_to_login_if_required, :check_xhr, :verify_authenticity_token, only: [:show, :show_letter, :show_letter_svg] + skip_before_filter :preload_json, :redirect_to_login_if_required, :check_xhr, :verify_authenticity_token, only: [:show, :show_letter] def refresh_gravatar user = User.find_by(username_lower: params[:username].downcase) @@ -19,30 +19,6 @@ class UserAvatarsController < ApplicationController end end - def show_letter_svg - params.require(:username) - params.require(:version) - params.require(:size) - - no_cookies - - size = params[:size].to_i - username = params[:username] - - identity = LetterAvatar::Identity.from_username(username) - color = identity.color - - svg = <<-SVG - - - #{username[0].capitalize} - - SVG - - expires_in 1.year, public: true - render inline: svg, content_type: "image/svg+xml" - end - def show_letter params.require(:username) params.require(:version) diff --git a/app/models/user.rb b/app/models/user.rb index cd23445641..2861fff881 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -457,7 +457,7 @@ class User < ActiveRecord::Base avatar_template = split_avatars[hash.abs % split_avatars.size] end else - letter_avatar_template(username) + "#{Discourse.base_uri}/letter_avatar/#{username.downcase}/{size}/#{LetterAvatar.version}.png" end end @@ -469,8 +469,7 @@ class User < ActiveRecord::Base end def self.letter_avatar_template(username) - extension = SiteSetting.svg_letter_avatars ? "svg" : "png" - "#{Discourse.base_uri}/letter_avatar/#{username.downcase}/{size}/#{LetterAvatar.version}.#{extension}" + "#{Discourse.base_uri}/letter_avatar/#{username.downcase}/{size}/#{LetterAvatar.version}.png" end def avatar_template diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 921edd59ed..fcd190dc8e 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -979,8 +979,6 @@ en: avatar_sizes: "List of automatically generated avatar sizes." - svg_letter_avatars: "Use SVG for letter avatars" - 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." diff --git a/config/routes.rb b/config/routes.rb index f5b5aa1b3d..66125570f4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -299,7 +299,6 @@ Discourse::Application.routes.draw do get "user-badges/:username" => "user_badges#username", constraints: {username: USERNAME_ROUTE_FORMAT} post "user_avatar/:username/refresh_gravatar" => "user_avatars#refresh_gravatar", constraints: {username: USERNAME_ROUTE_FORMAT} - get "letter_avatar/:username/:size/:version.svg" => "user_avatars#show_letter_svg", format: :svg, constraints: { hostname: /[\w\.-]+/, size: /\d+/, username: USERNAME_ROUTE_FORMAT} get "letter_avatar/:username/:size/:version.png" => "user_avatars#show_letter", format: false, constraints: { hostname: /[\w\.-]+/, size: /\d+/, username: USERNAME_ROUTE_FORMAT} get "user_avatar/:hostname/:username/:size/:version.png" => "user_avatars#show", format: false, constraints: { hostname: /[\w\.-]+/, size: /\d+/, username: USERNAME_ROUTE_FORMAT } diff --git a/config/site_settings.yml b/config/site_settings.yml index 0c4950ad84..754e067b82 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -572,9 +572,6 @@ files: avatar_sizes: default: '20|25|32|45|60|120' type: list - svg_letter_avatars: - default: false - client: true trust: default_trust_level: diff --git a/lib/email/styles.rb b/lib/email/styles.rb index e82106b96d..22f9ffe1e8 100644 --- a/lib/email/styles.rb +++ b/lib/email/styles.rb @@ -30,6 +30,7 @@ module Email # images @fragment.css('img').each do |img| + next if img['class'] == 'site-logo' if img['class'] == "emoji" || img['src'] =~ /plugins\/emoji/ @@ -57,6 +58,7 @@ module Email # attachments @fragment.css('a.attachment').each do |a| + # ensure all urls are absolute if a['href'] =~ /^\/[^\/]/ a['href'] = "#{Discourse.base_url}#{a['href']}" diff --git a/lib/letter_avatar.rb b/lib/letter_avatar.rb index e49ab6c417..abde76ec08 100644 --- a/lib/letter_avatar.rb +++ b/lib/letter_avatar.rb @@ -7,21 +7,21 @@ class LetterAvatar FULLSIZE = 120 * 3 POINTSIZE = 280 - class Identity - attr_accessor :color, :letter - - def self.from_username(username) - identity = new - identity.color = LetterAvatar::COLORS[ - Digest::MD5.hexdigest(username)[0...15].to_i(16) % LetterAvatar::COLORS.length - ] - identity.letter = username[0].upcase - identity - end - end - class << self + class Identity + attr_accessor :color, :letter + + def self.from_username(username) + identity = new + identity.color = LetterAvatar::COLORS[ + Digest::MD5.hexdigest(username)[0...15].to_i(16) % LetterAvatar::COLORS.length + ] + identity.letter = username[0].upcase + identity + end + end + def version "#{VERSION}_#{image_magick_version}" end @@ -32,7 +32,7 @@ class LetterAvatar def generate(username, size, opts = nil) DistributedMutex.synchronize("letter_avatar_#{version}_#{username}") do - identity = LetterAvatar::Identity.from_username(username) + identity = Identity.from_username(username) cache = true cache = false if opts && opts[:cache] == false From 2742602254c177ca014109c5ab60bafa3ccbfa47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Fri, 11 Sep 2015 02:12:40 +0200 Subject: [PATCH 044/157] FEATURE: support for external letter avatars service --- .../discourse/helpers/application.js.es6 | 8 +- .../discourse/helpers/user-avatar.js.es6 | 11 +- .../discourse/lib/avatar-template.js.es6 | 27 +- .../discourse/models/user-action.js.es6 | 55 +-- .../javascripts/discourse/models/user.js.es6 | 336 +++++++----------- .../discourse/views/composer.js.es6 | 7 +- app/controllers/users_controller.rb | 2 +- app/models/user.rb | 23 +- app/serializers/basic_post_serializer.rb | 6 + app/serializers/basic_user_serializer.rb | 10 +- app/serializers/post_serializer.rb | 3 +- app/serializers/user_action_serializer.rb | 12 +- app/serializers/user_name_serializer.rb | 21 +- app/serializers/user_serializer.rb | 1 + config/locales/server.en.yml | 3 + config/site_settings.yml | 7 + 16 files changed, 250 insertions(+), 282 deletions(-) diff --git a/app/assets/javascripts/discourse/helpers/application.js.es6 b/app/assets/javascripts/discourse/helpers/application.js.es6 index cac2ea1f0a..02fa08fa84 100644 --- a/app/assets/javascripts/discourse/helpers/application.js.es6 +++ b/app/assets/javascripts/discourse/helpers/application.js.es6 @@ -9,12 +9,14 @@ Em.Handlebars.helper('bound-avatar', function(user, size, uploadId) { return new safe("
        "); } - const username = Em.get(user, 'username'); + const username = Em.get(user, 'username'), + letterAvatarColor = Em.get(user, 'letter_avatar_color'); + if (arguments.length < 4) { uploadId = Em.get(user, 'uploaded_avatar_id'); } - const avatar = Em.get(user, 'avatar_template') || avatarTemplate(username, uploadId); + const avatar = Em.get(user, 'avatar_template') || avatarTemplate(username, uploadId, letterAvatarColor); return new safe(Discourse.Utilities.avatarImg({ size: size, avatarTemplate: avatar })); -}, 'username', 'uploaded_avatar_id', 'avatar_template'); +}, 'username', 'uploaded_avatar_id', 'letter_avatar_color', 'avatar_template'); /* * Used when we only have a template diff --git a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 index 1ab668ffc0..aea2e9baae 100644 --- a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 +++ b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 @@ -5,20 +5,20 @@ function renderAvatar(user, options) { options = options || {}; if (user) { - var username = Em.get(user, 'username'); + let username = Em.get(user, 'username'); if (!username) { if (!options.usernamePath) { return ''; } username = Em.get(user, options.usernamePath); } - var title; + let title; if (!options.ignoreTitle) { // first try to get a title title = Em.get(user, 'title'); // if there was no title provided if (!title) { // try to retrieve a description - var description = Em.get(user, 'description'); + const description = Em.get(user, 'description'); // if a description has been provided if (description && description.length > 0) { // preprend the username before the description @@ -28,13 +28,14 @@ function renderAvatar(user, options) { } // this is simply done to ensure we cache images correctly - var uploadedAvatarId = Em.get(user, 'uploaded_avatar_id') || Em.get(user, 'user.uploaded_avatar_id'); + const uploadedAvatarId = Em.get(user, 'uploaded_avatar_id') || Em.get(user, 'user.uploaded_avatar_id'), + letterAvatarColor = Em.get(user, 'letter_avatar_color') || Em.get(user, 'user.letter_avatar_color'); return Discourse.Utilities.avatarImg({ size: options.imageSize, extraClasses: Em.get(user, 'extras') || options.extraClasses, title: title || username, - avatarTemplate: avatarTemplate(username, uploadedAvatarId) + avatarTemplate: Em.get("avatar_template") || avatarTemplate(username, uploadedAvatarId, letterAvatarColor) }); } else { return ''; diff --git a/app/assets/javascripts/discourse/lib/avatar-template.js.es6 b/app/assets/javascripts/discourse/lib/avatar-template.js.es6 index 542e979596..731a2047d8 100644 --- a/app/assets/javascripts/discourse/lib/avatar-template.js.es6 +++ b/app/assets/javascripts/discourse/lib/avatar-template.js.es6 @@ -2,8 +2,10 @@ import { hashString } from 'discourse/lib/hash'; let _splitAvatars; -function defaultAvatar(username) { - const defaultAvatars = Discourse.SiteSettings.default_avatars; +function defaultAvatar(username, letterAvatarColor) { + const defaultAvatars = Discourse.SiteSettings.default_avatars, + version = Discourse.LetterAvatarVersion; + if (defaultAvatars && defaultAvatars.length) { _splitAvatars = _splitAvatars || defaultAvatars.split("\n"); @@ -13,20 +15,17 @@ function defaultAvatar(username) { } } - return Discourse.getURLWithCDN("/letter_avatar/" + - username.toLowerCase() + - "/{size}/" + - Discourse.LetterAvatarVersion + ".png"); + if (Discourse.SiteSettings.external_letter_avatars_enabled) { + const url = Discourse.SiteSettings.external_letter_avatars_url; + return `${url}/letter/${username[0]}?color=${letterAvatarColor}&size={size}`; + } else { + return Discourse.getURLWithCDN(`/letter_avatar/${username.toLowerCase()}/{size}/${version}.png`); + } } -export default function(username, uploadedAvatarId) { +export default function(username, uploadedAvatarId, letterAvatarColor) { if (uploadedAvatarId) { - return Discourse.getURLWithCDN("/user_avatar/" + - Discourse.BaseUrl + - "/" + - username.toLowerCase() + - "/{size}/" + - uploadedAvatarId + ".png"); + return Discourse.getURLWithCDN(`/user_avatar/${Discourse.BaseUrl}/${username.toLowerCase()}/{size}/${uploadedAvatarId}.png`); } - return defaultAvatar(username); + return defaultAvatar(username, letterAvatarColor); } diff --git a/app/assets/javascripts/discourse/models/user-action.js.es6 b/app/assets/javascripts/discourse/models/user-action.js.es6 index 2d273c43e1..05e1e4929c 100644 --- a/app/assets/javascripts/discourse/models/user-action.js.es6 +++ b/app/assets/javascripts/discourse/models/user-action.js.es6 @@ -1,5 +1,7 @@ import RestModel from 'discourse/models/rest'; import { url } from 'discourse/lib/computed'; +import { on } from 'ember-addons/ember-computed-decorators'; +import computed from 'ember-addons/ember-computed-decorators'; const UserActionTypes = { likes_given: 1, @@ -17,21 +19,22 @@ const UserActionTypes = { }; const InvertedActionTypes = {}; -_.each(UserActionTypes, function (k, v) { +_.each(UserActionTypes, (k, v) => { InvertedActionTypes[k] = v; }); const UserAction = RestModel.extend({ - _attachCategory: function() { + @on("init") + _attachCategory() { const categoryId = this.get('category_id'); if (categoryId) { this.set('category', Discourse.Category.findById(categoryId)); } - }.on('init'), + }, - descriptionKey: function() { - const action = this.get('action_type'); + @computed("action_type") + descriptionKey(action) { if (action === null || Discourse.UserAction.TO_SHOW.indexOf(action) >= 0) { if (this.get('isPM')) { return this.get('sameUser') ? 'sent_by_you' : 'sent_by_user'; @@ -59,34 +62,39 @@ const UserAction = RestModel.extend({ return this.get('targetUser') ? 'user_mentioned_you' : 'user_mentioned_user'; } } - }.property('action_type'), + }, - sameUser: function() { - return this.get('username') === Discourse.User.currentProp('username'); - }.property('username'), + @computed("username") + sameUser(username) { + return username === Discourse.User.currentProp('username'); + }, - targetUser: function() { - return this.get('target_username') === Discourse.User.currentProp('username'); - }.property('target_username'), + @computed("target_username") + targetUser(targetUsername) { + return targetUsername === Discourse.User.currentProp('username'); + }, presentName: Em.computed.any('name', 'username'), targetDisplayName: Em.computed.any('target_name', 'target_username'), actingDisplayName: Em.computed.any('acting_name', 'acting_username'), targetUserUrl: url('target_username', '/users/%@'), - usernameLower: function() { - return this.get('username').toLowerCase(); - }.property('username'), + @computed("username") + usernameLower(username) { + return username.toLowerCase(); + }, userUrl: url('usernameLower', '/users/%@'), - postUrl: function() { + @computed() + postUrl() { return Discourse.Utilities.postUrl(this.get('slug'), this.get('topic_id'), this.get('post_number')); - }.property(), + }, - replyUrl: function() { + @computed() + replyUrl() { return Discourse.Utilities.postUrl(this.get('slug'), this.get('topic_id'), this.get('reply_to_post_number')); - }.property(), + }, replyType: Em.computed.equal('action_type', UserActionTypes.replies), postType: Em.computed.equal('action_type', UserActionTypes.posts), @@ -99,7 +107,7 @@ const UserAction = RestModel.extend({ postReplyType: Em.computed.or('postType', 'replyType'), removableBookmark: Em.computed.and('bookmarkType', 'sameUser'), - addChild: function(action) { + addChild(action) { let groups = this.get("childGroups"); if (!groups) { groups = { @@ -143,22 +151,23 @@ const UserAction = RestModel.extend({ "childGroups.edits.items", "childGroups.edits.items.@each", "childGroups.bookmarks.items", "childGroups.bookmarks.items.@each"), - switchToActing: function() { + switchToActing() { this.setProperties({ username: this.get('acting_username'), uploaded_avatar_id: this.get('acting_uploaded_avatar_id'), + letter_avatar_color: this.get('action_letter_avatar_color'), name: this.get('actingDisplayName') }); } }); UserAction.reopenClass({ - collapseStream: function(stream) { + collapseStream(stream) { const uniq = {}; const collapsed = []; let pos = 0; - stream.forEach(function(item) { + stream.forEach(item => { const key = "" + item.topic_id + "-" + item.post_number; const found = uniq[key]; if (found === void 0) { diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6 index 01aef870af..8fac2812ed 100644 --- a/app/assets/javascripts/discourse/models/user.js.es6 +++ b/app/assets/javascripts/discourse/models/user.js.es6 @@ -6,6 +6,7 @@ import UserPostsStream from 'discourse/models/user-posts-stream'; import Singleton from 'discourse/mixins/singleton'; import { longDate } from 'discourse/lib/formatter'; import computed from 'ember-addons/ember-computed-decorators'; +import { observes } from 'ember-addons/ember-computed-decorators'; import Badge from 'discourse/models/badge'; import UserBadge from 'discourse/models/user-badge'; @@ -18,13 +19,15 @@ const User = RestModel.extend({ hasNotPosted: Em.computed.not("hasPosted"), canBeDeleted: Em.computed.and("can_be_deleted", "hasNotPosted"), - stream: function() { + @computed() + stream() { return UserStream.create({ user: this }); - }.property(), + }, - postsStream: function() { + @computed() + postsStream() { return UserPostsStream.create({ user: this }); - }.property(), + }, staff: Em.computed.or('admin', 'moderator'), @@ -32,27 +35,22 @@ const User = RestModel.extend({ return Discourse.ajax(`/session/${this.get('username')}`, { type: 'DELETE'}); }, - searchContext: function() { + @computed("username_lower") + searchContext(username) { return { type: 'user', - id: this.get('username_lower'), + id: username, user: this }; - }.property('username_lower'), + }, - /** - This user's display name. Returns the name if possible, otherwise returns the - username. - - @property displayName - @type {String} - **/ - displayName: function() { - if (Discourse.SiteSettings.enable_names && !Ember.isEmpty(this.get('name'))) { - return this.get('name'); + @computed("username", "name") + displayName(username, name) { + if (Discourse.SiteSettings.enable_names && !Ember.isEmpty(name)) { + return name; } - return this.get('username'); - }.property('username', 'name'), + return username; + }, @computed('profile_background') profileBackground(bgUrl) { @@ -60,38 +58,23 @@ const User = RestModel.extend({ return ('background-image: url(' + Discourse.getURLWithCDN(bgUrl) + ')').htmlSafe(); }, - path: function(){ - return Discourse.getURL('/users/' + this.get('username_lower')); + @computed() + path() { // no need to observe, requires a hard refresh to update - }.property(), + return Discourse.getURL(`/users/${this.get('username_lower')}`); + }, - /** - Path to this user's administration - - @property adminPath - @type {String} - **/ adminPath: url('username_lower', "/admin/users/%@"), - /** - This user's username in lowercase. + @computed("username") + username_lower(username) { + return username.toLowerCase(); + }, - @property username_lower - @type {String} - **/ - username_lower: function() { - return this.get('username').toLowerCase(); - }.property('username'), - - /** - This user's trust level. - - @property trustLevel - @type {Integer} - **/ - trustLevel: function() { - return Discourse.Site.currentProp('trustLevels').findProperty('id', parseInt(this.get('trust_level'), 10)); - }.property('trust_level'), + @computed("trust_level") + trustLevel(trustLevel) { + return Discourse.Site.currentProp('trustLevels').findProperty('id', parseInt(trustLevel, 10)); + }, isBasic: Em.computed.equal('trust_level', 0), isLeader: Em.computed.equal('trust_level', 3), @@ -100,61 +83,36 @@ const User = RestModel.extend({ isSuspended: Em.computed.equal('suspended', true), - suspended: function() { - return this.get('suspended_till') && moment(this.get('suspended_till')).isAfter(); - }.property('suspended_till'), + @computed("suspended_till") + suspended(suspendedTill) { + return suspendedTill && moment(suspendedTill).isAfter(); + }, - suspendedTillDate: function() { - return longDate(this.get('suspended_till')); - }.property('suspended_till'), + @computed("suspended_till") + suspendedTillDate(suspendedTill) { + return longDate(suspendedTill); + }, - /** - Changes this user's username. - - @method changeUsername - @param {String} newUsername The user's new username - @returns Result of ajax call - **/ - changeUsername: function(newUsername) { - return Discourse.ajax("/users/" + this.get('username_lower') + "/preferences/username", { + changeUsername(new_username) { + return Discourse.ajax(`/users/${this.get('username_lower')}/preferences/username`, { type: 'PUT', - data: { new_username: newUsername } + data: { new_username } }); }, - /** - Changes this user's email address. - - @method changeEmail - @param {String} email The user's new email address\ - @returns Result of ajax call - **/ - changeEmail: function(email) { - return Discourse.ajax("/users/" + this.get('username_lower') + "/preferences/email", { + changeEmail(email) { + return Discourse.ajax(`/users/${this.get('username_lower')}/preferences/email`, { type: 'PUT', - data: { email: email } + data: { email } }); }, - /** - Returns a copy of this user. - - @method copy - @returns {User} - **/ - copy: function() { + copy() { return Discourse.User.create(this.getProperties(Ember.keys(this))); }, - /** - Save's this user's properties over AJAX via a PUT request. - - @method save - @returns {Promise} the result of the operation - **/ - save: function() { - const self = this, - data = this.getProperties( + save() { + const data = this.getProperties( 'auto_track_topics_after_msecs', 'bio_raw', 'website', @@ -179,10 +137,10 @@ const User = RestModel.extend({ 'card_background' ); - ['muted','watched','tracked'].forEach(function(s){ - var cats = self.get(s + 'Categories').map(function(c){ return c.get('id')}); + ['muted','watched','tracked'].forEach(s => { + let cats = this.get(s + 'Categories').map(c => c.get('id')); // HACK: denote lack of categories - if(cats.length === 0) { cats = [-1]; } + if (cats.length === 0) { cats = [-1]; } data[s + '_category_ids'] = cats; }); @@ -192,26 +150,19 @@ const User = RestModel.extend({ // TODO: We can remove this when migrated fully to rest model. this.set('isSaving', true); - return Discourse.ajax("/users/" + this.get('username_lower'), { + return Discourse.ajax(`/users/${this.get('username_lower')}`, { data: data, type: 'PUT' - }).then(function(result) { - self.set('bio_excerpt', result.user.bio_excerpt); - - const userProps = self.getProperties('enable_quoting', 'external_links_in_new_tab', 'dynamic_favicon'); + }).then(result => { + this.set('bio_excerpt', result.user.bio_excerpt); + const userProps = this.getProperties('enable_quoting', 'external_links_in_new_tab', 'dynamic_favicon'); Discourse.User.current().setProperties(userProps); }).finally(() => { this.set('isSaving', false); }); }, - /** - Changes the password and calls the callback function on AJAX.complete. - - @method changePassword - @returns {Promise} the result of the change password operation - **/ - changePassword: function() { + changePassword() { return Discourse.ajax("/session/forgot_password", { dataType: 'json', data: { login: this.get('username') }, @@ -219,73 +170,63 @@ const User = RestModel.extend({ }); }, - /** - Loads a single user action by id. - - @method loadUserAction - @param {Integer} id The id of the user action being loaded - @returns A stream of the user's actions containing the action of id - **/ - loadUserAction: function(id) { - var self = this, - stream = this.get('stream'); - return Discourse.ajax("/user_actions/" + id + ".json", { cache: 'false' }).then(function(result) { + loadUserAction(id) { + const stream = this.get('stream'); + return Discourse.ajax(`/user_actions/${id}.json`, { cache: 'false' }).then(result => { if (result && result.user_action) { - var ua = result.user_action; + const ua = result.user_action; - if ((self.get('stream.filter') || ua.action_type) !== ua.action_type) return; - if (!self.get('stream.filter') && !self.inAllStream(ua)) return; + if ((this.get('stream.filter') || ua.action_type) !== ua.action_type) return; + if (!this.get('stream.filter') && !this.inAllStream(ua)) return; - var action = Discourse.UserAction.collapseStream([Discourse.UserAction.create(ua)]); + const action = Discourse.UserAction.collapseStream([Discourse.UserAction.create(ua)]); stream.set('itemsLoaded', stream.get('itemsLoaded') + 1); stream.get('content').insertAt(0, action[0]); } }); }, - inAllStream: function(ua) { + inAllStream(ua) { return ua.action_type === Discourse.UserAction.TYPES.posts || ua.action_type === Discourse.UserAction.TYPES.topics; }, // The user's stat count, excluding PMs. - statsCountNonPM: function() { - var self = this; - + @computed("statsExcludingPms.@each.count") + statsCountNonPM() { if (Ember.isEmpty(this.get('statsExcludingPms'))) return 0; - var count = 0; - _.each(this.get('statsExcludingPms'), function(val) { - if (self.inAllStream(val)){ + let count = 0; + _.each(this.get('statsExcludingPms'), val => { + if (this.inAllStream(val)) { count += val.count; } }); return count; - }.property('statsExcludingPms.@each.count'), + }, // The user's stats, excluding PMs. - statsExcludingPms: function() { + @computed("stats.@each.isPM") + statsExcludingPms() { if (Ember.isEmpty(this.get('stats'))) return []; return this.get('stats').rejectProperty('isPM'); - }.property('stats.@each.isPM'), + }, - findDetails: function(options) { - var user = this; + findDetails(options) { + const user = this; - return PreloadStore.getAndRemove("user_" + user.get('username'), function() { - return Discourse.ajax("/users/" + user.get('username') + '.json', {data: options}); - }).then(function (json) { + return PreloadStore.getAndRemove(`user_${user.get('username')}`, () => { + return Discourse.ajax(`/users/${user.get('username')}.json`, { data: options }); + }).then(json => { if (!Em.isEmpty(json.user.stats)) { - json.user.stats = Discourse.User.groupStats(_.map(json.user.stats,function(s) { + json.user.stats = Discourse.User.groupStats(_.map(json.user.stats, s => { if (s.count) s.count = parseInt(s.count, 10); return Discourse.UserActionStat.create(s); })); } if (!Em.isEmpty(json.user.custom_groups)) { - json.user.custom_groups = json.user.custom_groups.map(function (g) { - return Discourse.Group.create(g); - }); + json.user.custom_groups = json.user.custom_groups.map(g => Discourse.Group.create(g)); } if (json.user.invited_by) { @@ -294,12 +235,10 @@ const User = RestModel.extend({ if (!Em.isEmpty(json.user.featured_user_badge_ids)) { const userBadgesMap = {}; - UserBadge.createFromJson(json).forEach(function(userBadge) { + UserBadge.createFromJson(json).forEach(userBadge => { userBadgesMap[ userBadge.get('id') ] = userBadge; }); - json.user.featured_user_badges = json.user.featured_user_badge_ids.map(function(id) { - return userBadgesMap[id]; - }); + json.user.featured_user_badges = json.user.featured_user_badge_ids.map(id => userBadgesMap[id]); } if (json.user.card_badge) { @@ -311,30 +250,26 @@ const User = RestModel.extend({ }); }, - findStaffInfo: function() { + findStaffInfo() { if (!Discourse.User.currentProp("staff")) { return Ember.RSVP.resolve(null); } - var self = this; - return Discourse.ajax("/users/" + this.get("username_lower") + "/staff-info.json").then(function(info) { - self.setProperties(info); + return Discourse.ajax(`/users/${this.get("username_lower")}/staff-info.json`).then(info => { + this.setProperties(info); }); }, - avatarTemplate: function() { - return avatarTemplate(this.get('username'), this.get('uploaded_avatar_id')); - }.property('uploaded_avatar_id', 'username'), + @computed("username", "uploaded_avatar_id", "letter_avatar_color") + avatarTemplate(username, uploadedAvatarId, letterAvatarColor) { + return avatarTemplate(username, uploadedAvatarId, letterAvatarColor); + }, /* Change avatar selection */ - pickAvatar: function(uploadId) { - var self = this; - - return Discourse.ajax("/users/" + this.get("username_lower") + "/preferences/avatar/pick", { + pickAvatar(uploadId) { + return Discourse.ajax(`/users/${this.get("username_lower")}/preferences/avatar/pick`, { type: 'PUT', data: { upload_id: uploadId } - }).then(function(){ - self.set('uploaded_avatar_id', uploadId); - }); + }).then(() => this.set('uploaded_avatar_id', uploadId)); }, /** @@ -344,7 +279,7 @@ const User = RestModel.extend({ @param {String} type The type of the upload (image, attachment) @returns true if the current user is allowed to upload a file **/ - isAllowedToUploadAFile: function(type) { + isAllowedToUploadAFile(type) { return this.get('staff') || this.get('trust_level') > 0 || Discourse.SiteSettings['newuser_max_' + type + 's'] > 0; @@ -357,35 +292,39 @@ const User = RestModel.extend({ @param {String} email The email address of the user to invite to the site @returns {Promise} the result of the server call **/ - createInvite: function(email, groupNames) { + createInvite(email, groupNames) { return Discourse.ajax('/invites', { type: 'POST', data: {email: email, group_names: groupNames} }); }, - generateInviteLink: function(email, groupNames, topicId) { + generateInviteLink(email, groupNames, topicId) { return Discourse.ajax('/invites/link', { type: 'POST', data: {email: email, group_names: groupNames, topic_id: topicId} }); }, - updateMutedCategories: function() { + @observes("muted_category_ids") + updateMutedCategories() { this.set("mutedCategories", Discourse.Category.findByIds(this.muted_category_ids)); - }.observes("muted_category_ids"), + }, - updateTrackedCategories: function() { + @observes("tracked_category_ids") + updateTrackedCategories() { this.set("trackedCategories", Discourse.Category.findByIds(this.tracked_category_ids)); - }.observes("tracked_category_ids"), + }, - updateWatchedCategories: function() { + @observes("watched_category_ids") + updateWatchedCategories() { this.set("watchedCategories", Discourse.Category.findByIds(this.watched_category_ids)); - }.observes("watched_category_ids"), + }, - canDeleteAccount: function() { - return !Discourse.SiteSettings.enable_sso && this.get('can_delete_account') && ((this.get('reply_count')||0) + (this.get('topic_count')||0)) <= 1; - }.property('can_delete_account', 'reply_count', 'topic_count'), + @computed("can_delete_account", "reply_count", "topic_count") + canDeleteAccount(canDeleteAccount, replyCount, topicCount) { + return !Discourse.SiteSettings.enable_sso && canDeleteAccount && ((replyCount || 0) + (topicCount || 0)) <= 1; + }, "delete": function() { if (this.get('can_delete_account')) { @@ -398,27 +337,26 @@ const User = RestModel.extend({ } }, - dismissBanner: function (bannerKey) { + dismissBanner(bannerKey) { this.set("dismissed_banner_key", bannerKey); - Discourse.ajax("/users/" + this.get('username'), { + Discourse.ajax(`/users/${this.get('username')}`, { type: 'PUT', data: { dismissed_banner_key: bannerKey } }); }, - checkEmail: function () { - var self = this; - return Discourse.ajax("/users/" + this.get("username_lower") + "/emails.json", { + checkEmail() { + return Discourse.ajax(`/users/${this.get("username_lower")}/emails.json`, { type: "PUT", data: { context: window.location.pathname } - }).then(function (result) { + }).then(result => { if (result) { - self.setProperties({ + this.setProperties({ email: result.email, associated_accounts: result.associated_accounts }); } - }, function () {}); + }); } }); @@ -426,14 +364,14 @@ const User = RestModel.extend({ User.reopenClass(Singleton, { // Find a `Discourse.User` for a given username. - findByUsername: function(username, options) { + findByUsername(username, options) { const user = User.create({username: username}); return user.findDetails(options); }, // TODO: Use app.register and junk Singleton - createCurrent: function() { - var userJson = PreloadStore.get('currentUser'); + createCurrent() { + const userJson = PreloadStore.get('currentUser'); if (userJson) { const store = Discourse.__container__.lookup('store:main'); return store.createRecord('user', userJson); @@ -441,56 +379,38 @@ User.reopenClass(Singleton, { return null; }, - /** - Checks if given username is valid for this email address - - @method checkUsername - @param {String} username A username to check - @param {String} email An email address to check - @param {Number} forUserId user id - provide when changing username - **/ - checkUsername: function(username, email, forUserId) { + checkUsername(username, email, for_user_id) { return Discourse.ajax('/users/check_username', { - data: { username: username, email: email, for_user_id: forUserId } + data: { username, email, for_user_id } }); }, - /** - Groups the user's statistics - - @method groupStats - @param {Array} stats Given stats - @returns {Object} - **/ - groupStats: function(stats) { - var responses = Discourse.UserActionStat.create({ + groupStats(stats) { + const responses = Discourse.UserActionStat.create({ count: 0, action_type: Discourse.UserAction.TYPES.replies }); - stats.filterProperty('isResponse').forEach(function (stat) { + stats.filterProperty('isResponse').forEach(stat => { responses.set('count', responses.get('count') + stat.get('count')); }); - var result = Em.A(); + const result = Em.A(); result.pushObjects(stats.rejectProperty('isResponse')); - var insertAt = 0; - result.forEach(function(item, index){ - if(item.action_type === Discourse.UserAction.TYPES.topics || item.action_type === Discourse.UserAction.TYPES.posts){ + let insertAt = 0; + result.forEach((item, index) => { + if (item.action_type === Discourse.UserAction.TYPES.topics || item.action_type === Discourse.UserAction.TYPES.posts) { insertAt = index + 1; } }); - if(responses.count > 0) { + if (responses.count > 0) { result.insertAt(insertAt, responses); } - return(result); + return result; }, - /** - Creates a new account - **/ - createAccount: function(attrs) { + createAccount(attrs) { return Discourse.ajax("/users", { data: { name: attrs.accountName, diff --git a/app/assets/javascripts/discourse/views/composer.js.es6 b/app/assets/javascripts/discourse/views/composer.js.es6 index d96c6a55a4..6964d102a5 100644 --- a/app/assets/javascripts/discourse/views/composer.js.es6 +++ b/app/assets/javascripts/discourse/views/composer.js.es6 @@ -252,9 +252,12 @@ const ComposerView = Ember.View.extend(Ember.Evented, { const quotedPost = posts.findProperty("post_number", postNumber); if (quotedPost) { const username = quotedPost.get('username'), - uploadId = quotedPost.get('uploaded_avatar_id'); + uploadId = quotedPost.get('uploaded_avatar_id'), + letterAvatarColor = quotedPost.get("letter_avatar_color"); - return Discourse.Utilities.tinyAvatar(avatarTemplate(username, uploadId)); + debugger; + + return Discourse.Utilities.tinyAvatar(avatarTemplate(username, uploadId, letterAvatarColor)); } } } diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index d537c6b7a8..cf72afcf6f 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -518,7 +518,7 @@ class UsersController < ApplicationController user_fields = [:username, :upload_avatar_template, :uploaded_avatar_id] user_fields << :name if SiteSetting.enable_names? - to_render = { users: results.as_json(only: user_fields, methods: :avatar_template) } + to_render = { users: results.as_json(only: user_fields, methods: [:avatar_template, :letter_avatar_color]) } if params[:include_groups] == "true" to_render[:groups] = Group.search_group(term, current_user).map {|m| {:name=>m.name, :usernames=> m.usernames.split(",")} } diff --git a/app/models/user.rb b/app/models/user.rb index 2861fff881..aa46dd7c77 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -457,11 +457,11 @@ class User < ActiveRecord::Base avatar_template = split_avatars[hash.abs % split_avatars.size] end else - "#{Discourse.base_uri}/letter_avatar/#{username.downcase}/{size}/#{LetterAvatar.version}.png" + letter_avatar_template(username) end end - def self.avatar_template(username,uploaded_avatar_id) + def self.avatar_template(username, uploaded_avatar_id) return default_template(username) if !uploaded_avatar_id username ||= "" hostname = RailsMultisite::ConnectionManagement.current_hostname @@ -469,11 +469,26 @@ class User < ActiveRecord::Base end def self.letter_avatar_template(username) - "#{Discourse.base_uri}/letter_avatar/#{username.downcase}/{size}/#{LetterAvatar.version}.png" + if SiteSetting.external_letter_avatars_enabled + color = letter_avatar_color(username) + "#{SiteSetting.external_letter_avatars_url}/letter/#{username[0]}?color=#{color}&size={size}" + else + "#{Discourse.base_uri}/letter_avatar/#{username.downcase}/{size}/#{LetterAvatar.version}.png" + end + end + + def letter_avatar_color + self.class.letter_avatar_color(username) + end + + def self.letter_avatar_color(username) + username = username || "" + color = LetterAvatar::COLORS[Digest::MD5.hexdigest(username)[0...15].to_i(16) % LetterAvatar::COLORS.length] + color.map { |c| c.to_s(16) }.join end def avatar_template - self.class.avatar_template(username,uploaded_avatar_id) + self.class.avatar_template(username, uploaded_avatar_id) end # The following count methods are somewhat slow - definitely don't use them in a loop. diff --git a/app/serializers/basic_post_serializer.rb b/app/serializers/basic_post_serializer.rb index 04b91ecad4..4edb2b5cc5 100644 --- a/app/serializers/basic_post_serializer.rb +++ b/app/serializers/basic_post_serializer.rb @@ -5,6 +5,7 @@ class BasicPostSerializer < ApplicationSerializer :username, :avatar_template, :uploaded_avatar_id, + :letter_avatar_color, :created_at, :cooked, :cooked_hidden @@ -25,9 +26,14 @@ class BasicPostSerializer < ApplicationSerializer object.user.try(:uploaded_avatar_id) end + def letter_avatar_color + object.user.try(:letter_avatar_color) + end + def cooked_hidden object.hidden && !scope.is_staff? end + def include_cooked_hidden? cooked_hidden end diff --git a/app/serializers/basic_user_serializer.rb b/app/serializers/basic_user_serializer.rb index 8911291f36..12ed3f3639 100644 --- a/app/serializers/basic_user_serializer.rb +++ b/app/serializers/basic_user_serializer.rb @@ -1,5 +1,5 @@ class BasicUserSerializer < ApplicationSerializer - attributes :id, :username, :uploaded_avatar_id, :avatar_template + attributes :id, :username, :uploaded_avatar_id, :avatar_template, :letter_avatar_color def include_name? SiteSetting.enable_names? @@ -17,4 +17,12 @@ class BasicUserSerializer < ApplicationSerializer object[:user] || object end + def letter_avatar_color + if Hash === object + User.letter_avatar_color(user[:username]) + else + object.letter_avatar_color + end + end + end diff --git a/app/serializers/post_serializer.rb b/app/serializers/post_serializer.rb index 5ba620ca27..9bc469f047 100644 --- a/app/serializers/post_serializer.rb +++ b/app/serializers/post_serializer.rb @@ -178,7 +178,8 @@ class PostSerializer < BasicPostSerializer { username: object.reply_to_user.username, avatar_template: object.reply_to_user.avatar_template, - uploaded_avatar_id: object.reply_to_user.uploaded_avatar_id + uploaded_avatar_id: object.reply_to_user.uploaded_avatar_id, + letter_avatar_color: object.reply_to_user.letter_avatar_color, } end diff --git a/app/serializers/user_action_serializer.rb b/app/serializers/user_action_serializer.rb index 8b39399639..4bf6650048 100644 --- a/app/serializers/user_action_serializer.rb +++ b/app/serializers/user_action_serializer.rb @@ -27,9 +27,11 @@ class UserActionSerializer < ApplicationSerializer :edit_reason, :category_id, :uploaded_avatar_id, + :letter_avatar_color, :closed, :archived, - :acting_uploaded_avatar_id + :acting_uploaded_avatar_id, + :acting_letter_avatar_color def excerpt cooked = object.cooked || PrettyText.cook(object.raw) @@ -84,4 +86,12 @@ class UserActionSerializer < ApplicationSerializer object.topic_archived end + def letter_avatar_color + User.letter_avatar_color(username) + end + + def acting_letter_avatar_color + User.letter_avatar_color(acting_username) + end + end diff --git a/app/serializers/user_name_serializer.rb b/app/serializers/user_name_serializer.rb index ac7beaa8d2..3d7fc0d1f8 100644 --- a/app/serializers/user_name_serializer.rb +++ b/app/serializers/user_name_serializer.rb @@ -1,20 +1,3 @@ -class UserNameSerializer < ApplicationSerializer - attributes :id, :username, :name, :title, :uploaded_avatar_id, :avatar_template - - def include_name? - SiteSetting.enable_names? - end - - def avatar_template - if Hash === object - User.avatar_template(user[:username], user[:uploaded_avatar_id]) - else - object.avatar_template - end - end - - def user - object[:user] || object - end - +class UserNameSerializer < BasicUserSerializer + attributes :name, :title end diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb index 8954539902..2d216a5150 100644 --- a/app/serializers/user_serializer.rb +++ b/app/serializers/user_serializer.rb @@ -323,4 +323,5 @@ class UserSerializer < BasicUserSerializer def pending_count 0 end + end diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index fcd190dc8e..bfab232cf1 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -979,6 +979,9 @@ en: avatar_sizes: "List of automatically generated avatar sizes." + external_letter_avatars_enabled: "Use external letter avatars service." + external_letter_avatars_url: "URL of the external letter avatars service." + 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." diff --git a/config/site_settings.yml b/config/site_settings.yml index 754e067b82..add19d2db0 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -572,6 +572,13 @@ files: avatar_sizes: default: '20|25|32|45|60|120' type: list + external_letter_avatars_enabled: + default: false + client: true + external_letter_avatars_url: + default: "https://avatars.discourse.org" + client: true + regex: '^https?:\/\/.+[^\/]$' trust: default_trust_level: From f6380c66efedeceb646fe0fb2b4507ac4f0d4d0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Fri, 11 Sep 2015 02:15:45 +0200 Subject: [PATCH 045/157] oooops --- app/assets/javascripts/discourse/views/composer.js.es6 | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/assets/javascripts/discourse/views/composer.js.es6 b/app/assets/javascripts/discourse/views/composer.js.es6 index 6964d102a5..63a8675ec8 100644 --- a/app/assets/javascripts/discourse/views/composer.js.es6 +++ b/app/assets/javascripts/discourse/views/composer.js.es6 @@ -255,8 +255,6 @@ const ComposerView = Ember.View.extend(Ember.Evented, { uploadId = quotedPost.get('uploaded_avatar_id'), letterAvatarColor = quotedPost.get("letter_avatar_color"); - debugger; - return Discourse.Utilities.tinyAvatar(avatarTemplate(username, uploadId, letterAvatarColor)); } } From 90d49d1497ce0b4969d6e624e0e54dfae4fa759e Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 11 Sep 2015 13:18:07 +1000 Subject: [PATCH 046/157] correct paths used for external service --- app/assets/javascripts/discourse/lib/avatar-template.js.es6 | 2 +- app/models/user.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/avatar-template.js.es6 b/app/assets/javascripts/discourse/lib/avatar-template.js.es6 index 731a2047d8..4d2fdb2bf7 100644 --- a/app/assets/javascripts/discourse/lib/avatar-template.js.es6 +++ b/app/assets/javascripts/discourse/lib/avatar-template.js.es6 @@ -17,7 +17,7 @@ function defaultAvatar(username, letterAvatarColor) { if (Discourse.SiteSettings.external_letter_avatars_enabled) { const url = Discourse.SiteSettings.external_letter_avatars_url; - return `${url}/letter/${username[0]}?color=${letterAvatarColor}&size={size}`; + return `${url}/letter/${username[0]}/${letterAvatarColor}/{size}.png`; } else { return Discourse.getURLWithCDN(`/letter_avatar/${username.toLowerCase()}/{size}/${version}.png`); } diff --git a/app/models/user.rb b/app/models/user.rb index aa46dd7c77..75d732ea67 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -454,7 +454,7 @@ class User < ActiveRecord::Base [((result << 5) - result) + char.ord].pack('L').unpack('l').first end - avatar_template = split_avatars[hash.abs % split_avatars.size] + split_avatars[hash.abs % split_avatars.size] end else letter_avatar_template(username) @@ -471,7 +471,7 @@ class User < ActiveRecord::Base def self.letter_avatar_template(username) if SiteSetting.external_letter_avatars_enabled color = letter_avatar_color(username) - "#{SiteSetting.external_letter_avatars_url}/letter/#{username[0]}?color=#{color}&size={size}" + "#{SiteSetting.external_letter_avatars_url}/letter/#{username[0]}/#{color}/{size}.png" else "#{Discourse.base_uri}/letter_avatar/#{username.downcase}/{size}/#{LetterAvatar.version}.png" end From 98e8b16c34f1453772eaf3411561ee5c9ad82d40 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Fri, 11 Sep 2015 11:54:08 +0800 Subject: [PATCH 047/157] FIX: Broken BasicUserSerializer. --- app/serializers/basic_user_serializer.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/serializers/basic_user_serializer.rb b/app/serializers/basic_user_serializer.rb index 12ed3f3639..2c72eb3422 100644 --- a/app/serializers/basic_user_serializer.rb +++ b/app/serializers/basic_user_serializer.rb @@ -9,7 +9,7 @@ class BasicUserSerializer < ApplicationSerializer if Hash === object User.avatar_template(user[:username], user[:uploaded_avatar_id]) else - object.avatar_template + user.try(:avatar_template) end end @@ -21,7 +21,7 @@ class BasicUserSerializer < ApplicationSerializer if Hash === object User.letter_avatar_color(user[:username]) else - object.letter_avatar_color + user.try(:letter_avatar_color) end end From d73d4d476984d6de647423d3869cfdb1d72c427a Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Fri, 11 Sep 2015 16:53:26 +0530 Subject: [PATCH 048/157] FIX: UserNameSuggester should not suggest usernames with a sequence of 2 or more special chars --- config/locales/server.en.yml | 2 +- lib/user_name_suggester.rb | 1 + spec/components/user_name_suggester_spec.rb | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index bfab232cf1..735f214961 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1347,7 +1347,7 @@ en: unique: "must be unique" blank: "must be present" must_begin_with_alphanumeric: "must begin with a letter or number or an underscore" - must_end_with_alphanumeric: "must end with a letter or number" + must_end_with_alphanumeric: "must end with a letter or number or an underscore" must_not_contain_two_special_chars_in_seq: "must not contain a sequence of 2 or more special chars (.-_)" must_not_contain_confusing_suffix: "must not contain a confusing suffix like .json or .png etc." email: diff --git a/lib/user_name_suggester.rb b/lib/user_name_suggester.rb index 09e4db698b..4819a3f879 100644 --- a/lib/user_name_suggester.rb +++ b/lib/user_name_suggester.rb @@ -38,6 +38,7 @@ module UserNameSuggester name = name.gsub(/^[^[:alnum:]]+|\W+$/, "") .gsub(/\W+/, "_") .gsub(/^\_+/, '') + .gsub(/[\-_\.]{2,}/, "_") name end diff --git a/spec/components/user_name_suggester_spec.rb b/spec/components/user_name_suggester_spec.rb index 8f63ba1b2e..ec9eb7a46b 100644 --- a/spec/components/user_name_suggester_spec.rb +++ b/spec/components/user_name_suggester_spec.rb @@ -75,6 +75,11 @@ describe UserNameSuggester do expect(UserNameSuggester.suggest("myname.")).to eq('myname') end + it 'handles usernames with a sequence of 2 or more special chars' do + expect(UserNameSuggester.suggest('Darth__Vader')).to eq('Darth_Vader') + expect(UserNameSuggester.suggest('Darth_-_Vader')).to eq('Darth_Vader') + end + it 'should handle typical facebook usernames' do expect(UserNameSuggester.suggest('roger.nelson.3344913')).to eq('roger_nelson_33') end From 8ca2ab1b3b25a6bc1ebcdc4e7e02d1333043b766 Mon Sep 17 00:00:00 2001 From: ismail-arilik Date: Fri, 11 Sep 2015 15:02:12 +0300 Subject: [PATCH 049/157] Update some strings to meet referred options lists The options which changed strings are referred, were changed to lists so these strings were supposed to be generalized. --- config/locales/server.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 735f214961..7dd33c874a 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1202,8 +1202,8 @@ en: default_email_mailing_list_mode: "Send an email for every new post by default." default_email_always: "Send an email notification even when the user is active by default." - default_other_new_topic_duration_minutes: "Global default number of minutes a topic is considered new." - default_other_auto_track_topics_after_msecs: "Global default milliseconds before a topic is automatically tracked." + 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." default_other_enable_quoting: "Enable quote reply for highlighted text by default." default_other_dynamic_favicon: "Show new/updated topic count on browser icon by default." From 6437cd03413a346976efef3e0a11a5eba0e2cf9c Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 11 Sep 2015 18:14:34 +1000 Subject: [PATCH 050/157] FEATURE: add support for generic external avatar services This changes it so we only ship an avatar template down to the client it has no magic, all it knows is how to plug in size --- .../discourse/components/who-liked.js.es6 | 2 +- .../discourse/helpers/application.js.es6 | 11 ++----- .../discourse/helpers/user-avatar.js.es6 | 17 ++++------ .../discourse/lib/avatar-template.js.es6 | 31 ------------------- .../discourse/models/composer.js.es6 | 4 +-- .../discourse/models/user-action.js.es6 | 2 -- .../javascripts/discourse/models/user.js.es6 | 6 ---- .../templates/components/stream-item.hbs | 2 +- .../templates/list/posters-column.raw.hbs | 2 +- .../discourse/views/composer.js.es6 | 7 +---- app/assets/javascripts/main_include.js | 2 -- app/controllers/users_controller.rb | 2 +- app/models/user.rb | 15 ++++++--- app/serializers/basic_post_serializer.rb | 10 ------ app/serializers/basic_user_serializer.rb | 10 +----- app/serializers/post_serializer.rb | 4 +-- app/serializers/user_action_serializer.rb | 14 +-------- config/locales/server.en.yml | 4 +-- config/site_settings.yml | 8 ++--- 19 files changed, 35 insertions(+), 118 deletions(-) delete mode 100644 app/assets/javascripts/discourse/lib/avatar-template.js.es6 diff --git a/app/assets/javascripts/discourse/components/who-liked.js.es6 b/app/assets/javascripts/discourse/components/who-liked.js.es6 index 34ba672236..5c12a91d94 100644 --- a/app/assets/javascripts/discourse/components/who-liked.js.es6 +++ b/app/assets/javascripts/discourse/components/who-liked.js.es6 @@ -13,7 +13,7 @@ export default Ember.Component.extend(StringBuffer, { iconsHtml += ""; iconsHtml += Discourse.Utilities.avatarImg({ size: 'small', - avatarTemplate: u.get('avatarTemplate'), + avatarTemplate: u.get('avatar_template'), title: u.get('username') }); iconsHtml += ""; diff --git a/app/assets/javascripts/discourse/helpers/application.js.es6 b/app/assets/javascripts/discourse/helpers/application.js.es6 index 02fa08fa84..5c72c6fc8b 100644 --- a/app/assets/javascripts/discourse/helpers/application.js.es6 +++ b/app/assets/javascripts/discourse/helpers/application.js.es6 @@ -1,22 +1,17 @@ import registerUnbound from 'discourse/helpers/register-unbound'; -import avatarTemplate from 'discourse/lib/avatar-template'; import { longDate, autoUpdatingRelativeAge, number } from 'discourse/lib/formatter'; const safe = Handlebars.SafeString; -Em.Handlebars.helper('bound-avatar', function(user, size, uploadId) { +Em.Handlebars.helper('bound-avatar', function(user, size) { if (Em.isEmpty(user)) { return new safe("
        "); } - const username = Em.get(user, 'username'), - letterAvatarColor = Em.get(user, 'letter_avatar_color'); - - if (arguments.length < 4) { uploadId = Em.get(user, 'uploaded_avatar_id'); } - const avatar = Em.get(user, 'avatar_template') || avatarTemplate(username, uploadId, letterAvatarColor); + const avatar = Em.get(user, 'avatar_template'); return new safe(Discourse.Utilities.avatarImg({ size: size, avatarTemplate: avatar })); -}, 'username', 'uploaded_avatar_id', 'letter_avatar_color', 'avatar_template'); +}, 'username', 'avatar_template'); /* * Used when we only have a template diff --git a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 index aea2e9baae..c5eac31ad6 100644 --- a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 +++ b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 @@ -1,15 +1,14 @@ import registerUnbound from 'discourse/helpers/register-unbound'; -import avatarTemplate from 'discourse/lib/avatar-template'; function renderAvatar(user, options) { options = options || {}; if (user) { - let username = Em.get(user, 'username'); - if (!username) { - if (!options.usernamePath) { return ''; } - username = Em.get(user, options.usernamePath); - } + + const username = Em.get(user, options.usernamePath || 'username'); + const avatarTemplate = Em.get(user, options.avatarTemplatePath || 'avatar_template'); + + if (!username || !avatarTemplate) { return ''; } let title; if (!options.ignoreTitle) { @@ -27,15 +26,11 @@ function renderAvatar(user, options) { } } - // this is simply done to ensure we cache images correctly - const uploadedAvatarId = Em.get(user, 'uploaded_avatar_id') || Em.get(user, 'user.uploaded_avatar_id'), - letterAvatarColor = Em.get(user, 'letter_avatar_color') || Em.get(user, 'user.letter_avatar_color'); - return Discourse.Utilities.avatarImg({ size: options.imageSize, extraClasses: Em.get(user, 'extras') || options.extraClasses, title: title || username, - avatarTemplate: Em.get("avatar_template") || avatarTemplate(username, uploadedAvatarId, letterAvatarColor) + avatarTemplate: avatarTemplate }); } else { return ''; diff --git a/app/assets/javascripts/discourse/lib/avatar-template.js.es6 b/app/assets/javascripts/discourse/lib/avatar-template.js.es6 deleted file mode 100644 index 4d2fdb2bf7..0000000000 --- a/app/assets/javascripts/discourse/lib/avatar-template.js.es6 +++ /dev/null @@ -1,31 +0,0 @@ -import { hashString } from 'discourse/lib/hash'; - -let _splitAvatars; - -function defaultAvatar(username, letterAvatarColor) { - const defaultAvatars = Discourse.SiteSettings.default_avatars, - version = Discourse.LetterAvatarVersion; - - if (defaultAvatars && defaultAvatars.length) { - _splitAvatars = _splitAvatars || defaultAvatars.split("\n"); - - if (_splitAvatars.length) { - const hash = hashString(username); - return _splitAvatars[Math.abs(hash) % _splitAvatars.length]; - } - } - - if (Discourse.SiteSettings.external_letter_avatars_enabled) { - const url = Discourse.SiteSettings.external_letter_avatars_url; - return `${url}/letter/${username[0]}/${letterAvatarColor}/{size}.png`; - } else { - return Discourse.getURLWithCDN(`/letter_avatar/${username.toLowerCase()}/{size}/${version}.png`); - } -} - -export default function(username, uploadedAvatarId, letterAvatarColor) { - if (uploadedAvatarId) { - return Discourse.getURLWithCDN(`/user_avatar/${Discourse.BaseUrl}/${username.toLowerCase()}/{size}/${uploadedAvatarId}.png`); - } - return defaultAvatar(username, letterAvatarColor); -} diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6 index 12cba4936a..9cb5db0693 100644 --- a/app/assets/javascripts/discourse/models/composer.js.es6 +++ b/app/assets/javascripts/discourse/models/composer.js.es6 @@ -567,7 +567,7 @@ const Composer = RestModel.extend({ username: user.get('username'), user_id: user.get('id'), user_title: user.get('title'), - uploaded_avatar_id: user.get('uploaded_avatar_id'), + avatar_template: user.get('avatar_template'), user_custom_fields: user.get('custom_fields'), post_type: this.site.get('post_types.regular'), actions_summary: [], @@ -587,7 +587,7 @@ const Composer = RestModel.extend({ reply_to_post_number: post.get('post_number'), reply_to_user: { username: post.get('username'), - uploaded_avatar_id: post.get('uploaded_avatar_id') + avatar_template: post.get('avatar_template') } }); } diff --git a/app/assets/javascripts/discourse/models/user-action.js.es6 b/app/assets/javascripts/discourse/models/user-action.js.es6 index 05e1e4929c..f03d819083 100644 --- a/app/assets/javascripts/discourse/models/user-action.js.es6 +++ b/app/assets/javascripts/discourse/models/user-action.js.es6 @@ -154,8 +154,6 @@ const UserAction = RestModel.extend({ switchToActing() { this.setProperties({ username: this.get('acting_username'), - uploaded_avatar_id: this.get('acting_uploaded_avatar_id'), - letter_avatar_color: this.get('action_letter_avatar_color'), name: this.get('actingDisplayName') }); } diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6 index 8fac2812ed..4fab93f2de 100644 --- a/app/assets/javascripts/discourse/models/user.js.es6 +++ b/app/assets/javascripts/discourse/models/user.js.es6 @@ -1,6 +1,5 @@ import { url } from 'discourse/lib/computed'; import RestModel from 'discourse/models/rest'; -import avatarTemplate from 'discourse/lib/avatar-template'; import UserStream from 'discourse/models/user-stream'; import UserPostsStream from 'discourse/models/user-posts-stream'; import Singleton from 'discourse/mixins/singleton'; @@ -257,11 +256,6 @@ const User = RestModel.extend({ }); }, - @computed("username", "uploaded_avatar_id", "letter_avatar_color") - avatarTemplate(username, uploadedAvatarId, letterAvatarColor) { - return avatarTemplate(username, uploadedAvatarId, letterAvatarColor); - }, - /* Change avatar selection */ diff --git a/app/assets/javascripts/discourse/templates/components/stream-item.hbs b/app/assets/javascripts/discourse/templates/components/stream-item.hbs index c84082519b..22900bbb27 100644 --- a/app/assets/javascripts/discourse/templates/components/stream-item.hbs +++ b/app/assets/javascripts/discourse/templates/components/stream-item.hbs @@ -23,7 +23,7 @@ {{fa-icon 'times'}} {{i18n "bookmarks.remove"}} {{else}} -
        {{avatar grandChild imageSize="tiny" extraClasses="actor" ignoreTitle="true"}}
         +
        {{avatar grandChild imageSize="tiny" extraClasses="actor" ignoreTitle="true" avatarTemplatePath="acting_avatar_template"}}
         {{#if grandChild.edit_reason}} — {{grandChild.edit_reason}}{{/if}} {{/if}} {{/each}} diff --git a/app/assets/javascripts/discourse/templates/list/posters-column.raw.hbs b/app/assets/javascripts/discourse/templates/list/posters-column.raw.hbs index 1b837fb5a7..5adbfd3d72 100644 --- a/app/assets/javascripts/discourse/templates/list/posters-column.raw.hbs +++ b/app/assets/javascripts/discourse/templates/list/posters-column.raw.hbs @@ -1,5 +1,5 @@ {{#each poster in posters}} -{{avatar poster usernamePath="user.username" imageSize="small"}} +{{avatar poster avatarTemplatePath="user.avatar_template" usernamePath="user.username" imageSize="small"}} {{/each}} diff --git a/app/assets/javascripts/discourse/views/composer.js.es6 b/app/assets/javascripts/discourse/views/composer.js.es6 index 63a8675ec8..5d62db4161 100644 --- a/app/assets/javascripts/discourse/views/composer.js.es6 +++ b/app/assets/javascripts/discourse/views/composer.js.es6 @@ -1,7 +1,6 @@ import userSearch from 'discourse/lib/user-search'; import afterTransition from 'discourse/lib/after-transition'; import loadScript from 'discourse/lib/load-script'; -import avatarTemplate from 'discourse/lib/avatar-template'; import positioningWorkaround from 'discourse/lib/safari-hacks'; import debounce from 'discourse/lib/debounce'; import { linkSeenMentions, fetchUnseenMentions } from 'discourse/lib/link-mentions'; @@ -251,11 +250,7 @@ const ComposerView = Ember.View.extend(Ember.Evented, { if (posts && topicId === self.get('controller.controllers.topic.model.id')) { const quotedPost = posts.findProperty("post_number", postNumber); if (quotedPost) { - const username = quotedPost.get('username'), - uploadId = quotedPost.get('uploaded_avatar_id'), - letterAvatarColor = quotedPost.get("letter_avatar_color"); - - return Discourse.Utilities.tinyAvatar(avatarTemplate(username, uploadId, letterAvatarColor)); + return Discourse.Utilities.tinyAvatar(quotedPost.get('avatar_template')); } } } diff --git a/app/assets/javascripts/main_include.js b/app/assets/javascripts/main_include.js index 797cab8658..757f7308ec 100644 --- a/app/assets/javascripts/main_include.js +++ b/app/assets/javascripts/main_include.js @@ -14,7 +14,6 @@ //= require ./discourse/lib/load-script //= require ./discourse/lib/notification-levels //= require ./discourse/lib/app-events -//= require ./discourse/lib/avatar-template //= require ./discourse/lib/url //= require ./discourse/lib/debounce //= require ./discourse/lib/quote @@ -41,7 +40,6 @@ //= require ./discourse/lib/autocomplete //= require ./discourse/lib/after-transition //= require ./discourse/lib/debounce -//= require ./discourse/lib/avatar-template //= require ./discourse/lib/safari-hacks //= require_tree ./discourse/adapters //= require ./discourse/models/rest diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index cf72afcf6f..22334cc9b9 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -518,7 +518,7 @@ class UsersController < ApplicationController user_fields = [:username, :upload_avatar_template, :uploaded_avatar_id] user_fields << :name if SiteSetting.enable_names? - to_render = { users: results.as_json(only: user_fields, methods: [:avatar_template, :letter_avatar_color]) } + to_render = { users: results.as_json(only: user_fields, methods: [:avatar_template]) } if params[:include_groups] == "true" to_render[:groups] = Group.search_group(term, current_user).map {|m| {:name=>m.name, :usernames=> m.usernames.split(",")} } diff --git a/app/models/user.rb b/app/models/user.rb index 75d732ea67..4c8e1d9aad 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -457,7 +457,7 @@ class User < ActiveRecord::Base split_avatars[hash.abs % split_avatars.size] end else - letter_avatar_template(username) + system_avatar_template(username) end end @@ -468,10 +468,15 @@ class User < ActiveRecord::Base UserAvatar.local_avatar_template(hostname, username.downcase, uploaded_avatar_id) end - def self.letter_avatar_template(username) - if SiteSetting.external_letter_avatars_enabled + def self.system_avatar_template(username) + # TODO it may be worth caching this in a distributed cache, should be benched + if SiteSetting.external_system_avatars_enabled color = letter_avatar_color(username) - "#{SiteSetting.external_letter_avatars_url}/letter/#{username[0]}/#{color}/{size}.png" + url = SiteSetting.external_system_avatars_url.dup + url.gsub! "{color}", color + url.gsub! "{username}", username + url.gsub! "{first_letter}", username[0].downcase + url else "#{Discourse.base_uri}/letter_avatar/#{username.downcase}/{size}/#{LetterAvatar.version}.png" end @@ -484,7 +489,7 @@ class User < ActiveRecord::Base def self.letter_avatar_color(username) username = username || "" color = LetterAvatar::COLORS[Digest::MD5.hexdigest(username)[0...15].to_i(16) % LetterAvatar::COLORS.length] - color.map { |c| c.to_s(16) }.join + color.map { |c| c.to_s(16).rjust(2, '0') }.join end def avatar_template diff --git a/app/serializers/basic_post_serializer.rb b/app/serializers/basic_post_serializer.rb index 4edb2b5cc5..8969d19a06 100644 --- a/app/serializers/basic_post_serializer.rb +++ b/app/serializers/basic_post_serializer.rb @@ -4,8 +4,6 @@ class BasicPostSerializer < ApplicationSerializer :name, :username, :avatar_template, - :uploaded_avatar_id, - :letter_avatar_color, :created_at, :cooked, :cooked_hidden @@ -22,14 +20,6 @@ class BasicPostSerializer < ApplicationSerializer object.user.try(:avatar_template) end - def uploaded_avatar_id - object.user.try(:uploaded_avatar_id) - end - - def letter_avatar_color - object.user.try(:letter_avatar_color) - end - def cooked_hidden object.hidden && !scope.is_staff? end diff --git a/app/serializers/basic_user_serializer.rb b/app/serializers/basic_user_serializer.rb index 2c72eb3422..8880c8dbd7 100644 --- a/app/serializers/basic_user_serializer.rb +++ b/app/serializers/basic_user_serializer.rb @@ -1,5 +1,5 @@ class BasicUserSerializer < ApplicationSerializer - attributes :id, :username, :uploaded_avatar_id, :avatar_template, :letter_avatar_color + attributes :id, :username, :avatar_template def include_name? SiteSetting.enable_names? @@ -17,12 +17,4 @@ class BasicUserSerializer < ApplicationSerializer object[:user] || object end - def letter_avatar_color - if Hash === object - User.letter_avatar_color(user[:username]) - else - user.try(:letter_avatar_color) - end - end - end diff --git a/app/serializers/post_serializer.rb b/app/serializers/post_serializer.rb index 9bc469f047..a10f9dbf63 100644 --- a/app/serializers/post_serializer.rb +++ b/app/serializers/post_serializer.rb @@ -177,9 +177,7 @@ class PostSerializer < BasicPostSerializer def reply_to_user { username: object.reply_to_user.username, - avatar_template: object.reply_to_user.avatar_template, - uploaded_avatar_id: object.reply_to_user.uploaded_avatar_id, - letter_avatar_color: object.reply_to_user.letter_avatar_color, + avatar_template: object.reply_to_user.avatar_template } end diff --git a/app/serializers/user_action_serializer.rb b/app/serializers/user_action_serializer.rb index 4bf6650048..d9609ff9b4 100644 --- a/app/serializers/user_action_serializer.rb +++ b/app/serializers/user_action_serializer.rb @@ -26,12 +26,8 @@ class UserActionSerializer < ApplicationSerializer :action_code, :edit_reason, :category_id, - :uploaded_avatar_id, - :letter_avatar_color, :closed, - :archived, - :acting_uploaded_avatar_id, - :acting_letter_avatar_color + :archived def excerpt cooked = object.cooked || PrettyText.cook(object.raw) @@ -86,12 +82,4 @@ class UserActionSerializer < ApplicationSerializer object.topic_archived end - def letter_avatar_color - User.letter_avatar_color(username) - end - - def acting_letter_avatar_color - User.letter_avatar_color(acting_username) - end - end diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 7dd33c874a..1309a124ed 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -979,8 +979,8 @@ en: avatar_sizes: "List of automatically generated avatar sizes." - external_letter_avatars_enabled: "Use external letter avatars service." - external_letter_avatars_url: "URL of the external letter avatars service." + external_system_avatars_enabled: "Use external system avatars service." + external_system_avatars_url: "URL of the external system avatars service. Allowed substitions are {username} {first_letter} {color} {size}" enable_flash_video_onebox: "Enable embedding of swf and flv (Adobe Flash) links in oneboxes. WARNING: may introduce security risks." diff --git a/config/site_settings.yml b/config/site_settings.yml index add19d2db0..5c96a03857 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -572,13 +572,13 @@ files: avatar_sizes: default: '20|25|32|45|60|120' type: list - external_letter_avatars_enabled: + external_system_avatars_enabled: default: false client: true - external_letter_avatars_url: - default: "https://avatars.discourse.org" + external_system_avatars_url: + default: "https://avatars.discourse.org/letter/{first_letter}/{color}/{size}.png" client: true - regex: '^https?:\/\/.+[^\/]$' + regex: '^https?:\/\/.+[^\/]' trust: default_trust_level: From 0c58f08207677eae93aad0ead17ef5a91d3dfb63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Fri, 11 Sep 2015 12:56:34 +0200 Subject: [PATCH 051/157] FIX: profile picture selector --- .../components/avatar-uploader.js.es6 | 17 +++++--- .../controllers/avatar-selector.js.es6 | 41 +++++++++++------- .../discourse/helpers/application.js.es6 | 15 +++---- .../javascripts/discourse/models/user.js.es6 | 34 +++++---------- .../discourse/routes/preferences.js.es6 | 43 ++++++++++--------- .../templates/modal/avatar_selector.hbs | 21 ++++----- .../discourse/views/avatar-selector.js.es6 | 12 ++++-- app/controllers/user_avatars_controller.rb | 5 ++- app/models/user.rb | 7 +-- app/serializers/user_serializer.rb | 22 ++++++++++ .../lib/avatar-template-test.js.es6 | 16 ------- 11 files changed, 116 insertions(+), 117 deletions(-) delete mode 100644 test/javascripts/lib/avatar-template-test.js.es6 diff --git a/app/assets/javascripts/discourse/components/avatar-uploader.js.es6 b/app/assets/javascripts/discourse/components/avatar-uploader.js.es6 index 8379606460..539171bc9a 100644 --- a/app/assets/javascripts/discourse/components/avatar-uploader.js.es6 +++ b/app/assets/javascripts/discourse/components/avatar-uploader.js.es6 @@ -1,3 +1,4 @@ +import computed from "ember-addons/ember-computed-decorators"; import UploadMixin from "discourse/mixins/upload"; export default Em.Component.extend(UploadMixin, { @@ -5,21 +6,23 @@ export default Em.Component.extend(UploadMixin, { tagName: "span", imageIsNotASquare: false, - uploadButtonText: function() { - return this.get("uploading") ? I18n.t("uploading") : I18n.t("user.change_avatar.upload_picture"); - }.property("uploading"), + @computed("uploading") + uploadButtonText(uploading) { + return uploading ? I18n.t("uploading") : I18n.t("user.change_avatar.upload_picture"); + }, uploadDone(upload) { this.setProperties({ imageIsNotASquare: upload.width !== upload.height, uploadedAvatarTemplate: upload.url, - custom_avatar_upload_id: upload.id, + uploadedAvatarId: upload.id, }); this.sendAction("done"); }, - data: function() { - return { user_id: this.get("user_id") }; - }.property("user_id") + @computed("user_id") + data(user_id) { + return { user_id }; + } }); diff --git a/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6 b/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6 index f0bb9fcb3f..29aae8bf67 100644 --- a/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6 +++ b/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6 @@ -1,21 +1,29 @@ -import ModalFunctionality from 'discourse/mixins/modal-functionality'; +import computed from "ember-addons/ember-computed-decorators"; +import ModalFunctionality from "discourse/mixins/modal-functionality"; export default Ember.Controller.extend(ModalFunctionality, { - uploadedAvatarTemplate: null, - saveDisabled: Em.computed.alias("uploading"), - hasUploadedAvatar: Em.computed.or('uploadedAvatarTemplate', 'custom_avatar_upload_id'), - - selectedUploadId: function() { - switch (this.get("selected")) { - case "system": return this.get("system_avatar_upload_id"); - case "gravatar": return this.get("gravatar_avatar_upload_id"); - default: return this.get("custom_avatar_upload_id"); + @computed("selected", "system_avatar_upload_id", "gravatar_avatar_upload_id", "custom_avatar_upload_id") + selectedUploadId(selected, system, gravatar, custom) { + switch (selected) { + case "system": return system; + case "gravatar": return gravatar; + default: return custom; } - }.property('selected', 'system_avatar_upload_id', 'gravatar_avatar_upload_id', 'custom_avatar_upload_id'), + }, - allowImageUpload: function() { + @computed("selected", "system_avatar_template", "gravatar_avatar_template", "custom_avatar_template") + selectedAvatarTemplate(selected, system, gravatar, custom) { + switch (selected) { + case "system": return system; + case "gravatar": return gravatar; + default: return custom; + } + }, + + @computed() + allowImageUpload() { return Discourse.Utilities.allowsImages(); - }.property(), + }, actions: { useUploadedAvatar() { this.set("selected", "uploaded"); }, @@ -25,8 +33,11 @@ export default Ember.Controller.extend(ModalFunctionality, { refreshGravatar() { this.set("gravatarRefreshDisabled", true); return Discourse - .ajax("/user_avatar/" + this.get("username") + "/refresh_gravatar.json", { method: 'POST' }) - .then(result => this.set("gravatar_avatar_upload_id", result.upload_id)) + .ajax(`/user_avatar/${this.get("username")}/refresh_gravatar.json`, { method: "POST" }) + .then(result => this.setProperties({ + gravatar_avatar_template: result.gravatar_avatar_template, + gravatar_upload_id: result.gravatar_upload_id, + })) .finally(() => this.set("gravatarRefreshDisabled", false)); } } diff --git a/app/assets/javascripts/discourse/helpers/application.js.es6 b/app/assets/javascripts/discourse/helpers/application.js.es6 index 5c72c6fc8b..2f4ea292c8 100644 --- a/app/assets/javascripts/discourse/helpers/application.js.es6 +++ b/app/assets/javascripts/discourse/helpers/application.js.es6 @@ -3,32 +3,27 @@ import { longDate, autoUpdatingRelativeAge, number } from 'discourse/lib/formatt const safe = Handlebars.SafeString; -Em.Handlebars.helper('bound-avatar', function(user, size) { +Em.Handlebars.helper('bound-avatar', (user, size) => { if (Em.isEmpty(user)) { return new safe("
        "); } const avatar = Em.get(user, 'avatar_template'); - return new safe(Discourse.Utilities.avatarImg({ size: size, avatarTemplate: avatar })); }, 'username', 'avatar_template'); /* * Used when we only have a template */ -Em.Handlebars.helper('bound-avatar-template', function(at, size) { +Em.Handlebars.helper('bound-avatar-template', (at, size) => { return new safe(Discourse.Utilities.avatarImg({ size: size, avatarTemplate: at })); }); -registerUnbound('raw-date', function(dt) { - return longDate(new Date(dt)); -}); +registerUnbound('raw-date', dt => longDate(new Date(dt))); -registerUnbound('age-with-tooltip', function(dt) { - return new safe(autoUpdatingRelativeAge(new Date(dt), {title: true})); -}); +registerUnbound('age-with-tooltip', dt => new safe(autoUpdatingRelativeAge(new Date(dt), {title: true}))); -registerUnbound('number', function(orig, params) { +registerUnbound('number', (orig, params) => { orig = parseInt(orig, 10); if (isNaN(orig)) { orig = 0; } diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6 index 4fab93f2de..48b84011b4 100644 --- a/app/assets/javascripts/discourse/models/user.js.es6 +++ b/app/assets/javascripts/discourse/models/user.js.es6 @@ -256,47 +256,33 @@ const User = RestModel.extend({ }); }, - /* - Change avatar selection - */ - pickAvatar(uploadId) { + pickAvatar(upload_id, avatar_template) { return Discourse.ajax(`/users/${this.get("username_lower")}/preferences/avatar/pick`, { type: 'PUT', - data: { upload_id: uploadId } - }).then(() => this.set('uploaded_avatar_id', uploadId)); + data: { upload_id } + }).then(() => this.setProperties({ + avatar_template, + uploaded_avatar_id: upload_id + })); }, - /** - Determines whether the current user is allowed to upload a file. - - @method isAllowedToUploadAFile - @param {String} type The type of the upload (image, attachment) - @returns true if the current user is allowed to upload a file - **/ isAllowedToUploadAFile(type) { return this.get('staff') || this.get('trust_level') > 0 || Discourse.SiteSettings['newuser_max_' + type + 's'] > 0; }, - /** - Invite a user to the site - - @method createInvite - @param {String} email The email address of the user to invite to the site - @returns {Promise} the result of the server call - **/ - createInvite(email, groupNames) { + createInvite(email, group_names) { return Discourse.ajax('/invites', { type: 'POST', - data: {email: email, group_names: groupNames} + data: { email, group_names } }); }, - generateInviteLink(email, groupNames, topicId) { + generateInviteLink(email, group_names, topic_id) { return Discourse.ajax('/invites/link', { type: 'POST', - data: {email: email, group_names: groupNames, topic_id: topicId} + data: { email, group_names, topic_id } }); }, diff --git a/app/assets/javascripts/discourse/routes/preferences.js.es6 b/app/assets/javascripts/discourse/routes/preferences.js.es6 index d748689f40..e1f9d597da 100644 --- a/app/assets/javascripts/discourse/routes/preferences.js.es6 +++ b/app/assets/javascripts/discourse/routes/preferences.js.es6 @@ -18,50 +18,51 @@ export default RestrictedUserRoute.extend({ showModal('avatar-selector'); // all the properties needed for displaying the avatar selector modal - const controller = this.controllerFor('avatar-selector'), - props = this.modelFor('user').getProperties( + const props = this.modelFor('user').getProperties( 'id', 'email', 'username', - 'uploaded_avatar_id', + 'avatar_template', + 'system_avatar_template', + 'gravatar_avatar_template', + 'custom_avatar_template', 'system_avatar_upload_id', 'gravatar_avatar_upload_id', 'custom_avatar_upload_id' ); - switch (props.uploaded_avatar_id) { - case props.system_avatar_upload_id: + switch (props.avatar_template) { + case props.system_avatar_template: props.selected = "system"; break; - case props.gravatar_avatar_upload_id: + case props.gravatar_avatar_template: props.selected = "gravatar"; break; default: props.selected = "uploaded"; } - controller.setProperties(props); + this.controllerFor('avatar-selector').setProperties(props); }, saveAvatarSelection() { const user = this.modelFor('user'), - avatarSelector = this.controllerFor('avatar-selector'); + controller = this.controllerFor('avatar-selector'), + selectedUploadId = controller.get("selectedUploadId"), + selectedAvatarTemplate = controller.get("selectedAvatarTemplate"); - // sends the information to the server if it has changed - if (avatarSelector.get('selectedUploadId') !== user.get('uploaded_avatar_id')) { - user.pickAvatar(avatarSelector.get('selectedUploadId')) - .then(() => { - user.setProperties(avatarSelector.getProperties( - 'system_avatar_upload_id', - 'gravatar_avatar_upload_id', - 'custom_avatar_upload_id' - )); - bootbox.alert(I18n.t("user.change_avatar.cache_notice")); - }); - } + user.pickAvatar(selectedUploadId, selectedAvatarTemplate) + .then(() => { + user.setProperties(controller.getProperties( + 'system_avatar_template', + 'gravatar_avatar_template', + 'custom_avatar_template' + )); + bootbox.alert(I18n.t("user.change_avatar.cache_notice")); + }); // saves the data back - avatarSelector.send('closeModal'); + controller.send('closeModal'); }, } diff --git a/app/assets/javascripts/discourse/templates/modal/avatar_selector.hbs b/app/assets/javascripts/discourse/templates/modal/avatar_selector.hbs index 12f0309d6c..e7d070d814 100644 --- a/app/assets/javascripts/discourse/templates/modal/avatar_selector.hbs +++ b/app/assets/javascripts/discourse/templates/modal/avatar_selector.hbs @@ -2,32 +2,27 @@
        - +
        - + {{d-button action="refreshGravatar" title="user.change_avatar.refresh_gravatar_title" disabled=gravatarRefreshDisabled icon="refresh"}}
        {{#if allowImageUpload}}
        - {{avatar-uploader username=username - user_id=id - uploadedAvatarTemplate=uploadedAvatarTemplate - custom_avatar_upload_id=custom_avatar_upload_id + {{avatar-uploader user_id=id + uploadedAvatarTemplate=custom_avatar_template + uploadedAvatarId=custom_avatar_upload_id uploading=uploading done="useUploadedAvatar"}}
        @@ -36,6 +31,6 @@
        - {{d-button action="saveAvatarSelection" class="btn-primary" disabled=saveDisabled label="save"}} + {{d-button action="saveAvatarSelection" class="btn-primary" disabled=uploading label="save"}} {{i18n 'cancel'}}
        diff --git a/app/assets/javascripts/discourse/views/avatar-selector.js.es6 b/app/assets/javascripts/discourse/views/avatar-selector.js.es6 index 15b8541ef3..6fcc5c9bc4 100644 --- a/app/assets/javascripts/discourse/views/avatar-selector.js.es6 +++ b/app/assets/javascripts/discourse/views/avatar-selector.js.es6 @@ -1,3 +1,4 @@ +import { on, observes } from "ember-addons/ember-computed-decorators"; import ModalBodyView from "discourse/views/modal-body"; export default ModalBodyView.extend({ @@ -6,11 +7,14 @@ export default ModalBodyView.extend({ title: I18n.t('user.change_avatar.title'), // *HACK* used to select the proper radio button, because {{action}} stops the default behavior - selectedChanged: function() { + @on("didInsertElement") + @observes("controller.selected") + selectedChanged() { Em.run.next(() => $('input:radio[name="avatar"]').val([this.get('controller.selected')])); - }.observes('controller.selected').on("didInsertElement"), + }, - _focusSelectedButton: function() { + @on("didInsertElement") + _focusSelectedButton() { Em.run.next(() => $('input:radio[value="' + this.get('controller.selected') + '"]').focus()); - }.on("didInsertElement") + } }); diff --git a/app/controllers/user_avatars_controller.rb b/app/controllers/user_avatars_controller.rb index ed8f31e4af..2666481070 100644 --- a/app/controllers/user_avatars_controller.rb +++ b/app/controllers/user_avatars_controller.rb @@ -13,7 +13,10 @@ class UserAvatarsController < ApplicationController user.create_user_avatar(user_id: user.id) unless user.user_avatar user.user_avatar.update_gravatar! - render json: { upload_id: user.user_avatar.gravatar_upload_id } + render json: { + gravatar_upload_id: user.user_avatar.gravatar_upload_id, + gravatar_avatar_template: User.avatar_template(user.username, user.user_avatar.gravatar_upload_id) + } else raise Discourse::NotFound end diff --git a/app/models/user.rb b/app/models/user.rb index 4c8e1d9aad..b00ac21b3a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -471,9 +471,8 @@ class User < ActiveRecord::Base def self.system_avatar_template(username) # TODO it may be worth caching this in a distributed cache, should be benched if SiteSetting.external_system_avatars_enabled - color = letter_avatar_color(username) url = SiteSetting.external_system_avatars_url.dup - url.gsub! "{color}", color + url.gsub! "{color}", letter_avatar_color(username) url.gsub! "{username}", username url.gsub! "{first_letter}", username[0].downcase url @@ -482,10 +481,6 @@ class User < ActiveRecord::Base end end - def letter_avatar_color - self.class.letter_avatar_color(username) - end - def self.letter_avatar_color(username) username = username || "" color = LetterAvatar::COLORS[Digest::MD5.hexdigest(username)[0...15].to_i(16) % LetterAvatar::COLORS.length] diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb index 2d216a5150..334b20e2d2 100644 --- a/app/serializers/user_serializer.rb +++ b/app/serializers/user_serializer.rb @@ -93,8 +93,12 @@ class UserSerializer < BasicUserSerializer :watched_category_ids, :private_messages_stats, :disable_jump_reply, + :system_avatar_upload_id, + :system_avatar_template, :gravatar_avatar_upload_id, + :gravatar_avatar_template, :custom_avatar_upload_id, + :custom_avatar_template, :has_title_badges, :card_image_badge, :card_image_badge_id, @@ -278,14 +282,32 @@ class UserSerializer < BasicUserSerializer UserAction.private_messages_stats(object.id, scope) end + def system_avatar_upload_id + # should be left blank + end + + def system_avatar_template + User.system_avatar_template(object.username) + end + def gravatar_avatar_upload_id object.user_avatar.try(:gravatar_upload_id) end + def gravatar_avatar_template + return unless gravatar_upload_id = object.user_avatar.try(:gravatar_upload_id) + User.avatar_template(object.username, gravatar_upload_id) + end + def custom_avatar_upload_id object.user_avatar.try(:custom_upload_id) end + def custom_avatar_template + return unless custom_upload_id = object.user_avatar.try(:custom_upload_id) + User.avatar_template(object.username, custom_upload_id) + end + def has_title_badges object.badges.where(allow_title: true).count > 0 end diff --git a/test/javascripts/lib/avatar-template-test.js.es6 b/test/javascripts/lib/avatar-template-test.js.es6 deleted file mode 100644 index c2f004c8da..0000000000 --- a/test/javascripts/lib/avatar-template-test.js.es6 +++ /dev/null @@ -1,16 +0,0 @@ -import avatarTemplate from 'discourse/lib/avatar-template'; - -module('lib:avatar-template'); - -test("avatarTemplate", function(){ - var oldCDN = Discourse.CDN; - var oldBase = Discourse.BaseUrl; - Discourse.BaseUrl = "frogs.com"; - - equal(avatarTemplate("sam", 1), "/user_avatar/frogs.com/sam/{size}/1.png"); - Discourse.CDN = "http://awesome.cdn.com"; - equal(avatarTemplate("sam", 1), "http://awesome.cdn.com/user_avatar/frogs.com/sam/{size}/1.png"); - Discourse.CDN = oldCDN; - Discourse.BaseUrl = oldBase; -}); - From 569f2815d1cff5c9bd749cb4c67cc22424eea0e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Fri, 11 Sep 2015 14:44:14 +0200 Subject: [PATCH 052/157] FIX: ensure we still works with cookies off --- app/assets/javascripts/discourse/lib/key-value-store.js.es6 | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/javascripts/discourse/lib/key-value-store.js.es6 b/app/assets/javascripts/discourse/lib/key-value-store.js.es6 index 30f86b16ec..243146833e 100644 --- a/app/assets/javascripts/discourse/lib/key-value-store.js.es6 +++ b/app/assets/javascripts/discourse/lib/key-value-store.js.es6 @@ -32,6 +32,7 @@ KeyValueStore.prototype = { }, remove(key) { + if (!safeLocalStorage) { return; } return safeLocalStorage.removeItem(this.context + key); }, From 93f9dcfcec9fbbdef247076e3930243843cb0943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Fri, 11 Sep 2015 15:04:29 +0200 Subject: [PATCH 053/157] FIX: don't overwrite custom uploaded avatar when selecting gravatar FIX: remove unecessary serialized fields --- app/assets/javascripts/discourse/models/user.js.es6 | 4 ++-- .../javascripts/discourse/routes/preferences.js.es6 | 7 +++++-- app/controllers/users_controller.rb | 13 ++++++------- app/models/upload.rb | 2 +- app/models/user.rb | 4 ++-- app/models/user_avatar.rb | 6 ++---- app/serializers/admin_post_serializer.rb | 6 +----- app/serializers/post_action_user_serializer.rb | 4 ---- app/serializers/topic_post_count_serializer.rb | 4 ---- lib/avatar_lookup.rb | 5 +---- 10 files changed, 20 insertions(+), 35 deletions(-) diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6 index 48b84011b4..bd0e36c5fa 100644 --- a/app/assets/javascripts/discourse/models/user.js.es6 +++ b/app/assets/javascripts/discourse/models/user.js.es6 @@ -256,10 +256,10 @@ const User = RestModel.extend({ }); }, - pickAvatar(upload_id, avatar_template) { + pickAvatar(upload_id, type, avatar_template) { return Discourse.ajax(`/users/${this.get("username_lower")}/preferences/avatar/pick`, { type: 'PUT', - data: { upload_id } + data: { upload_id, type } }).then(() => this.setProperties({ avatar_template, uploaded_avatar_id: upload_id diff --git a/app/assets/javascripts/discourse/routes/preferences.js.es6 b/app/assets/javascripts/discourse/routes/preferences.js.es6 index e1f9d597da..8bea9b4604 100644 --- a/app/assets/javascripts/discourse/routes/preferences.js.es6 +++ b/app/assets/javascripts/discourse/routes/preferences.js.es6 @@ -49,9 +49,12 @@ export default RestrictedUserRoute.extend({ const user = this.modelFor('user'), controller = this.controllerFor('avatar-selector'), selectedUploadId = controller.get("selectedUploadId"), - selectedAvatarTemplate = controller.get("selectedAvatarTemplate"); + selectedAvatarTemplate = controller.get("selectedAvatarTemplate"), + type = controller.get("selected"); - user.pickAvatar(selectedUploadId, selectedAvatarTemplate) + if (type === "uploaded") { type = "custom" } + + user.pickAvatar(selectedUploadId, type, selectedAvatarTemplate) .then(() => { user.setProperties(controller.getProperties( 'system_avatar_template', diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 22334cc9b9..ab1104e8d4 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -515,13 +515,13 @@ class UsersController < ApplicationController results = UserSearch.new(term, topic_id: topic_id, topic_allowed_users: topic_allowed_users, searching_user: current_user).search - user_fields = [:username, :upload_avatar_template, :uploaded_avatar_id] + user_fields = [:username, :upload_avatar_template] user_fields << :name if SiteSetting.enable_names? to_render = { users: results.as_json(only: user_fields, methods: [:avatar_template]) } if params[:include_groups] == "true" - to_render[:groups] = Group.search_group(term, current_user).map {|m| {:name=>m.name, :usernames=> m.usernames.split(",")} } + to_render[:groups] = Group.search_group(term, current_user).map { |m| { name: m.name, usernames: m.usernames.split(",") } } end render json: to_render @@ -533,12 +533,11 @@ class UsersController < ApplicationController upload_id = params[:upload_id] - user.uploaded_avatar_id = upload_id + type = params[:type] + type = "custom" if type == "uploaded" - # ensure we associate the custom avatar properly - if upload_id && user.user_avatar.custom_upload_id != upload_id - user.user_avatar.custom_upload_id = upload_id - end + user.uploaded_avatar_id = upload_id + user.user_avatar.send("#{type}_upload_id=", upload_id) user.save! user.user_avatar.save! diff --git a/app/models/upload.rb b/app/models/upload.rb index 39e5fb94ef..bcc468d445 100644 --- a/app/models/upload.rb +++ b/app/models/upload.rb @@ -50,7 +50,7 @@ class Upload < ActiveRecord::Base end # list of image types that will be cropped - CROPPED_IMAGE_TYPES ||= ["avatar", "profile_background", "card_background"] + CROPPED_IMAGE_TYPES ||= %w{avatar profile_background card_background} # options # - content_type diff --git a/app/models/user.rb b/app/models/user.rb index b00ac21b3a..a17e4e9baa 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -462,8 +462,8 @@ class User < ActiveRecord::Base end def self.avatar_template(username, uploaded_avatar_id) - return default_template(username) if !uploaded_avatar_id username ||= "" + return default_template(username) if !uploaded_avatar_id hostname = RailsMultisite::ConnectionManagement.current_hostname UserAvatar.local_avatar_template(hostname, username.downcase, uploaded_avatar_id) end @@ -482,7 +482,7 @@ class User < ActiveRecord::Base end def self.letter_avatar_color(username) - username = username || "" + username ||= "" color = LetterAvatar::COLORS[Digest::MD5.hexdigest(username)[0...15].to_i(16) % LetterAvatar::COLORS.length] color.map { |c| c.to_s(16).rjust(2, '0') }.join end diff --git a/app/models/user_avatar.rb b/app/models/user_avatar.rb index f61df736bf..dd17fd6e3e 100644 --- a/app/models/user_avatar.rb +++ b/app/models/user_avatar.rb @@ -39,8 +39,7 @@ class UserAvatar < ActiveRecord::Base end def self.local_avatar_url(hostname, username, upload_id, size) - version = self.version(upload_id) - "#{Discourse.base_uri}/user_avatar/#{hostname}/#{username}/#{size}/#{version}.png" + self.local_avatar_template(hostname, username, upload_id).gsub("{size}", size) end def self.local_avatar_template(hostname, username, upload_id) @@ -49,8 +48,7 @@ class UserAvatar < ActiveRecord::Base end def self.external_avatar_url(user_id, upload_id, size) - version = self.version(upload_id) - "#{Discourse.store.absolute_base_url}/avatars/#{user_id}/#{size}/#{version}.png" + self.external_avatar_template(user_id, upload_id).gsub("{size}", size) end def self.external_avatar_template(user_id, upload_id) diff --git a/app/serializers/admin_post_serializer.rb b/app/serializers/admin_post_serializer.rb index 2dd29df5c0..a06328d832 100644 --- a/app/serializers/admin_post_serializer.rb +++ b/app/serializers/admin_post_serializer.rb @@ -3,7 +3,7 @@ class AdminPostSerializer < ApplicationSerializer attributes :id, :created_at, :post_number, - :name, :username, :avatar_template, :uploaded_avatar_id, + :name, :username, :avatar_template, :topic_id, :topic_slug, :topic_title, :category_id, :excerpt, @@ -29,10 +29,6 @@ class AdminPostSerializer < ApplicationSerializer object.user.avatar_template end - def uploaded_avatar_id - object.user.uploaded_avatar_id - end - def topic_slug topic.slug end diff --git a/app/serializers/post_action_user_serializer.rb b/app/serializers/post_action_user_serializer.rb index b69a273482..72dbd8e4d8 100644 --- a/app/serializers/post_action_user_serializer.rb +++ b/app/serializers/post_action_user_serializer.rb @@ -9,10 +9,6 @@ class PostActionUserSerializer < BasicUserSerializer object.user.username end - def uploaded_avatar_id - object.user.uploaded_avatar_id - end - def avatar_template object.user.avatar_template end diff --git a/app/serializers/topic_post_count_serializer.rb b/app/serializers/topic_post_count_serializer.rb index 586f9f2d79..c780d12031 100644 --- a/app/serializers/topic_post_count_serializer.rb +++ b/app/serializers/topic_post_count_serializer.rb @@ -14,8 +14,4 @@ class TopicPostCountSerializer < BasicUserSerializer object[:post_count] end - def uploaded_avatar_id - object[:user].uploaded_avatar_id - end - end diff --git a/lib/avatar_lookup.rb b/lib/avatar_lookup.rb index b1fc1c6169..4af184052a 100644 --- a/lib/avatar_lookup.rb +++ b/lib/avatar_lookup.rb @@ -12,10 +12,7 @@ class AvatarLookup private def self.lookup_columns - @lookup_columns ||= [:id, - :email, - :username, - :uploaded_avatar_id] + @lookup_columns ||= %i{id email username uploaded_avatar_id} end def users From a28df555181b75a1fd2ac8e6f1e8dcf6d974e7b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Fri, 11 Sep 2015 15:06:17 +0200 Subject: [PATCH 054/157] fix the build --- app/assets/javascripts/discourse/routes/preferences.js.es6 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/routes/preferences.js.es6 b/app/assets/javascripts/discourse/routes/preferences.js.es6 index 8bea9b4604..fd9bba95d2 100644 --- a/app/assets/javascripts/discourse/routes/preferences.js.es6 +++ b/app/assets/javascripts/discourse/routes/preferences.js.es6 @@ -49,9 +49,9 @@ export default RestrictedUserRoute.extend({ const user = this.modelFor('user'), controller = this.controllerFor('avatar-selector'), selectedUploadId = controller.get("selectedUploadId"), - selectedAvatarTemplate = controller.get("selectedAvatarTemplate"), - type = controller.get("selected"); + selectedAvatarTemplate = controller.get("selectedAvatarTemplate"); + let type = controller.get("selected"); if (type === "uploaded") { type = "custom" } user.pickAvatar(selectedUploadId, type, selectedAvatarTemplate) From 8128abe6b91b2d8f6496384ac6f32d0d3e1c6701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Fri, 11 Sep 2015 15:10:38 +0200 Subject: [PATCH 055/157] ES6ify user preferences controller --- .../discourse/controllers/preferences.js.es6 | 67 ++++++++++--------- 1 file changed, 35 insertions(+), 32 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/preferences.js.es6 b/app/assets/javascripts/discourse/controllers/preferences.js.es6 index ee3e86e9d8..a7aa333fbc 100644 --- a/app/assets/javascripts/discourse/controllers/preferences.js.es6 +++ b/app/assets/javascripts/discourse/controllers/preferences.js.es6 @@ -1,6 +1,7 @@ import { setting } from 'discourse/lib/computed'; import CanCheckEmails from 'discourse/mixins/can-check-emails'; import { popupAjaxError } from 'discourse/lib/ajax-error'; +import computed from "ember-addons/ember-computed-decorators"; export default Ember.Controller.extend(CanCheckEmails, { @@ -10,18 +11,18 @@ export default Ember.Controller.extend(CanCheckEmails, { allowBackgrounds: setting('allow_profile_backgrounds'), editHistoryVisible: setting('edit_history_visible_to_public'), - selectedCategories: function(){ - return [].concat(this.get("model.watchedCategories"), - this.get("model.trackedCategories"), - this.get("model.mutedCategories")); - }.property("model.watchedCategories", "model.trackedCategories", "model.mutedCategories"), + @computed("model.watchedCategories", "model.trackedCategories", "model.mutedCategories") + selectedCategories(watched, tracked, muted) { + return [].concat(watched, tracked, muted); + }, // By default we haven't saved anything saved: false, newNameInput: null, - userFields: function() { + @computed("model.user_fields.@each.value") + userFields() { let siteUserFields = this.site.get('user_fields'); if (!Ember.isEmpty(siteUserFields)) { const userFields = this.get('model.user_fields'); @@ -35,34 +36,37 @@ export default Ember.Controller.extend(CanCheckEmails, { return Ember.Object.create({ value, field }); }); } - }.property('model.user_fields.@each.value'), + }, cannotDeleteAccount: Em.computed.not('can_delete_account'), deleteDisabled: Em.computed.or('saving', 'deleting', 'cannotDeleteAccount'), canEditName: setting('enable_names'), - nameInstructions: function() { + @computed() + nameInstructions() { return I18n.t(Discourse.SiteSettings.full_name_required ? 'user.name.instructions_required' : 'user.name.instructions'); - }.property(), + }, - canSelectTitle: function() { - return this.siteSettings.enable_badges && this.get('model.has_title_badges'); - }.property('model.badge_count'), + @computed("model.has_title_badges") + canSelectTitle(hasTitleBadges) { + return this.siteSettings.enable_badges && hasTitleBadges; + }, - canChangePassword: function() { + @computed() + canChangePassword() { return !this.siteSettings.enable_sso && this.siteSettings.enable_local_logins; - }.property(), + }, - canReceiveDigest: function() { + @computed() + canReceiveDigest() { return !this.siteSettings.disable_digest_emails; - }.property(), + }, - availableLocales: function() { - return this.siteSettings.available_locales.split('|').map( function(s) { - return {name: s, value: s}; - }); - }.property(), + @computed() + availableLocales() { + return this.siteSettings.available_locales.split('|').map(s => ({ name: s, value: s })); + }, digestFrequencies: [{ name: I18n.t('user.email_digests.daily'), value: 1 }, { name: I18n.t('user.email_digests.every_three_days'), value: 3 }, @@ -86,16 +90,16 @@ export default Ember.Controller.extend(CanCheckEmails, { { name: I18n.t('user.new_topic_duration.after_2_weeks'), value: 2 * 7 * 60 * 24 }, { name: I18n.t('user.new_topic_duration.last_here'), value: -2 }], - saveButtonText: function() { - return this.get('model.isSaving') ? I18n.t('saving') : I18n.t('save'); - }.property('model.isSaving'), + @computed("model.isSaving") + saveButtonText(isSaving) { + return isSaving ? I18n.t('saving') : I18n.t('save'); + }, passwordProgress: null, actions: { save() { - const self = this; this.set('saved', false); const model = this.get('model'); @@ -113,28 +117,27 @@ export default Ember.Controller.extend(CanCheckEmails, { // Cook the bio for preview model.set('name', this.get('newNameInput')); - return model.save().then(function() { + return model.save().then(() => { if (Discourse.User.currentProp('id') === model.get('id')) { Discourse.User.currentProp('name', model.get('name')); } model.set('bio_cooked', Discourse.Markdown.cook(Discourse.Markdown.sanitize(model.get('bio_raw')))); - self.set('saved', true); + this.set('saved', true); }).catch(popupAjaxError); }, changePassword() { - const self = this; if (!this.get('passwordProgress')) { this.set('passwordProgress', I18n.t("user.change_password.in_progress")); - return this.get('model').changePassword().then(function() { + return this.get('model').changePassword().then(() => { // password changed - self.setProperties({ + this.setProperties({ changePasswordProgress: false, passwordProgress: I18n.t("user.change_password.success") }); - }, function() { + }).catch(() => { // password failed to change - self.setProperties({ + this.setProperties({ changePasswordProgress: false, passwordProgress: I18n.t("user.change_password.error") }); From 29f25dbf6e9bdfa17e41a3a660cac68e695c1759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Fri, 11 Sep 2015 15:18:17 +0200 Subject: [PATCH 056/157] fix the build --- app/models/user_avatar.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/user_avatar.rb b/app/models/user_avatar.rb index dd17fd6e3e..8d57472c68 100644 --- a/app/models/user_avatar.rb +++ b/app/models/user_avatar.rb @@ -39,7 +39,7 @@ class UserAvatar < ActiveRecord::Base end def self.local_avatar_url(hostname, username, upload_id, size) - self.local_avatar_template(hostname, username, upload_id).gsub("{size}", size) + self.local_avatar_template(hostname, username, upload_id).gsub("{size}", size.to_s) end def self.local_avatar_template(hostname, username, upload_id) @@ -48,7 +48,7 @@ class UserAvatar < ActiveRecord::Base end def self.external_avatar_url(user_id, upload_id, size) - self.external_avatar_template(user_id, upload_id).gsub("{size}", size) + self.external_avatar_template(user_id, upload_id).gsub("{size}", size.to_s) end def self.external_avatar_template(user_id, upload_id) From 18d7c1c75d7f346b68a63ee1dd8943a674a3a719 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Fri, 11 Sep 2015 15:47:48 +0200 Subject: [PATCH 057/157] fix the build - take 2 --- .../javascripts/discourse/routes/preferences.js.es6 | 6 ++---- app/controllers/users_controller.rb | 11 +++++++---- spec/controllers/users_controller_spec.rb | 13 +++---------- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/app/assets/javascripts/discourse/routes/preferences.js.es6 b/app/assets/javascripts/discourse/routes/preferences.js.es6 index fd9bba95d2..3ae6aed002 100644 --- a/app/assets/javascripts/discourse/routes/preferences.js.es6 +++ b/app/assets/javascripts/discourse/routes/preferences.js.es6 @@ -49,10 +49,8 @@ export default RestrictedUserRoute.extend({ const user = this.modelFor('user'), controller = this.controllerFor('avatar-selector'), selectedUploadId = controller.get("selectedUploadId"), - selectedAvatarTemplate = controller.get("selectedAvatarTemplate"); - - let type = controller.get("selected"); - if (type === "uploaded") { type = "custom" } + selectedAvatarTemplate = controller.get("selectedAvatarTemplate"), + type = controller.get("selected"); user.pickAvatar(selectedUploadId, type, selectedAvatarTemplate) .then(() => { diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index ab1104e8d4..bb361de6fd 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -531,13 +531,16 @@ class UsersController < ApplicationController user = fetch_user_from_params guardian.ensure_can_edit!(user) + type = params[:type] upload_id = params[:upload_id] - type = params[:type] - type = "custom" if type == "uploaded" - user.uploaded_avatar_id = upload_id - user.user_avatar.send("#{type}_upload_id=", upload_id) + + if type == "uploaded" || type == "custom" + user.user_avatar.custom_upload_id = upload_id + elsif type == "gravatar" + user.user_avatar.gravatar_upload_id = upload_id + end user.save! user.user_avatar.save! diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index 32544497de..884f3f3ff2 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -1301,7 +1301,7 @@ describe UsersController do describe '.pick_avatar' do it 'raises an error when not logged in' do - expect { xhr :put, :pick_avatar, username: 'asdf', avatar_id: 1}.to raise_error(Discourse::NotLoggedIn) + expect { xhr :put, :pick_avatar, username: 'asdf', avatar_id: 1, type: "custom"}.to raise_error(Discourse::NotLoggedIn) end context 'while logged in' do @@ -1310,12 +1310,12 @@ describe UsersController do it 'raises an error when you don\'t have permission to toggle the avatar' do another_user = Fabricate(:user) - xhr :put, :pick_avatar, username: another_user.username, upload_id: 1 + xhr :put, :pick_avatar, username: another_user.username, upload_id: 1, type: "custom" expect(response).to be_forbidden end it 'it successful' do - xhr :put, :pick_avatar, username: user.username, upload_id: 111 + xhr :put, :pick_avatar, username: user.username, upload_id: 111, type: "custom" expect(user.reload.uploaded_avatar_id).to eq(111) expect(user.user_avatar.reload.custom_upload_id).to eq(111) expect(response).to be_success @@ -1326,13 +1326,6 @@ describe UsersController do expect(response).to be_success end - it 'returns success' do - xhr :put, :pick_avatar, username: user.username, upload_id: 111 - expect(user.reload.uploaded_avatar_id).to eq(111) - expect(response).to be_success - json = ::JSON.parse(response.body) - expect(json['success']).to eq("OK") - end end end From 460243d7a319781f1742ccb08c859943098910a5 Mon Sep 17 00:00:00 2001 From: Kane York Date: Fri, 11 Sep 2015 08:29:44 -0700 Subject: [PATCH 058/157] FIX: Give 403 for deleted topics, +lots of tests --- lib/topic_view.rb | 4 +- spec/controllers/topics_controller_spec.rb | 120 +++++++++++++++++++++ spec/spec_helper.rb | 1 - 3 files changed, 122 insertions(+), 3 deletions(-) diff --git a/lib/topic_view.rb b/lib/topic_view.rb index 54483efd5d..333e155b40 100644 --- a/lib/topic_view.rb +++ b/lib/topic_view.rb @@ -355,8 +355,8 @@ class TopicView end def find_topic(topic_id) - finder = Topic.where(id: topic_id).includes(:category) - finder = finder.with_deleted if @guardian.can_see_deleted_topics? + # with_deleted covered in #check_and_raise_exceptions + finder = Topic.with_deleted.where(id: topic_id).includes(:category) finder.first end diff --git a/spec/controllers/topics_controller_spec.rb b/spec/controllers/topics_controller_spec.rb index fd927ebac3..e87a27f482 100644 --- a/spec/controllers/topics_controller_spec.rb +++ b/spec/controllers/topics_controller_spec.rb @@ -1,5 +1,23 @@ require 'spec_helper' +def topics_controller_show_gen_perm_tests(expected, ctx) + expected.each do |sym, status| + params = "topic_id: #{sym}.id, slug: #{sym}.slug" + if sym == :nonexist + params = "topic_id: nonexist_topic_id" + end + ctx.instance_eval(" +it 'returns #{status} for #{sym}' do + begin + xhr :get, :show, #{params} + expect(response.status).to eq(#{status}) + rescue Discourse::NotLoggedIn + expect(302).to eq(#{status}) + end +end") + end +end + describe TopicsController do context 'wordpress' do @@ -554,6 +572,108 @@ describe TopicsController do end end + context 'permission errors' do + let(:allowed_user) { Fabricate(:user) } + let(:allowed_group) { Fabricate(:group) } + let(:secure_category) { + c = Fabricate(:category) + c.permissions = [[allowed_group, :full]] + c.save + allowed_user.groups = [allowed_group] + allowed_user.save + c } + let(:normal_topic) { Fabricate(:topic) } + let(:secure_topic) { Fabricate(:topic, category: secure_category) } + let(:private_topic) { Fabricate(:private_message_topic, user: allowed_user) } + let(:deleted_topic) { Fabricate(:deleted_topic) } + let(:nonexist_topic_id) { Topic.last.id + 10000 } + + context 'anonymous' do + expected = { + :normal_topic => 200, + :secure_topic => 403, + :private_topic => 302, + :deleted_topic => 403, + :nonexist => 404 + } + topics_controller_show_gen_perm_tests(expected, self) + end + + context 'anonymous with login required' do + before do + SiteSetting.login_required = true + end + expected = { + :normal_topic => 302, + :secure_topic => 302, + :private_topic => 302, + :deleted_topic => 302, + :nonexist => 302 + } + topics_controller_show_gen_perm_tests(expected, self) + end + + context 'normal user' do + before do + log_in(:user) + end + + expected = { + :normal_topic => 200, + :secure_topic => 403, + :private_topic => 403, + :deleted_topic => 403, + :nonexist => 404 + } + topics_controller_show_gen_perm_tests(expected, self) + end + + context 'allowed user' do + before do + log_in_user(allowed_user) + end + + expected = { + :normal_topic => 200, + :secure_topic => 200, + :private_topic => 200, + :deleted_topic => 403, + :nonexist => 404 + } + topics_controller_show_gen_perm_tests(expected, self) + end + + context 'moderator' do + before do + log_in(:moderator) + end + + expected = { + :normal_topic => 200, + :secure_topic => 403, + :private_topic => 403, + :deleted_topic => 200, + :nonexist => 404 + } + topics_controller_show_gen_perm_tests(expected, self) + end + + context 'admin' do + before do + log_in(:admin) + end + + expected = { + :normal_topic => 200, + :secure_topic => 200, + :private_topic => 200, + :deleted_topic => 200, + :nonexist => 404 + } + topics_controller_show_gen_perm_tests(expected, self) + end + end + it 'records a view' do expect { xhr :get, :show, topic_id: topic.id, slug: topic.slug }.to change(TopicViewItem, :count).by(1) end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 63b3b45b02..701c0de01b 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -144,7 +144,6 @@ Spork.prefork do FileUtils.cp("#{Rails.root}/spec/fixtures/images/#{filename}", "#{Rails.root}/tmp/spec/#{filename}") File.new("#{Rails.root}/tmp/spec/#{filename}") end - end Spork.each_run do From 4b43edee91e0007c7f8b8d0baadcaea9cf3210e1 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Thu, 10 Sep 2015 18:17:00 -0400 Subject: [PATCH 059/157] UX: mobile topic list and suggested topics: show new/unread counts OR total post count, not both. --- .../templates/list/post-count-or-badges.raw.hbs | 5 +++++ .../templates/mobile/components/basic-topic-list.hbs | 12 ++++++------ .../templates/mobile/list/topic_list_item.raw.hbs | 7 ++----- .../discourse/views/list/post-count-or-badges.js.es6 | 6 ++++++ app/assets/stylesheets/mobile/topic-list.scss | 2 +- 5 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 app/assets/javascripts/discourse/templates/list/post-count-or-badges.raw.hbs create mode 100644 app/assets/javascripts/discourse/views/list/post-count-or-badges.js.es6 diff --git a/app/assets/javascripts/discourse/templates/list/post-count-or-badges.raw.hbs b/app/assets/javascripts/discourse/templates/list/post-count-or-badges.raw.hbs new file mode 100644 index 0000000000..6ac240e758 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/list/post-count-or-badges.raw.hbs @@ -0,0 +1,5 @@ +{{#if view.showBadges}} + {{raw "topic-post-badges" unread=topic.unread newPosts=topic.displayNewPosts unseen=topic.unseen url=topic.lastUnreadUrl}} +{{else}} + {{raw "list/posts-count-column" topic=topic tagName="div"}} +{{/if}} \ No newline at end of file diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs index 611d012ccf..06af1df5d1 100644 --- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs +++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs @@ -5,13 +5,9 @@ {{#each t in topics}} -
        +
        {{topic-status topic=t}} {{topic-link t}} - {{topic-post-badges unread=t.unread - newPosts=t.new_posts - unseen=t.unseen - url=t.lastUnreadUrl}} {{#if t.hasExcerpt}}
        @@ -25,10 +21,14 @@
        {{/if}}
        +
        + {{raw "list/post-count-or-badges" topic=t postBadgesEnabled="true"}} +
        +
        - {{raw "list/posts-count-column" topic=t tagName="div"}} {{raw "list/activity-column" topic=t tagName="div" class="num activity last"}} + {{t.last_poster_username}}
        {{#unless controller.hideCategory}}
        diff --git a/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.raw.hbs b/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.raw.hbs index 01937421ae..aa4370c966 100644 --- a/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.raw.hbs +++ b/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.raw.hbs @@ -2,13 +2,10 @@
        {{raw "topic-status" topic=content}} {{topic-link content}} - {{#if controller.showTopicPostBadges}} - {{raw "topic-post-badges" unread=content.unread newPosts=content.displayNewPosts unseen=content.unseen url=content.lastUnreadUrl}} - {{/if}} {{raw "list/topic-excerpt" topic=content}}
        - {{raw "list/posts-count-column" topic=content tagName="div"}} + {{raw "list/post-count-or-badges" topic=content postBadgesEnabled=controller.showTopicPostBadges}}
        @@ -22,8 +19,8 @@
        - {{content.last_poster_username}} {{raw "list/activity-column" topic=content tagName="span" class="age"}} + {{content.last_poster_username}}
        diff --git a/app/assets/javascripts/discourse/views/list/post-count-or-badges.js.es6 b/app/assets/javascripts/discourse/views/list/post-count-or-badges.js.es6 new file mode 100644 index 0000000000..3c968935e1 --- /dev/null +++ b/app/assets/javascripts/discourse/views/list/post-count-or-badges.js.es6 @@ -0,0 +1,6 @@ +import computed from "ember-addons/ember-computed-decorators"; + +export default Ember.Object.extend({ + postCountsPresent: Ember.computed.or('topic.unread', 'topic.displayNewPosts', 'topic.unseen'), + showBadges: Ember.computed.and('postBadgesEnabled', 'postCountsPresent') +}); diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss index 6922da71c2..886e354878 100644 --- a/app/assets/stylesheets/mobile/topic-list.scss +++ b/app/assets/stylesheets/mobile/topic-list.scss @@ -357,7 +357,7 @@ td .main-link { padding: 5px 10px 5px 0; } } -.topic-list-item { +.topic-list { .posts-map { font-size: 1.071em; padding-top: 2px; From 637b110e76fb72b9983ffc2b34423674d8a0081f Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Fri, 11 Sep 2015 11:38:25 -0400 Subject: [PATCH 060/157] use setter in topic-tracking-state or else get assertion error --- .../javascripts/discourse/models/topic-tracking-state.js.es6 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6 b/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6 index ded0d824c8..11c8d67feb 100644 --- a/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6 +++ b/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6 @@ -174,8 +174,8 @@ const TopicTrackingState = Discourse.Model.extend({ if (filter === "new") { list.topics.splice(i, 1); } else { - list.topics[i].unseen = false; - list.topics[i].dont_sync = true; + list.topics[i].set('unseen', false); + list.topics[i].set('dont_sync', true); } } } From 7e50af75473658e83a00697f85e2e855c960646a Mon Sep 17 00:00:00 2001 From: Kane York Date: Fri, 11 Sep 2015 09:10:08 -0700 Subject: [PATCH 061/157] Temporarily lock eslint to 1.3.1 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 62961abc4a..a3571378a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,7 +41,7 @@ cache: before_install: - gem install bundler - - npm i -g eslint babel-eslint + - npm i -g eslint@1.3.1 babel-eslint - eslint app/assets/javascripts - eslint --ext .es6 app/assets/javascripts - eslint --ext .es6 test/javascripts From b706c59ab9d12a7b776327bebc8ad40a882cc490 Mon Sep 17 00:00:00 2001 From: Kane York Date: Fri, 11 Sep 2015 09:14:45 -0700 Subject: [PATCH 062/157] Use the json boolean trick --- app/serializers/category_serializer.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/serializers/category_serializer.rb b/app/serializers/category_serializer.rb index 1f8ee5bf88..6138f1d1bd 100644 --- a/app/serializers/category_serializer.rb +++ b/app/serializers/category_serializer.rb @@ -38,11 +38,15 @@ class CategorySerializer < BasicCategorySerializer true end - def is_special + def include_is_special? [SiteSetting.lounge_category_id, SiteSetting.meta_category_id, SiteSetting.staff_category_id, SiteSetting.uncategorized_category_id] .include? object.id end + def is_special + true + end + def include_can_delete? scope && scope.can_delete?(object) end From 3c9a818a2f81d3e1a4076970913119a86e78fa5b Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Fri, 11 Sep 2015 12:22:34 -0400 Subject: [PATCH 063/157] fix broken js tests --- .../discourse/views/list/post-count-or-badges.js.es6 | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/assets/javascripts/discourse/views/list/post-count-or-badges.js.es6 b/app/assets/javascripts/discourse/views/list/post-count-or-badges.js.es6 index 3c968935e1..9a8559f1a3 100644 --- a/app/assets/javascripts/discourse/views/list/post-count-or-badges.js.es6 +++ b/app/assets/javascripts/discourse/views/list/post-count-or-badges.js.es6 @@ -1,5 +1,3 @@ -import computed from "ember-addons/ember-computed-decorators"; - export default Ember.Object.extend({ postCountsPresent: Ember.computed.or('topic.unread', 'topic.displayNewPosts', 'topic.unseen'), showBadges: Ember.computed.and('postBadgesEnabled', 'postCountsPresent') From fc5e15739509b1a141ec697ee3348465133d7cbc Mon Sep 17 00:00:00 2001 From: Kane York Date: Fri, 11 Sep 2015 09:34:20 -0700 Subject: [PATCH 064/157] Sane sendAction() behavior --- .../components/categories-admin-dropdown.js.es6 | 14 ++++++++------ app/assets/stylesheets/admin.scss | 1 - 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/discourse/components/categories-admin-dropdown.js.es6 b/app/assets/javascripts/discourse/components/categories-admin-dropdown.js.es6 index ac53485198..b2fea03ffd 100644 --- a/app/assets/javascripts/discourse/components/categories-admin-dropdown.js.es6 +++ b/app/assets/javascripts/discourse/components/categories-admin-dropdown.js.es6 @@ -12,14 +12,14 @@ export default DropdownButton.extend({ dropDownContent() { const includeReorder = this.get('siteSettings.fixed_category_positions'); const items = [ - { id: 'createCategory', + { id: 'create', title: I18n.t('category.create'), description: I18n.t('category.create_long'), styleClasses: 'fa fa-plus' } ]; if (includeReorder) { items.push({ - id: 'reorderCategories', + id: 'reorder', title: I18n.t('categories.reorder.title'), description: I18n.t('categories.reorder.title_long'), styleClasses: 'fa fa-random' @@ -28,10 +28,12 @@ export default DropdownButton.extend({ return items; }, - // sendAction() is pretty silly if you ask me - actionFor_createCategory: 'createCategory', - actionFor_reorderCategories: 'reorderCategories', + actionNames: { + create: 'createCategory', + reorder: 'reorderCategories' + }, + clicked(id) { - this.sendAction('actionFor_' + id); + this.sendAction('actionNames.' + id); } }); diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 577f9aba1c..498dae55e2 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -1,2 +1 @@ @import "common/admin/admin_base"; -@import "common/admin/cat_reorder"; From b3913b569216ba7455169572f871f0bb44e4aac8 Mon Sep 17 00:00:00 2001 From: Kane York Date: Fri, 11 Sep 2015 09:36:03 -0700 Subject: [PATCH 065/157] doh, computed.or --- .../discourse/controllers/reorder-categories.js.es6 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 b/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 index 877d948a6d..0debb1e709 100644 --- a/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 +++ b/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 @@ -38,10 +38,7 @@ export default Ember.Controller.extend(ModalFunctionality, Ember.Evented, { return anyChanged; }.property('categoriesBuffered.@each.hasBufferedChanges'), - @computed('showApplyAll', 'showFixIndices') - saveDisabled(a, b) { - return a || b; - }, + saveDisabled: Ember.computed.or('showApplyAll', 'showFixIndices'), moveDir(cat, dir) { const cats = this.get('categoriesOrdered'); From 6119d9fdc0d22a1b077c7be8db30b6d5c12a408f Mon Sep 17 00:00:00 2001 From: Kane York Date: Fri, 11 Sep 2015 09:25:03 -0700 Subject: [PATCH 066/157] FIX: Fallbacks for missing interpolation arguments This takes effect when an interpolation is removed from a translation in a Discourse update. The I18n::Backend::Fallbacks loops with a catch(:exception), so calling throw(:exception) will cause it to use the next locale, until it reaches English which is assumed to be correct. Also, enable fallbacks in everything except development (#3724 for more discussion) - we should be able to test this --- config/initializers/i18n.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb index 00dab6775c..43b7299572 100644 --- a/config/initializers/i18n.rb +++ b/config/initializers/i18n.rb @@ -28,8 +28,10 @@ class NoFallbackLocaleList < FallbackLocaleList end end -if Rails.env.production? - I18n.fallbacks = FallbackLocaleList.new -else + +if Rails.env.development? I18n.fallbacks = NoFallbackLocaleList.new +else + I18n.fallbacks = FallbackLocaleList.new + I18n.config.missing_interpolation_argument_handler = proc { throw(:exception) } end From 42263ac969a756f98f75ec5b847d3a2f84b9d702 Mon Sep 17 00:00:00 2001 From: Kane York Date: Fri, 11 Sep 2015 09:46:54 -0700 Subject: [PATCH 067/157] use translations (doh) --- .../discourse/templates/modal/reorder-categories.hbs | 4 ++-- config/locales/client.en.yml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs index b9ae576799..64c36b959d 100644 --- a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs +++ b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs @@ -2,8 +2,8 @@
        - - + + {{#each categoriesOrdered as |cat|}} diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index e3576d8035..8bf64d56cb 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -375,6 +375,7 @@ en: fix_order_tooltip: "Not all categories have a unique position number, which may cause unexpected results." save: "Save Order" apply_all: "Apply" + position: "Position" posts: "Posts" topics: "Topics" latest: "Latest" From 62cc029886051aeed6774849b13416bd87243773 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 11 Sep 2015 12:44:37 -0400 Subject: [PATCH 068/157] FIX: Support using enter to change the hash, clicks should update hash --- .../discourse/initializers/click-interceptor.js.es6 | 2 ++ app/assets/javascripts/discourse/lib/url.js.es6 | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/initializers/click-interceptor.js.es6 b/app/assets/javascripts/discourse/initializers/click-interceptor.js.es6 index d74e5264e3..763a06b2e8 100644 --- a/app/assets/javascripts/discourse/initializers/click-interceptor.js.es6 +++ b/app/assets/javascripts/discourse/initializers/click-interceptor.js.es6 @@ -1,8 +1,10 @@ import interceptClick from 'discourse/lib/intercept-click'; +import DiscourseURL from 'discourse/lib/url'; export default { name: "click-interceptor", initialize() { $('#main').on('click.discourse', 'a', interceptClick); + $(window).on('hashchange', () => DiscourseURL.routeTo(document.location.hash)); } }; diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6 index f94c4c2bd5..7f2d1bc6c4 100644 --- a/app/assets/javascripts/discourse/lib/url.js.es6 +++ b/app/assets/javascripts/discourse/lib/url.js.es6 @@ -105,7 +105,7 @@ const DiscourseURL = Ember.Object.createWithMixins({ It contains the logic necessary to route within a topic using replaceState to keep the history intact. **/ - routeTo: function(path, opts) { + routeTo(path, opts) { if (Em.isEmpty(path)) { return; } if (Discourse.get('requiresRefresh')) { @@ -122,6 +122,7 @@ const DiscourseURL = Ember.Object.createWithMixins({ // Scroll to the same page, different anchor if (path.indexOf('#') === 0) { this.scrollToId(path); + history.replaceState(undefined, undefined, path); return; } From 5af0f5f80ea5f03c75a02e18a40d56e4e4bad47c Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 10 Sep 2015 16:01:23 -0400 Subject: [PATCH 069/157] FEATURE: Whisper posts --- .../discourse/controllers/composer.js.es6 | 7 +++- .../discourse/models/composer.js.es6 | 6 +++- .../javascripts/discourse/models/post.js.es6 | 3 +- .../discourse/templates/composer.hbs | 10 ++++++ .../javascripts/discourse/templates/post.hbs | 13 ++++--- .../javascripts/discourse/views/post.js.es6 | 12 ++++++- .../stylesheets/common/base/topic-post.scss | 2 +- .../stylesheets/desktop/topic-post.scss | 9 +++++ app/controllers/posts_controller.rb | 4 +++ app/models/post.rb | 27 ++++++++++----- app/models/topic.rb | 7 ++++ config/locales/client.en.yml | 2 ++ config/locales/server.en.yml | 1 + config/site_settings.yml | 3 ++ lib/guardian/post_guardian.rb | 11 +++--- lib/topic_view.rb | 21 ++++++++---- spec/components/guardian_spec.rb | 26 ++++++++++++++ spec/components/topic_view_spec.rb | 17 ++++++++++ spec/models/topic_spec.rb | 34 +++++++++++++++++++ 19 files changed, 186 insertions(+), 29 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6 index 843aae4ee9..d6d1224f53 100644 --- a/app/assets/javascripts/discourse/controllers/composer.js.es6 +++ b/app/assets/javascripts/discourse/controllers/composer.js.es6 @@ -3,6 +3,7 @@ import DiscourseURL from 'discourse/lib/url'; import Quote from 'discourse/lib/quote'; import Draft from 'discourse/models/draft'; import Composer from 'discourse/models/composer'; +import computed from 'ember-addons/ember-computed-decorators'; function loadDraft(store, opts) { opts = opts || {}; @@ -64,6 +65,11 @@ export default Ember.Controller.extend({ this.set('similarTopics', []); }.on('init'), + @computed('model.action') + canWhisper(action) { + return this.siteSettings.enable_whispers && action === Composer.REPLY; + }, + showWarning: function() { if (!Discourse.User.currentProp('staff')) { return false; } @@ -132,7 +138,6 @@ export default Ember.Controller.extend({ }, hitEsc() { - const messages = this.get('controllers.composer-messages.model'); if (messages.length) { messages.popObject(); diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6 index 9cb5db0693..576bec3973 100644 --- a/app/assets/javascripts/discourse/models/composer.js.es6 +++ b/app/assets/javascripts/discourse/models/composer.js.es6 @@ -24,6 +24,7 @@ const CLOSED = 'closed', category: 'categoryId', topic_id: 'topic.id', is_warning: 'isWarning', + whisper: 'whisper', archetype: 'archetypeId', target_usernames: 'targetUsernames', typing_duration_msecs: 'typingTime', @@ -557,6 +558,9 @@ const Composer = RestModel.extend({ let addedToStream = false; + const postTypes = this.site.get('post_types'); + const postType = this.get('whisper') ? postTypes.whisper : postTypes.regular; + // Build the post object const createdPost = this.store.createRecord('post', { imageSizes: opts.imageSizes, @@ -569,7 +573,7 @@ const Composer = RestModel.extend({ user_title: user.get('title'), avatar_template: user.get('avatar_template'), user_custom_fields: user.get('custom_fields'), - post_type: this.site.get('post_types.regular'), + post_type: postType, actions_summary: [], moderator: user.get('moderator'), admin: user.get('admin'), diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6 index c332836f67..6ba2606aa6 100644 --- a/app/assets/javascripts/discourse/models/post.js.es6 +++ b/app/assets/javascripts/discourse/models/post.js.es6 @@ -1,7 +1,7 @@ import RestModel from 'discourse/models/rest'; import { popupAjaxError } from 'discourse/lib/ajax-error'; import ActionSummary from 'discourse/models/action-summary'; -import { url, fmt, propertyEqual } from 'discourse/lib/computed'; +import { url, propertyEqual } from 'discourse/lib/computed'; import Quote from 'discourse/lib/quote'; import computed from 'ember-addons/ember-computed-decorators'; @@ -77,7 +77,6 @@ const Post = RestModel.extend({ topicOwner: propertyEqual('topic.details.created_by.id', 'user_id'), hasHistory: Em.computed.gt('version', 1), - postElementId: fmt('post_number', 'post_%@'), canViewRawEmail: function() { return this.get("user_id") === Discourse.User.currentProp("id") || Discourse.User.currentProp('staff'); diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs index 711996431f..362df12791 100644 --- a/app/assets/javascripts/discourse/templates/composer.hbs +++ b/app/assets/javascripts/discourse/templates/composer.hbs @@ -60,6 +60,16 @@ {{/unless}} {{/if}} + + {{#if canWhisper}} +
        + +
        + {{/if}} + {{plugin-outlet "composer-fields"}} diff --git a/app/assets/javascripts/discourse/templates/post.hbs b/app/assets/javascripts/discourse/templates/post.hbs index 29b95d5aa2..8beccb2b66 100644 --- a/app/assets/javascripts/discourse/templates/post.hbs +++ b/app/assets/javascripts/discourse/templates/post.hbs @@ -8,7 +8,7 @@ {{view 'reply-history' content=replyHistory}} -
        +
        @@ -45,15 +45,20 @@
        {{/if}} {{#if wiki}} -
        {{fa-icon "pencil-square-o"}}
        +
        {{fa-icon "pencil-square-o"}}
        {{/if}} {{#if via_email}} {{#if canViewRawEmail}} -
        {{fa-icon "envelope-o"}}
        +
        {{fa-icon "envelope-o"}}
        {{else}} -
        {{fa-icon "envelope-o"}}
        +
        {{fa-icon "envelope-o"}}
        {{/if}} {{/if}} + + {{#if view.whisper}} +
        {{fa-icon "user-secret"}}
        + {{/if}} + {{#if showUserReplyTab}} {{#if loadingReplyHistory}} diff --git a/app/assets/javascripts/discourse/views/post.js.es6 b/app/assets/javascripts/discourse/views/post.js.es6 index ef1869e90a..e2c6631775 100644 --- a/app/assets/javascripts/discourse/views/post.js.es6 +++ b/app/assets/javascripts/discourse/views/post.js.es6 @@ -1,6 +1,8 @@ import ScreenTrack from 'discourse/lib/screen-track'; import { number } from 'discourse/lib/formatter'; import DiscourseURL from 'discourse/lib/url'; +import computed from 'ember-addons/ember-computed-decorators'; +import { fmt } from 'discourse/lib/computed'; const DAY = 60 * 50 * 1000; @@ -12,10 +14,18 @@ const PostView = Discourse.GroupedView.extend(Ember.Evented, { 'post.deleted:deleted', 'post.topicOwner:topic-owner', 'groupNameClass', - 'post.wiki:wiki'], + 'post.wiki:wiki', + 'whisper'], post: Ember.computed.alias('content'), + postElementId: fmt('post.post_number', 'post_%@'), + + @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'), diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss index 3b0d620087..d11b4ac3a6 100644 --- a/app/assets/stylesheets/common/base/topic-post.scss +++ b/app/assets/stylesheets/common/base/topic-post.scss @@ -147,7 +147,7 @@ aside.quote { } .post-info { - &.wiki, &.via-email { + &.wiki, &.via-email, &.whisper { margin-right: 5px; i.fa { font-size: 1em; diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 41409878ff..84730deccf 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -582,6 +582,15 @@ a.mention { } } +.whisper { + .topic-body { + .cooked { + font-style: italic; + color: dark-light-diff($primary, $secondary, 55%, -40%); + } + } +} + #share-link { width: 365px; margin-left: -4px; diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb index a35e2f423e..5ee72c315a 100644 --- a/app/controllers/posts_controller.rb +++ b/app/controllers/posts_controller.rb @@ -465,6 +465,10 @@ class PostsController < ApplicationController result[:is_warning] = false end + if SiteSetting.enable_whispers? && params[:whisper] == "true" + result[:post_type] = Post.types[:whisper] + end + PostRevisor.tracked_topic_fields.each_key do |f| params.permit(f => []) result[f] = params[f] if params.has_key?(f) diff --git a/app/models/post.rb b/app/models/post.rb index 3a6a8d5159..3cf1fb367d 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -74,7 +74,7 @@ class Post < ActiveRecord::Base end def self.types - @types ||= Enum.new(:regular, :moderator_action, :small_action) + @types ||= Enum.new(:regular, :moderator_action, :small_action, :whisper) end def self.cook_methods @@ -96,15 +96,24 @@ class Post < ActiveRecord::Base end def publish_change_to_clients!(type) - # special failsafe for posts missing topics - # consistency checks should fix, but message + + channel = "/topic/#{topic_id}" + msg = { id: id, + post_number: post_number, + updated_at: Time.now, + type: type } + + # special failsafe for posts missing topics consistency checks should fix, but message # is safe to skip - MessageBus.publish("/topic/#{topic_id}", { - id: id, - post_number: post_number, - updated_at: Time.now, - type: type - }, group_ids: topic.secure_group_ids) if topic + return unless topic + + # Whispers should not be published to everyone + if post_type == Post.types[:whisper] + user_ids = User.where('admin or moderator or id = ?', user_id).pluck(:id) + MessageBus.publish(channel, msg, user_ids: user_ids) + else + MessageBus.publish(channel, msg, group_ids: topic.secure_group_ids) + end end def trash!(trashed_by=nil) diff --git a/app/models/topic.rb b/app/models/topic.rb index 442fb43c2d..703b547265 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -218,6 +218,13 @@ class Topic < ActiveRecord::Base end end + def visible_post_types(viewed_by=nil) + types = Post.types + result = [types[:regular], types[:moderator_action], types[:small_action]] + result << types[:whisper] if viewed_by.try(:staff?) + result + end + def self.top_viewed(max = 10) Topic.listable_topics.visible.secured.order('views desc').limit(max) end diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index bbc1833f03..881c30a571 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -809,6 +809,7 @@ en: emoji: "Emoji :smile:" add_warning: "This is an official warning." + add_whisper: "This is a whisper only visible to moderators" posting_not_on_topic: "Which topic do you want to reply to?" saving_draft_tip: "saving..." saved_draft_tip: "saved" @@ -1349,6 +1350,7 @@ en: yes_value: "Yes, abandon" via_email: "this post arrived via email" + whisper: "this post is a private whisper for moderators" wiki: about: "this post is a wiki; basic users can edit it" diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 1309a124ed..1da6daf5bb 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -880,6 +880,7 @@ en: email_token_grace_period_hours: "Forgot password / activate account tokens are still valid for a grace period of (n) hours after being redeemed." enable_badges: "Enable the badge system" + enable_whispers: "Allow users to whisper to moderators" allow_index_in_robots_txt: "Specify in robots.txt that this site is allowed to be indexed by web search engines." email_domains_blacklist: "A pipe-delimited list of email domains that users are not allowed to register accounts with. Example: mailinator.com|trashmail.net" diff --git a/config/site_settings.yml b/config/site_settings.yml index 70992a968d..fb6adceedf 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -182,6 +182,9 @@ basic: enable_badges: client: true default: true + enable_whispers: + client: true + default: false login: invite_only: diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rb index e3f1a030b8..5b03eff43a 100644 --- a/lib/guardian/post_guardian.rb +++ b/lib/guardian/post_guardian.rb @@ -144,10 +144,13 @@ module PostGuardian end def can_see_post?(post) - post.present? && - (is_admin? || - ((is_moderator? || !post.deleted_at.present?) && - can_see_topic?(post.topic))) + return false if post.blank? + return true if is_admin? + return false unless can_see_topic?(post.topic) + return false unless post.user == @user || post.topic.visible_post_types(@user).include?(post.post_type) + return false if !is_moderator? && post.deleted_at.present? + + true end def can_view_edit_history?(post) diff --git a/lib/topic_view.rb b/lib/topic_view.rb index 333e155b40..52222a6d3f 100644 --- a/lib/topic_view.rb +++ b/lib/topic_view.rb @@ -191,11 +191,9 @@ class TopicView # Find the sort order for a post in the topic def sort_order_for_post_number(post_number) - Post.where(topic_id: @topic.id, post_number: post_number) - .with_deleted - .select(:sort_order) - .first - .try(:sort_order) + posts = Post.where(topic_id: @topic.id, post_number: post_number).with_deleted + posts = filter_post_types(posts) + posts.select(:sort_order).first.try(:sort_order) end # Filter to all posts near a particular post number @@ -332,11 +330,22 @@ class TopicView private + def filter_post_types(posts) + visible_types = @topic.visible_post_types(@user) + + if @user.present? + posts.where("user_id = ? OR post_type IN (?)", @user.id, visible_types) + else + posts.where(post_type: visible_types) + end + end + def filter_posts_by_ids(post_ids) # TODO: Sort might be off @posts = Post.where(id: post_ids, topic_id: @topic.id) .includes(:user, :reply_to_user) .order('sort_order') + @posts = filter_post_types(@posts) @posts = @posts.with_deleted if @guardian.can_see_deleted_posts? @posts end @@ -361,7 +370,7 @@ class TopicView end def unfiltered_posts - result = @topic.posts + result = filter_post_types(@topic.posts) result = result.with_deleted if @guardian.can_see_deleted_posts? result = @topic.posts.where("user_id IS NOT NULL") if @exclude_deleted_users result diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb index 8727666490..66430c8f82 100644 --- a/spec/components/guardian_spec.rb +++ b/spec/components/guardian_spec.rb @@ -437,6 +437,32 @@ describe Guardian do expect(Guardian.new(user).can_see?(post)).to be_falsey expect(Guardian.new(admin).can_see?(post)).to be_truthy end + + it 'respects whispers' do + regular_post = Fabricate.build(:post) + whisper_post = Fabricate.build(:post, post_type: Post.types[:whisper]) + + anon_guardian = Guardian.new + expect(anon_guardian.can_see?(regular_post)).to eq(true) + expect(anon_guardian.can_see?(whisper_post)).to eq(false) + + regular_user = Fabricate.build(:user) + regular_guardian = Guardian.new(regular_user) + expect(regular_guardian.can_see?(regular_post)).to eq(true) + expect(regular_guardian.can_see?(whisper_post)).to eq(false) + + # can see your own whispers + regular_whisper = Fabricate.build(:post, post_type: Post.types[:whisper], user: regular_user) + expect(regular_guardian.can_see?(regular_whisper)).to eq(true) + + mod_guardian = Guardian.new(Fabricate.build(:moderator)) + expect(mod_guardian.can_see?(regular_post)).to eq(true) + expect(mod_guardian.can_see?(whisper_post)).to eq(true) + + admin_guardian = Guardian.new(Fabricate.build(:admin)) + expect(admin_guardian.can_see?(regular_post)).to eq(true) + expect(admin_guardian.can_see?(whisper_post)).to eq(true) + end end describe 'a PostRevision' do diff --git a/spec/components/topic_view_spec.rb b/spec/components/topic_view_spec.rb index dedc080b9f..fe2658d975 100644 --- a/spec/components/topic_view_spec.rb +++ b/spec/components/topic_view_spec.rb @@ -251,6 +251,23 @@ describe TopicView do end + context 'whispers' do + it "handles their visibility properly" do + p1 = Fabricate(:post, topic: topic, user: coding_horror) + p2 = Fabricate(:post, topic: topic, user: coding_horror, post_type: Post.types[:whisper]) + p3 = Fabricate(:post, topic: topic, user: coding_horror) + + ch_posts = TopicView.new(topic.id, coding_horror).posts + expect(ch_posts.map(&:id)).to eq([p1.id, p2.id, p3.id]) + + anon_posts = TopicView.new(topic.id).posts + expect(anon_posts.map(&:id)).to eq([p1.id, p3.id]) + + admin_posts = TopicView.new(topic.id, Fabricate(:moderator)).posts + expect(admin_posts.map(&:id)).to eq([p1.id, p2.id, p3.id]) + end + end + context '.posts' do # Create the posts in a different order than the sort_order diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb index 7471c5cd7b..b65ec208c6 100644 --- a/spec/models/topic_spec.rb +++ b/spec/models/topic_spec.rb @@ -11,6 +11,40 @@ describe Topic do it { is_expected.to rate_limit } + context '#visible_post_types' do + let(:types) { Post.types } + + it "returns the appropriate types for anonymous users" do + topic = Fabricate.build(:topic) + post_types = topic.visible_post_types + + expect(post_types).to include(types[:regular]) + expect(post_types).to include(types[:moderator_action]) + expect(post_types).to include(types[:small_action]) + expect(post_types).to_not include(types[:whisper]) + end + + it "returns the appropriate types for regular users" do + topic = Fabricate.build(:topic) + post_types = topic.visible_post_types(Fabricate.build(:user)) + + expect(post_types).to include(types[:regular]) + expect(post_types).to include(types[:moderator_action]) + expect(post_types).to include(types[:small_action]) + expect(post_types).to_not include(types[:whisper]) + end + + it "returns the appropriate types for staff users" do + topic = Fabricate.build(:topic) + post_types = topic.visible_post_types(Fabricate.build(:moderator)) + + expect(post_types).to include(types[:regular]) + expect(post_types).to include(types[:moderator_action]) + expect(post_types).to include(types[:small_action]) + expect(post_types).to include(types[:whisper]) + end + end + context 'slug' do let(:title) { "hello world topic" } let(:slug) { "hello-world-topic" } From b6febb0638b1d8232c0941bd94f07c4f0ef30ae5 Mon Sep 17 00:00:00 2001 From: Kane York Date: Fri, 11 Sep 2015 11:37:36 -0700 Subject: [PATCH 070/157] fix the build (460243d7) --- spec/components/topic_view_spec.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/components/topic_view_spec.rb b/spec/components/topic_view_spec.rb index fe2658d975..ad23e0ade5 100644 --- a/spec/components/topic_view_spec.rb +++ b/spec/components/topic_view_spec.rb @@ -13,6 +13,7 @@ describe TopicView do expect { TopicView.new(1231232, coding_horror) }.to raise_error(Discourse::NotFound) end + # see also spec/controllers/topics_controller_spec.rb TopicsController::show::permission errors it "raises an error if the user can't see the topic" do Guardian.any_instance.expects(:can_see?).with(topic).returns(false) expect { topic_view }.to raise_error(Discourse::InvalidAccess) @@ -21,7 +22,7 @@ describe TopicView do it "handles deleted topics" do admin = Fabricate(:admin) topic.trash!(admin) - expect { TopicView.new(topic.id, Fabricate(:user)) }.to raise_error(Discourse::NotFound) + expect { TopicView.new(topic.id, Fabricate(:user)) }.to raise_error(Discourse::InvalidAccess) expect { TopicView.new(topic.id, admin) }.not_to raise_error end From e5ade5a7611ac0279dbcf781b0c552a73db1e6e6 Mon Sep 17 00:00:00 2001 From: scossar Date: Fri, 11 Sep 2015 11:28:18 -0700 Subject: [PATCH 071/157] set widths on table cells --- app/assets/stylesheets/mobile/topic-list.scss | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss index 886e354878..41dd47b8b9 100644 --- a/app/assets/stylesheets/mobile/topic-list.scss +++ b/app/assets/stylesheets/mobile/topic-list.scss @@ -110,6 +110,29 @@ // Category list // -------------------------------------------------- +.categories-list .list-container { + margin-left: -10px; // Extend past the .wrap padding to the edge of the window +} + +.category-list-item.category { + // Allow percentage widths on table cells to include their padding + box-sizing: border-box; + *, *:before, *:after { + box-sizing: inherit; + } + + .main-link { + width: 80%; + } + + .posts { + width: 10%; + } + + .age { + width: 10%; + } +} tr.category-topic-link { border-top: darken($secondary, 3%) 1px solid; From 3b46ec7ae3dee62960149c79c498f5987d8dc6bf Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Fri, 11 Sep 2015 16:34:27 -0400 Subject: [PATCH 072/157] visual tweaks for topic lists on mobile --- app/assets/stylesheets/mobile/topic-list.scss | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss index 41dd47b8b9..1b59b39e7b 100644 --- a/app/assets/stylesheets/mobile/topic-list.scss +++ b/app/assets/stylesheets/mobile/topic-list.scss @@ -80,7 +80,17 @@ .badge-notification { position: relative; top: -1px; - i {color: $secondary;} + font-size: 1.071em; + padding: 4px 6px 3px 6px; + i {color: $secondary;} + + &.new-topic::before { + content: none; + margin-right: 0; + } + &.new-topic { + padding-right: 0; + } } .topic-item-stats { @@ -91,7 +101,7 @@ .category a { max-width: 160px; } - .num .fa { + .num .fa, a, a:visited { color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); } } From 3ca3746d7e8234d497d2ec1e05c10ccad9667ec5 Mon Sep 17 00:00:00 2001 From: Kane York Date: Fri, 11 Sep 2015 16:39:19 -0700 Subject: [PATCH 073/157] Unlock eslint version eslint/eslint#3746 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a3571378a3..62961abc4a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,7 +41,7 @@ cache: before_install: - gem install bundler - - npm i -g eslint@1.3.1 babel-eslint + - npm i -g eslint babel-eslint - eslint app/assets/javascripts - eslint --ext .es6 app/assets/javascripts - eslint --ext .es6 test/javascripts From 4252a2ee1e78daff1267e47a4caebe3386d6cd25 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Fri, 11 Sep 2015 16:53:20 -0700 Subject: [PATCH 074/157] switch to eye-slash on whisper, similar to unlisted --- app/assets/javascripts/discourse/templates/post.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/templates/post.hbs b/app/assets/javascripts/discourse/templates/post.hbs index 8beccb2b66..ff990eb66a 100644 --- a/app/assets/javascripts/discourse/templates/post.hbs +++ b/app/assets/javascripts/discourse/templates/post.hbs @@ -56,7 +56,7 @@ {{/if}} {{#if view.whisper}} -
        {{fa-icon "user-secret"}}
        +
        {{fa-icon "eye-slash"}}
        {{/if}} {{#if showUserReplyTab}} From 1e739e8c96393aedf9cbccf4d1c487b27ce5a139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Sat, 12 Sep 2015 20:44:20 +0200 Subject: [PATCH 075/157] FIX: move whisper styling to common --- app/assets/stylesheets/common/base/topic-post.scss | 9 +++++++++ app/assets/stylesheets/desktop/topic-post.scss | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss index d11b4ac3a6..dab4f08f13 100644 --- a/app/assets/stylesheets/common/base/topic-post.scss +++ b/app/assets/stylesheets/common/base/topic-post.scss @@ -317,3 +317,12 @@ table.md-table { clear: both; } + +.whisper { + .topic-body { + .cooked { + font-style: italic; + color: dark-light-diff($primary, $secondary, 55%, -40%); + } + } +} diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 84730deccf..41409878ff 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -582,15 +582,6 @@ a.mention { } } -.whisper { - .topic-body { - .cooked { - font-style: italic; - color: dark-light-diff($primary, $secondary, 55%, -40%); - } - } -} - #share-link { width: 365px; margin-left: -4px; From 1e6bf67b5bc8078ec2db47fe24560198c1b0280f Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Sat, 12 Sep 2015 23:58:18 +0530 Subject: [PATCH 076/157] FIX: show category links if category has sub-categories in nojs view --- app/views/list/list.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/list/list.erb b/app/views/list/list.erb index a6768190d3..b9ae8a0868 100644 --- a/app/views/list/list.erb +++ b/app/views/list/list.erb @@ -22,7 +22,7 @@ <%= t.title %>         <%= page_links(t) %> - <% if !@category && t.category %> + <% if (!@category || @category.has_children?) && t.category %> [<%= t.category.name %>] <% end %> '>(<%= t.posts_count %>) From b4974f5876d53969e7b523ac4592cf4fe58fb34c Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Sat, 12 Sep 2015 13:38:20 +0800 Subject: [PATCH 077/157] UX: Don't allow search if searchTerm is not valid. --- .../discourse/components/search-menu.js.es6 | 9 ++++----- .../discourse/controllers/full-page-search.js.es6 | 10 ++++++++-- app/assets/javascripts/discourse/lib/search.js.es6 | 10 +++++++++- .../discourse/routes/full-page-search.js.es6 | 4 ++-- .../discourse/templates/full-page-search.hbs | 2 +- 5 files changed, 24 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/discourse/components/search-menu.js.es6 b/app/assets/javascripts/discourse/components/search-menu.js.es6 index 8a4f2ddece..153929ecd6 100644 --- a/app/assets/javascripts/discourse/components/search-menu.js.es6 +++ b/app/assets/javascripts/discourse/components/search-menu.js.es6 @@ -1,4 +1,4 @@ -import {searchForTerm, searchContextDescription} from 'discourse/lib/search'; +import {searchForTerm, searchContextDescription, isValidSearchTerm } from 'discourse/lib/search'; import DiscourseURL from 'discourse/lib/url'; import { default as computed, observes } from 'ember-addons/ember-computed-decorators'; import showModal from 'discourse/lib/show-modal'; @@ -61,8 +61,8 @@ export default Ember.Component.extend({ @observes('searchService.term', 'typeFilter') newSearchNeeded() { this.set('noResults', false); - const term = (this.get('searchService.term') || '').trim(); - if (term.length >= Discourse.SiteSettings.min_search_term_length) { + const term = this.get('searchService.term') + if (isValidSearchTerm(term)) { this.set('loading', true); Ember.run.debounce(this, 'searchTerm', term, this.get('typeFilter'), 400); } else { @@ -154,8 +154,7 @@ export default Ember.Component.extend({ }, keyDown(e) { - const term = this.get('searchService.term'); - if (e.which === 13 && term && term.length >= this.siteSettings.min_search_term_length) { + if (e.which === 13 && isValidSearchTerm(this.get('searchService.term'))) { this.set('visible', false); this.send('fullSearch'); } diff --git a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 index fce0fecd83..2e909601fb 100644 --- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 +++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 @@ -1,4 +1,4 @@ -import { translateResults, searchContextDescription, getSearchKey } from "discourse/lib/search"; +import { translateResults, searchContextDescription, getSearchKey, isValidSearchTerm } from "discourse/lib/search"; import showModal from 'discourse/lib/show-modal'; import { default as computed, observes } from 'ember-addons/ember-computed-decorators'; import Category from 'discourse/models/category'; @@ -37,7 +37,12 @@ export default Ember.Controller.extend({ @computed('q') searchActive(q){ - return q && q.length > 0; + return isValidSearchTerm(q); + }, + + @computed('searchTerm') + isNotValidSearchTerm(searchTerm) { + return !isValidSearchTerm(searchTerm); }, @observes('model') @@ -129,6 +134,7 @@ export default Ember.Controller.extend({ }, search() { + if (this.get("isNotValidSearchTerm")) return; this.search(); } } diff --git a/app/assets/javascripts/discourse/lib/search.js.es6 b/app/assets/javascripts/discourse/lib/search.js.es6 index 21fd8afeb6..9d7bec2d67 100644 --- a/app/assets/javascripts/discourse/lib/search.js.es6 +++ b/app/assets/javascripts/discourse/lib/search.js.es6 @@ -106,4 +106,12 @@ const getSearchKey = function(args){ ((args.searchContext && args.searchContext.id) || "") }; -export { searchForTerm, searchContextDescription, getSearchKey }; +const isValidSearchTerm = function(searchTerm) { + if (searchTerm) { + return searchTerm.trim().length >= Discourse.SiteSettings.min_search_term_length; + } else { + return false; + } +}; + +export { searchForTerm, searchContextDescription, getSearchKey, isValidSearchTerm }; diff --git a/app/assets/javascripts/discourse/routes/full-page-search.js.es6 b/app/assets/javascripts/discourse/routes/full-page-search.js.es6 index 10072d99f5..3464250a74 100644 --- a/app/assets/javascripts/discourse/routes/full-page-search.js.es6 +++ b/app/assets/javascripts/discourse/routes/full-page-search.js.es6 @@ -1,4 +1,4 @@ -import { translateResults, getSearchKey } from "discourse/lib/search"; +import { translateResults, getSearchKey, isValidSearchTerm } from "discourse/lib/search"; export default Discourse.Route.extend({ queryParams: { q: {}, context_id: {}, context: {} }, @@ -23,7 +23,7 @@ export default Discourse.Route.extend({ } return PreloadStore.getAndRemove("search", function() { - if (params.q && params.q.length > 2) { + if (isValidSearchTerm(params.q)) { return Discourse.ajax("/search", { data: args }); } else { return null; diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs index db60849ff9..43e3e835ad 100644 --- a/app/assets/javascripts/discourse/templates/full-page-search.hbs +++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs @@ -1,6 +1,6 @@
        {{input type="text" value=searchTerm class="input-xxlarge search no-blur" action="search"}} - {{d-button action="search" icon="search" class="btn-primary"}} + {{d-button action="search" icon="search" class="btn-primary" disabled=isNotValidSearchTerm}} {{#if canBulkSelect}} {{#if model.posts}} {{d-button icon="list" class="bulk-select" title="topics.bulk.toggle" action="toggleBulkSelect"}} From 2ae0ef0ad92a585c2c28b8d79f39b620506a2551 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Sat, 12 Sep 2015 14:06:46 +0800 Subject: [PATCH 078/157] UX: Select search term when focus returns to search box. --- .../javascripts/discourse/components/search-menu.js.es6 | 2 +- .../javascripts/discourse/components/search-text-field.js.es6 | 4 ++++ .../javascripts/discourse/templates/full-page-search.hbs | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/components/search-menu.js.es6 b/app/assets/javascripts/discourse/components/search-menu.js.es6 index 153929ecd6..4135252807 100644 --- a/app/assets/javascripts/discourse/components/search-menu.js.es6 +++ b/app/assets/javascripts/discourse/components/search-menu.js.es6 @@ -134,7 +134,7 @@ export default Ember.Component.extend({ }, showedSearch() { - $('#search-term').focus(); + $('#search-term').focus().select(); }, showSearchHelp() { diff --git a/app/assets/javascripts/discourse/components/search-text-field.js.es6 b/app/assets/javascripts/discourse/components/search-text-field.js.es6 index bf46ddf33f..bb83304bcb 100644 --- a/app/assets/javascripts/discourse/components/search-text-field.js.es6 +++ b/app/assets/javascripts/discourse/components/search-text-field.js.es6 @@ -5,5 +5,9 @@ export default TextField.extend({ @computed('searchService.searchContextEnabled') placeholder: function(searchContextEnabled) { return searchContextEnabled ? "" : I18n.t('search.title'); + }, + + focusIn: function() { + Em.run.later(() => { this.$().select(); }); } }); diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs index 43e3e835ad..3b9bebb962 100644 --- a/app/assets/javascripts/discourse/templates/full-page-search.hbs +++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs @@ -1,5 +1,5 @@
        - {{input type="text" value=searchTerm class="input-xxlarge search no-blur" action="search"}} + {{search-text-field value=searchTerm class="input-xxlarge search no-blur" action="search"}} {{d-button action="search" icon="search" class="btn-primary" disabled=isNotValidSearchTerm}} {{#if canBulkSelect}} {{#if model.posts}} From c1deee772b5eddf262f0be1ea5ffcb5f09b13018 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Sun, 13 Sep 2015 09:41:05 +0800 Subject: [PATCH 079/157] UX: Autofocus when input is empty. --- .../discourse/components/search-text-field.js.es6 | 6 +++++- .../discourse/controllers/full-page-search.js.es6 | 5 +++++ .../javascripts/discourse/templates/full-page-search.hbs | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/components/search-text-field.js.es6 b/app/assets/javascripts/discourse/components/search-text-field.js.es6 index bb83304bcb..80dcc0ba21 100644 --- a/app/assets/javascripts/discourse/components/search-text-field.js.es6 +++ b/app/assets/javascripts/discourse/components/search-text-field.js.es6 @@ -9,5 +9,9 @@ export default TextField.extend({ focusIn: function() { Em.run.later(() => { this.$().select(); }); - } + }, + + becomeFocused: function() { + if (this.get('hasAutofocus')) this.$().focus(); + }.on('didInsertElement') }); diff --git a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 index 2e909601fb..f4fb1e787b 100644 --- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 +++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 @@ -13,6 +13,11 @@ export default Ember.Controller.extend({ context_id: null, context: null, + @computed('q') + hasAutofocus(q) { + return Em.isEmpty(q); + }, + @computed('skip_context', 'context') searchContextEnabled: { get(skip,context){ diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs index 3b9bebb962..8f1874345c 100644 --- a/app/assets/javascripts/discourse/templates/full-page-search.hbs +++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs @@ -1,5 +1,5 @@
        - {{search-text-field value=searchTerm class="input-xxlarge search no-blur" action="search"}} + {{search-text-field value=searchTerm class="input-xxlarge search no-blur" action="search" hasAutofocus=hasAutofocus}} {{d-button action="search" icon="search" class="btn-primary" disabled=isNotValidSearchTerm}} {{#if canBulkSelect}} {{#if model.posts}} From 63e96580c4e438bf91a1bdc1a86e47875db95782 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Sun, 13 Sep 2015 03:18:44 -0700 Subject: [PATCH 080/157] correct minor default embedding style issues --- app/assets/stylesheets/embed.css.scss | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/embed.css.scss b/app/assets/stylesheets/embed.css.scss index 40eab28757..ef9347c609 100644 --- a/app/assets/stylesheets/embed.css.scss +++ b/app/assets/stylesheets/embed.css.scss @@ -27,8 +27,8 @@ article.post { blockquote { padding: 10px 8px 10px 13px; margin: 0 0 10px 0; - background-color: dark-light-diff($primary, $secondary, 90%, -60%); - border-left: 5px solid darken(dark-light-diff($primary, $secondary, 90%, -60%), 10%); + background-color: dark-light-diff($primary, $secondary, 97%, -45%); + border-left: 5px solid darken(dark-light-diff($primary, $secondary, 97%, -45%), 10%); overflow: hidden; p { margin: 0 0 10px 0; @@ -137,9 +137,3 @@ footer { float: right; max-height: 30px; } - -.button { - background-color: #eee; - padding: 5px; - display: inline-block; -} From 9ba22b5155598c0e3ed97db9cacdd43c94687ef0 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Sun, 13 Sep 2015 04:02:58 -0700 Subject: [PATCH 081/157] minor embedding css fix --- app/assets/stylesheets/embed.css.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/embed.css.scss b/app/assets/stylesheets/embed.css.scss index ef9347c609..9eee091348 100644 --- a/app/assets/stylesheets/embed.css.scss +++ b/app/assets/stylesheets/embed.css.scss @@ -14,8 +14,8 @@ article.post { } .quote .title { - border-left: 5px solid darken(dark-light-diff($primary, $secondary, 90%, -60%), 10%); - background-color: dark-light-diff($primary, $secondary, 90%, -60%); + border-left: 5px solid darken(dark-light-diff($primary, $secondary, 97%, -45%), 10%); + background-color: dark-light-diff($primary, $secondary, 97%, -45%); padding: 10px 10px 0 12px; .avatar { margin-right: 7px; } } From 08dccaa874182e82a0235c10b14d8121c4d5cc34 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 14 Sep 2015 00:30:39 +0800 Subject: [PATCH 082/157] FIX: Title input validation position. --- app/assets/stylesheets/desktop/compose.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss index 9fea1acef1..ca821824de 100644 --- a/app/assets/stylesheets/desktop/compose.scss +++ b/app/assets/stylesheets/desktop/compose.scss @@ -324,8 +324,8 @@ } .title-input .popup-tip { width: 300px; - left: 0px; - top: -30px; + margin-top: 8px; + left: 150px; } .category-input .popup-tip { width: 240px; From 6891c7f8aa09309bae0277c0d87530856273bbe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Garc=C3=ADa-Navas=20L=C3=B3pez=20de=20Cu=C3=A9llar?= Date: Sun, 13 Sep 2015 22:45:26 +0200 Subject: [PATCH 083/157] little typo? --- config/locales/server.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 1da6daf5bb..6f765f1598 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -94,7 +94,7 @@ en: min_username_length_exists: "You cannot set the minimum username length above the shortest username." min_username_length_range: "You cannot set the minimum above the maximum." max_username_length_exists: "You cannot set the maximum username length below the longest username." - max_username_length_range: "You cannot set the maximum above the minimum." + max_username_length_range: "You cannot set the maximum below the minimum." default_categories_already_selected: "You cannot select a category used in another list." activemodel: From f948ee9e2618793d0ec0dab48562d9593213d4aa Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 14 Sep 2015 09:42:21 +1000 Subject: [PATCH 084/157] FIX: ensure letter avatar service uses same algorithm --- app/models/user.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index a17e4e9baa..cd4792ea81 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -472,7 +472,7 @@ class User < ActiveRecord::Base # TODO it may be worth caching this in a distributed cache, should be benched if SiteSetting.external_system_avatars_enabled url = SiteSetting.external_system_avatars_url.dup - url.gsub! "{color}", letter_avatar_color(username) + url.gsub! "{color}", letter_avatar_color(username.downcase) url.gsub! "{username}", username url.gsub! "{first_letter}", username[0].downcase url From d39faf7ddfa85db9cac8c596d2118f8aa8217c50 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 14 Sep 2015 09:43:40 +1000 Subject: [PATCH 085/157] FEATURE: allow external avatars to be shadowed by global --- config/site_settings.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/site_settings.yml b/config/site_settings.yml index fb6adceedf..1c8e9f1126 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -575,6 +575,7 @@ files: external_system_avatars_enabled: default: false client: true + shadowed_by_global: true external_system_avatars_url: default: "https://avatars.discourse.org/letter/{first_letter}/{color}/{size}.png" client: true From 5fb405cca265a430ecf8e4b9253645e918fe7f53 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 14 Sep 2015 11:17:28 +0800 Subject: [PATCH 086/157] FIX: Use custom date for redis key in `TopicViewItem.add`. --- app/models/topic_view_item.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/models/topic_view_item.rb b/app/models/topic_view_item.rb index 73bdc636c6..958abca820 100644 --- a/app/models/topic_view_item.rb +++ b/app/models/topic_view_item.rb @@ -8,7 +8,8 @@ class TopicViewItem < ActiveRecord::Base def self.add(topic_id, ip, user_id=nil, at=nil, skip_redis=false) # Only store a view once per day per thing per user per ip - redis_key = "view:#{topic_id}:#{Date.today}" + at ||= Date.today + redis_key = "view:#{topic_id}:#{at}" if user_id redis_key << ":user-#{user_id}" else @@ -19,8 +20,6 @@ class TopicViewItem < ActiveRecord::Base skip_redis || $redis.expire(redis_key, SiteSetting.topic_view_duration_hours.hours) TopicViewItem.transaction do - at ||= Date.today - # this is called real frequently, working hard to avoid exceptions sql = "INSERT INTO topic_views (topic_id, ip_address, viewed_at, user_id) SELECT :topic_id, :ip_address, :viewed_at, :user_id From b9a9a91335cede1e591e4fa3c9445da27742b7e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 14 Sep 2015 10:36:25 +0200 Subject: [PATCH 087/157] FIX: couldn't set 'never' for the default email digest frequency setting --- app/models/digest_email_site_setting.rb | 12 ++++++------ app/models/user.rb | 2 +- spec/jobs/enqueue_digest_emails_spec.rb | 2 +- spec/models/digest_email_site_setting_spec.rb | 1 - 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/models/digest_email_site_setting.rb b/app/models/digest_email_site_setting.rb index 688104950c..5d0d40635a 100644 --- a/app/models/digest_email_site_setting.rb +++ b/app/models/digest_email_site_setting.rb @@ -3,16 +3,16 @@ require_dependency 'enum_site_setting' class DigestEmailSiteSetting < EnumSiteSetting def self.valid_value?(val) - val.blank? or values.any? { |v| v[:value] == val.to_s } + values.any? { |v| v[:value] == val.to_i } end def self.values @values ||= [ - {name: 'never', value: '' }, - {name: 'daily', value: '1' }, - {name: 'every_three_days', value: '3' }, - {name: 'weekly', value: '7' }, - {name: 'every_two_weeks', value: '14' } + { name: 'never', value: 0 }, + { name: 'daily', value: 1 }, + { name: 'every_three_days', value: 3 }, + { name: 'weekly', value: 7 }, + { name: 'every_two_weeks', value: 14 } ] end diff --git a/app/models/user.rb b/app/models/user.rb index cd4792ea81..3dfb2ed347 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -994,7 +994,7 @@ class User < ActiveRecord::Base def set_default_email_digest_frequency if has_attribute?(:email_digests) - if SiteSetting.default_email_digest_frequency.blank? + if SiteSetting.default_email_digest_frequency.to_i <= 0 self.email_digests = false else self.email_digests = true diff --git a/spec/jobs/enqueue_digest_emails_spec.rb b/spec/jobs/enqueue_digest_emails_spec.rb index 459e087051..d3f6b354d9 100644 --- a/spec/jobs/enqueue_digest_emails_spec.rb +++ b/spec/jobs/enqueue_digest_emails_spec.rb @@ -6,7 +6,7 @@ describe Jobs::EnqueueDigestEmails do describe '#target_users' do context 'disabled digests' do - before { SiteSetting.stubs(:default_email_digest_frequency).returns("") } + before { SiteSetting.stubs(:default_email_digest_frequency).returns(0) } let!(:user_no_digests) { Fabricate(:active_user, last_emailed_at: 8.days.ago, last_seen_at: 10.days.ago) } it "doesn't return users with email disabled" do diff --git a/spec/models/digest_email_site_setting_spec.rb b/spec/models/digest_email_site_setting_spec.rb index cc5f39fa86..dc07f45dbd 100644 --- a/spec/models/digest_email_site_setting_spec.rb +++ b/spec/models/digest_email_site_setting_spec.rb @@ -11,7 +11,6 @@ describe DigestEmailSiteSetting do end it 'returns false for an invalid value' do - expect(DigestEmailSiteSetting.valid_value?(1.5)).to eq false expect(DigestEmailSiteSetting.valid_value?('7 dogs')).to eq false end end From 2c06db67a99016fc6b7e6b08f0ed0404f74acffa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 14 Sep 2015 10:48:24 +0200 Subject: [PATCH 088/157] fix the build --- app/models/auto_track_duration_site_setting.rb | 1 + app/models/digest_email_site_setting.rb | 1 + app/models/new_topic_duration_site_setting.rb | 1 + app/models/trust_level_setting.rb | 1 + 4 files changed, 4 insertions(+) diff --git a/app/models/auto_track_duration_site_setting.rb b/app/models/auto_track_duration_site_setting.rb index ce4c7b6878..b40ff6e0eb 100644 --- a/app/models/auto_track_duration_site_setting.rb +++ b/app/models/auto_track_duration_site_setting.rb @@ -3,6 +3,7 @@ require_dependency 'enum_site_setting' class AutoTrackDurationSiteSetting < EnumSiteSetting def self.valid_value?(val) + val.to_i.to_s == val.to_s && values.any? { |v| v[:value] == val.to_i } end diff --git a/app/models/digest_email_site_setting.rb b/app/models/digest_email_site_setting.rb index 5d0d40635a..5276fe3b3e 100644 --- a/app/models/digest_email_site_setting.rb +++ b/app/models/digest_email_site_setting.rb @@ -3,6 +3,7 @@ require_dependency 'enum_site_setting' class DigestEmailSiteSetting < EnumSiteSetting def self.valid_value?(val) + val.to_i.to_s == val.to_s && values.any? { |v| v[:value] == val.to_i } end diff --git a/app/models/new_topic_duration_site_setting.rb b/app/models/new_topic_duration_site_setting.rb index f04b9e67e5..ccc091a8b6 100644 --- a/app/models/new_topic_duration_site_setting.rb +++ b/app/models/new_topic_duration_site_setting.rb @@ -3,6 +3,7 @@ require_dependency 'enum_site_setting' class NewTopicDurationSiteSetting < EnumSiteSetting def self.valid_value?(val) + val.to_i.to_s == val.to_s && values.any? { |v| v[:value] == val.to_i } end diff --git a/app/models/trust_level_setting.rb b/app/models/trust_level_setting.rb index 4b3e5d42e6..9ea838ad82 100644 --- a/app/models/trust_level_setting.rb +++ b/app/models/trust_level_setting.rb @@ -3,6 +3,7 @@ require_dependency 'enum_site_setting' class TrustLevelSetting < EnumSiteSetting def self.valid_value?(val) + val.to_i.to_s == val.to_s && valid_values.any? { |v| v == val.to_i } end From 48c3fa423a7c87d86b7bdb1a8be843acf9737418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 14 Sep 2015 12:39:46 +0200 Subject: [PATCH 089/157] FIX: auto-focus input field on Safari was closing the modal --- .../components/auto-close-form.js.es6 | 11 +++--- .../components/autofocus-text-field.js.es6 | 11 ++++-- .../components/search-text-field.js.es6 | 12 ++++--- .../discourse/components/text-field.js.es6 | 19 +++-------- .../controllers/edit-topic-auto-close.js.es6 | 34 ++++++++++--------- .../mixins/modal-functionality.js.es6 | 2 +- .../javascripts/discourse/routes/topic.js.es6 | 2 +- .../templates/components/auto-close-form.hbs | 2 +- .../templates/modal/edit-topic-auto-close.hbs | 4 +-- .../views/edit-topic-auto-close.js.es6 | 7 ++++ .../discourse/views/modal-body.js.es6 | 12 ++++--- .../javascripts/discourse/views/modal.js.es6 | 12 ++++--- app/assets/stylesheets/desktop/discourse.scss | 2 -- 13 files changed, 71 insertions(+), 59 deletions(-) create mode 100644 app/assets/javascripts/discourse/views/edit-topic-auto-close.js.es6 diff --git a/app/assets/javascripts/discourse/components/auto-close-form.js.es6 b/app/assets/javascripts/discourse/components/auto-close-form.js.es6 index 2d564d246d..f6ab041c7c 100644 --- a/app/assets/javascripts/discourse/components/auto-close-form.js.es6 +++ b/app/assets/javascripts/discourse/components/auto-close-form.js.es6 @@ -2,8 +2,8 @@ import computed from "ember-addons/ember-computed-decorators"; import { observes } from "ember-addons/ember-computed-decorators"; export default Ember.Component.extend({ - autoCloseValid: false, limited: false, + autoCloseValid: false, @computed("limited") autoCloseUnits(limited) { @@ -19,15 +19,14 @@ export default Ember.Component.extend({ @observes("autoCloseTime", "limited") _updateAutoCloseValid() { - const autoCloseTime = this.get("autoCloseTime"); - const limited = this.get("limited"); - - var isValid = this._isAutoCloseValid(autoCloseTime, limited); + const limited = this.get("limited"), + autoCloseTime = this.get("autoCloseTime"), + isValid = this._isAutoCloseValid(autoCloseTime, limited); this.set("autoCloseValid", isValid); }, _isAutoCloseValid(autoCloseTime, limited) { - var t = (autoCloseTime || "").toString().trim(); + const t = (autoCloseTime || "").toString().trim(); if (t.length === 0) { // "empty" is always valid return true; diff --git a/app/assets/javascripts/discourse/components/autofocus-text-field.js.es6 b/app/assets/javascripts/discourse/components/autofocus-text-field.js.es6 index 29ecbb0d30..dd1ccd9871 100644 --- a/app/assets/javascripts/discourse/components/autofocus-text-field.js.es6 +++ b/app/assets/javascripts/discourse/components/autofocus-text-field.js.es6 @@ -1,7 +1,12 @@ +import { on } from "ember-addons/ember-computed-decorators"; + export default Ember.TextField.extend({ - becomeFocused: function() { - var input = this.get("element"); + + @on("didInsertElement") + becomeFocused() { + const input = this.get("element"); input.focus(); input.selectionStart = input.selectionEnd = input.value.length; - }.on('didInsertElement') + } + }); diff --git a/app/assets/javascripts/discourse/components/search-text-field.js.es6 b/app/assets/javascripts/discourse/components/search-text-field.js.es6 index 80dcc0ba21..0b7b3d0e36 100644 --- a/app/assets/javascripts/discourse/components/search-text-field.js.es6 +++ b/app/assets/javascripts/discourse/components/search-text-field.js.es6 @@ -1,17 +1,19 @@ import computed from 'ember-addons/ember-computed-decorators'; +import { on } from 'ember-addons/ember-computed-decorators'; import TextField from 'discourse/components/text-field'; export default TextField.extend({ @computed('searchService.searchContextEnabled') - placeholder: function(searchContextEnabled) { + placeholder(searchContextEnabled) { return searchContextEnabled ? "" : I18n.t('search.title'); }, - focusIn: function() { - Em.run.later(() => { this.$().select(); }); + focusIn() { + Em.run.later(() => this.$().select()); }, - becomeFocused: function() { + @on("didInsertElement") + becomeFocused() { if (this.get('hasAutofocus')) this.$().focus(); - }.on('didInsertElement') + } }); diff --git a/app/assets/javascripts/discourse/components/text-field.js.es6 b/app/assets/javascripts/discourse/components/text-field.js.es6 index 40560b8c84..a9246efa7d 100644 --- a/app/assets/javascripts/discourse/components/text-field.js.es6 +++ b/app/assets/javascripts/discourse/components/text-field.js.es6 @@ -1,19 +1,10 @@ -/** - This is a custom text field that allows i18n placeholders +import computed from "ember-addons/ember-computed-decorators"; - @class TextField - @extends Ember.TextField - @namespace Discourse - @module Discourse -**/ export default Ember.TextField.extend({ attributeBindings: ['autocorrect', 'autocapitalize', 'autofocus', 'maxLength'], - placeholder: function() { - if (this.get('placeholderKey')) { - return I18n.t(this.get('placeholderKey')); - } else { - return ''; - } - }.property('placeholderKey') + @computed("placeholderKey") + placeholder(placeholderKey) { + return placeholderKey ? I18n.t(placeholderKey) : ""; + } }); diff --git a/app/assets/javascripts/discourse/controllers/edit-topic-auto-close.js.es6 b/app/assets/javascripts/discourse/controllers/edit-topic-auto-close.js.es6 index 6958ff446d..0c8795dd1d 100644 --- a/app/assets/javascripts/discourse/controllers/edit-topic-auto-close.js.es6 +++ b/app/assets/javascripts/discourse/controllers/edit-topic-auto-close.js.es6 @@ -1,3 +1,4 @@ +import { observes } from "ember-addons/ember-computed-decorators"; import ModalFunctionality from 'discourse/mixins/modal-functionality'; // Modal related to auto closing of topics @@ -5,31 +6,32 @@ export default Ember.Controller.extend(ModalFunctionality, { auto_close_valid: true, auto_close_invalid: Em.computed.not('auto_close_valid'), - setAutoCloseTime: function() { - var autoCloseTime = null; + @observes("model.details.auto_close_at", "model.details.auto_close_hours") + setAutoCloseTime() { + let autoCloseTime = null; if (this.get("model.details.auto_close_based_on_last_post")) { autoCloseTime = this.get("model.details.auto_close_hours"); } else if (this.get("model.details.auto_close_at")) { - var closeTime = new Date(this.get("model.details.auto_close_at")); + const closeTime = new Date(this.get("model.details.auto_close_at")); if (closeTime > new Date()) { autoCloseTime = moment(closeTime).format("YYYY-MM-DD HH:mm"); } } this.set("model.auto_close_time", autoCloseTime); - }.observes("model.details.{auto_close_at,auto_close_hours}"), - - actions: { - saveAutoClose: function() { this.setAutoClose(this.get("model.auto_close_time")); }, - removeAutoClose: function() { this.setAutoClose(null); } }, - setAutoClose: function(time) { - var self = this; + actions: { + saveAutoClose() { this.setAutoClose(this.get("model.auto_close_time")); }, + removeAutoClose() { this.setAutoClose(null); } + }, + + setAutoClose(time) { + const self = this; this.send('hideModal'); Discourse.ajax({ - url: '/t/' + this.get('model.id') + '/autoclose', + url: `/t/${this.get('model.id')}/autoclose`, type: 'PUT', dataType: 'json', data: { @@ -37,15 +39,15 @@ export default Ember.Controller.extend(ModalFunctionality, { auto_close_based_on_last_post: this.get("model.details.auto_close_based_on_last_post"), timezone_offset: (new Date().getTimezoneOffset()) } - }).then(function(result){ + }).then(result => { if (result.success) { - self.send('closeModal'); - self.set('model.details.auto_close_at', result.auto_close_at); - self.set('model.details.auto_close_hours', result.auto_close_hours); + this.send('closeModal'); + this.set('model.details.auto_close_at', result.auto_close_at); + this.set('model.details.auto_close_hours', result.auto_close_hours); } else { bootbox.alert(I18n.t('composer.auto_close.error'), function() { self.send('reopenModal'); } ); } - }, function () { + }).catch(() => { bootbox.alert(I18n.t('composer.auto_close.error'), function() { self.send('reopenModal'); } ); }); } diff --git a/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6 b/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6 index e73b685d4e..42a279b803 100644 --- a/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6 +++ b/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6 @@ -3,7 +3,7 @@ export default Em.Mixin.create({ needs: ['modal'], - flash: function(message, messageClass) { + flash(message, messageClass) { this.set('flashMessage', Em.Object.create({ message, messageClass })); } }); diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6 index 1f0b8098d3..759ec4bbb7 100644 --- a/app/assets/javascripts/discourse/routes/topic.js.es6 +++ b/app/assets/javascripts/discourse/routes/topic.js.es6 @@ -56,7 +56,7 @@ const TopicRoute = Discourse.Route.extend({ }, showAutoClose() { - showModal('edit-topic-auto-close', { model: this.modelFor('topic'), title: 'topic.auto_close_title' }); + showModal('edit-topic-auto-close', { model: this.modelFor('topic') }); this.controllerFor('modal').set('modalClass', 'edit-auto-close-modal'); }, diff --git a/app/assets/javascripts/discourse/templates/components/auto-close-form.hbs b/app/assets/javascripts/discourse/templates/components/auto-close-form.hbs index 4234d0673b..34d53e2f70 100644 --- a/app/assets/javascripts/discourse/templates/components/auto-close-form.hbs +++ b/app/assets/javascripts/discourse/templates/components/auto-close-form.hbs @@ -12,7 +12,7 @@
        diff --git a/app/assets/javascripts/discourse/templates/modal/edit-topic-auto-close.hbs b/app/assets/javascripts/discourse/templates/modal/edit-topic-auto-close.hbs index 4ad1e97e4b..94ce2fd0ad 100644 --- a/app/assets/javascripts/discourse/templates/modal/edit-topic-auto-close.hbs +++ b/app/assets/javascripts/discourse/templates/modal/edit-topic-auto-close.hbs @@ -6,8 +6,8 @@ limited=model.details.auto_close_based_on_last_post }}
        - + {{d-button class="btn-primary" disabled=auto_close_invalid label="topic.auto_close_save"}} {{i18n 'cancel'}} - + {{d-button class="pull-right" action="removeAutoClose" label="topic.auto_close_remove"}}
        diff --git a/app/assets/javascripts/discourse/views/edit-topic-auto-close.js.es6 b/app/assets/javascripts/discourse/views/edit-topic-auto-close.js.es6 new file mode 100644 index 0000000000..6265d41b80 --- /dev/null +++ b/app/assets/javascripts/discourse/views/edit-topic-auto-close.js.es6 @@ -0,0 +1,7 @@ +import ModalBodyView from "discourse/views/modal-body"; + +export default ModalBodyView.extend({ + templateName: "modal/edit-topic-auto-close", + title: I18n.t("topic.auto_close_title"), + focusInput: false +}); diff --git a/app/assets/javascripts/discourse/views/modal-body.js.es6 b/app/assets/javascripts/discourse/views/modal-body.js.es6 index c5807ea32b..f164c8dbbe 100644 --- a/app/assets/javascripts/discourse/views/modal-body.js.es6 +++ b/app/assets/javascripts/discourse/views/modal-body.js.es6 @@ -1,7 +1,10 @@ +import { observes, on } from "ember-addons/ember-computed-decorators"; + export default Ember.View.extend({ focusInput: true, - _setupModal: function() { + @on("didInsertElement") + _setupModal() { $('#modal-alert').hide(); $('#discourse-modal').modal('show'); @@ -14,9 +17,10 @@ export default Ember.View.extend({ if (title) { this.set('controller.controllers.modal.title', title); } - }.on('didInsertElement'), + }, - flashMessageChanged: function() { + @observes("controller.flashMessage") + flashMessageChanged() { const flashMessage = this.get('controller.flashMessage'); if (flashMessage) { const messageClass = flashMessage.get('messageClass') || 'success'; @@ -25,6 +29,6 @@ export default Ember.View.extend({ .addClass("alert alert-" + messageClass).html(flashMessage.get('message')) .fadeIn(); } - }.observes('controller.flashMessage') + } }); diff --git a/app/assets/javascripts/discourse/views/modal.js.es6 b/app/assets/javascripts/discourse/views/modal.js.es6 index e69cd3c517..07f2bbeb14 100644 --- a/app/assets/javascripts/discourse/views/modal.js.es6 +++ b/app/assets/javascripts/discourse/views/modal.js.es6 @@ -1,3 +1,5 @@ +import { on } from "ember-addons/ember-computed-decorators"; + export default Ember.View.extend({ elementId: 'discourse-modal', templateName: 'modal/modal', @@ -7,17 +9,19 @@ export default Ember.View.extend({ // We handle ESC ourselves 'data-keyboard': 'false', - _bindOnInsert: function() { + @on("didInsertElement") + setUp() { $('html').on('keydown.discourse-modal', e => { if (e.which === 27) { Em.run.next(() => $('.modal-header a.close').click()); } }); - }.on('didInsertElement'), + }, - _bindOnDestroy: function() { + @on("willDestroyElement") + cleanUp() { $('html').off('keydown.discourse-modal'); - }.on('willDestroyElement'), + }, click(e) { const $target = $(e.target); diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss index 2c58ae8fd3..17baebbc1c 100644 --- a/app/assets/stylesheets/desktop/discourse.scss +++ b/app/assets/stylesheets/desktop/discourse.scss @@ -185,7 +185,6 @@ body { border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); border-radius: 3px; box-shadow: inset 0 1px 1px rgba(0,0,0, .3); - transition: border linear 0.2s, box-shadow linear 0.2s; } input { &[type="text"], &[type="password"], &[type="datetime"], &[type="datetime-local"], &[type="date"], &[type="month"], &[type="time"], &[type="week"], &[type="number"], &[type="email"], &[type="url"], &[type="search"], &[type="tel"], &[type="color"] { @@ -193,7 +192,6 @@ body { border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); border-radius: 3px; box-shadow: inset 0 1px 1px rgba(0,0,0, .3); - transition: border linear 0.2s, box-shadow linear 0.2s; } } textarea:focus { From 632c170caa1a5a7df1447c702eb9e70c7fcf3067 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Mon, 14 Sep 2015 20:02:40 +0530 Subject: [PATCH 090/157] Update Translations --- config/locales/client.ar.yml | 5 ++ config/locales/client.es.yml | 10 +++- config/locales/client.tr_TR.yml | 57 ++++++++++++----------- config/locales/server.ar.yml | 40 ++++++++++++++-- config/locales/server.es.yml | 13 ++++++ config/locales/server.tr_TR.yml | 82 --------------------------------- config/locales/server.zh_CN.yml | 17 ++++--- public/503.tr_TR.html | 2 +- 8 files changed, 103 insertions(+), 123 deletions(-) diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml index 96a75d1353..11dc28c3e5 100644 --- a/config/locales/client.ar.yml +++ b/config/locales/client.ar.yml @@ -437,6 +437,10 @@ ar: all_subcategories: "جميع" no_subcategory: "لا شيء" category: "تصنيف" + reorder: + title: "إعادة ترتيب الفئات" + save: "حفظ الترتيب" + apply_all: "تطبيق" posts: "مشاركات" topics: "مواضيع" latest: "آخر" @@ -487,6 +491,7 @@ ar: private_messages: "الرسائل" activity_stream: "النشاط" preferences: " التفضيلات" + expand_profile: "توسيع" bookmarks: "المفضلة" bio: "معلومات عنّي" invited_by: "مدعو بواسطة" diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml index e9c723fbcf..477b00e88e 100644 --- a/config/locales/client.es.yml +++ b/config/locales/client.es.yml @@ -328,6 +328,10 @@ es: all_subcategories: "todas" no_subcategory: "ninguna" category: "Categoría" + reorder: + title: "Reorganizar Categorías" + save: "Guardar orden" + apply_all: "Aplicar" posts: "Posts" topics: "Temas" latest: "Recientes" @@ -859,11 +863,11 @@ es: topic: "Buscar en este tema" private_messages: "Buscar en mensajes" hamburger_menu: "ir a otra lista de temas o categoría" + new_item: "¡Nuevo!" go_back: 'volver' not_logged_in_user: 'página con el resumen de actividad y preferencias' current_user: 'ir a tu página de usuario' topics: - too_many_tracked: "Atención: tienes demasiados temas seguidos y nuevos, quita algunos usando Ignorar nuevos o Ignorar posts" bulk: reset_read: "Restablecer leídos" delete: "Eliminar temas" @@ -1396,6 +1400,7 @@ es: add_permission: "Añadir permisos" this_year: "este año" position: "posición" + reorder: "Reordenar" default_position: "Posición predeterminada" position_disabled: "Las Categorías se mostrarán por orden de actividad. Para controlar el orden en que aparecen en las listas," position_disabled_click: 'activa la opción "fixed category positions".' @@ -2343,10 +2348,13 @@ es: feed_settings: "Ajustes de Feed" feed_description: "Discourse podrá importar tu contenido de forma más fácil si proporcionas un feed RSS/ATOM de tu sitio." crawling_settings: "Ajustes de Crawlers" + crawling_description: "Cuando Discourse crea temas para tus posts, si no hay un feed RSS/ATOM presente intentará analizar el contenido de tu HTML. A veces puede ser difícil extraer tu contenido, por eso facilitamos la opción de especificar reglas CSS para hacer la extracción más fácil." embed_by_username: "Usuario para la creación de temas" embed_post_limit: "Máximo número de posts a incluir" embed_username_key_from_feed: "Clave para extraer usuario de discourse del feed" embed_truncate: "Truncar los posts insertados" + embed_whitelist_selector: "Selector CSS para permitir elementos a embeber" + embed_blacklist_selector: "Selector CSS para restringir elementos a embeber" feed_polling_enabled: "Importar posts usando RSS/ATOM" feed_polling_url: "URL del feed RSS/ATOM del que extraer datos" save: "Guardar ajustes de Insertado" diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml index bb0ab800ec..4e637adb13 100644 --- a/config/locales/client.tr_TR.yml +++ b/config/locales/client.tr_TR.yml @@ -92,23 +92,23 @@ tr_TR: action_codes: split_topic: "bu konuyu ayır" autoclosed: - enabled: 'kapatıldı %{when}' - disabled: 'açıldı %{when}' + enabled: '%{when} kapatıldı' + disabled: '%{when} açıldı' closed: - enabled: 'kapatıldı %{when}' - disabled: 'açıldı %{when}' + enabled: '%{when} kapatıldı' + disabled: '%{when} açıldı' archived: - enabled: 'arşivlendi %{when}' - disabled: 'arşivden çıkarıldı %{when}' + enabled: '%{when} arşivlendi' + disabled: '%{when} arşivden çıkarıldı' pinned: - enabled: 'sabitlendi %{when}' - disabled: 'sabitlikten çıkarıldı %{when}' + enabled: '%{when} sabitlendi' + disabled: '%{when} sabitlikten çıkarıldı' pinned_globally: - enabled: 'genel olarak sabitlendi %{when}' - disabled: 'genel olarak sabitlikten çıkarıldı %{when}' + enabled: '%{when} genel olarak sabitlendi' + disabled: '%{when} genel olarak sabitleme kaldırıldı' visible: - enabled: 'listelendi %{when}' - disabled: 'listelenmedi %{when}' + enabled: '%{when} listelendi' + disabled: '%{when} listelenmedi' topic_admin_menu: "konuyla alakalı yönetici işlemleri" emails_are_disabled: "Tüm giden e-postalar yönetici tarafından evrensel olarak devre dışı bırakıldı. Herhangi bir e-posta bildirimi gönderilmeyecek." edit: 'bu konunun başlığını ve kategorisini düzenleyin' @@ -183,11 +183,11 @@ tr_TR: remove: "İşareti Kaldır" confirm_clear: "Bu konuya ait tüm işaretleri kaldırmak istediğinize emin misiniz?" topic_count_latest: - other: "{{count}} yeni ya da güncellenmiş konular." + other: "{{count}} yeni ya da güncellenmiş konu." topic_count_unread: - other: "{{count}} okunmamış konular." + other: "{{count}} okunmamış konu." topic_count_new: - other: "{{count}} yeni konular." + other: "{{count}} yeni konu." click_to_show: "Görüntülemek için tıklayın." preview: "önizleme" cancel: "İptal" @@ -300,6 +300,10 @@ tr_TR: all_subcategories: "hepsi" no_subcategory: "hiçbiri" category: "Kategori" + reorder: + title: "Kategorileri Yeniden Sırala" + save: "Sıralamayı Kaydet" + apply_all: "Uygula" posts: "Gönderiler" topics: "Konular" latest: "En Son" @@ -439,14 +443,14 @@ tr_TR: instructions: "Profil arkaplanları ortalanacak ve genişlikleri 590px olacak. " email: title: "E-posta" - instructions: "Kimseye gösterilmeyecek" + instructions: "Kimseye gösterilmeyecek." ok: "Onay için size e-posta atacağız" invalid: "Lütfen geçerli bir e-posta adresini giriniz" authenticated: "E-posta adresiniz {{provider}} tarafından doğrulanmıştır" frequency: zero: "Eğer yollamak üzere olduğumuz şeyi okumadıysanız size direk e-posta yollayacağız." - one: "Sadece sizi son bir dakika içinde görmediysek size e-posta yollayacağız." - other: "Sadece sizi son {{count}} dakika içerisinde görmediysek size e-posta yollayacağız." + one: "Sadece son bir dakika içinde sizi görmediysek e-posta yollayacağız." + other: "Sadece son {{count}} dakika içinde sizi görmediysek e-posta yollayacağız." name: title: "İsim" instructions: "Tam adınız (zorunlu değil)" @@ -513,7 +517,7 @@ tr_TR: after_5_minutes: "5 dakika sonra" after_10_minutes: "10 dakika sonra" invited: - search: "davetler arasında aramak için yazın..." + search: "davetiye aramak için yazın..." title: "Davetler" user: "Davet Edilen Kullanıcı" sent: "Gönderildi" @@ -776,10 +780,10 @@ tr_TR: private_message: "

        {{username}} {{description}}

        " invited_to_private_message: "

        {{username}} {{description}}

        " invited_to_topic: "

        {{username}} {{description}}

        " - invitee_accepted: "

        {{username}} davetiyeni kabul etti

        " + invitee_accepted: "

        {{username}} davetini kabul etti!

        " moved_post: "

        {{username}} taşıdı {{description}}

        " linked: "

        {{username}} {{description}}

        " - granted_badge: "

        Kazanıldı'{{description}}'

        " + granted_badge: "

        {{description}} rozeti kazandınız!

        " alt: mentioned: "Bahsedildi, şu kişi tarafından" quoted: "Alıntılandı, şu kişi tarafından" @@ -816,23 +820,23 @@ tr_TR: select_file: "Dosya seçin" image_link: "resminizin yönleneceği bağlantı" search: - title: "konular, gönderiler, kullanıcılar, veya kategoriler arasında ara" + title: "konu, gönderi, kullanıcı veya kategori ara" no_results: "Hiç bir sonuç bulunamadı." no_more_results: "Başka sonuç yok." search_help: Arama yardımı searching: "Aranıyor..." post_format: "{{username}} tarafından #{{post_number}}" context: - user: "@{{username}} kullancısına ait gönderiler arasında ara" + user: "@{{username}} kullancısına ait gönderilerde ara" category: "\"{{category}}\" kategorisinde ara" topic: "Bu konuda ara" private_messages: "Mesajlarda ara" hamburger_menu: "bir diğer konu ya da kategoriye git" + new_item: "Yeni!" go_back: 'geri dön' not_logged_in_user: 'güncel aktivitelerin ve ayarların özetinin bulunduğu kullanıcı sayfası' current_user: 'kendi kullanıcı sayfana git' topics: - too_many_tracked: "Uyarı: takip edilen çok fazla yeni ve okunmamış konunuz var, bazılarını Yeniyi Kaldır ya da Konuları Kaldır'ı kullanarak temizleyin." bulk: reset_read: "Okunmuşları Sıfırla" delete: "Konuları Sil" @@ -852,7 +856,7 @@ tr_TR: other: "{{count}} konu seçtiniz." none: unread: "Okunmamış konunuz yok." - new: "Yeni konunuz yok" + new: "Yeni konunuz yok." read: "Henüz herhangi bir konu okumadınız." posted: "Henüz herhangi bir konuda gönderi oluşturmadınız." latest: "Son bir konu yok. Bu üzücü." @@ -862,7 +866,7 @@ tr_TR: top: "Popüler bir konu yok." search: "Arama sonuçları yok." educate: - new: '

        Yeni konularınız burada belirir.

        Varsayılan ayarlarda, son 2 gün içerisinde yaratılan konular yeni sayılır ve yeni işaretiyle gösterilir.

        Dilerseniz bu seçeneği ayarlar sayfanızdan düzenleyebilirsiniz.

        ' + new: '

        Yeni konularınız burada belirir.

        Varsayılan ayarlarda, son 2 gün içerisinde açılan konular yeni sayılır ve yeni işaretiyle gösterilir.

        Dilerseniz bu seçeneği ayarlar sayfanızdan düzenleyebilirsiniz.

        ' unread: '

        Okunmamış konularınız burada belirecek.

        Varsayılan ayarlarda, şu durumlarda konular okunmamış sayılır ve okunmamışların sayısı 1 gösterilir:

        • Konuyu oluşturduysanız
        • Konuyu cevapladıysanız
        • Konuyu 4 dakikadan uzun bir süre okuduysanız

        Ya da, konunun altında bulunan bildirim kontrol bölümünden, konuyu Takip Edildi veya Gözlendi diye işaretlediyseniz.

        Bu ayarları ayarlar sayfasından değiştirebilirsiniz.

        ' bottom: latest: "Daha fazla son konu yok." @@ -1329,6 +1333,7 @@ tr_TR: add_permission: "İzin Ekle" this_year: "bu yıl" position: "pozisyon" + reorder: "Yeniden Sırala" default_position: "Varsayılan Pozisyon" position_disabled: "Kategoriler etkinlik sıralarına göre görünecekler. Listelerdeki kategorilerin sıralamalarını kontrol edebilmek için," position_disabled_click: '"sabitlenmiş kategori pozisyonları" ayarını etklinleştirin.' diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml index 56cddab015..4889db9180 100644 --- a/config/locales/server.ar.yml +++ b/config/locales/server.ar.yml @@ -311,8 +311,7 @@ ar: category: topic_prefix: "عن الفئة %{category}." replace_paragraph: "[استبدل هذا الفقرة الأولى بوصف قصير لفئتك الجديدة. سيظهر هذا التوجيه في منطقة اختيار الفئة, لذا حاول أن تبقيها أقل من 200 حرف. حتى عند تحريرك لهذا النص أو إنشائك لموضوع, هذه الفئة لن تظهر على صفحة الفئات.]" - post_template: "%{replace_paragraph}\n\nاستخدم الفقرات التالي لوصف طويل, إضافة لإنشاء أي فئة قواعد أو توجيهات.\n\nبعض الأشياء تؤخذ بعين الإعتبار في أسفل أي ردود لنقاش:\n\n- لما هذا الفئة؟لماذا يختار الناس هذه الفئة لمواضيعهم؟\n\n- كيف تختلف الفئات الأخرى عن التي لدينا؟\n\n- هل نحتاج هذه الفئة؟\n\n- هل يجب أن ندمج هذه مع فئة أخرى, أو تقسم إلى أكثر من قئة\ - \ ؟\n" + post_template: "%{replace_paragraph}\n\nاستخدم الفقرات التالي لوصف طويل, إضافة لإنشاء أي فئة قواعد أو توجيهات.\n\nبعض الأشياء تؤخذ بعين الإعتبار في أسفل أي ردود لنقاش:\n\n- لما هذا الفئة؟لماذا يختار الناس هذه الفئة لمواضيعهم؟\n\n- كيف تختلف الفئات الأخرى عن التي لدينا؟\n\n- هل نحتاج هذه الفئة؟\n\n- هل يجب أن ندمج هذه مع فئة أخرى, أو تقسم إلى أكثر من قئة ؟\n" errors: uncategorized_parent: "غير مصنف لا يمكن أن يكون فئة الأم" self_parent: "الفئة الفرعية لا يمكن ان تكون كالفئة الرئيسية." @@ -549,17 +548,21 @@ ar: post_action_types: off_topic: title: 'خارج الموضوع' + description: 'لا صلة للمشاركة بالنقاش الحالي على النحو المحدد بواسطة العنوان والمشاركة الأولى، وربما ينبغي نقلها لمكان أخر.' long_form: 'أبلغ أن هذا خارج الموضوع.' spam: title: 'بريد مزعج' + description: 'هذه المشاركة هي إعلان. ليست مفيدة أو مناسبة للموضوع الحالي، ولكنه نوع ترويجي.' long_form: 'تبليغ على أنه مزعج' email_title: '"%{title}" تم الأبلاغ على أنه بريد مزعج' email_body: "%{link}\n\n%{message}" inappropriate: title: 'غير مناسب' + description: 'هذه المشاركة تشمل محتوى أي شخص عاقل سيعتبره عدواني، أو مسيئ، أو انتهاك لـمبادئ مجتمعنا التوجيهية.' long_form: 'ترفع علم هذا عن صورة غير ملائمة' notify_user: title: 'رسالة @{{username}}' + description: 'هذه المشاركة تحتوي بعض الأشياء التي أريد أن أتكلم مع هذا الشخص حولها مباشرة وسرا. لا يمكنك عمل تبليغ.' long_form: 'العضو أرسل' email_title: 'مشاركتك في "%{title}"' email_body: "%{link}\n\n%{message}" @@ -588,13 +591,16 @@ ar: long_form: 'ترفع علم هذا كدعاية' inappropriate: title: 'غير مناسب' + description: 'هذا الموضوع يشمل محتوى أي شخص عاقل سيعتبره عدواني، أو مسيئ، أو انتهاك لـمبادئ مجتمعنا التوجيهية.' long_form: 'ترفع علم هذا عن صورة غير ملائمة' notify_moderators: title: "شيء آخر " + description: 'هذا الموضوع يتطلب اهتمام مشرف عام يعتمد على دليل التوجيهات, TOS, أو لسبب أخر غير مذكور أعلاه.' long_form: 'علم هذا لتنبيه المراقب' email_title: 'الموضوع "%{title}" يتطلب موافقة المشرف' email_body: "%{link}\n\n%{message}" flagging: + you_must_edit: '

        مشاركتك تم التبليغ عليها بواسطة المجتمع. نرجوا رؤية رسالتك.

        ' user_must_edit: '

        هذه المشاركة كانت معلّمة بواسطة المجتمع وهي مخفية مؤقتاً.

        ' archetypes: regular: @@ -760,6 +766,10 @@ ar: sidekiq_warning: "\"Sidekiq\" لا يعمل! \nالعديد من المهام, كإرسال البريدوغيرها, يتم تنفيذها بشكل غير متزامن من قبل \"sidekiq\". الرجاء التحقيق من عمل احدى وضائف الـ\"Sidekiq\". Learn about Sidekiq here." queue_size_warning: 'عدد المهام قيد الانتظار هو %{queue_size}, وهو مرتفع. وقد يسبب مشكلة مع احدى/كل مهام "Sidekiq", أو قد تحتاج الى إضافة المزيد من (Sidekiq workers).' memory_warning: 'خادمك يعمل بأقل من 1 جيجا بايت من الذاكرة الإجمالية. يتطلب على الأقل 1 جيجا بايت من الذاكرة.' + google_oauth2_config_warning: 'تم تكوين الخادم للسماح بالتسجيل وتسجيل الدخول مع Google OAuth2 (enable_google_oauth2_logins)، لكن معرف العميل وعميل القيم السرية لم يعين. أذهب إلى إعدادات الموقعوتحديث الإعدادات. أنظر لهذا الدليل لمزيد من المعلومات.' + facebook_config_warning: 'تم تكوين الخادم للسماح بالتسجيل وتسجيل الدخول مع Facebook (enable_facebook_logins), لكن معرف العميل وعميل القيم السرية لم يعين. أذهب إلى إعدادات الموقعوتحديث الإعدادات. أنظر لهذا الدليل لمزيد من المعلومات.' + twitter_config_warning: 'تم تكوين الخادم للسماح بالتسجيل وتسجيل الدخول مع Twitter (enable_twitter_logins), لكن معرف العميل وعميل القيم السرية لم يعين. أذهب إلى إعدادات الموقع وتحديث الإعدادات. أنظر لهذا الدليل لمزيد من المعلومات.' + github_config_warning: 'تم تكوين الخادم للسماح بالتسجيل وتسجيل الدخول مع GitHub (enable_github_logins), لكن معرف العميل وعميل القيم السرية لم يعين. أذهب إلى إعدادات الموقع وتحديث الإعدادات. أنظر لهذا الدليل لمزيد من المعلومات.' contact_email_invalid: "البريد الالكتروني للموقع معطل. حدّثه Site Settings." title_nag: "أدخل اسم موقعك. حدث العنوان في الاعدادات Site Settings." site_description_missing: "أدخل جملة وصفية واحدة لموقعك والتي ستظهر في نتائج البحث. حدّث وصف_الموقع في اعدادات الموقع Site Settings." @@ -896,6 +906,7 @@ ar: suggested_topics: "عدد المواضيع المواضيع المقترحة يظهر في أسفل الموضوع." limit_suggested_to_category: "أظهر فقط المواضيع من الفئات الحالية في المواضيع المقترحة." clean_up_uploads: " يتيم أزالة تحديث غير مرجعية لمنع استضافة غير المشروعة. تحذير: قد تحتاج لعمل نسخة احتياطية من الدليل / تحميل قبل تمكين هذا الإعداد." + clean_orphan_uploads_grace_period_hours: "فترة الراحة (بالساعات) قبل الرفع الوحيد تمت إزالته." purge_deleted_uploads_grace_period_days: "يتم مسح فترة سماح (بالأيام) قبل تحميل حذفه." purge_unactivated_users_grace_period_days: "يتم حذف فترة سماح (بالأيام) قبل المستخدم الذي لم تنشيط حساباتهم." enable_s3_uploads: "وضع الإضافات على تخزين الأمازون S3. هام: يتطلب اعتماد S3 صالحة (على حد سواء الوصول معرف مفتاح ومفتاح الوصول السري)." @@ -916,6 +927,7 @@ ar: tl2_requires_likes_received: "كمية الإعجابات التي يجب على العضو إرسالها قبل ترقيته لمستوى الثقة 2." tl2_requires_likes_given: "كمية الإعجابات التي يجب على العضو جمعها قبل ترقيته لمستوى الثقة 2." tl2_requires_topic_reply_count: "كمية مواضيع العضو التي يجب الرد عليها قبل الترقية لمستوى الثقة 2." + min_trust_to_create_topic: "أدنى مستوى ثقة مطلوب لإنشاء موضوع جديد." newuser_max_links: "عدد الروابط التي يمكن للمستخدم الجديد إضافتها للمشاركة." newuser_max_images: "عدد الصور التي يمكن للمستخدم الجديد إضافتها للمشاركة." newuser_max_attachments: "عدد المرفقات التي يمكن للمستخدم الجديد إضافتها للمشاركة." @@ -923,6 +935,8 @@ ar: category_style: "النمط المرئي لفئة الشارات." auto_respond_to_flag_actions: "تمكين الرد التلقائي عند التخلص من التبليغ." auto_block_fast_typers_max_trust_level: "الحد الأعلى لمستوى الثقة لأنواع الحظر التلقائي السريع." + reply_by_email_enabled: "تفعيل الرد على الموضوع بواسطة البريد الالكتروني" + short_email_length: "طول أقصر بريد الكتروني بـ Bytes." full_name_required: "الإسم الكامل مطلوب وهو ضروري لإكمال الحساب " enable_names: "عرض الاسم الكامل للعضو , بطاقة العضو , ورسائل البريد الالكتروني , تعطيل عرض الاسم في اي مكان " display_name_on_posts: "عرض الاسم الكامل للعضو على التعليقات بالاضافة الى @username." @@ -932,6 +946,14 @@ ar: delete_drafts_older_than_n_days: حذف المسودات مضى عليها أكثر من (ن) يوما. enable_emoji: "تمكين الرموز التعبيرية " emoji_set: "كيف تريد الرموز التعبيرية الخاصة بك؟" + default_other_external_links_in_new_tab: "أفتح الروابط الخارجية في تبويب جديد إفتراضيا." + default_other_enable_quoting: "فعل إقتباس الردود لتحديد النص إفتراضيا." + default_other_dynamic_favicon: "إعرض عدد المواضيع الجديدة/الحديثة في أيقونة المتصفح إفتراضيا." + default_other_disable_jump_reply: "لا تتجاوز إلى مشاركة الضو بعد ردهم إفتراضيا." + default_other_edit_history_public: "أنشئ مشاركة المراجعات العامة إفتراضيا." + default_categories_watching: "قائمة الفئات التي تشاهد إفتراضيا." + default_categories_tracking: "قائمة الفئات التي تتابع إفتراضيا." + default_categories_muted: "قائمة الفئات التي توضع صامتة إفتراضيا." errors: invalid_email: "بريد الكتروني غير صالح " invalid_username: "لا يوجد مستخدم بهذا الاسم " @@ -975,7 +997,11 @@ ar: most_posts: "معظم المشاركات" most_recent_poster: "معظم المشاركات الاخيرة " frequent_poster: "تكرار المشاركات " + redirected_to_top_reasons: + new_user: "مرحبا بكم في مجتمعنا! هذه هي المواضيع الأكثر شعبية الأخيرة." + not_seen_in_a_month: "مرحبا بعودتك! لم نرك منذ مدة. هذه أكثر المواضيع شعبية عندما كنت بعيدا." change_owner: + post_revision_text: "نقل الملكية من %{old_user} إلى %{new_user}" deleted_user: "عضو محذوف" emoji: errors: @@ -990,8 +1016,10 @@ ar: autoclosed_disabled_lastpost: "تم فتح هذا الموضوع الان ويسمح باضافة ردود جديدة " pinned_enabled: "هذا الموضوع الآن مقيد. سوف تظهر في الجزء العلوي من فئة لها حتى أنها متغيرة من الموظفين لكل فرد، أو بواسطة المستخدمين انفسهم." pinned_disabled: "هذا الموضوع يتم الآن إزالة. لن يظهر في الجزء العلوي من هذه الفئة." + visible_enabled: "هذا الموضوع مدرج الأن. سيظهر في قائمة المواضيع." login: incorrect_username_email_or_password: "اسم المستخدم او كلمة المرور او البريد الالكتروني غير صحيح" + active: "حسابك مفعل وجاهز للاستخدام." not_allowed_from_ip_address: "ﻻ يمكنك تسجيل الدخول كـ %{username} من هذا الـIP" admin_not_allowed_from_ip_address: "لا يمكنك تسجيل الدخول كمدير من خلال هذا العنوان الرقمي - IP." suspended: "ﻻ يمكنك تسجيل الدخول حتى %{date}." @@ -1014,6 +1042,9 @@ ar: characters: "يجب ان تحتوي الارقام والاحرف الصغيرة فقط " unique: "يجب أن يكون فريدا" blank: "يجب أن يكون موجود" + must_end_with_alphanumeric: "يجب أن ينتهي بحرف أو رقم." + must_not_contain_two_special_chars_in_seq: "يجب أن لا يحتوي على تسلسل من 2 أو رموز خاصة (.-_)" + must_not_contain_confusing_suffix: "يجب أن لا تحتوي على ملحقة مربكة مثل : json. أو png. الخ." email: not_allowed: "بريد الكتروني غير مسموح . يرجى استخدام بريد الكتروني آخر " blocked: "غير مسموح" @@ -1041,6 +1072,7 @@ ar: disagreed: "شكراً لإعلامنا سننظر في ذلك " deferred: "شكراً لإعلامنا سننظر في ذلك " deferred_and_deleted: "شكرا لاعلامنا تم ازالة هذا التعليق " + temporarily_closed_due_to_flags: "هذا الموضوع مغلق مؤقتا بسبب عدد التبليغات الكبير للمجتمع." system_messages: post_hidden: subject_template: "تم إخفاء المنشور بسبب حظر المجتمع" @@ -1075,8 +1107,8 @@ ar: text_body_template: "نحن آسفون ، ولكن رسالة البريد الإلكتروني إلى %{destination} (titled %{former_title}) لا تعمل. \n\nليس هنالك حساب عضو يمتلك هذا البريد الالكتروني. حاول أن ترسل من بريد الكتروني مختلف، أو أتصل بـ أحد المشرفين.\n\n" email_reject_empty: subject_template: "[%{site_name}] بريد الكتروني -- بدون محتوى" - text_body_template: "نحن آسفون ، ولكن رسالة البريد الإلكتروني إلى %{destination} (titled %{former_title}) لا تعمل. \n\nلم نتمكن من العثور على أي محتوى في البريد الإلكتروني الخاص بك. تأكد من الرد الخاص بك هو في الجزء العلوي من البريد الإلكتروني -- نحن لا يمكننا معالجة الردود في سطر .\n\nإذا كنت الحصول على هذا وانت_ قمت _ بتضمين المحتوى، حاول مرة أخرى\ - \ مع محتوى HTML المضمنه في بريدك الالكتروني ( ليس مجرد نص عادي).\n" + text_body_template: "نحن آسفون ، ولكن رسالة البريد الإلكتروني إلى %{destination} (titled %{former_title}) لا تعمل. \n\nلم نتمكن من العثور على أي محتوى في البريد الإلكتروني الخاص بك. تأكد من الرد الخاص بك هو في الجزء العلوي من البريد الإلكتروني -- نحن لا يمكننا معالجة الردود في سطر .\n\nإذا كنت الحصول على هذا وانت_ قمت _ بتضمين المحتوى، حاول مرة أخرى مع محتوى HTML المضمنه في بريدك الالكتروني\ + \ ( ليس مجرد نص عادي).\n" email_reject_parsing: subject_template: "[%{site_name}] بريد الكتروني -- محتواه غير معروف" text_body_template: "نحن آسفون ، ولكن رسالة البريد الإلكتروني إلى %{destination} (titled %{former_title}) لا تعمل. \n\nلم نتمكن من العثور على أي محتوى في البريد الإلكتروني الخاص بك. **تأكد من الرد الخاص بك هو في الجزء العلوي من البريد الإلكتروني -- نحن لا يمكننا معالجة الردود في سطر .\n" diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml index 4bad0f0d0e..42eceed134 100644 --- a/config/locales/server.es.yml +++ b/config/locales/server.es.yml @@ -65,6 +65,12 @@ es: other: '%{count} errores impidieron guardar este %{model}' embed: load_from_remote: "Hubo un error al cargar ese post." + site_settings: + min_username_length_exists: "No se puede establecer una longitud mínima para nombre de usuario mayor que el nombre de usuario más corto ya existente." + min_username_length_range: "No se puede establecer el mínimo por encima del máximo." + max_username_length_exists: "No se puede establecer una longitud máxima de nombre de usuario menor que el nombre de usuario más largo ya existente." + max_username_length_range: "No se puede establecer el máximo por debajo del mínimo." + default_categories_already_selected: "No se puede seleccionar una categoría ya utilizada en otra lista." bulk_invite: file_should_be_csv: "El archivo a subir debe tener formato csv o txt." backup: @@ -392,6 +398,7 @@ es: please_continue: "Continuar a %{site_name}" error: "Hubo un problema cambiando tu dirección de email. ¿Quizás la dirección ya está en uso?" activation: + action: "Haz clic aquí para activar tu cuenta" already_done: "Lo sentimos, este link de confirmación de cuenta ya no es válido. ¿Quizás tu cuenta ya está activa?" please_continue: "Tu nueva cuenta está confirmada; se te redirigirá a la página de inicio." continue_button: "Continuar a %{site_name}" @@ -711,6 +718,7 @@ es: logo_url: "El logo situado en la esquina superior izquierda de tu sitio, debería encajar en las dimensiones de un rectángulo. Si se deja en blanco, se mostrará un texto con el título del sitio." digest_logo_url: "El logo alternativo que irá arriba en los emails de resumen de tu sitio. Debería encajar en las dimensiones de un rectángulo. Si se deja en blanco, se utilizará `logo_url`." logo_small_url: "El logo pequeño situado en la esquina superior izquierda del sitio, debería encajar en las dimensiones de un cuadrado y se muestra cuando se hace scroll hacia abajo. Si se deja en blanco, se mostrará un glifo de una casita." + favicon_url: "Un favicon para tu sitio, mira más info en http://es.wikipedia.org/wiki/Favicon - para que funcione correctamente sobre un CDN debe ser un png" mobile_logo_url: "El logo con posición fija utilizado en la esquina superior izquierda de la versión móvil de tu sitio. Debería encajar en las dimensiones de un cuadrado. Si se deja en blanco, se mostrará el campo introducido en `logo_url`. Ejemplo: http://example.com/uploads/default/logo.png" apple_touch_icon_url: "Icono para los dispositivos táctiles de Apple. Se recomienda un tamaño de 144px por 144px." notification_email: "La dirección de correo electrónico \"remitente\", utilizada al enviar todos los emails esenciales de sistema. El dominio especificado debe tener correctamente configurados los registros SPF, DKIM y PTR inversos para que los emails se reciban correctamente." @@ -741,6 +749,7 @@ es: notify_mods_when_user_blocked: "Si un usuario es bloqueado automáticamente, enviar un mensaje a todos los moderadores." flag_sockpuppets: "Si un nuevo usuario responde a un tema desde la misma dirección de IP que el nuevo usuario que inició el tema, reportar los posts de los dos como spam en potencia." traditional_markdown_linebreaks: "Utiliza saltos de línea tradicionales en Markdown, que requieren dos espacios al final para un salto de línea." + allow_html_tables: "Permitir la inserción de tablas en Markdown usando etiquetas HTML como TABLE, THEAD, TD, TR o TH (requiere un rebake completo para todos los posts antiguos que contengan tablas)" post_undo_action_window_mins: "Número de minutos durante los cuales los usuarios pueden deshacer sus acciones recientes en un post (me gusta, reportes, etc)." must_approve_users: "Los miembros administración deben aprobar todas las nuevas cuentas antes de que se les permita el acceso al sitio. AVISO: ¡habilitar esta opción en un sitio activo revocará el acceso a los usuarios que no sean moderadores o admin!" ga_tracking_code: "Código de Google Analytics, ej: UA-12345678-9; visita http://google.com/analytics" @@ -783,6 +792,8 @@ es: invite_passthrough_hours: "Durante cuánto tiempo, en horas, un usuario puede utilizar una clave de invitación redimida para iniciar sesión iniciar sesión" invite_only: "El registro público está deshabilitado, todos los nuevos usuarios deberán ser invitados explícitamente por otros miembros de la comunidad o por el staff." login_required: "Se requiere haber iniciado sesión para leer el contenido de este sitio, deshabilita el acceso anónimo." + min_username_length: "Longitud mínima del nombre de usuario en caracteres." + max_username_length: "Longitud máxima del nombre de usuario en caracteres." reserved_usernames: "Nombres de usuario no permitidos en el registro." min_password_length: "Longitud mínima de contraseña." block_common_passwords: "No permitir contraseñas que están entre las 10.000 más comunes." @@ -995,6 +1006,7 @@ es: enable_cdn_js_debugging: "Permitir /logs mostrar los errores correctamente, añadiendo permisos crossorigin en todas las inclusiones de js" show_create_topics_notice: "Si el sitio tiene menos de 5 temas abiertos al público, mostrar un aviso pidiendo a los administradores crear más temas." delete_drafts_older_than_n_days: Eliminar borradores de más de (n) días de antigüedad. + show_logout_in_header: "Mostrar el botón para cerrar sesión en el desplegable de la cabecera" vacuum_db_days: "Correr VACUUM FULL ANALYZE para reclamar espacio en la base de datos después de las migraciones. (Poner en 0 para inhabilitar)" prevent_anons_from_downloading_files: "Impedir que los usuarios anónimos descarguen archivos. ADVERTENCIA: Esto impedirá que funcione cualquier recurso del sitio publicado como adjunto." slug_generation_method: "Elegir un método de generación de slug. 'encoded' generará cadenas con código porciento. 'none' hara que no se genere slug." @@ -1004,6 +1016,7 @@ es: approve_post_count: "La cantidad de posts de un nuevo usuario que deben ser aprobados" approve_unless_trust_level: "Los posts de usuarios con un nivel de confianza inferior a este deberán ser aprobados" notify_about_queued_posts_after: "Si hay posts esperando a ser revisados por este número de horas, se enviará un email al correo de contacto. Establece este valor a 0 para desactivar estos emails." + default_email_digest_frequency: "Frecuencia por defecto con la que se reciben los emails resumen." errors: invalid_email: "Dirección de correo electrónico inválida. " invalid_username: "No existe ningún usuario con ese nombre de usuario. " diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml index a1b49d2fea..6c0c4d7784 100644 --- a/config/locales/server.tr_TR.yml +++ b/config/locales/server.tr_TR.yml @@ -1821,88 +1821,6 @@ tr_TR: Originally adapted from the [WordPress Terms of Service](http://en.wordpress.com/tos/). privacy_topic: title: "Gizlilik İlkeleri" - body: | - - - ## [What information do we collect?](#collect) - - We collect information from you when you register on our site and gather data when you participate in the forum by reading, writing, and evaluating the content shared here. - - When registering on our site, you may be asked to enter your name and e-mail address. You may, however, visit our site without registering. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address. - - When registered and posting, we record the IP address that the post originated from. We also may retain server logs which include the IP address of every request to our server. - - - - ## [What do we use your information for?](#use) - - Any of the information we collect from you may be used in one of the following ways: - - * To personalize your experience — your information helps us to better respond to your individual needs. - * To improve our site — we continually strive to improve our site offerings based on the information and feedback we receive from you. - * To improve customer service — your information helps us to more effectively respond to your customer service requests and support needs. - * To send periodic emails — The email address you provide may be used to send you information, notifications that you request about changes to topics or in response to your user name, respond to inquiries, and/or other requests or questions. - - - - ## [How do we protect your information?](#protect) - - We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. - - - - ## [What is your data retention policy?](#data-retention) - - We will make a good faith effort to: - - * Retain server logs containing the IP address of all requests to this server no more than 90 days. - * Retain the IP addresses associated with registered users and their posts no more than 5 years. - - - - ## [Do we use cookies?](#cookies) - - Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account. - - We use cookies to understand and save your preferences for future visits and compile aggregate data about site traffic and site interaction so that we can offer better site experiences and tools in the future. We may contract with third-party service providers to assist us in better understanding our site visitors. These service providers are not permitted to use the information collected on our behalf except to help us conduct and improve our business. - - - - ## [Do we disclose any information to outside parties?](#disclose) - - We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety. However, non-personally identifiable visitor information may be provided to other parties for marketing, advertising, or other uses. - - - - ## [Third party links](#third-party) - - Occasionally, at our discretion, we may include or offer third party products or services on our site. These third party sites have separate and independent privacy policies. We therefore have no responsibility or liability for the content and activities of these linked sites. Nonetheless, we seek to protect the integrity of our site and welcome any feedback about these sites. - - - - ## [Children's Online Privacy Protection Act Compliance](#coppa) - - Our site, products and services are all directed to people who are at least 13 years old or older. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA ([Children's Online Privacy Protection Act](http://en.wikipedia.org/wiki/Children)), do not use this site. - - - - ## [Online Privacy Policy Only](#online) - - This online privacy policy applies only to information collected through our site and not to information collected offline. - - - - ## [Your Consent](#consent) - - By using our site, you consent to our web site privacy policy. - - - - ## [Changes to our Privacy Policy](#changes) - - If we decide to change our privacy policy, we will post those changes on this page. - - This document is CC-BY-SA. It was last updated May 31, 2013. static: search_help: |

        İpuçları

        diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml index 9bbeceab28..9778d641c0 100644 --- a/config/locales/server.zh_CN.yml +++ b/config/locales/server.zh_CN.yml @@ -1583,7 +1583,7 @@ zh_CN: unsubscribe_link: | 要取消订阅这些邮件，访问你的[用户设置](%{user_preferences_url})。 - 不想在接受这类主题的通知，[点击这儿](%{unsubscribe_url})。 + 不想再接受这类主题的通知，[点击这里](%{unsubscribe_url})。 subject_re: "回复：" subject_pm: "[私信]" user_notifications: @@ -1964,10 +1964,10 @@ zh_CN: 从你那收集的任何数据将以以下方式使用： - * 改进你的个人体验 — 你的信息帮助我们更好地满足你的个人需求。 - * 改进我们的站点 — 我们基于信息和我们从你那收到的反馈不断地试图改进我们的站点。 - * 改善我们的客户服务 — 你的信息帮助我们更有效地回应用户服务请求和支持。 - * 用于发送阶段性的邮件 — 你提供的邮件地址可能用于接受信息、你想看到的通知或与你用户名有关的回复和询问，或是其他的请求和问题。 + * 改进你的个人体验 — 你的信息帮助我们更好地满足你的个人需求。 + * 改进我们的站点 — 我们基于信息和我们从你那收到的反馈不断地试图改进我们的站点。 + * 改善我们的客户服务 — 你的信息帮助我们更有效地回应用户服务请求和支持。 + * 用于发送阶段性的邮件 — 你提供的邮件地址可能用于接受信息、你想看到的通知或与你用户名有关的回复和询问，或是其他的请求和问题。 @@ -1981,8 +1981,8 @@ zh_CN: 我们将善意地： - * 保存 90 天内的所有向服务器的包含 IP 地址的请求。 - * 保存 5 年内已注册用户和与他们的帖子有关的 IP 地址。 + * 保存 90 天内的所有向服务器的包含 IP 地址的请求。 + * 保存 5 年内已注册用户和与他们的帖子有关的 IP 地址。 @@ -2008,8 +2008,7 @@ zh_CN: ## [儿童在线隐私保护法案合规](#coppa) - 我们的站点、产品和服务提供给 13 岁以上的人们。如果服务器位于美国，并且你小于 13 岁，根据 COPPA（[儿童在线隐私保护法案合规 - ](http://en.wikipedia.org/wiki/Children)），不要使用这个站点。 + 我们的站点、产品和服务提供给 13 岁以上的人们。如果服务器位于美国，并且你小于 13 岁，根据 COPPA（[儿童在线隐私保护法案合规](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)），不要使用这个站点。 diff --git a/public/503.tr_TR.html b/public/503.tr_TR.html index f9c2f8028c..a8e4090cb7 100644 --- a/public/503.tr_TR.html +++ b/public/503.tr_TR.html @@ -1,6 +1,6 @@ -Site Bakıma Alınıyor - Discourse.org +Site Bakım Modunda - Discourse.org From 2c95336239cf29a6475d93ffc9c4fdbc6987116f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0smail=20Ar=C4=B1l=C4=B1k?= Date: Mon, 14 Sep 2015 17:43:22 +0300 Subject: [PATCH 091/157] add GitHub login configuration link --- docs/INSTALL-cloud.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md index 4301163c97..e714108cac 100644 --- a/docs/INSTALL-cloud.md +++ b/docs/INSTALL-cloud.md @@ -156,6 +156,8 @@ Do you want... - Users to log in via Twitter? [Configure Twitter logins](https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395/last). +- Users to log in via GitHub? [Configure GitHub logins](https://meta.discourse.org/t/configuring-github-login-for-discourse/13745) + - Users to post replies via email? [Configure reply via email](https://meta.discourse.org/t/set-up-reply-via-email-support/14003). - Automatic daily backups? [Configure backups](https://meta.discourse.org/t/configure-automatic-backups-for-discourse/14855). From 60bbd8160749e30576273d37d171798e4bd5690b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 14 Sep 2015 19:27:54 +0200 Subject: [PATCH 092/157] FIX: polls with votes were preventing users from updating the post --- plugins/poll/plugin.rb | 14 ++++--- .../spec/controllers/posts_controller_spec.rb | 41 +++++++++++++++---- 2 files changed, 41 insertions(+), 14 deletions(-) diff --git a/plugins/poll/plugin.rb b/plugins/poll/plugin.rb index 34e71188b2..0f061e5b5f 100644 --- a/plugins/poll/plugin.rb +++ b/plugins/poll/plugin.rb @@ -17,6 +17,9 @@ PLUGIN_NAME ||= "discourse_poll".freeze POLLS_CUSTOM_FIELD ||= "polls".freeze VOTES_CUSTOM_FIELD ||= "polls-votes".freeze +DATA_PREFIX ||= "data-poll-".freeze +DEFAULT_POLL_NAME ||= "poll".freeze + after_initialize do # remove "Vote Now!" & "Show Results" links in emails @@ -157,6 +160,7 @@ after_initialize do end require_dependency "application_controller" + class DiscoursePoll::PollsController < ::ApplicationController requires_plugin PLUGIN_NAME @@ -217,9 +221,6 @@ after_initialize do end end - DATA_PREFIX ||= "data-poll-".freeze - DEFAULT_POLL_NAME ||= "poll".freeze - validate(:post, :validate_polls) do # only care when raw has changed! return unless self.raw_changed? @@ -285,9 +286,12 @@ after_initialize do # load previous polls previous_polls = post.custom_fields[POLLS_CUSTOM_FIELD] || {} + # extract options + current_options = polls.values.map { |p| p["options"].map { |o| o["id"] } }.flatten.sort + previous_options = previous_polls.values.map { |p| p["options"].map { |o| o["id"] } }.flatten.sort + # are the polls different? - if polls.keys != previous_polls.keys || - polls.values.map { |p| p["options"] } != previous_polls.values.map { |p| p["options"] } + if polls.keys != previous_polls.keys || current_options != previous_options # outside of the 5-minute edit window? if post.created_at < 5.minutes.ago diff --git a/plugins/poll/spec/controllers/posts_controller_spec.rb b/plugins/poll/spec/controllers/posts_controller_spec.rb index a647be1327..a47d7def26 100644 --- a/plugins/poll/spec/controllers/posts_controller_spec.rb +++ b/plugins/poll/spec/controllers/posts_controller_spec.rb @@ -10,7 +10,6 @@ describe PostsController do describe "polls" do - it "works" do xhr :post, :create, { title: title, raw: "[poll]\n- A\n- B\n[/poll]" } expect(response).to be_success @@ -91,7 +90,7 @@ describe PostsController do describe "within the first 5 minutes" do let(:post_id) do - Timecop.freeze(3.minutes.ago) do + Timecop.freeze(4.minutes.ago) do xhr :post, :create, { title: title, raw: "[poll]\n- A\n- B\n[/poll]" } ::JSON.parse(response.body)["id"] end @@ -116,30 +115,54 @@ describe PostsController do describe "after the first 5 minutes" do + let(:poll) { "[poll]\n- A\n- B[/poll]" } + let(:new_option) { "[poll]\n- A\n- C[/poll]" } + let(:updated) { "before\n\n[poll]\n- A\n- B[/poll]\n\nafter" } + let(:post_id) do Timecop.freeze(6.minutes.ago) do - xhr :post, :create, { title: title, raw: "[poll]\n- A\n- B\n[/poll]" } + xhr :post, :create, { title: title, raw: poll } ::JSON.parse(response.body)["id"] end end - let(:new_raw) { "[poll]\n- A\n- C[/poll]" } - - it "cannot be changed by OP" do - xhr :put, :update, { id: post_id, post: { raw: new_raw } } + it "OP cannot change the options" do + xhr :put, :update, { id: post_id, post: { raw: new_option } } expect(response).not_to be_success json = ::JSON.parse(response.body) expect(json["errors"][0]).to eq(I18n.t("poll.op_cannot_edit_options_after_5_minutes")) end - it "can be edited by staff" do + it "staff can change the options" do log_in_user(Fabricate(:moderator)) - xhr :put, :update, { id: post_id, post: { raw: new_raw } } + xhr :put, :update, { id: post_id, post: { raw: new_option } } expect(response).to be_success json = ::JSON.parse(response.body) expect(json["post"]["polls"]["poll"]["options"][1]["html"]).to eq("C") end + it "support changes on the post" do + xhr :put, :update, { id: post_id, post: { raw: updated } } + expect(response).to be_success + json = ::JSON.parse(response.body) + expect(json["post"]["cooked"]).to match("before") + end + + describe "with at least one vote" do + + before do + DiscoursePoll::Poll.vote(post_id, "poll", ["5c24fc1df56d764b550ceae1b9319125"], user.id) + end + + it "support changes on the post" do + xhr :put, :update, { id: post_id, post: { raw: updated } } + expect(response).to be_success + json = ::JSON.parse(response.body) + expect(json["post"]["cooked"]).to match("before") + end + + end + end end From 30999de3e2ee85cd1f87d08b434e46708df0a279 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Mon, 14 Sep 2015 13:36:41 -0400 Subject: [PATCH 093/157] add support for reports of 'time to first response' from a set of users --- app/models/report.rb | 2 +- app/models/topic.rb | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/models/report.rb b/app/models/report.rb index 1e924fc0d8..204bc3e9bc 100644 --- a/app/models/report.rb +++ b/app/models/report.rb @@ -114,7 +114,7 @@ class Report def self.report_time_to_first_response(report) report.data = [] - Topic.time_to_first_response_per_day(report.start_date, report.end_date, report.category_id).each do |r| + Topic.time_to_first_response_per_day(report.start_date, report.end_date, {category_id: report.category_id}).each do |r| report.data << { x: Date.parse(r["date"]), y: r["hours"].to_f.round(2) } end report.total = Topic.time_to_first_response_total(category_id: report.category_id) diff --git a/app/models/topic.rb b/app/models/topic.rb index 703b547265..ccd21de755 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -911,12 +911,13 @@ class Topic < ActiveRecord::Base builder.where("p.deleted_at IS NULL") builder.where("p.post_number > 1") builder.where("p.user_id != t.user_id") + builder.where("p.user_id in (:user_ids)", {user_ids: opts[:user_ids]}) if opts[:user_ids] builder.where("EXTRACT(EPOCH FROM p.created_at - t.created_at) > 0") builder.exec end - def self.time_to_first_response_per_day(start_date, end_date, category_id=nil) - time_to_first_response(TIME_TO_FIRST_RESPONSE_SQL, start_date: start_date, end_date: end_date, category_id: category_id) + def self.time_to_first_response_per_day(start_date, end_date, opts={}) + time_to_first_response(TIME_TO_FIRST_RESPONSE_SQL, opts.merge({start_date: start_date, end_date: end_date})) end def self.time_to_first_response_total(opts=nil) From 18538294719898477fef1d2a31e87d3e2fd90b55 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 14 Sep 2015 13:51:57 -0400 Subject: [PATCH 094/157] FIX: When switching discovery routes, fill the screen if content changes --- .../javascripts/discourse/views/discovery-topics.js.es6 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/views/discovery-topics.js.es6 b/app/assets/javascripts/discourse/views/discovery-topics.js.es6 index ac6e897d60..af4a5f8d71 100644 --- a/app/assets/javascripts/discourse/views/discovery-topics.js.es6 +++ b/app/assets/javascripts/discourse/views/discovery-topics.js.es6 @@ -1,7 +1,6 @@ import UrlRefresh from 'discourse/mixins/url-refresh'; import LoadMore from "discourse/mixins/load-more"; -import { on } from "ember-addons/ember-computed-decorators"; -import computed from "ember-addons/ember-computed-decorators"; +import { on, observes, default as computed } from "ember-addons/ember-computed-decorators"; export default Ember.View.extend(LoadMore, UrlRefresh, { eyelineSelector: '.topic-list-item', @@ -22,6 +21,7 @@ export default Ember.View.extend(LoadMore, UrlRefresh, { }, @on("didInsertElement") + @observes("controller.model") _readjustScrollPosition() { const scrollTo = this.session.get('topicListScrollPosition'); if (scrollTo && scrollTo >= 0) { From 26c743a962e3eaf849a4671341a057b7005efaec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 14 Sep 2015 20:11:03 +0200 Subject: [PATCH 095/157] FIX: disable poll dialect when poll plugin is disabled --- plugins/poll/assets/javascripts/poll_dialect.js | 3 +++ plugins/poll/config/settings.yml | 1 + 2 files changed, 4 insertions(+) diff --git a/plugins/poll/assets/javascripts/poll_dialect.js b/plugins/poll/assets/javascripts/poll_dialect.js index 70771e4156..bc9b6585ed 100644 --- a/plugins/poll/assets/javascripts/poll_dialect.js +++ b/plugins/poll/assets/javascripts/poll_dialect.js @@ -36,6 +36,9 @@ } } + // Disable dialect when poll plugin is disabled + if (!Discourse.SiteSettings.poll_enabled) { return ["div"].concat(contents); } + // default poll attributes var attributes = { "class": "poll" }; attributes[DATA_PREFIX + "status"] = "open"; diff --git a/plugins/poll/config/settings.yml b/plugins/poll/config/settings.yml index f75945a5d6..2d01ba6b88 100644 --- a/plugins/poll/config/settings.yml +++ b/plugins/poll/config/settings.yml @@ -1,6 +1,7 @@ plugins: poll_enabled: default: true + client: true poll_maximum_options: default: 20 client: true From edf54979e4df85f8821475ee906b217fe412a658 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 14 Sep 2015 21:54:39 +0200 Subject: [PATCH 096/157] UX: don't show the top period in the navigation bar since it has its own dropdown --- .../discourse/components/nav-item.js.es6 | 20 ++++++---- .../components/navigation-bar.js.es6 | 40 +++++++++---------- .../components/navigation-item.js.es6 | 22 +++++----- .../controllers/navigation/category.js.es6 | 10 +++-- .../controllers/navigation/default.js.es6 | 16 +++++--- .../discourse/models/nav-item.js.es6 | 14 +++---- 6 files changed, 64 insertions(+), 58 deletions(-) diff --git a/app/assets/javascripts/discourse/components/nav-item.js.es6 b/app/assets/javascripts/discourse/components/nav-item.js.es6 index 87ab1007a8..69c797bd30 100644 --- a/app/assets/javascripts/discourse/components/nav-item.js.es6 +++ b/app/assets/javascripts/discourse/components/nav-item.js.es6 @@ -1,24 +1,28 @@ /* You might be looking for navigation-item. */ +import computed from "ember-addons/ember-computed-decorators"; + export default Ember.Component.extend({ tagName: 'li', classNameBindings: ['active'], - router: function() { + @computed() + router() { return this.container.lookup('router:main'); - }.property(), + }, - fullPath: function() { - return Discourse.getURL(this.get('path')); - }.property('path'), + @computed("path") + fullPath(path) { + return Discourse.getURL(path); + }, - active: function() { - const route = this.get('route'); + @computed("route", "router.url") + active(route) { if (!route) { return; } const routeParam = this.get('routeParam'), router = this.get('router'); return routeParam ? router.isActive(route, routeParam) : router.isActive(route); - }.property('router.url', 'route') + } }); diff --git a/app/assets/javascripts/discourse/components/navigation-bar.js.es6 b/app/assets/javascripts/discourse/components/navigation-bar.js.es6 index 46fc846dbe..7bc237c900 100644 --- a/app/assets/javascripts/discourse/components/navigation-bar.js.es6 +++ b/app/assets/javascripts/discourse/components/navigation-bar.js.es6 @@ -1,27 +1,25 @@ +import { default as computed, observes } from "ember-addons/ember-computed-decorators"; import DiscourseURL from 'discourse/lib/url'; export default Ember.Component.extend({ tagName: 'ul', classNameBindings: [':nav', ':nav-pills'], id: 'navigation-bar', - selectedNavItem: function(){ - const filterMode = this.get('filterMode'), - navItems = this.get('navItems'); - - var item = navItems.find(function(i){ - return i.get('filterMode').indexOf(filterMode) === 0; - }); + @computed("filterMode", "navItems") + selectedNavItem(filterMode, navItems){ + var item = navItems.find(i => i.get('filterMode').indexOf(filterMode) === 0); return item || navItems[0]; - }.property('filterMode'), + }, - closedNav: function(){ + @observes("expanded") + closedNav() { if (!this.get('expanded')) { this.ensureDropClosed(); } - }.observes('expanded'), + }, - ensureDropClosed: function(){ + ensureDropClosed() { if (!this.get('expanded')) { this.set('expanded',false); } @@ -30,25 +28,23 @@ export default Ember.Component.extend({ }, actions: { - toggleDrop: function(){ + toggleDrop() { this.set('expanded', !this.get('expanded')); - var self = this; - if (this.get('expanded')) { + if (this.get('expanded')) { DiscourseURL.appEvents.on('dom:clean', this, this.ensureDropClosed); - Em.run.next(function() { + Em.run.next(() => { + if (!this.get('expanded')) { return; } - if (!self.get('expanded')) { return; } - - self.$('.drop a').on('click', function(){ - self.$('.drop').hide(); - self.set('expanded', false); + this.$('.drop a').on('click', () => { + this.$('.drop').hide(); + this.set('expanded', false); return true; }); - $(window).on('click.navigation-bar', function() { - self.set('expanded', false); + $(window).on('click.navigation-bar', () => { + this.set('expanded', false); return true; }); }); diff --git a/app/assets/javascripts/discourse/components/navigation-item.js.es6 b/app/assets/javascripts/discourse/components/navigation-item.js.es6 index 075919ca74..758e4a385c 100644 --- a/app/assets/javascripts/discourse/components/navigation-item.js.es6 +++ b/app/assets/javascripts/discourse/components/navigation-item.js.es6 @@ -1,3 +1,4 @@ +import computed from "ember-addons/ember-computed-decorators"; import StringBuffer from 'discourse/mixins/string-buffer'; export default Ember.Component.extend(StringBuffer, { @@ -7,22 +8,23 @@ export default Ember.Component.extend(StringBuffer, { hidden: Em.computed.not('content.visible'), rerenderTriggers: ['content.count'], - title: function() { - var categoryName = this.get('content.categoryName'), - name = this.get('content.name'), - extra = {}; + @computed("content.categoryName", "content.name") + title(categoryName, name) { + const extra = {}; if (categoryName) { name = "category"; extra.categoryName = categoryName; } - return I18n.t("filters." + name.replace("/", ".") + ".help", extra); - }.property("content.{categoryName,name}"), - active: function() { - return this.get('content.filterMode') === this.get('filterMode') || - this.get('filterMode').indexOf(this.get('content.filterMode')) === 0; - }.property('content.filterMode', 'filterMode'), + return I18n.t("filters." + name.replace("/", ".") + ".help", extra); + }, + + @computed("content.filterMode", "filterMode") + active(contentFilterMode, filterMode) { + return contentFilterMode === filterMode || + filterMode.indexOf(contentFilterMode) === 0; + }, renderString(buffer) { const content = this.get('content'); diff --git a/app/assets/javascripts/discourse/controllers/navigation/category.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/category.js.es6 index c21ed81341..35b11cd304 100644 --- a/app/assets/javascripts/discourse/controllers/navigation/category.js.es6 +++ b/app/assets/javascripts/discourse/controllers/navigation/category.js.es6 @@ -1,3 +1,4 @@ +import computed from "ember-addons/ember-computed-decorators"; import NavigationDefaultController from 'discourse/controllers/navigation/default'; import { setting } from 'discourse/lib/computed'; @@ -6,8 +7,9 @@ export default NavigationDefaultController.extend({ showingParentCategory: Em.computed.none('category.parentCategory'), showingSubcategoryList: Em.computed.and('subcategoryListSetting', 'showingParentCategory'), - navItems: function() { - if (this.get('showingSubcategoryList')) { return []; } - return Discourse.NavItem.buildList(this.get('category'), { noSubcategories: this.get('noSubcategories') }); - }.property('category', 'noSubcategories') + @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/navigation/default.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/default.js.es6 index c2a48c4b7a..1d23c1fb2b 100644 --- a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6 +++ b/app/assets/javascripts/discourse/controllers/navigation/default.js.es6 @@ -1,12 +1,18 @@ +import computed from "ember-addons/ember-computed-decorators"; + export default Ember.Controller.extend({ needs: ['discovery', 'discovery/topics'], - categories: function() { + @computed() + categories() { return Discourse.Category.list(); - }.property(), + }, - navItems: function() { - return Discourse.NavItem.buildList(null, {filterMode: this.get('filterMode')}); - }.property('filterMode') + @computed("filterMode") + navItems(filterMode) { + // we don't want to show the period in the navigation bar since it's in a dropdown + if (filterMode.indexOf("top/") === 0) { filterMode = filterMode.replace("top/", ""); } + return Discourse.NavItem.buildList(null, { filterMode }); + } }); diff --git a/app/assets/javascripts/discourse/models/nav-item.js.es6 b/app/assets/javascripts/discourse/models/nav-item.js.es6 index 2a424c64f9..ee81b705ec 100644 --- a/app/assets/javascripts/discourse/models/nav-item.js.es6 +++ b/app/assets/javascripts/discourse/models/nav-item.js.es6 @@ -103,21 +103,17 @@ NavItem.reopenClass({ buildList(category, args) { args = args || {}; + if (category) { args.category = category } - var items = Discourse.SiteSettings.top_menu.split("|"); + let items = Discourse.SiteSettings.top_menu.split("|"); - if (args.filterMode && !_.some(items, function(i){ - return i.indexOf(args.filterMode) !== -1; - })) { + if (args.filterMode && !_.some(items, i => i.indexOf(args.filterMode) !== -1)) { items.push(args.filterMode); } - return items.map(function(i) { - return Discourse.NavItem.fromText(i, args); - }).filter(function(i) { - return i !== null && !(category && i.get("name").indexOf("categor") === 0); - }); + return items.map(i => Discourse.NavItem.fromText(i, args)) + .filter(i => i !== null && !(category && i.get("name").indexOf("categor") === 0)); } }); From a8b3010617acbb1016db0ffe44188d0f836f2d69 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 14 Sep 2015 15:54:34 -0400 Subject: [PATCH 097/157] FIX: Pagination was broken for groups --- app/assets/javascripts/admin/controllers/admin-group.js.es6 | 4 ++-- app/assets/javascripts/admin/templates/group.hbs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/admin/controllers/admin-group.js.es6 b/app/assets/javascripts/admin/controllers/admin-group.js.es6 index f16151ed29..2ee95299a1 100644 --- a/app/assets/javascripts/admin/controllers/admin-group.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-group.js.es6 @@ -39,7 +39,7 @@ export default Ember.Controller.extend({ if (this.get("showingLast")) { return; } const group = this.get("model"), - offset = Math.min(group.get("offset") + group.get("model.limit"), group.get("user_count")); + offset = Math.min(group.get("offset") + group.get("limit"), group.get("user_count")); group.set("offset", offset); @@ -50,7 +50,7 @@ export default Ember.Controller.extend({ if (this.get("showingFirst")) { return; } const group = this.get("model"), - offset = Math.max(group.get("offset") - group.get("model.limit"), 0); + offset = Math.max(group.get("offset") - group.get("limit"), 0); group.set("offset", offset); diff --git a/app/assets/javascripts/admin/templates/group.hbs b/app/assets/javascripts/admin/templates/group.hbs index 3da80d9af7..ac1f979691 100644 --- a/app/assets/javascripts/admin/templates/group.hbs +++ b/app/assets/javascripts/admin/templates/group.hbs @@ -13,9 +13,9 @@
        {{#each model.members as |member|}} @@ -28,7 +28,7 @@
        {{user-selector usernames=model.usernames placeholderKey="admin.groups.selector_placeholder" id="user-selector"}} - + {{d-button action="addMembers" class="add" icon="plus" label="admin.groups.add"}}
        {{/unless}} {{/if}} From db1820f39c0c019098d69d0c5a9b1d2f4056eb19 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Mon, 14 Sep 2015 15:34:28 -0400 Subject: [PATCH 098/157] make it possible for plugins to add methods to classes that don't follow naming conventions --- lib/plugin/instance.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb index eef8d5ba2e..d51adc4f13 100644 --- a/lib/plugin/instance.rb +++ b/lib/plugin/instance.rb @@ -78,7 +78,7 @@ class Plugin::Instance # Adds a class method to a class, respecting if plugin is enabled def add_class_method(klass, attr, &block) - klass = klass.to_s.classify.constantize + klass = klass.to_s.classify.constantize rescue klass.to_s.constantize hidden_method_name = :"#{attr}_without_enable_check" klass.send(:define_singleton_method, hidden_method_name, &block) @@ -90,7 +90,7 @@ class Plugin::Instance end def add_model_callback(klass, callback, &block) - klass = klass.to_s.classify.constantize + klass = klass.to_s.classify.constantize rescue klass.to_s.constantize plugin = self # generate a unique method name From 991a36f4f27689b2fa57623629f50f35a8a9bbc0 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Mon, 14 Sep 2015 15:35:05 -0400 Subject: [PATCH 099/157] always use fetch_stats to get AdminDashboardData data --- app/jobs/scheduled/dashboard_stats.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jobs/scheduled/dashboard_stats.rb b/app/jobs/scheduled/dashboard_stats.rb index ab716b5756..3a04c1070e 100644 --- a/app/jobs/scheduled/dashboard_stats.rb +++ b/app/jobs/scheduled/dashboard_stats.rb @@ -5,7 +5,7 @@ module Jobs every 30.minutes def execute(args) - stats = AdminDashboardData.new.as_json + stats = AdminDashboardData.fetch_stats set_cache(AdminDashboardData, stats) stats end From 3a93fafb583327d5c73f5da5aa79f450ca7647f8 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 14 Sep 2015 16:15:18 -0400 Subject: [PATCH 100/157] FIX: Add `when` to split this topic text --- config/locales/client.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 866e6f7fbc..6cbde0799c 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -120,7 +120,7 @@ en: email: 'send this link in an email' action_codes: - split_topic: "split this topic" + split_topic: "split this topic %{when}" autoclosed: enabled: 'closed %{when}' disabled: 'opened %{when}' From 4e39f9662dba6aaec5c98c6f37b76d6f462ba54c Mon Sep 17 00:00:00 2001 From: Rafael dos Santos Silva Date: Mon, 14 Sep 2015 18:29:39 -0300 Subject: [PATCH 101/157] Rewrite origin so it matches original behavior As suggested by @nlalonde --- app/assets/javascripts/discourse/lib/url.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6 index b9a56ba4af..d7231109e1 100644 --- a/app/assets/javascripts/discourse/lib/url.js.es6 +++ b/app/assets/javascripts/discourse/lib/url.js.es6 @@ -271,7 +271,7 @@ const DiscourseURL = Ember.Object.createWithMixins({ // This has been extracted so it can be tested. origin: function() { - return Discourse.BaseUrl + Discourse.BaseUri; + return window.location.origin + (Discourse.BaseUri === "/" ? '' : Discourse.BaseUri); }, /** From 230bc8bb6eaad3ba8fb6e7a7bc5e756a9012d3be Mon Sep 17 00:00:00 2001 From: Rafael dos Santos Silva Date: Mon, 14 Sep 2015 18:39:54 -0300 Subject: [PATCH 102/157] Add tests to isInternal on subfolder installs --- test/javascripts/lib/url-test.js.es6 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/javascripts/lib/url-test.js.es6 b/test/javascripts/lib/url-test.js.es6 index 0598c32e54..39941fd00e 100644 --- a/test/javascripts/lib/url-test.js.es6 +++ b/test/javascripts/lib/url-test.js.es6 @@ -16,3 +16,10 @@ test("isInternal with a HTTPS url", function() { sandbox.stub(DiscourseURL, "origin").returns("https://eviltrout.com"); ok(DiscourseURL.isInternal("http://eviltrout.com/monocle"), "HTTPS urls match HTTP urls"); }); + +test("isInternal on subfolder install", function() { + sandbox.stub(DiscourseURL, "origin").returns("http://eviltrout.com/forum"); + not(DiscourseURL.isInternal("http://eviltrout.com"), "the host root is not internal"); + not(DiscourseURL.isInternal("http://eviltrout.com/tophat"), "a url on the same host but on a different folder is not internal"); + ok(DiscourseURL.isInternal("http://eviltrout.com/forum/moustache"), "a url on the same host and on the same folder is internal"); +}); From 3ebad3e29472abb38844e466a55ef229a0f4a872 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Mon, 14 Sep 2015 18:56:32 -0400 Subject: [PATCH 103/157] show a dot and reply count for new topics on mobile --- .../discourse/templates/list/post-count-or-badges.raw.hbs | 3 +++ .../discourse/views/list/post-count-or-badges.js.es6 | 2 +- app/assets/stylesheets/mobile/topic-list.scss | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/list/post-count-or-badges.raw.hbs b/app/assets/javascripts/discourse/templates/list/post-count-or-badges.raw.hbs index 6ac240e758..88dfe8f000 100644 --- a/app/assets/javascripts/discourse/templates/list/post-count-or-badges.raw.hbs +++ b/app/assets/javascripts/discourse/templates/list/post-count-or-badges.raw.hbs @@ -1,5 +1,8 @@ {{#if view.showBadges}} {{raw "topic-post-badges" unread=topic.unread newPosts=topic.displayNewPosts unseen=topic.unseen url=topic.lastUnreadUrl}} {{else}} + {{#if topic.unseen}} + + {{/if}} {{raw "list/posts-count-column" topic=topic tagName="div"}} {{/if}} \ No newline at end of file diff --git a/app/assets/javascripts/discourse/views/list/post-count-or-badges.js.es6 b/app/assets/javascripts/discourse/views/list/post-count-or-badges.js.es6 index 9a8559f1a3..40faddcde2 100644 --- a/app/assets/javascripts/discourse/views/list/post-count-or-badges.js.es6 +++ b/app/assets/javascripts/discourse/views/list/post-count-or-badges.js.es6 @@ -1,4 +1,4 @@ export default Ember.Object.extend({ - postCountsPresent: Ember.computed.or('topic.unread', 'topic.displayNewPosts', 'topic.unseen'), + postCountsPresent: Ember.computed.or('topic.unread', 'topic.displayNewPosts'), showBadges: Ember.computed.and('postBadgesEnabled', 'postCountsPresent') }); diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss index 1b59b39e7b..2a96f47b0a 100644 --- a/app/assets/stylesheets/mobile/topic-list.scss +++ b/app/assets/stylesheets/mobile/topic-list.scss @@ -85,11 +85,11 @@ i {color: $secondary;} &.new-topic::before { - content: none; margin-right: 0; } &.new-topic { padding-right: 0; + top: -3px; } } @@ -392,6 +392,7 @@ td .main-link { } .topic-list { .posts-map { + display: inline; font-size: 1.071em; padding-top: 2px; } From d0199bb7171f90a17f97553170fa7b805e4fe63b Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 15 Sep 2015 09:54:18 +1000 Subject: [PATCH 104/157] FEATURE: by default everyone gets the letter free avatar service --- config/site_settings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/site_settings.yml b/config/site_settings.yml index 1c8e9f1126..efa9b24908 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -573,7 +573,7 @@ files: default: '20|25|32|45|60|120' type: list external_system_avatars_enabled: - default: false + default: true client: true shadowed_by_global: true external_system_avatars_url: From e0562894a8f22c548c682234210bc9ecb8c44b51 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 15 Sep 2015 10:52:42 +1000 Subject: [PATCH 105/157] FEATURE: if there is only one category, don't show the category picker --- .../javascripts/discourse/models/composer.js.es6 | 13 +++++++++++++ .../javascripts/discourse/templates/composer.hbs | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6 index 576bec3973..2b5241d29e 100644 --- a/app/assets/javascripts/discourse/models/composer.js.es6 +++ b/app/assets/javascripts/discourse/models/composer.js.es6 @@ -67,6 +67,12 @@ const Composer = RestModel.extend({ creatingPrivateMessage: Em.computed.equal('action', PRIVATE_MESSAGE), notCreatingPrivateMessage: Em.computed.not('creatingPrivateMessage'), + showCategoryChooser: function(){ + const manyCategories = Discourse.Category.list().length > 1; + const hasOptions = this.get('archetype.hasOptions'); + return !this.get('privateMessage') && (hasOptions || manyCategories); + }.property('privateMessage'), + privateMessage: function(){ return this.get('creatingPrivateMessage') || this.get('topic.archetype') === 'private_message'; }.property('creatingPrivateMessage', 'topic'), @@ -434,6 +440,13 @@ const Composer = RestModel.extend({ // We set the category id separately for topic templates on opening of composer this.set('categoryId', opts.categoryId || this.get('topic.category.id')); + if (!this.get('categoryId') && this.get('creatingTopic')) { + const categories = Discourse.Category.list(); + if (categories.length === 1) { + this.set('categoryId', categories[0].get('id')); + } + } + if (opts.postId) { this.set('loading', true); this.store.find('post', opts.postId).then(function(post) { diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs index 362df12791..01234ff0e9 100644 --- a/app/assets/javascripts/discourse/templates/composer.hbs +++ b/app/assets/javascripts/discourse/templates/composer.hbs @@ -48,7 +48,7 @@ {{popup-input-tip validation=view.titleValidation shownAt=view.showTitleTip}}
        - {{#unless model.privateMessage}} + {{#if model.showCategoryChooser}}
        {{category-chooser valueAttribute="id" value=model.categoryId scopedCategoryId=scopedCategoryId tabindex="3"}} {{popup-input-tip validation=view.categoryValidation shownAt=view.showCategoryTip}} @@ -57,7 +57,7 @@ {{/if}} {{render "additional-composer-buttons" model}} - {{/unless}} + {{/if}}
        {{/if}} From 24520937aa40cd2ad4358c03630f91769daba513 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 15 Sep 2015 13:09:12 +1000 Subject: [PATCH 106/157] FEATURE: improve safari editor hack --- .../discourse/lib/safari-hacks.js.es6 | 50 +++++++++---------- app/assets/stylesheets/desktop/compose.scss | 5 ++ 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 index a73d880207..647f9a6e06 100644 --- a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 +++ b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 @@ -1,11 +1,8 @@ function applicable() { - // CriOS is Chrome on iPad / iPhone, OPiOS is Opera (they need no patching) - // Dolphin has a wierd user agent, rest seem a bit nitch + // This will apply hack on all iDevices return navigator.userAgent.match(/(iPad|iPhone|iPod)/g) && - navigator.userAgent.match(/Safari/g) && - !navigator.userAgent.match(/CriOS/g) && - !navigator.userAgent.match(/OPiOS/g); + navigator.userAgent.match(/Safari/g); } // per http://stackoverflow.com/questions/29001977/safari-in-ios8-is-scrolling-screen-when-fixed-elements-get-focus/29064810 @@ -17,6 +14,7 @@ function positioningWorkaround($fixedElement) { const fixedElement = $fixedElement[0]; var done = false; + var originalScrollTop = 0; var blurredNow = function(evt) { if (!done && _.include($(document.activeElement).parents(), fixedElement)) { @@ -25,8 +23,16 @@ function positioningWorkaround($fixedElement) { } done = true; + + fixedElement.parentElement.style.height = ''; + $('#main-outlet').show(); + $('header').show(); + fixedElement.style.position = ''; fixedElement.style.top = ''; + fixedElement.style.height = ''; + $(window).scrollTop(originalScrollTop); + if (evt) { evt.target.removeEventListener('blur', blurred); } @@ -50,31 +56,23 @@ function positioningWorkaround($fixedElement) { return; } + originalScrollTop = $(window).scrollTop(); + + // take care of body + $('#main-outlet').hide(); + $('header').hide(); + + fixedElement.style.position = 'absolute'; // get out of the way while opening keyboard fixedElement.style.top = '0px'; + fixedElement.style.height = parseInt(window.innerHeight*0.6) + "px"; + fixedElement.parentElement.style.height = window.innerHeight + "px"; + $(window).scrollTop(0); + // great ... iOS positions this yet again + // so lets take over if this happens + setTimeout(()=>$(window).scrollTop(0),500); - var iPadOffset = 0; - if (window.innerHeight > window.innerWidth && navigator.userAgent.match(/iPad/)) { - // there is no way to get virtual keyboard height - iPadOffset = 640 - $(fixedElement).height(); - } - - var oldScrollY = 0; - - var positionElement = function(){ - if (done) { - return; - } - if (Math.abs(oldScrollY - window.scrollY) < 20) { - return; - } - oldScrollY = window.scrollY; - fixedElement.style.top = window.scrollY + iPadOffset + 'px'; - }; - - // position once, correctly, after keyboard is shown - setTimeout(positionElement, 500); evt.preventDefault(); self.focus(); diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss index ca821824de..5fc774c7ac 100644 --- a/app/assets/stylesheets/desktop/compose.scss +++ b/app/assets/stylesheets/desktop/compose.scss @@ -94,6 +94,11 @@ // hide cancel upload link on IE9 (not supported) .ie9 #cancel-file-upload { display: none; } +// todo, enable if we ever implement touch grippie... I question the value though (Sam) +.touch #reply-control.open .grippie { + display: none; +} + #reply-control { .toggle-preview, #draft-status, #file-uploading { position: absolute; From 83efde79f01000bb9ce96c4f514304d3355c4085 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 15 Sep 2015 13:25:15 +1000 Subject: [PATCH 107/157] specs to account for new default letter avatar location --- .../components/onebox/engine/discourse_local_onebox_spec.rb | 1 + spec/controllers/topics_controller_spec.rb | 2 ++ spec/models/user_spec.rb | 6 ++++++ 3 files changed, 9 insertions(+) diff --git a/spec/components/onebox/engine/discourse_local_onebox_spec.rb b/spec/components/onebox/engine/discourse_local_onebox_spec.rb index 78c7bcb096..4ca2d8eaf3 100644 --- a/spec/components/onebox/engine/discourse_local_onebox_spec.rb +++ b/spec/components/onebox/engine/discourse_local_onebox_spec.rb @@ -61,6 +61,7 @@ describe Onebox::Engine::DiscourseLocalOnebox do end it "returns some onebox goodness if post exists and can be seen" do + SiteSetting.external_system_avatars_enabled = false url = "#{topic.url}" Guardian.any_instance.stubs(:can_see?).returns(true) html = Onebox.preview(url).to_s diff --git a/spec/controllers/topics_controller_spec.rb b/spec/controllers/topics_controller_spec.rb index e87a27f482..35640b6311 100644 --- a/spec/controllers/topics_controller_spec.rb +++ b/spec/controllers/topics_controller_spec.rb @@ -27,6 +27,8 @@ describe TopicsController do let!(:p2) { Fabricate(:post, topic: topic, user:user )} it "returns the JSON in the format our wordpress plugin needs" do + SiteSetting.external_system_avatars_enabled = false + xhr :get, :wordpress, topic_id: topic.id, best: 3 expect(response).to be_success json = ::JSON.parse(response.body) diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 5eaa7f6419..be2b49e56e 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -896,7 +896,11 @@ describe User do let(:user) { build(:user, username: 'Sam') } it "returns a 45-pixel-wide avatar" do + SiteSetting.external_system_avatars_enabled = false expect(user.small_avatar_url).to eq("//test.localhost/letter_avatar/sam/45/#{LetterAvatar.version}.png") + + SiteSetting.external_system_avatars_enabled = true + expect(user.small_avatar_url).to eq("https://avatars.discourse.org/letter/s/5f9b8f/45.png") end end @@ -1070,6 +1074,8 @@ describe User do describe "automatic avatar creation" do it "sets a system avatar for new users" do + SiteSetting.external_system_avatars_enabled = false + u = User.create!(username: "bob", email: "bob@bob.com") u.reload expect(u.uploaded_avatar_id).to eq(nil) From 4758144f6a48420f8687c0a19473055ae0375036 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 15 Sep 2015 15:35:58 +1000 Subject: [PATCH 108/157] FIX: avoid horizontal scrollbar on narrow windows --- .../views/topic-footer-buttons.js.es6 | 43 +++++++++++++------ app/assets/stylesheets/desktop/topic.scss | 36 +++++++--------- 2 files changed, 45 insertions(+), 34 deletions(-) diff --git a/app/assets/javascripts/discourse/views/topic-footer-buttons.js.es6 b/app/assets/javascripts/discourse/views/topic-footer-buttons.js.es6 index 1598eb1ae9..3b70d394db 100644 --- a/app/assets/javascripts/discourse/views/topic-footer-buttons.js.es6 +++ b/app/assets/javascripts/discourse/views/topic-footer-buttons.js.es6 @@ -9,6 +9,32 @@ import PinnedButton from 'discourse/components/pinned-button'; import TopicNotificationsButton from 'discourse/components/topic-notifications-button'; import DiscourseContainerView from 'discourse/views/container'; +const MainPanel = Discourse.ContainerView.extend({ + elementId: 'topic-footer-main-buttons', + topicBinding: 'controller.content', + + init() { + this._super(); + + const topic = this.get('topic'); + if (!topic.get('isPrivateMessage')) { + // We hide some controls from private messages + if (this.get('topic.details.can_invite_to')) { + this.attachViewClass(InviteReplyButton); + } + this.attachViewClass(BookmarkButton); + this.attachViewClass(ShareButton); + if (this.get('topic.details.can_flag_topic')) { + this.attachViewClass(FlagTopicButton); + } + } + if (this.get('topic.details.can_create_post')) { + this.attachViewClass(ReplyButton); + } + } + +}); + export default DiscourseContainerView.extend({ elementId: 'topic-footer-buttons', topicBinding: 'controller.content', @@ -26,20 +52,9 @@ export default DiscourseContainerView.extend({ if (Discourse.User.currentProp("staff")) { this.attachViewClass(TopicAdminMenuButton); } - if (!topic.get('isPrivateMessage')) { - // We hide some controls from private messages - if (this.get('topic.details.can_invite_to')) { - this.attachViewClass(InviteReplyButton); - } - this.attachViewClass(BookmarkButton); - this.attachViewClass(ShareButton); - if (this.get('topic.details.can_flag_topic')) { - this.attachViewClass(FlagTopicButton); - } - } - if (this.get('topic.details.can_create_post')) { - this.attachViewClass(ReplyButton); - } + + this.attachViewWithArgs(viewArgs, MainPanel); + this.attachViewWithArgs(viewArgs, PinnedButton); this.attachViewWithArgs(viewArgs, TopicNotificationsButton); diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss index f63cadd221..c3929fd250 100644 --- a/app/assets/stylesheets/desktop/topic.scss +++ b/app/assets/stylesheets/desktop/topic.scss @@ -228,40 +228,36 @@ a:hover.reply-new { } @media all -and (max-width : 940px) { +and (max-width : 1000px) { #topic-progress, #topic-progress-expanded { - left: 295px; + right: 0; + left: 0; } -} - - -@media all -and (max-width : 870px) { - - #topic-progress, #topic-progress-expanded { - left: 210px; - } - -} - - -@media all -and (max-width : 724px) { #topic-progress-wrapper { - right: 0; - #topic-progress, #topic-progress-expanded { left: auto; right: 145px; } + right: 160px; } + #topic-progress-wrapper.docked { + right: 152px; + } + + #topic-footer-main-buttons { + max-width: 70%; + } } + @media all and (max-width : 485px) { #topic-progress-wrapper.docked { display: none; - } + } + #topic-footer-main-buttons { + max-width: 100%; + } } From 607265fc2805f8f957365ca35e02de1bf6f8748c Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Tue, 15 Sep 2015 12:36:44 +0530 Subject: [PATCH 109/157] FEATURE: add users to group via email --- app/controllers/admin/groups_controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb index 35f3295d27..767657f1e1 100644 --- a/app/controllers/admin/groups_controller.rb +++ b/app/controllers/admin/groups_controller.rb @@ -80,8 +80,10 @@ class Admin::GroupsController < Admin::AdminController users = User.where(username: params[:usernames].split(",")) elsif params[:user_ids].present? users = User.find(params[:user_ids].split(",")) + elsif params[:user_emails].present? + users = User.where(email: params[:user_emails].split(",")) else - raise Discourse::InvalidParameters.new('user_ids or usernames must be present') + raise Discourse::InvalidParameters.new('user_ids or usernames or user_emails must be present') end users.each do |user| From 17d999ab1209ac32627263e1b87fcc771bac5846 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 15 Sep 2015 17:21:46 +1000 Subject: [PATCH 110/157] FEATURE: search for all posts of users that have a badge with_badge:"badge name" will allow you to search only posts of users with a particular badge --- lib/search.rb | 25 +++++++++++++++++++++++-- spec/components/search_spec.rb | 11 +++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/lib/search.rb b/lib/search.rb index 25840cd678..adb82a5383 100644 --- a/lib/search.rb +++ b/lib/search.rb @@ -103,6 +103,7 @@ class Search @limit = Search.per_facet term = process_advanced_search!(term) + if term.present? @term = Search.prepare_data(term.to_s) @original_term = PG::Connection.escape_string(@term) @@ -184,6 +185,15 @@ class Search posts.where("posts.post_number = 1") end + advanced_filter(/with_badge:(.*)/) do |posts,match| + badge_id = Badge.where('name ilike ? OR id = ?', match, match.to_i).pluck(:id).first + if badge_id + posts.where('posts.user_id IN (SELECT ub.user_id FROM user_badges ub WHERE ub.badge_id = ?)', badge_id) + else + posts.where("1 = 0") + end + end + advanced_filter(/in:(likes|bookmarks)/) do |posts, match| if @guardian.user post_action_type = PostActionType.types[:like] if match == "likes" @@ -247,12 +257,14 @@ class Search def process_advanced_search!(term) - term.to_s.split(/\s+/).map do |word| + term.to_s.scan(/(([^" \t\n\x0B\f\r]+)?(("[^"]+")?))/).to_a.map do |(word,_)| + next if word.blank? found = false Search.advanced_filters.each do |matcher, block| - if word =~ matcher + cleaned = word.gsub(/["']/,"") + if cleaned =~ matcher (@filters ||= []) << [block, $1] found = true end @@ -273,6 +285,9 @@ class Search elsif word == 'order:views' @order = :views nil + elsif word == 'order:likes' + @order = :likes + nil elsif word == 'in:private' @search_pms = true nil @@ -440,6 +455,12 @@ class Search else posts = posts.order("topics.views DESC") end + elsif @order == :likes + if opts[:aggregate_search] + posts = posts.order("MAX(posts.like_count) DESC") + else + posts = posts.order("posts.like_count DESC") + end else posts = posts.order("TS_RANK_CD(TO_TSVECTOR(#{query_locale}, topics.title), #{ts_query}) DESC") diff --git a/spec/components/search_spec.rb b/spec/components/search_spec.rb index a74bffee1b..335e538b0e 100644 --- a/spec/components/search_spec.rb +++ b/spec/components/search_spec.rb @@ -391,6 +391,17 @@ describe Search do expect(Search.execute("user:#{_post.user.username}").posts.length).to eq(1) end + it 'supports with_badge' do + + topic = Fabricate(:topic, created_at: 3.months.ago) + post = Fabricate(:post, raw: 'hi this is a test 123 123', topic: topic) + + badge = Badge.create!(name: "Like a Boss", badge_type_id: 1) + UserBadge.create!(user_id: post.user_id, badge_id: badge.id, granted_at: 1.minute.ago, granted_by_id: -1) + + expect(Search.execute('with_badge:"like a boss"').posts.length).to eq(1) + end + it 'can search numbers correctly, and match exact phrases' do topic = Fabricate(:topic, created_at: 3.months.ago) Fabricate(:post, raw: '3.0 eta is in 2 days horrah', topic: topic) From 6496895096dad7d282fc4318ffb737eba2ee7ac3 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 15 Sep 2015 17:39:14 +1000 Subject: [PATCH 111/157] FEATURE: search for all posts by a group --- lib/search.rb | 9 +++++++++ spec/components/search_spec.rb | 11 +++++++++++ 2 files changed, 20 insertions(+) diff --git a/lib/search.rb b/lib/search.rb index adb82a5383..2dccf45145 100644 --- a/lib/search.rb +++ b/lib/search.rb @@ -233,6 +233,15 @@ class Search end end + advanced_filter(/group:(.+)/) do |posts,match| + group_id = Group.where('name ilike ? OR (id = ? AND id > 0)', match, match.to_i).pluck(:id).first + if group_id + posts.where("posts.user_id IN (select gu.user_id from group_users gu where gu.group_id = ?)", group_id) + else + posts.where("1 = 0") + end + end + advanced_filter(/user:(.+)/) do |posts,match| user_id = User.where('username_lower = ? OR id = ?', match.downcase, match.to_i).pluck(:id).first if user_id diff --git a/spec/components/search_spec.rb b/spec/components/search_spec.rb index 335e538b0e..219ca398ac 100644 --- a/spec/components/search_spec.rb +++ b/spec/components/search_spec.rb @@ -391,6 +391,17 @@ describe Search do expect(Search.execute("user:#{_post.user.username}").posts.length).to eq(1) end + it 'supports group' do + topic = Fabricate(:topic, created_at: 3.months.ago) + post = Fabricate(:post, raw: 'hi this is a test 123 123', topic: topic) + + group = Group.create!(name: "Like_a_Boss") + GroupUser.create!(user_id: post.user_id, group_id: group.id) + + expect(Search.execute('group:like_a_boss').posts.length).to eq(1) + expect(Search.execute('group:"like a brick"').posts.length).to eq(0) + end + it 'supports with_badge' do topic = Fabricate(:topic, created_at: 3.months.ago) From d49f382dcc5446f657e294b1d44e7f20434b1a10 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Tue, 15 Sep 2015 15:55:23 +0800 Subject: [PATCH 112/157] [CI SKIP] Typo. --- config/locales/server.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 6f765f1598..4c03b835c6 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1071,7 +1071,7 @@ en: white_listed_spam_host_domains: "A list of domains excluded from spam host testing. New users will never be restricted from creating posts with links to these domains." staff_like_weight: "How much extra weighting factor to give staff likes." - topic_view_duration_hours: "Count new a topic view once per IP/User every N hours" + topic_view_duration_hours: "Count a new topic view once per IP/User every N hours" levenshtein_distance_spammer_emails: "When matching spammer emails, number of characters difference that will still allow a fuzzy match." max_new_accounts_per_registration_ip: "If there are already (n) trust level 0 accounts from this IP (and none is a staff member or at TL2 or higher), stop accepting new signups from that IP." From 46c93a2687c81849c19f6067776d0e4996e0516a Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Tue, 15 Sep 2015 16:30:35 +0800 Subject: [PATCH 113/157] FIX: Selected posts buttons not clickable. --- app/assets/stylesheets/mobile/topic-post.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss index ef1bbbe8b3..42849b137e 100644 --- a/app/assets/stylesheets/mobile/topic-post.scss +++ b/app/assets/stylesheets/mobile/topic-post.scss @@ -396,7 +396,6 @@ iframe { } #selected-posts { - float: left; width: 97%; padding-left: 3%; background-color: srgb-scale($tertiary, $secondary, 15%); From 9977599ca9bc48295b5ecffb67ae0eae3fe5c6cf Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Tue, 15 Sep 2015 16:39:52 +0800 Subject: [PATCH 114/157] FIX: Input on modal was overflowing. --- app/assets/stylesheets/mobile/modal.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss index 3111b60132..9715a19316 100644 --- a/app/assets/stylesheets/mobile/modal.scss +++ b/app/assets/stylesheets/mobile/modal.scss @@ -88,7 +88,8 @@ form { margin-top: 20px; input[type=text] { - width: 500px; + box-sizing: border-box; + width: 100%; } } } From 6360420aed8e9401c24f09e671a568cad87637ae Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Tue, 15 Sep 2015 16:49:47 +0800 Subject: [PATCH 115/157] FIX: Make category combobox in modal take 100% width. --- app/assets/stylesheets/mobile/modal.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss index 9715a19316..7114c9b2e1 100644 --- a/app/assets/stylesheets/mobile/modal.scss +++ b/app/assets/stylesheets/mobile/modal.scss @@ -92,6 +92,10 @@ width: 100%; } } + + .category-combobox { + width: 100%; + } } .flag-modal { From 0de00308af8d9aa617a70dad7723a198b37b3c77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Tue, 15 Sep 2015 14:58:22 +0200 Subject: [PATCH 116/157] FIX: categories' notification_level wasn't serialized when hitting /categories --- .../discourse/models/category.js.es6 | 59 +++++++++---------- .../javascripts/discourse/models/site.js.es6 | 56 ++++++++---------- .../routes/build-category-route.js.es6 | 52 ++++++++-------- .../routes/discovery-categories.js.es6 | 8 ++- app/models/category_list.rb | 7 +++ 5 files changed, 88 insertions(+), 94 deletions(-) diff --git a/app/assets/javascripts/discourse/models/category.js.es6 b/app/assets/javascripts/discourse/models/category.js.es6 index 906d4e8fdf..01e281c62b 100644 --- a/app/assets/javascripts/discourse/models/category.js.es6 +++ b/app/assets/javascripts/discourse/models/category.js.es6 @@ -198,76 +198,71 @@ var _uncategorized; Category.reopenClass({ - findUncategorized: function() { + findUncategorized() { _uncategorized = _uncategorized || Category.list().findBy('id', Discourse.Site.currentProp('uncategorized_category_id')); return _uncategorized; }, - slugFor: function(category) { + slugFor(category) { if (!category) return ""; - var parentCategory = Em.get(category, 'parentCategory'), - result = ""; + const parentCategory = Em.get(category, 'parentCategory'); + let result = ""; if (parentCategory) { result = Category.slugFor(parentCategory) + "/"; } - var id = Em.get(category, 'id'), - slug = Em.get(category, 'slug'); + const id = Em.get(category, 'id'), + slug = Em.get(category, 'slug'); - if (!slug || slug.trim().length === 0) return result + id + "-category"; - return result + slug; + return !slug || slug.trim().length === 0 ? `${result}${id}-category` : result + slug; }, - list: function() { - if (Discourse.SiteSettings.fixed_category_positions) { - return Discourse.Site.currentProp('categories'); - } else { - return Discourse.Site.currentProp('sortedCategories'); - } + list() { + return Discourse.SiteSettings.fixed_category_positions ? + Discourse.Site.currentProp('categories') : + Discourse.Site.currentProp('sortedCategories'); }, - listByActivity: function() { + listByActivity() { return Discourse.Site.currentProp('sortedCategories'); }, - idMap: function() { + idMap() { return Discourse.Site.currentProp('categoriesById'); }, - findSingleBySlug: function(slug) { - return Category.list().find(function(c) { - return Category.slugFor(c) === slug; - }); + findSingleBySlug(slug) { + return Category.list().find(c => Category.slugFor(c) === slug); }, - findById: function(id) { + findById(id) { if (!id) { return; } return Category.idMap()[id]; }, - findByIds: function(ids){ - var categories = []; - _.each(ids, function(id){ - var found = Category.findById(id); - if(found){ + findByIds(ids) { + const categories = []; + _.each(ids, id => { + const found = Category.findById(id); + if (found) { categories.push(found); } }); return categories; }, - findBySlug: function(slug, parentSlug) { - var categories = Category.list(), - category; + findBySlug(slug, parentSlug) { + const categories = Category.list(); + let category; if (parentSlug) { - var parentCategory = Category.findSingleBySlug(parentSlug); + const parentCategory = Category.findSingleBySlug(parentSlug); if (parentCategory) { if (slug === 'none') { return parentCategory; } - category = categories.find(function(item) { + category = categories.find(item => { return item && item.get('parentCategory') === parentCategory && Category.slugFor(item) === (parentSlug + "/" + slug); }); } @@ -287,7 +282,7 @@ Category.reopenClass({ }, reloadById(id) { - return Discourse.ajax("/c/" + id + "/show.json"); + return Discourse.ajax(`/c/${id}/show.json`); } }); diff --git a/app/assets/javascripts/discourse/models/site.js.es6 b/app/assets/javascripts/discourse/models/site.js.es6 index deddc23d3c..988ba1eac7 100644 --- a/app/assets/javascripts/discourse/models/site.js.es6 +++ b/app/assets/javascripts/discourse/models/site.js.es6 @@ -1,3 +1,4 @@ +import computed from "ember-addons/ember-computed-decorators"; import Archetype from 'discourse/models/archetype'; import PostActionType from 'discourse/models/post-action-type'; import Singleton from 'discourse/mixins/singleton'; @@ -7,30 +8,30 @@ const Site = RestModel.extend({ isReadOnly: Em.computed.alias('is_readonly'), - notificationLookup: function() { + @computed("notification_types") + notificationLookup(notificationTypes) { const result = []; - _.each(this.get('notification_types'), function(v,k) { - result[v] = k; - }); + _.each(notificationTypes, (v, k) => result[v] = k); return result; - }.property('notification_types'), + }, - flagTypes: function() { + @computed("post_action_types.@each") + flagTypes() { const postActionTypes = this.get('post_action_types'); if (!postActionTypes) return []; return postActionTypes.filterProperty('is_flag', true); - }.property('post_action_types.@each'), + }, topicCountDesc: ['topic_count:desc'], categoriesByCount: Ember.computed.sort('categories', 'topicCountDesc'), // Sort subcategories under parents - sortedCategories: function() { - const cats = this.get('categoriesByCount'), - result = [], - remaining = {}; + @computed("categoriesByCount", "categories.@each") + sortedCategories(cats) { + const result = [], + remaining = {}; - cats.forEach(function(c) { + cats.forEach(c => { const parentCategoryId = parseInt(c.get('parent_category_id'), 10); if (!parentCategoryId) { result.pushObject(c); @@ -40,17 +41,17 @@ const Site = RestModel.extend({ } }); - Ember.keys(remaining).forEach(function(parentCategoryId) { + Ember.keys(remaining).forEach(parentCategoryId => { const category = result.findBy('id', parseInt(parentCategoryId, 10)), - index = result.indexOf(category); + index = result.indexOf(category); if (index !== -1) { - result.replace(index+1, 0, remaining[parentCategoryId]); + result.replace(index + 1, 0, remaining[parentCategoryId]); } }); return result; - }.property("categories.@each"), + }, postActionTypeById(id) { return this.get("postActionByIdLookup.action" + id); @@ -98,16 +99,14 @@ Site.reopenClass(Singleton, { create() { const result = this._super.apply(this, arguments); - const store = result.store; + if (result.categories) { result.categoriesById = {}; - result.categories = _.map(result.categories, function(c) { - return result.categoriesById[c.id] = store.createRecord('category', c); - }); + result.categories = _.map(result.categories, c => result.categoriesById[c.id] = store.createRecord('category', c)); // Associate the categories with their parents - result.categories.forEach(function (c) { + result.categories.forEach(c => { if (c.get('parent_category_id')) { c.set('parentCategory', result.categoriesById[c.get('parent_category_id')]); } @@ -115,16 +114,13 @@ Site.reopenClass(Singleton, { } if (result.trust_levels) { - result.trustLevels = result.trust_levels.map(function (tl) { - return Discourse.TrustLevel.create(tl); - }); - + result.trustLevels = result.trust_levels.map(tl => Discourse.TrustLevel.create(tl)); delete result.trust_levels; } if (result.post_action_types) { result.postActionByIdLookup = Em.Object.create(); - result.post_action_types = _.map(result.post_action_types,function(p) { + result.post_action_types = _.map(result.post_action_types, p => { const actionType = PostActionType.create(p); result.postActionByIdLookup.set("action" + p.id, actionType); return actionType; @@ -133,7 +129,7 @@ Site.reopenClass(Singleton, { if (result.topic_flag_types) { result.topicFlagByIdLookup = Em.Object.create(); - result.topic_flag_types = _.map(result.topic_flag_types,function(p) { + result.topic_flag_types = _.map(result.topic_flag_types, p => { const actionType = PostActionType.create(p); result.topicFlagByIdLookup.set("action" + p.id, actionType); return actionType; @@ -141,16 +137,14 @@ Site.reopenClass(Singleton, { } if (result.archetypes) { - result.archetypes = _.map(result.archetypes,function(a) { + result.archetypes = _.map(result.archetypes, a => { a.site = result; return Archetype.create(a); }); } if (result.user_fields) { - result.user_fields = result.user_fields.map(function(uf) { - return Ember.Object.create(uf); - }); + result.user_fields = result.user_fields.map(uf => Ember.Object.create(uf)); } return result; diff --git a/app/assets/javascripts/discourse/routes/build-category-route.js.es6 b/app/assets/javascripts/discourse/routes/build-category-route.js.es6 index 1921552850..58f945ac96 100644 --- a/app/assets/javascripts/discourse/routes/build-category-route.js.es6 +++ b/app/assets/javascripts/discourse/routes/build-category-route.js.es6 @@ -1,15 +1,15 @@ import { queryParams, filterQueryParams, findTopicList } from 'discourse/routes/build-topic-route'; // A helper function to create a category route with parameters -export default function(filter, params) { +export default (filter, params) => { return Discourse.Route.extend({ queryParams: queryParams, - model: function(modelParams) { + model(modelParams) { return Discourse.Category.findBySlug(modelParams.slug, modelParams.parentSlug); }, - afterModel: function(model, transition) { + afterModel(model, transition) { if (!model) { this.replaceWith('/404'); return; @@ -20,9 +20,9 @@ export default function(filter, params) { this._retrieveTopicList(model, transition)]); }, - _setupNavigation: function(model) { - var noSubcategories = params && !!params.no_subcategories, - filterMode = "c/" + Discourse.Category.slugFor(model) + (noSubcategories ? "/none" : "") + "/l/" + filter; + _setupNavigation(model) { + const noSubcategories = params && !!params.no_subcategories, + filterMode = `c/${Discourse.Category.slugFor(model)}${noSubcategories ? "/none" : ""}/l/${filter}`; this.controllerFor('navigation/category').setProperties({ category: model, @@ -32,42 +32,38 @@ export default function(filter, params) { }); }, - _createSubcategoryList: function(model) { + _createSubcategoryList(model) { this._categoryList = null; if (Em.isNone(model.get('parentCategory')) && Discourse.SiteSettings.show_subcategory_list) { - var self = this; - return Discourse.CategoryList.listForParent(this.store, model).then(function(list) { - self._categoryList = list; - }); + return Discourse.CategoryList.listForParent(this.store, model) + .then(list => this._categoryList = list); } // If we're not loading a subcategory list just resolve return Em.RSVP.resolve(); }, - _retrieveTopicList: function(model, transition) { - var listFilter = "c/" + Discourse.Category.slugFor(model) + "/l/" + filter, - self = this; + _retrieveTopicList(model, transition) { + const listFilter = `c/${Discourse.Category.slugFor(model)}/l/${filter}`, + findOpts = filterQueryParams(transition.queryParams, params), + extras = { cached: this.isPoppedState(transition) }; - var findOpts = filterQueryParams(transition.queryParams, params), - extras = { cached: this.isPoppedState(transition) }; - - return findTopicList(this.store, this.topicTrackingState, listFilter, findOpts, extras).then(function(list) { + return findTopicList(this.store, this.topicTrackingState, listFilter, findOpts, extras).then(list => { Discourse.TopicList.hideUniformCategory(list, model); - self.set('topics', list); + this.set('topics', list); }); }, - titleToken: function() { - var filterText = I18n.t('filters.' + filter.replace('/', '.') + '.title', {count: 0}), - model = this.currentModel; + titleToken() { + const filterText = I18n.t('filters.' + filter.replace('/', '.') + '.title', { count: 0 }), + model = this.currentModel; return I18n.t('filters.with_category', { filter: filterText, category: model.get('name') }); }, - setupController: function(controller, model) { - var topics = this.get('topics'), - periodId = topics.get('for_period') || (filter.indexOf('/') > 0 ? filter.split('/')[1] : ''); + setupController(controller, model) { + const topics = this.get('topics'), + periodId = topics.get('for_period') || (filter.indexOf('/') > 0 ? filter.split('/')[1] : ''); this.controllerFor('navigation/category').set('canCreateTopic', topics.get('can_create_topic')); this.controllerFor('discovery/topics').setProperties({ @@ -87,7 +83,7 @@ export default function(filter, params) { this.openTopicDraft(topics); }, - renderTemplate: function() { + renderTemplate() { this.render('navigation/category', { outlet: 'navigation-bar' }); if (this._categoryList) { @@ -96,13 +92,13 @@ export default function(filter, params) { this.render('discovery/topics', { controller: 'discovery/topics', outlet: 'list-container' }); }, - deactivate: function() { + deactivate() { this._super(); this.searchService.set('searchContext', null); }, actions: { - setNotification: function(notification_level){ + setNotification(notification_level) { this.currentModel.setNotification(notification_level); } } diff --git a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6 b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6 index 47a04ae92a..072f33e47d 100644 --- a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6 +++ b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6 @@ -16,7 +16,7 @@ const DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, { // if default page is categories PreloadStore.remove("topic_list"); - return Discourse.CategoryList.list(this.store, 'categories').then((list) => { + return Discourse.CategoryList.list(this.store, 'categories').then(list => { const tracking = this.topicTrackingState; if (tracking) { tracking.sync(list, "categories"); @@ -34,8 +34,10 @@ const DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, { setupController(controller, model) { controller.set("model", model); - this.controllerFor("navigation/categories").set("canCreateCategory", model.get("can_create_category")); - this.controllerFor("navigation/categories").set("canCreateTopic", model.get("can_create_topic")); + this.controllerFor("navigation/categories").setProperties({ + canCreateCategory: model.get("can_create_category"), + canCreateTopic: model.get("can_create_topic"), + }); this.openTopicDraft(model); }, diff --git a/app/models/category_list.rb b/app/models/category_list.rb index 1472a27501..6f445feaa1 100644 --- a/app/models/category_list.rb +++ b/app/models/category_list.rb @@ -83,9 +83,16 @@ class CategoryList @categories = @categories.to_a + category_user = {} + unless @guardian.anonymous? + category_user = Hash[*CategoryUser.where(user: @guardian.user).pluck(:category_id, :notification_level).flatten] + end + allowed_topic_create = Set.new(Category.topic_create_allowed(@guardian).pluck(:id)) @categories.each do |category| + category.notification_level = category_user[category.id] category.permission = CategoryGroup.permission_types[:full] if allowed_topic_create.include?(category.id) + category.has_children = category.subcategories.present? end if @options[:parent_category_id].blank? From 9484a042b2807d5ec0e37057a2858ee4a113fe8f Mon Sep 17 00:00:00 2001 From: Erlend Sogge Heggen Date: Tue, 15 Sep 2015 15:42:34 +0200 Subject: [PATCH 117/157] Correct and update some links - Point to updated Google OAuth2 doc - Remove `/latest` from Twitter doc - Replace @eviltrout's blog link with the new canonical Meta doc --- docs/INSTALL-cloud.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md index e714108cac..88306633d2 100644 --- a/docs/INSTALL-cloud.md +++ b/docs/INSTALL-cloud.md @@ -150,11 +150,11 @@ Do you want... * Users to log in *only* via your pre-existing website's registration system? [Configure Single-Sign-On](https://meta.discourse.org/t/official-single-sign-on-for-discourse/13045). -- Users to log in via Google? (new Oauth2 authentication) [Configure Google logins](https://meta.discourse.org/t/configuring-google-login-for-discourse/15858). +- Users to log in via Google? (new Oauth2 authentication) [Configure Google logins](https://meta.discourse.org/t/configuring-google-oauth2-login-for-discourse/15858). - Users to log in via Facebook? [Configure Facebook logins](https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394). -- Users to log in via Twitter? [Configure Twitter logins](https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395/last). +- Users to log in via Twitter? [Configure Twitter logins](https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395). - Users to log in via GitHub? [Configure GitHub logins](https://meta.discourse.org/t/configuring-github-login-for-discourse/13745) @@ -172,7 +172,7 @@ Do you want... - A firewall on your server? [Configure firewall](https://meta.discourse.org/t/configure-a-firewall-for-discourse/20584) -- To embed Discourse [in your WordPress install](https://github.com/discourse/wp-discourse), or [on your static HTML site](http://eviltrout.com/2014/01/22/embedding-discourse.html)? +- To embed Discourse [in your WordPress install](https://github.com/discourse/wp-discourse), or [on your static HTML site](https://meta.discourse.org/t/embedding-discourse-comments-via-javascript/31963)? If anything needs to be improved in this guide, feel free to ask on [meta.discourse.org][meta], or even better, submit a pull request. From 72f245429043f14d3051345c455bdee70462a799 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 15 Sep 2015 11:09:09 -0400 Subject: [PATCH 118/157] FIX: Auto close was broken --- .../discourse/templates/modal/edit-topic-auto-close.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/modal/edit-topic-auto-close.hbs b/app/assets/javascripts/discourse/templates/modal/edit-topic-auto-close.hbs index 94ce2fd0ad..fcf524920c 100644 --- a/app/assets/javascripts/discourse/templates/modal/edit-topic-auto-close.hbs +++ b/app/assets/javascripts/discourse/templates/modal/edit-topic-auto-close.hbs @@ -1,4 +1,4 @@ -
        +
        {{auto-close-form autoCloseTime=model.auto_close_time autoCloseValid=auto_close_valid @@ -6,7 +6,7 @@ limited=model.details.auto_close_based_on_last_post }}
        - {{d-button class="btn-primary" disabled=auto_close_invalid label="topic.auto_close_save"}} + {{d-button class="btn-primary" disabled=auto_close_invalid label="topic.auto_close_save" action="saveAutoClose"}} {{i18n 'cancel'}} {{d-button class="pull-right" action="removeAutoClose" label="topic.auto_close_remove"}}
        From 7e1a24e205584a677a272369ee800eaee79fab77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Tue, 15 Sep 2015 18:26:09 +0200 Subject: [PATCH 119/157] FEATURE: ensure localStorage is disabled in smoke tests --- spec/phantom_js/smoke_test.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/spec/phantom_js/smoke_test.js b/spec/phantom_js/smoke_test.js index c41c488ea8..969205dc43 100644 --- a/spec/phantom_js/smoke_test.js +++ b/spec/phantom_js/smoke_test.js @@ -17,6 +17,14 @@ page.viewportSize = { height: 768 }; +// In the browser, when the cookies are disabled, it also disables the localStorage +// Here, we're mocking that behavior and making sure the application doesn't blow up +page.onInitialized = function() { + page.evaluate(function() { + localStorage["disableLocalStorage"] = true; + }) +} + // page.onConsoleMessage = function(msg) { // console.log(msg); // } From 91f3e8e7244eb327dcf98dfba17b37529c8f9a80 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 15 Sep 2015 12:29:15 -0400 Subject: [PATCH 120/157] For now, restrict whispering to staff only. --- app/assets/javascripts/discourse/controllers/composer.js.es6 | 3 ++- app/controllers/posts_controller.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6 index d6d1224f53..9e5b2206d0 100644 --- a/app/assets/javascripts/discourse/controllers/composer.js.es6 +++ b/app/assets/javascripts/discourse/controllers/composer.js.es6 @@ -67,7 +67,8 @@ export default Ember.Controller.extend({ @computed('model.action') canWhisper(action) { - return this.siteSettings.enable_whispers && action === Composer.REPLY; + const currentUser = this.currentUser; + return currentUser && currentUser.get('staff') && this.siteSettings.enable_whispers && action === Composer.REPLY; }, showWarning: function() { diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb index 5ee72c315a..b7c321ed95 100644 --- a/app/controllers/posts_controller.rb +++ b/app/controllers/posts_controller.rb @@ -465,7 +465,7 @@ class PostsController < ApplicationController result[:is_warning] = false end - if SiteSetting.enable_whispers? && params[:whisper] == "true" + if current_user.staff? && SiteSetting.enable_whispers? && params[:whisper] == "true" result[:post_type] = Post.types[:whisper] end From 9c740ffa7e5a27522de52054dbf0af7b761ff4f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Tue, 15 Sep 2015 18:33:13 +0200 Subject: [PATCH 121/157] UX: top period chooser was misaligned on mobile --- app/assets/stylesheets/mobile/topic-list.scss | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss index 2a96f47b0a..f3f6c21eeb 100644 --- a/app/assets/stylesheets/mobile/topic-list.scss +++ b/app/assets/stylesheets/mobile/topic-list.scss @@ -371,12 +371,6 @@ ol.category-breadcrumb { padding: 8px 0; } -.period-chooser { - button { - margin-top: 10px; - } -} - button.dismiss-read { margin-right: 10px; } From b12ace5f9d867426172c0fa17e8107b3805e8901 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 15 Sep 2015 13:28:50 -0400 Subject: [PATCH 122/157] FEATURE: Add staff gear icon to composer with options --- .../discourse/components/popup-menu.js.es6 | 45 +++++++++++++ .../discourse/components/post-menu.js.es6 | 10 +-- .../components/show-popup-button.js.es6 | 17 +++++ .../components/show-topic-admin.js.es6 | 24 ------- .../discourse/controllers/composer.js.es6 | 15 +++++ .../controllers/topic-admin-menu.js.es6 | 12 ---- .../discourse/controllers/topic.js.es6 | 12 ++++ .../discourse/lib/Markdown.Editor.js | 25 ++++--- .../javascripts/discourse/lib/markdown.js | 13 ++-- .../javascripts/discourse/routes/topic.js.es6 | 5 -- .../templates/components/popup-menu.hbs | 4 ++ .../discourse/templates/composer.hbs | 24 ++++--- .../discourse/templates/topic-admin-menu.hbs | 62 ------------------ .../javascripts/discourse/templates/topic.hbs | 65 ++++++++++++++++++- .../discourse/views/composer.js.es6 | 40 +++++++++--- .../views/topic-admin-menu-button.js.es6 | 21 ------ .../discourse/views/topic-admin-menu.js.es6 | 52 --------------- .../views/topic-footer-buttons.js.es6 | 10 +-- .../stylesheets/common/base/compose.scss | 5 ++ .../stylesheets/common/base/pagedown.scss | 4 ++ app/assets/stylesheets/common/base/rtl.scss | 2 +- .../common/base/topic-admin-menu.scss | 7 +- .../common/components/buttons.css.scss | 6 -- .../stylesheets/desktop/topic-post.scss | 9 +-- app/assets/stylesheets/mobile/topic-post.scss | 8 --- config/locales/client.en.yml | 4 +- 26 files changed, 250 insertions(+), 251 deletions(-) create mode 100644 app/assets/javascripts/discourse/components/popup-menu.js.es6 create mode 100644 app/assets/javascripts/discourse/components/show-popup-button.js.es6 delete mode 100644 app/assets/javascripts/discourse/components/show-topic-admin.js.es6 delete mode 100644 app/assets/javascripts/discourse/controllers/topic-admin-menu.js.es6 create mode 100644 app/assets/javascripts/discourse/templates/components/popup-menu.hbs delete mode 100644 app/assets/javascripts/discourse/templates/topic-admin-menu.hbs delete mode 100644 app/assets/javascripts/discourse/views/topic-admin-menu-button.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/topic-admin-menu.js.es6 diff --git a/app/assets/javascripts/discourse/components/popup-menu.js.es6 b/app/assets/javascripts/discourse/components/popup-menu.js.es6 new file mode 100644 index 0000000000..1f5de232ae --- /dev/null +++ b/app/assets/javascripts/discourse/components/popup-menu.js.es6 @@ -0,0 +1,45 @@ +import { on } from 'ember-addons/ember-computed-decorators'; + +export default Ember.Component.extend({ + classNameBindings: ["visible::hidden", ":popup-menu"], + + @on('didInsertElement') + _setup() { + this.appEvents.on("popup-menu:open", this, "_changeLocation"); + + $('html').on(`mouseup.popup-menu-${this.get('elementId')}`, (e) => { + const $target = $(e.target); + if ($target.is("button") || this.$().has($target).length === 0) { + this.sendAction('hide'); + } + }); + }, + + @on('willDestroyElement') + _cleanup() { + $('html').off(`mouseup.popup-menu-${this.get('elementId')}`); + this.appEvents.off("popup-menu:open"); + }, + + _changeLocation(location) { + const $this = this.$(); + switch (location.position) { + case "absolute": { + $this.css({ + position: "absolute", + top: location.top - $this.innerHeight() + 5, + left: location.left, + }); + break; + } + case "fixed": { + $this.css({ + position: "fixed", + top: location.top, + left: location.left - $this.innerWidth(), + }); + break; + } + } + } +}); diff --git a/app/assets/javascripts/discourse/components/post-menu.js.es6 b/app/assets/javascripts/discourse/components/post-menu.js.es6 index 33800387f2..9981c5330b 100644 --- a/app/assets/javascripts/discourse/components/post-menu.js.es6 +++ b/app/assets/javascripts/discourse/components/post-menu.js.es6 @@ -369,13 +369,13 @@ const PostMenuComponent = Ember.Component.extend(StringBuffer, { unhidePostIcon = iconHTML('eye'), unhidePostText = I18n.t('post.controls.unhide'); - const html = '
        ' + + const html = '
        ' + '

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

        ' + '
          ' + - '
        • ' + wikiIcon + wikiText + '
          • ' + - (Discourse.User.currentProp('staff') ? '
        • ' + postTypeIcon + postTypeText + '
          • ' : '') + - '
        • ' + rebakePostIcon + rebakePostText + '
          • ' + - (post.hidden ? '
        • ' + unhidePostIcon + unhidePostText + '
          • ' : '') + + '
        • ' + wikiIcon + wikiText + '
          • ' + + (Discourse.User.currentProp('staff') ? '
        • ' + postTypeIcon + postTypeText + '
          • ' : '') + + '
        • ' + rebakePostIcon + rebakePostText + '
          • ' + + (post.hidden ? '
        • ' + unhidePostIcon + unhidePostText + '
          • ' : '') + '
        ' + '
        '; diff --git a/app/assets/javascripts/discourse/components/show-popup-button.js.es6 b/app/assets/javascripts/discourse/components/show-popup-button.js.es6 new file mode 100644 index 0000000000..0f1a40734f --- /dev/null +++ b/app/assets/javascripts/discourse/components/show-popup-button.js.es6 @@ -0,0 +1,17 @@ +import DButton from 'discourse/components/d-button'; + +export default DButton.extend({ + click() { + const $target = this.$(), + position = $target.position(), + width = $target.innerWidth(), + loc = { + position: this.get('position') || "fixed", + left: position.left + width, + top: position.top + }; + + this.appEvents.trigger("popup-menu:open", loc); + this.sendAction("action"); + } +}); diff --git a/app/assets/javascripts/discourse/components/show-topic-admin.js.es6 b/app/assets/javascripts/discourse/components/show-topic-admin.js.es6 deleted file mode 100644 index 1faf600056..0000000000 --- a/app/assets/javascripts/discourse/components/show-topic-admin.js.es6 +++ /dev/null @@ -1,24 +0,0 @@ -export default Em.Component.extend({ - tagName: "button", - classNames: ["btn", "no-text", "show-topic-admin"], - attributeBindings: ["title"], - title: I18n.t("topic_admin_menu"), - - render: function(buffer) { - buffer.push(""); - }, - - click: function() { - var $target = this.$(), - position = $target.position(), - width = $target.innerWidth(); - var location = { - position: "fixed", - left: position.left + width, - top: position.top, - }; - this.appEvents.trigger("topic-admin-menu:open", location); - this.sendAction("show"); - return false; - } -}); diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6 index 9e5b2206d0..8ded3a2e85 100644 --- a/app/assets/javascripts/discourse/controllers/composer.js.es6 +++ b/app/assets/javascripts/discourse/controllers/composer.js.es6 @@ -55,6 +55,7 @@ export default Ember.Controller.extend({ similarTopics: null, similarTopicsMessage: null, lastSimilaritySearch: null, + optionsVisible: false, topic: null, @@ -84,6 +85,20 @@ export default Ember.Controller.extend({ }.property('model.creatingPrivateMessage', 'model.targetUsernames'), actions: { + + toggleWhisper() { + this.toggleProperty('model.whisper'); + }, + + showOptions(loc) { + this.appEvents.trigger('popup-menu:open', loc); + this.set('optionsVisible', true); + }, + + hideOptions() { + this.set('optionsVisible', false); + }, + // Toggle the reply view toggle() { this.toggle(); diff --git a/app/assets/javascripts/discourse/controllers/topic-admin-menu.js.es6 b/app/assets/javascripts/discourse/controllers/topic-admin-menu.js.es6 deleted file mode 100644 index 4e454b8523..0000000000 --- a/app/assets/javascripts/discourse/controllers/topic-admin-menu.js.es6 +++ /dev/null @@ -1,12 +0,0 @@ -// This controller supports the admin menu on topics -export default Ember.Controller.extend({ - menuVisible: false, - showRecover: Em.computed.and('model.deleted', 'model.details.can_recover'), - isFeatured: Em.computed.or("model.pinned_at", "model.isBanner"), - - actions: { - show: function() { this.set('menuVisible', true); }, - hide: function() { this.set('menuVisible', false); } - } - -}); diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6 index 80ac937398..4d8b126d02 100644 --- a/app/assets/javascripts/discourse/controllers/topic.js.es6 +++ b/app/assets/javascripts/discourse/controllers/topic.js.es6 @@ -19,6 +19,10 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { enteredAt: null, firstPostExpanded: false, retrying: false, + adminMenuVisible: false, + + showRecover: Em.computed.and('model.deleted', 'model.details.can_recover'), + isFeatured: Em.computed.or("model.pinned_at", "model.isBanner"), maxTitleLength: setting('max_topic_title_length'), @@ -93,6 +97,14 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { }.on('init'), actions: { + showTopicAdminMenu() { + this.set('adminMenuVisible', true); + }, + + hideTopicAdminMenu() { + this.set('adminMenuVisible', false); + }, + deleteTopic() { this.deleteTopic(); }, diff --git a/app/assets/javascripts/discourse/lib/Markdown.Editor.js b/app/assets/javascripts/discourse/lib/Markdown.Editor.js index 97a58375c9..13ca4b52a4 100644 --- a/app/assets/javascripts/discourse/lib/Markdown.Editor.js +++ b/app/assets/javascripts/discourse/lib/Markdown.Editor.js @@ -163,7 +163,7 @@ } } - uiManager = new UIManager(idPostfix, panels, undoManager, previewManager, commandManager, options.helpButton, getString); + uiManager = new UIManager(idPostfix, panels, undoManager, previewManager, commandManager, options.helpButton, getString, options); uiManager.setUndoRedoButtonStates(); var forceRefresh = that.refreshPreview = function () { previewManager.refresh(true); }; @@ -1219,12 +1219,12 @@ }, 0); }; - function UIManager(postfix, panels, undoManager, previewManager, commandManager, helpOptions, getString) { + function UIManager(postfix, panels, undoManager, previewManager, commandManager, helpOptions, getString, options) { var inputBox = panels.input, buttons = {}; // buttons.undo, buttons.link, etc. The actual DOM elements. - makeSpritedButtonRow(); + makeSpritedButtonRow(options); var keyEvent = "keydown"; @@ -1396,7 +1396,8 @@ return function () { method.apply(commandManager, arguments); } } - function makeSpritedButtonRow() { + function makeSpritedButtonRow(options) { + options = options || {}; var buttonBar = panels.buttonBar; var buttonRow = document.createElement("div"); @@ -1459,17 +1460,21 @@ buttons.heading = makeButton("wmd-heading-button", getString("heading"), bindCommand("doHeading")); buttons.hr = makeButton("wmd-hr-button", getString("hr"), bindCommand("doHorizontalRule")); - // If we have any buttons to append, do it! - if (typeof PagedownCustom != "undefined") { - var appendButtons = PagedownCustom.appendButtons - if (appendButtons && (appendButtons.length > 0)) { - for (var i=0; i< appendButtons.length; i++) { - var b = appendButtons[i]; + function createExtraButtons(buttons) { + if (buttons && (buttons.length > 0)) { + for (var i=0; i< buttons.length; i++) { + var b = buttons[i]; makeButton(b.id, b.description, b.execute) } } } + // If we have any buttons to append, do it! + if (typeof PagedownCustom != "undefined") { + createExtraButtons(PagedownCustom.appendButtons); + } + + createExtraButtons(options.appendButtons); //makeSpacer(3); //buttons.undo = makeButton("wmd-undo-button", getString("undo"), null); diff --git a/app/assets/javascripts/discourse/lib/markdown.js b/app/assets/javascripts/discourse/lib/markdown.js index 9e59a38a38..888f282d18 100644 --- a/app/assets/javascripts/discourse/lib/markdown.js +++ b/app/assets/javascripts/discourse/lib/markdown.js @@ -152,16 +152,16 @@ Discourse.Markdown = { return this.markdownConverter(opts).makeHtml(raw); }, - createEditor: function(converterOptions) { - if (!converterOptions) converterOptions = {}; + createEditor: function(options) { + options = options || {}; // By default we always sanitize content in the editor - converterOptions.sanitize = true; + options.sanitize = true; - var markdownConverter = Discourse.Markdown.markdownConverter(converterOptions); + var markdownConverter = Discourse.Markdown.markdownConverter(options); var editorOptions = { - containerElement: converterOptions.containerElement, + containerElement: options.containerElement, strings: { bold: I18n.t("composer.bold_title") + " Ctrl+B", boldexample: I18n.t("composer.bold_text"), @@ -197,7 +197,8 @@ Discourse.Markdown = { redomac: I18n.t("composer.redo_title") + " - Ctrl+Shift+Z", help: I18n.t("composer.help") - } + }, + appendButtons: options.appendButtons }; return new Markdown.Editor(markdownConverter, undefined, editorOptions); diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6 index 759ec4bbb7..8bfdf13d5b 100644 --- a/app/assets/javascripts/discourse/routes/topic.js.es6 +++ b/app/assets/javascripts/discourse/routes/topic.js.es6 @@ -41,10 +41,6 @@ const TopicRoute = Discourse.Route.extend({ actions: { - showTopicAdminMenu() { - this.controllerFor("topic-admin-menu").send("show"); - }, - showFlags(model) { showModal('flag', { model }); this.controllerFor('flag').setProperties({ selected: null }); @@ -213,7 +209,6 @@ const TopicRoute = Discourse.Route.extend({ this.controllerFor('header').setProperties({ topic: model, showExtraInfo: false }); this.searchService.set('searchContext', model.get('searchContext')); - this.controllerFor('topic-admin-menu').set('model', model); this.controllerFor('composer').set('topic', model); this.topicTrackingState.trackIncoming('all'); diff --git a/app/assets/javascripts/discourse/templates/components/popup-menu.hbs b/app/assets/javascripts/discourse/templates/components/popup-menu.hbs new file mode 100644 index 0000000000..5c5c8a9ed2 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/popup-menu.hbs @@ -0,0 +1,4 @@ +

        {{i18n title}}

        +
          + {{yield}} +
        diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs index 01234ff0e9..4e75418d92 100644 --- a/app/assets/javascripts/discourse/templates/composer.hbs +++ b/app/assets/javascripts/discourse/templates/composer.hbs @@ -1,8 +1,17 @@ {{#if visible}}
        + + {{#if currentUser.staff}} + {{#popup-menu visible=optionsVisible hide="hideOptions" title="composer.options"}} +
      • + {{d-button action="toggleWhisper" icon="eye-slash" label="composer.toggle_whisper"}} +
        • + {{/popup-menu}} + {{/if}} + {{render "composer-messages"}}
        - + {{#if model.viewOpen}}
        @@ -11,6 +20,10 @@
        {{{model.actionTitle}}} + {{#if model.whisper}} + ({{i18n "composer.whisper"}}) + {{/if}} + {{#if canEdit}} {{#if showEditReason}}
        @@ -61,15 +74,6 @@
        {{/if}} - {{#if canWhisper}} -
        - -
        - {{/if}} - {{plugin-outlet "composer-fields"}}
        diff --git a/app/assets/javascripts/discourse/templates/topic-admin-menu.hbs b/app/assets/javascripts/discourse/templates/topic-admin-menu.hbs deleted file mode 100644 index 2f190df214..0000000000 --- a/app/assets/javascripts/discourse/templates/topic-admin-menu.hbs +++ /dev/null @@ -1,62 +0,0 @@ -

        {{i18n 'admin_title'}}

        - -
          -
        • - {{d-button action="toggleMultiSelect" icon="tasks" label="topic.actions.multi_select" class="btn-admin"}} -
          • - - {{#if model.details.can_delete}} -
        • - {{d-button action="deleteTopic" icon="trash-o" label="topic.actions.delete" class="btn-admin btn-danger"}} -
          • - {{/if}} - - {{#if showRecover}} -
        • - {{d-button action="recoverTopic" icon="undo" label="topic.actions.recover" class="btn-admin"}} -
          • - {{/if}} - -
        • - {{#if model.closed}} - {{d-button action="toggleClosed" icon="unlock" label="topic.actions.open" class="btn-admin"}} - {{else}} - {{d-button action="toggleClosed" icon="lock" label="topic.actions.close" class="btn-admin"}} - {{d-button action="showAutoClose" icon="clock-o" label="topic.actions.auto_close" class="btn-admin"}} - {{/if}} -
          • - - {{#unless model.isPrivateMessage}} - {{#if model.visible}} -
        • - {{#if isFeatured}} - {{d-button action="showFeatureTopic" icon="thumb-tack" label="topic.actions.unpin" class="btn-admin"}} - {{else}} - {{d-button action="showFeatureTopic" icon="thumb-tack" label="topic.actions.pin" class="btn-admin"}} - {{/if}} -
          • - {{/if}} - {{/unless}} - -
        • - {{d-button action="showChangeTimestamp" icon="calendar" label="topic.change_timestamp.title" class="btn-admin"}} -
          • - -
        • - {{#if model.archived}} - {{d-button action="toggleArchived" icon="folder" label="topic.actions.unarchive" class="btn-admin"}} - {{else}} - {{d-button action="toggleArchived" icon="folder" label="topic.actions.archive" class="btn-admin"}} - {{/if}} -
          • - -
        • - {{#if model.visible}} - {{d-button action="toggleVisibility" icon="eye-slash" label="topic.actions.invisible" class="btn-admin"}} - {{else}} - {{d-button action="toggleVisibility" icon="eye" label="topic.actions.visible" class="btn-admin"}} - {{/if}} -
          • - - {{plugin-outlet "topic-admin-menu-buttons"}} -
        diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs index 0a38e3d574..bb9d854540 100644 --- a/app/assets/javascripts/discourse/templates/topic.hbs +++ b/app/assets/javascripts/discourse/templates/topic.hbs @@ -55,7 +55,6 @@ {{/if}}
        - {{view "selected-posts"}}
        @@ -87,6 +86,7 @@ {{#if loadedAllPosts}} {{view "topic-closing" topic=model}} + {{show-popup-button action="showTopicAdminMenu" title="topic_admin_menu" icon="wrench" position="absolute"}} {{view "topic-footer-buttons" topic=model}} {{#if model.pending_posts_count}} @@ -150,6 +150,65 @@ {{/if}} {{#if currentUser.canManageTopic}} - {{show-topic-admin show="showTopicAdminMenu"}} - {{render "topic-admin-menu"}} + {{show-popup-button action="showTopicAdminMenu" class="show-topic-admin" title="topic_admin_menu" icon="wrench"}} + {{#popup-menu visible=adminMenuVisible hide="hideTopicAdminMenu" title="admin_title"}} +
      • + {{d-button action="toggleMultiSelect" icon="tasks" label="topic.actions.multi_select"}} +
        • + + {{#if model.details.can_delete}} +
      • + {{d-button action="deleteTopic" icon="trash-o" label="topic.actions.delete" class="btn-danger"}} +
        • + {{/if}} + + {{#if showRecover}} +
      • + {{d-button action="recoverTopic" icon="undo" label="topic.actions.recover"}} +
        • + {{/if}} + +
      • + {{#if model.closed}} + {{d-button action="toggleClosed" icon="unlock" label="topic.actions.open"}} + {{else}} + {{d-button action="toggleClosed" icon="lock" label="topic.actions.close"}} + {{d-button action="showAutoClose" icon="clock-o" label="topic.actions.auto_close"}} + {{/if}} +
        • + + {{#unless model.isPrivateMessage}} + {{#if model.visible}} +
      • + {{#if isFeatured}} + {{d-button action="showFeatureTopic" icon="thumb-tack" label="topic.actions.unpin"}} + {{else}} + {{d-button action="showFeatureTopic" icon="thumb-tack" label="topic.actions.pin"}} + {{/if}} +
        • + {{/if}} + {{/unless}} + +
      • + {{d-button action="showChangeTimestamp" icon="calendar" label="topic.change_timestamp.title"}} +
        • + +
      • + {{#if model.archived}} + {{d-button action="toggleArchived" icon="folder" label="topic.actions.unarchive"}} + {{else}} + {{d-button action="toggleArchived" icon="folder" label="topic.actions.archive"}} + {{/if}} +
        • + +
      • + {{#if model.visible}} + {{d-button action="toggleVisibility" icon="eye-slash" label="topic.actions.invisible"}} + {{else}} + {{d-button action="toggleVisibility" icon="eye" label="topic.actions.visible"}} + {{/if}} +
        • + + {{plugin-outlet "topic-admin-menu-buttons"}} + {{/popup-menu}} {{/if}} diff --git a/app/assets/javascripts/discourse/views/composer.js.es6 b/app/assets/javascripts/discourse/views/composer.js.es6 index 5d62db4161..076c02ab98 100644 --- a/app/assets/javascripts/discourse/views/composer.js.es6 +++ b/app/assets/javascripts/discourse/views/composer.js.es6 @@ -219,6 +219,8 @@ const ComposerView = Ember.View.extend(Ember.Evented, { // but if you start replying to another topic it will get the avatars wrong let $wmdInput; const self = this; + const controller = this.get('controller'); + this.wmdInput = $wmdInput = this.$('.wmd-input'); if ($wmdInput.length === 0 || $wmdInput.data('init') === true) return; @@ -233,7 +235,7 @@ const ComposerView = Ember.View.extend(Ember.Evented, { dataSource(term) { return userSearch({ term: term, - topicId: self.get('controller.controllers.topic.model.id'), + topicId: controller.get('controllers.topic.model.id'), includeGroups: true }); }, @@ -243,18 +245,40 @@ const ComposerView = Ember.View.extend(Ember.Evented, { } }); - this.editor = Discourse.Markdown.createEditor({ + + const options ={ containerElement: this.element, lookupAvatarByPostNumber(postNumber, topicId) { - const posts = self.get('controller.controllers.topic.model.postStream.posts'); - if (posts && topicId === self.get('controller.controllers.topic.model.id')) { + const posts = controller.get('controllers.topic.model.postStream.posts'); + if (posts && topicId === controller.get('controllers.topic.model.id')) { const quotedPost = posts.findProperty("post_number", postNumber); if (quotedPost) { return Discourse.Utilities.tinyAvatar(quotedPost.get('avatar_template')); } } } - }); + }; + + const showOptions = controller.get('canWhisper'); + if (showOptions) { + options.appendButtons = [{ + id: 'wmd-composer-options', + description: I18n.t("composer.options"), + execute() { + const toolbarPos = self.$('.wmd-controls').position(); + const pos = self.$('.wmd-composer-options').position(); + + const location = { + position: "absolute", + left: toolbarPos.left + pos.left, + top: toolbarPos.top + pos.top, + } + controller.send('showOptions', location); + } + }]; + } + + this.editor = Discourse.Markdown.createEditor(options); // HACK to change the upload icon of the composer's toolbar if (!Discourse.Utilities.allowsAttachments()) { @@ -265,7 +289,7 @@ const ComposerView = Ember.View.extend(Ember.Evented, { this.editor.hooks.insertImageDialog = function(callback) { callback(null); - self.get('controller').send('showUploadSelector', self); + controller.send('showUploadSelector', self); return true; }; @@ -278,7 +302,7 @@ const ComposerView = Ember.View.extend(Ember.Evented, { this.loadingChanged(); const saveDraft = debounce((function() { - return self.get('controller').saveDraft(); + return controller.saveDraft(); }), 2000); $wmdInput.keyup(function() { @@ -344,7 +368,7 @@ const ComposerView = Ember.View.extend(Ember.Evented, { $uploadTarget.on("fileuploadsend", (e, data) => { // hide the "file selector" modal - this.get("controller").send("closeModal"); + controller.send("closeModal"); // deal with cancellation cancelledByTheUser = false; // add upload placeholder diff --git a/app/assets/javascripts/discourse/views/topic-admin-menu-button.js.es6 b/app/assets/javascripts/discourse/views/topic-admin-menu-button.js.es6 deleted file mode 100644 index cdd00b78dc..0000000000 --- a/app/assets/javascripts/discourse/views/topic-admin-menu-button.js.es6 +++ /dev/null @@ -1,21 +0,0 @@ -import ButtonView from "discourse/views/button"; - -export default ButtonView.extend({ - classNameBindings: [":no-text"], - helpKey: "topic_admin_menu", - - renderIcon: function(buffer) { - buffer.push(""); - }, - - click: function() { - var offset = this.$().offset(); - var location = { - position: "absolute", - left: offset.left, - top: offset.top, - }; - this.get("controller").appEvents.trigger("topic-admin-menu:open", location); - return this.get("controller").send("showTopicAdminMenu"); - } -}); diff --git a/app/assets/javascripts/discourse/views/topic-admin-menu.js.es6 b/app/assets/javascripts/discourse/views/topic-admin-menu.js.es6 deleted file mode 100644 index 05321a4547..0000000000 --- a/app/assets/javascripts/discourse/views/topic-admin-menu.js.es6 +++ /dev/null @@ -1,52 +0,0 @@ -/** - This view is used for rendering the topic admin menu - - @class TopicAdminMenuView - @extends Ember.View - @namespace Discourse - @module Discourse -**/ -export default Ember.View.extend({ - classNameBindings: ["controller.menuVisible::hidden", ":topic-admin-menu"], - - _setup: function() { - var self = this; - - this.appEvents.on("topic-admin-menu:open", this, "_changeLocation"); - - $("html").on("mouseup.discourse-topic-admin-menu", function(e) { - var $target = $(e.target); - if ($target.is("button") || self.$().has($target).length === 0) { - self.get("controller").send("hide"); - } - }); - }.on("didInsertElement"), - - _changeLocation: function(location) { - var $this = this.$(); - switch (location.position) { - case "absolute": { - $this.css({ - position: "absolute", - top: location.top - $this.innerHeight() + 5, - left: location.left, - }); - break; - } - case "fixed": { - $this.css({ - position: "fixed", - top: location.top, - left: location.left - $this.innerWidth(), - }); - break; - } - } - }, - - _cleanup: function() { - $("html").off("mouseup.discourse-topic-admin-menu"); - this.appEvents.off("topic-admin-menu:open"); - }.on("willDestroyElement"), - -}); diff --git a/app/assets/javascripts/discourse/views/topic-footer-buttons.js.es6 b/app/assets/javascripts/discourse/views/topic-footer-buttons.js.es6 index 3b70d394db..25c9974f79 100644 --- a/app/assets/javascripts/discourse/views/topic-footer-buttons.js.es6 +++ b/app/assets/javascripts/discourse/views/topic-footer-buttons.js.es6 @@ -1,4 +1,3 @@ -import TopicAdminMenuButton from 'discourse/views/topic-admin-menu-button'; import LoginReplyButton from 'discourse/views/login-reply-button'; import FlagTopicButton from 'discourse/views/flag-topic-button'; import BookmarkButton from 'discourse/views/bookmark-button'; @@ -47,14 +46,11 @@ export default DiscourseContainerView.extend({ // Add the buttons below a topic createButtons() { const topic = this.get('topic'); - if (Discourse.User.current()) { + const currentUser = this.get('controller.currentUser'); + + if (currentUser) { const viewArgs = {topic}; - if (Discourse.User.currentProp("staff")) { - this.attachViewClass(TopicAdminMenuButton); - } - this.attachViewWithArgs(viewArgs, MainPanel); - this.attachViewWithArgs(viewArgs, PinnedButton); this.attachViewWithArgs(viewArgs, TopicNotificationsButton); diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss index 844a9e32d3..c128d32cce 100644 --- a/app/assets/stylesheets/common/base/compose.scss +++ b/app/assets/stylesheets/common/base/compose.scss @@ -142,8 +142,13 @@ div.ac-wrap { left: 48%; top: 20%; } + .whisper { + margin-left: 1em; + font-style: italic; + } } + // this removes the topmost margin from the first element in the topic post // if we don't do this, all posts would have extra space at the top .wmd-preview > *:first-child { diff --git a/app/assets/stylesheets/common/base/pagedown.scss b/app/assets/stylesheets/common/base/pagedown.scss index d7d411f631..1ee211aa50 100644 --- a/app/assets/stylesheets/common/base/pagedown.scss +++ b/app/assets/stylesheets/common/base/pagedown.scss @@ -111,6 +111,10 @@ content: "\f0e5"; } +.wmd-composer-options:before { + content: "\f013"; +} + .wmd-prompt-background { background-color: #111; box-shadow: 0 3px 7px rgba(0,0,0, .8); diff --git a/app/assets/stylesheets/common/base/rtl.scss b/app/assets/stylesheets/common/base/rtl.scss index 1be9d21a48..bae997b469 100644 --- a/app/assets/stylesheets/common/base/rtl.scss +++ b/app/assets/stylesheets/common/base/rtl.scss @@ -3,7 +3,7 @@ // Adding the !important declaration to a rule prevents it from being flipped. // Keep the topic admin menu on the page -.rtl .topic-admin-menu { +.rtl .popup-menu { right: 0 !important; } diff --git a/app/assets/stylesheets/common/base/topic-admin-menu.scss b/app/assets/stylesheets/common/base/topic-admin-menu.scss index a0db149139..73e6a896e2 100644 --- a/app/assets/stylesheets/common/base/topic-admin-menu.scss +++ b/app/assets/stylesheets/common/base/topic-admin-menu.scss @@ -8,7 +8,7 @@ outline: 0; } -.topic-admin-menu { +.popup-menu { background-color: $secondary; width: 205px; padding: 10px; @@ -20,10 +20,13 @@ margin: 10px 0 0 0; } + .btn { + text-align: left; + } + button { width: 200px; margin-bottom: 5px; - i { width: 14px; } diff --git a/app/assets/stylesheets/common/components/buttons.css.scss b/app/assets/stylesheets/common/components/buttons.css.scss index e195a034f4..bf42ff0f08 100644 --- a/app/assets/stylesheets/common/components/buttons.css.scss +++ b/app/assets/stylesheets/common/components/buttons.css.scss @@ -62,12 +62,6 @@ } } -// Buttons used in admin panel -// -------------------------------------------------- -.btn-admin { - text-align:left; -} - // Primary button // -------------------------------------------------- diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 41409878ff..35d81ef66f 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -593,14 +593,7 @@ a.mention { margin-top: -20px; } -#show-topic-admin { - right: 20px; - padding: 5px 8px; - margin-top: 5px; - -} - -.topic-admin-menu { +.popup-menu { h3 {margin-top: 0;} } diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss index 42849b137e..9f93f5c597 100644 --- a/app/assets/stylesheets/mobile/topic-post.scss +++ b/app/assets/stylesheets/mobile/topic-post.scss @@ -437,14 +437,6 @@ button.select-post { background-color: dark-light-diff(rgba($danger,.7), $secondary, 50%, -60%); } -#show-topic-admin { - color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); - right: 0; - border-right: 0; - padding-right: 4px; - padding-left: 5px; -} - .deleted-user-avatar { font-size: 2.571em; } diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 6cbde0799c..0f096926ab 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -811,9 +811,11 @@ en: composer: emoji: "Emoji :smile:" + options: "Composer Options" + whisper: "whisper" add_warning: "This is an official warning." - add_whisper: "This is a whisper only visible to moderators" + toggle_whisper: "Toggle Whisper" posting_not_on_topic: "Which topic do you want to reply to?" saving_draft_tip: "saving..." saved_draft_tip: "saved" From b4a724e80a9099efeb9cc8b4874966142b60dd80 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Tue, 15 Sep 2015 16:45:01 -0400 Subject: [PATCH 123/157] FEATURE: export dashboard reports to csv file --- .../admin/controllers/admin-reports.js.es6 | 12 ++++++++++++ .../javascripts/admin/templates/reports.hbs | 1 + .../javascripts/discourse/lib/export-csv.js.es6 | 8 ++++---- app/controllers/export_csv_controller.rb | 16 +++++++++++----- app/jobs/regular/export_csv_file.rb | 12 ++++++++++++ 5 files changed, 40 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/admin/controllers/admin-reports.js.es6 b/app/assets/javascripts/admin/controllers/admin-reports.js.es6 index e964d17a25..d83a031c6b 100644 --- a/app/assets/javascripts/admin/controllers/admin-reports.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-reports.js.es6 @@ -1,3 +1,6 @@ +import { exportEntity } from 'discourse/lib/export-csv'; +import { outputExportResult } from 'discourse/lib/export-result'; + export default Ember.Controller.extend({ viewMode: 'table', viewingTable: Em.computed.equal('viewMode', 'table'), @@ -30,6 +33,15 @@ export default Ember.Controller.extend({ viewAsBarChart() { this.set('viewMode', 'barChart'); + }, + + exportCsv() { + exportEntity('report', { + name: this.get("model.type"), + start_date: this.get('startDate'), + end_date: this.get('endDate'), + category_id: this.get('categoryId') == 'all' ? undefined : this.get('categoryId') + }).then(outputExportResult); } } }); diff --git a/app/assets/javascripts/admin/templates/reports.hbs b/app/assets/javascripts/admin/templates/reports.hbs index c7383ef2c8..5e1b406ea6 100644 --- a/app/assets/javascripts/admin/templates/reports.hbs +++ b/app/assets/javascripts/admin/templates/reports.hbs @@ -5,6 +5,7 @@ {{i18n 'admin.dashboard.reports.end_date'}} {{input type="date" value=endDate}} {{combo-box valueAttribute="value" content=categoryOptions value=categoryId}} {{d-button action="refreshReport" class="btn-primary" label="admin.dashboard.reports.refresh_report" icon="refresh"}} + {{d-button action="exportCsv" label="admin.export_csv.button_text"}}
        diff --git a/app/assets/javascripts/discourse/lib/export-csv.js.es6 b/app/assets/javascripts/discourse/lib/export-csv.js.es6 index 9681c9fc5a..c4b74a08fb 100644 --- a/app/assets/javascripts/discourse/lib/export-csv.js.es6 +++ b/app/assets/javascripts/discourse/lib/export-csv.js.es6 @@ -1,7 +1,7 @@ -function exportEntityByType(type, entity) { +function exportEntityByType(type, entity, args) { return Discourse.ajax("/export_csv/export_entity.json", { method: 'POST', - data: {entity_type: type, entity} + data: {entity_type: type, entity, args} }); } @@ -14,6 +14,6 @@ export function exportUserArchive() { } -export function exportEntity(entity) { - return exportEntityByType('admin', entity); +export function exportEntity(entity, args) { + return exportEntityByType('admin', entity, args); } diff --git a/app/controllers/export_csv_controller.rb b/app/controllers/export_csv_controller.rb index 74e341168c..f632b93bee 100644 --- a/app/controllers/export_csv_controller.rb +++ b/app/controllers/export_csv_controller.rb @@ -3,11 +3,8 @@ class ExportCsvController < ApplicationController skip_before_filter :preload_json, :check_xhr, only: [:show] def export_entity - params.require(:entity) - params.require(:entity_type) - guardian.ensure_can_export_entity!(params[:entity_type]) - - Jobs.enqueue(:export_csv_file, entity: params[:entity], user_id: current_user.id) + guardian.ensure_can_export_entity!(export_params[:entity_type]) + Jobs.enqueue(:export_csv_file, entity: export_params[:entity], user_id: current_user.id, args: export_params[:args]) render json: success_json end @@ -27,4 +24,13 @@ class ExportCsvController < ApplicationController end end + private + + def export_params + @_export_params ||= begin + params.require(:entity) + params.require(:entity_type) + params.permit(:entity, :entity_type, args: [:name, :start_date, :end_date, :category_id]) + end + end end diff --git a/app/jobs/regular/export_csv_file.rb b/app/jobs/regular/export_csv_file.rb index 8e4201453d..d3d2d3da89 100644 --- a/app/jobs/regular/export_csv_file.rb +++ b/app/jobs/regular/export_csv_file.rb @@ -15,12 +15,14 @@ module Jobs HEADER_ATTRS_FOR['screened_email'] = ['email','action','match_count','last_match_at','created_at','ip_address'] HEADER_ATTRS_FOR['screened_ip'] = ['ip_address','action','match_count','last_match_at','created_at'] HEADER_ATTRS_FOR['screened_url'] = ['domain','action','match_count','last_match_at','created_at'] + HEADER_ATTRS_FOR['report'] = ['date', 'value'] sidekiq_options retry: false attr_accessor :current_user def execute(args) @entity = args[:entity] + @extra = HashWithIndifferentAccess.new(args[:args]) if args[:args] @file_name = @entity @current_user = User.find_by(id: args[:user_id]) @@ -93,6 +95,16 @@ module Jobs end end + def report_export + @extra[:start_date] = @extra[:start_date].to_date if @extra[:start_date].is_a?(String) + @extra[:end_date] = @extra[:end_date].to_date if @extra[:end_date].is_a?(String) + @extra[:category_id] = @extra[:category_id].to_i if @extra[:category_id] + r = Report.find(@extra[:name], @extra) + r.data.map do |row| + [row[:x].to_s(:db), row[:y].to_s(:db)] + end + end + def get_header case @entity From 41025be8f72d9fcbf644c7edc6126b5f64d4f9d7 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Tue, 15 Sep 2015 16:52:46 -0400 Subject: [PATCH 124/157] add download icon --- app/assets/javascripts/admin/templates/reports.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/admin/templates/reports.hbs b/app/assets/javascripts/admin/templates/reports.hbs index 5e1b406ea6..718a61a2c1 100644 --- a/app/assets/javascripts/admin/templates/reports.hbs +++ b/app/assets/javascripts/admin/templates/reports.hbs @@ -5,7 +5,7 @@ {{i18n 'admin.dashboard.reports.end_date'}} {{input type="date" value=endDate}} {{combo-box valueAttribute="value" content=categoryOptions value=categoryId}} {{d-button action="refreshReport" class="btn-primary" label="admin.dashboard.reports.refresh_report" icon="refresh"}} - {{d-button action="exportCsv" label="admin.export_csv.button_text"}} + {{d-button action="exportCsv" label="admin.export_csv.button_text" icon="download"}}
        From 3c28eeaae3eff85091542bbf1828b3b79e7c0ee9 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 15 Sep 2015 16:54:38 -0400 Subject: [PATCH 125/157] FIX: Don't ESLINT addons --- .eslintignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.eslintignore b/.eslintignore index 1ecda00738..528b8358a1 100644 --- a/.eslintignore +++ b/.eslintignore @@ -7,6 +7,7 @@ app/assets/javascripts/vendor.js app/assets/javascripts/locales/i18n.js app/assets/javascripts/defer/html-sanitizer-bundle.js app/assets/javascripts/discourse/lib/Markdown.Editor.js +app/assets/javascripts/ember-addons jsapp/lib/Markdown.Editor.js lib/javascripts/locale/ lib/javascripts/messageformat.js From 24991c40165866c5be7d43108ac442de585fefd8 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 15 Sep 2015 16:57:57 -0400 Subject: [PATCH 126/157] FIX: ESLint failure --- app/assets/javascripts/admin/controllers/admin-reports.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/admin/controllers/admin-reports.js.es6 b/app/assets/javascripts/admin/controllers/admin-reports.js.es6 index d83a031c6b..d11e67305a 100644 --- a/app/assets/javascripts/admin/controllers/admin-reports.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-reports.js.es6 @@ -40,7 +40,7 @@ export default Ember.Controller.extend({ name: this.get("model.type"), start_date: this.get('startDate'), end_date: this.get('endDate'), - category_id: this.get('categoryId') == 'all' ? undefined : this.get('categoryId') + category_id: this.get('categoryId') === 'all' ? undefined : this.get('categoryId') }).then(outputExportResult); } } From 2fa801c0142f3a16aad7beea6dd19ef4aa323f7a Mon Sep 17 00:00:00 2001 From: Kane York Date: Tue, 15 Sep 2015 14:06:20 -0700 Subject: [PATCH 127/157] Do fix positions upon opening dialog --- .../discourse/controllers/reorder-categories.js.es6 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 b/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 index 0debb1e709..38ce60f4b1 100644 --- a/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 +++ b/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 @@ -1,13 +1,18 @@ import ModalFunctionality from 'discourse/mixins/modal-functionality'; const BufferedProxy = window.BufferedProxy; // import BufferedProxy from 'ember-buffered-proxy/proxy'; import { popupAjaxError } from 'discourse/lib/ajax-error'; -import computed from "ember-addons/ember-computed-decorators"; +import { on, default as computed } from "ember-addons/ember-computed-decorators"; import Ember from 'ember'; const SortableArrayProxy = Ember.ArrayProxy.extend(Ember.SortableMixin); export default Ember.Controller.extend(ModalFunctionality, Ember.Evented, { + @on('init') + _fixOrder() { + this.send('fixIndices'); + }, + @computed("site.categories") categoriesBuffered(categories) { const bufProxy = Ember.ObjectProxy.extend(BufferedProxy); From 975edceff497ee219ac43e4a980e5e53e417ac7f Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 15 Sep 2015 17:08:50 -0400 Subject: [PATCH 128/157] Add semi colon linting to Javascript --- .eslintrc | 5 +---- .../admin/controllers/admin-dashboard.js.es6 | 2 +- .../modals/admin-edit-badge-groupings.js.es6 | 4 ++-- app/assets/javascripts/discourse.js | 14 +++++++------- .../discourse/components/category-drop.js.es6 | 2 +- .../discourse/components/group-selector.js.es6 | 2 +- .../discourse/components/search-menu.js.es6 | 2 +- .../discourse/components/track-selected.js.es6 | 2 +- .../discourse/controllers/full-page-search.js.es6 | 6 +++--- .../controllers/reorder-categories.js.es6 | 2 +- .../javascripts/discourse/lib/censored-words.js | 2 +- .../discourse/lib/key-value-store.js.es6 | 2 +- .../javascripts/discourse/lib/screen-track.js.es6 | 2 +- app/assets/javascripts/discourse/lib/search.js.es6 | 2 +- app/assets/javascripts/discourse/lib/utilities.js | 2 +- .../discourse/mixins/stale-local-storage.js.es6 | 6 +++--- .../javascripts/discourse/models/nav-item.js.es6 | 2 +- .../discourse/routes/build-category-route.js.es6 | 2 +- .../discourse/routes/full-page-search.js.es6 | 2 +- .../javascripts/discourse/routes/user.js.es6 | 4 ++-- .../javascripts/discourse/views/composer.js.es6 | 2 +- .../discourse/views/full-page-search.js.es6 | 2 +- test/javascripts/components/d-link-test.js.es6 | 2 +- test/javascripts/components/menu-panel-test.js.es6 | 4 ++-- 24 files changed, 37 insertions(+), 40 deletions(-) diff --git a/.eslintrc b/.eslintrc index 149d842488..d2a13ae262 100644 --- a/.eslintrc +++ b/.eslintrc @@ -90,10 +90,7 @@ "no-undef": 2, "no-unused-vars": 2, "no-with": 2, - "semi": [ - 0, - "never" - ], + "semi": 2, "strict": 0, "valid-typeof": 2, "wrap-iife": [ diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6 index ab304adc7a..c712a8ac5a 100644 --- a/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6 @@ -13,7 +13,7 @@ export default Ember.Controller.extend({ }.property('problems'), thereWereProblems: function() { - if(!Discourse.User.currentProp('admin')) { return false } + if(!Discourse.User.currentProp('admin')) { return false; } if( this.get('foundProblems') ) { this.set('hadProblems', true); return true; diff --git a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6 index 2034d10368..74c4f79e6c 100644 --- a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6 +++ b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6 @@ -56,8 +56,8 @@ export default Ember.Controller.extend({ saveAll: function(){ var self = this; var items = this.get('workingCopy'); - var groupIds = items.map(function(i){return i.get("id") || -1}); - var names = items.map(function(i){return i.get("name")}); + var groupIds = items.map(function(i){return i.get("id") || -1;}); + var names = items.map(function(i){return i.get("name");}); Discourse.ajax('/admin/badges/badge_groupings',{ data: {ids: groupIds, names: names}, diff --git a/app/assets/javascripts/discourse.js b/app/assets/javascripts/discourse.js index 57165d9d26..ebe4da3ee9 100644 --- a/app/assets/javascripts/discourse.js +++ b/app/assets/javascripts/discourse.js @@ -152,10 +152,10 @@ function proxyDep(propName, moduleFunc, msg) { }); } -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"); +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"); diff --git a/app/assets/javascripts/discourse/components/category-drop.js.es6 b/app/assets/javascripts/discourse/components/category-drop.js.es6 index 696991853c..b824117955 100644 --- a/app/assets/javascripts/discourse/components/category-drop.js.es6 +++ b/app/assets/javascripts/discourse/components/category-drop.js.es6 @@ -47,7 +47,7 @@ export default Ember.Component.extend({ if (color) { var style = ""; - if (color) { style += "background-color: #" + color + ";" } + if (color) { style += "background-color: #" + color + ";"; } return style.htmlSafe(); } } diff --git a/app/assets/javascripts/discourse/components/group-selector.js.es6 b/app/assets/javascripts/discourse/components/group-selector.js.es6 index e88505ca9f..dc23f0f1e4 100644 --- a/app/assets/javascripts/discourse/components/group-selector.js.es6 +++ b/app/assets/javascripts/discourse/components/group-selector.js.es6 @@ -25,7 +25,7 @@ export default Ember.Component.extend({ } return groups.filter(function(group){ - return !selectedGroups.any(function(s){return s === group.name}); + return !selectedGroups.any(function(s){return s === group.name;}); }); }); }, diff --git a/app/assets/javascripts/discourse/components/search-menu.js.es6 b/app/assets/javascripts/discourse/components/search-menu.js.es6 index 4135252807..be80d20a26 100644 --- a/app/assets/javascripts/discourse/components/search-menu.js.es6 +++ b/app/assets/javascripts/discourse/components/search-menu.js.es6 @@ -61,7 +61,7 @@ export default Ember.Component.extend({ @observes('searchService.term', 'typeFilter') newSearchNeeded() { this.set('noResults', false); - const term = this.get('searchService.term') + const term = this.get('searchService.term'); if (isValidSearchTerm(term)) { this.set('loading', true); Ember.run.debounce(this, 'searchTerm', term, this.get('typeFilter'), 400); diff --git a/app/assets/javascripts/discourse/components/track-selected.js.es6 b/app/assets/javascripts/discourse/components/track-selected.js.es6 index ded975509c..20f05bef6f 100644 --- a/app/assets/javascripts/discourse/components/track-selected.js.es6 +++ b/app/assets/javascripts/discourse/components/track-selected.js.es6 @@ -11,4 +11,4 @@ export default Ember.Component.extend({ list.removeObject(id); } }.observes('selected') -}) +}); diff --git a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 index f4fb1e787b..d5ba0ad2fb 100644 --- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 +++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 @@ -24,7 +24,7 @@ export default Ember.Controller.extend({ return (!skip && context) || skip === "false"; }, set(val) { - this.set('skip_context', val ? "false" : "true" ) + this.set('skip_context', val ? "false" : "true" ); } }, @@ -100,7 +100,7 @@ export default Ember.Controller.extend({ const model = translateResults(results) || {}; router.transientCache('lastSearch', { searchKey, model }, 5); this.set("model", model); - }).finally(() => {this._searching = false}); + }).finally(() => this._searching = false); }, actions: { @@ -116,7 +116,7 @@ export default Ember.Controller.extend({ }, clearAll() { - this.get('selected').clear() + this.get('selected').clear(); $('.fps-result input[type=checkbox]').prop('checked', false); }, diff --git a/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 b/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 index 0debb1e709..59d9e197a4 100644 --- a/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 +++ b/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 @@ -34,7 +34,7 @@ export default Ember.Controller.extend(ModalFunctionality, Ember.Evented, { showApplyAll: function() { let anyChanged = false; - this.get('categoriesBuffered').forEach(bc => { anyChanged = anyChanged || bc.get('hasBufferedChanges') }); + this.get('categoriesBuffered').forEach(bc => { anyChanged = anyChanged || bc.get('hasBufferedChanges'); }); return anyChanged; }.property('categoriesBuffered.@each.hasBufferedChanges'), diff --git a/app/assets/javascripts/discourse/lib/censored-words.js b/app/assets/javascripts/discourse/lib/censored-words.js index 840c3093b0..246bc2a0b0 100644 --- a/app/assets/javascripts/discourse/lib/censored-words.js +++ b/app/assets/javascripts/discourse/lib/censored-words.js @@ -22,4 +22,4 @@ Discourse.CensoredWords = { } return text; } -} +}; diff --git a/app/assets/javascripts/discourse/lib/key-value-store.js.es6 b/app/assets/javascripts/discourse/lib/key-value-store.js.es6 index 243146833e..80b99327d1 100644 --- a/app/assets/javascripts/discourse/lib/key-value-store.js.es6 +++ b/app/assets/javascripts/discourse/lib/key-value-store.js.es6 @@ -14,7 +14,7 @@ try { const KeyValueStore = function(ctx) { this.context = ctx; -} +}; KeyValueStore.prototype = { abandonLocal() { diff --git a/app/assets/javascripts/discourse/lib/screen-track.js.es6 b/app/assets/javascripts/discourse/lib/screen-track.js.es6 index 4bac0e5217..975d835b97 100644 --- a/app/assets/javascripts/discourse/lib/screen-track.js.es6 +++ b/app/assets/javascripts/discourse/lib/screen-track.js.es6 @@ -30,7 +30,7 @@ const ScreenTrack = Ember.Object.extend({ self.tick(); }, 1000)); - $(window).on('scroll.screentrack', function(){self.scrolled()}); + $(window).on('scroll.screentrack', function(){self.scrolled();}); } this.set('topicId', topicId); diff --git a/app/assets/javascripts/discourse/lib/search.js.es6 b/app/assets/javascripts/discourse/lib/search.js.es6 index 9d7bec2d67..4b4c083d61 100644 --- a/app/assets/javascripts/discourse/lib/search.js.es6 +++ b/app/assets/javascripts/discourse/lib/search.js.es6 @@ -103,7 +103,7 @@ const searchContextDescription = function(type, name){ const getSearchKey = function(args){ return args.q + "|" + ((args.searchContext && args.searchContext.type) || "") + "|" + - ((args.searchContext && args.searchContext.id) || "") + ((args.searchContext && args.searchContext.id) || ""); }; const isValidSearchTerm = function(searchTerm) { diff --git a/app/assets/javascripts/discourse/lib/utilities.js b/app/assets/javascripts/discourse/lib/utilities.js index 20d9c53f5e..672c752373 100644 --- a/app/assets/javascripts/discourse/lib/utilities.js +++ b/app/assets/javascripts/discourse/lib/utilities.js @@ -99,7 +99,7 @@ Discourse.Utilities = { div.innerHTML = html; var $div = $(div); // Find all emojis and replace with its title attribute. - $div.find('img.emoji').replaceWith(function() { return this.title }); + $div.find('img.emoji').replaceWith(function() { return this.title; }); $('.clicks', $div).remove(); var text = div.textContent || div.innerText || ""; diff --git a/app/assets/javascripts/discourse/mixins/stale-local-storage.js.es6 b/app/assets/javascripts/discourse/mixins/stale-local-storage.js.es6 index 07dcd548a5..19d8495162 100644 --- a/app/assets/javascripts/discourse/mixins/stale-local-storage.js.es6 +++ b/app/assets/javascripts/discourse/mixins/stale-local-storage.js.es6 @@ -10,7 +10,7 @@ export default { findStale(store, type, findArgs, opts) { const staleResult = new StaleResult(); - const key = (opts && opts.storageKey) || this.storageKey(type, findArgs) + const key = (opts && opts.storageKey) || this.storageKey(type, findArgs); try { const stored = this.keyValueStore.getItem(key); if (stored) { @@ -24,11 +24,11 @@ export default { }, find(store, type, findArgs, opts) { - const key = (opts && opts.storageKey) || this.storageKey(type, findArgs) + const key = (opts && opts.storageKey) || this.storageKey(type, findArgs); return this._super(store, type, findArgs).then((results) => { this.keyValueStore.setItem(key, JSON.stringify(results)); return results; }); } -} +}; diff --git a/app/assets/javascripts/discourse/models/nav-item.js.es6 b/app/assets/javascripts/discourse/models/nav-item.js.es6 index ee81b705ec..64cb9fea43 100644 --- a/app/assets/javascripts/discourse/models/nav-item.js.es6 +++ b/app/assets/javascripts/discourse/models/nav-item.js.es6 @@ -104,7 +104,7 @@ NavItem.reopenClass({ buildList(category, args) { args = args || {}; - if (category) { args.category = category } + if (category) { args.category = category; } let items = Discourse.SiteSettings.top_menu.split("|"); diff --git a/app/assets/javascripts/discourse/routes/build-category-route.js.es6 b/app/assets/javascripts/discourse/routes/build-category-route.js.es6 index 58f945ac96..e3d2e89a8b 100644 --- a/app/assets/javascripts/discourse/routes/build-category-route.js.es6 +++ b/app/assets/javascripts/discourse/routes/build-category-route.js.es6 @@ -103,4 +103,4 @@ export default (filter, params) => { } } }); -} +}; diff --git a/app/assets/javascripts/discourse/routes/full-page-search.js.es6 b/app/assets/javascripts/discourse/routes/full-page-search.js.es6 index 3464250a74..9c95de0aac 100644 --- a/app/assets/javascripts/discourse/routes/full-page-search.js.es6 +++ b/app/assets/javascripts/discourse/routes/full-page-search.js.es6 @@ -11,7 +11,7 @@ export default Discourse.Route.extend({ args.search_context = { type: params.context, id: params.context_id - } + }; } const searchKey = getSearchKey(args); diff --git a/app/assets/javascripts/discourse/routes/user.js.es6 b/app/assets/javascripts/discourse/routes/user.js.es6 index c0d4507ad5..7fb8fffe6f 100644 --- a/app/assets/javascripts/discourse/routes/user.js.es6 +++ b/app/assets/javascripts/discourse/routes/user.js.es6 @@ -61,7 +61,7 @@ export default Discourse.Route.extend({ setupController(controller, user) { controller.set('model', user); - this.searchService.set('searchContext', user.get('searchContext')) + this.searchService.set('searchContext', user.get('searchContext')); }, activate() { @@ -77,7 +77,7 @@ export default Discourse.Route.extend({ this.messageBus.unsubscribe("/users/" + this.modelFor('user').get('username_lower')); // Remove the search context - this.searchService.set('searchContext', null) + this.searchService.set('searchContext', null); } }); diff --git a/app/assets/javascripts/discourse/views/composer.js.es6 b/app/assets/javascripts/discourse/views/composer.js.es6 index 076c02ab98..093af41741 100644 --- a/app/assets/javascripts/discourse/views/composer.js.es6 +++ b/app/assets/javascripts/discourse/views/composer.js.es6 @@ -272,7 +272,7 @@ const ComposerView = Ember.View.extend(Ember.Evented, { position: "absolute", left: toolbarPos.left + pos.left, top: toolbarPos.top + pos.top, - } + }; controller.send('showOptions', location); } }]; diff --git a/app/assets/javascripts/discourse/views/full-page-search.js.es6 b/app/assets/javascripts/discourse/views/full-page-search.js.es6 index f0b71073ac..7a8aa550ea 100644 --- a/app/assets/javascripts/discourse/views/full-page-search.js.es6 +++ b/app/assets/javascripts/discourse/views/full-page-search.js.es6 @@ -1 +1 @@ -export default Ember.View.extend({}); +export default Ember.View.extend(); diff --git a/test/javascripts/components/d-link-test.js.es6 b/test/javascripts/components/d-link-test.js.es6 index d0b9692695..fc17333d30 100644 --- a/test/javascripts/components/d-link-test.js.es6 +++ b/test/javascripts/components/d-link-test.js.es6 @@ -56,6 +56,6 @@ componentTest('with an action', { assert.ok(true, 'it fired the action'); }); - click('a') + click('a'); } }); diff --git a/test/javascripts/components/menu-panel-test.js.es6 b/test/javascripts/components/menu-panel-test.js.es6 index 45607dc2b3..6c586eed7c 100644 --- a/test/javascripts/components/menu-panel-test.js.es6 +++ b/test/javascripts/components/menu-panel-test.js.es6 @@ -24,7 +24,7 @@ componentTest('as a dropdown', { assert.ok(!exists(".menu-panel.hidden"), "toggling visible makes it appear"); }); - click('#outside-area') + click('#outside-area'); andThen(() => { assert.ok(exists(".menu-panel.hidden"), "clicking the body hides the menu"); assert.equal(this.get('panelVisible'), false, 'it updates the bound variable'); @@ -54,7 +54,7 @@ componentTest('as a slide-in', { assert.ok(!exists(".menu-panel.hidden"), "toggling visible makes it appear"); }); - click('#outside-area') + click('#outside-area'); andThen(() => { assert.ok(exists(".menu-panel.hidden"), "clicking the body hides the menu"); assert.equal(this.get('panelVisible'), false, 'it updates the bound variable'); From d4db1949a799528ef8b6aac9a5e0a141d612caaf Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Tue, 15 Sep 2015 14:22:28 -0700 Subject: [PATCH 129/157] fix search help on mobile --- app/assets/stylesheets/mobile/modal.scss | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss index 7114c9b2e1..6431e56b99 100644 --- a/app/assets/stylesheets/mobile/modal.scss +++ b/app/assets/stylesheets/mobile/modal.scss @@ -172,14 +172,27 @@ } #search-help { - max-width: 300px; + max-width: 98%; } -#search-help h2 { - margin: 0; - font-size: 0.857em; +// this makes the table behave like a flat list +#search-help td { + display: block; + padding-left: 10px; +} + +#search-help h3 { + display: none; } #search-help p { - margin: 5px; + margin: 10px; +} + +#search-help .btn-primary { + float: none; +} + +#google-search form { + padding-left: 10px; } From a47a71dd82df9b01aee92143dcec678a510c98d6 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Tue, 15 Sep 2015 14:28:31 -0700 Subject: [PATCH 130/157] fix cancel button alignment on mobile editor --- app/assets/stylesheets/mobile/compose.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/assets/stylesheets/mobile/compose.scss b/app/assets/stylesheets/mobile/compose.scss index cc0c26f0f1..5ee2889cb5 100644 --- a/app/assets/stylesheets/mobile/compose.scss +++ b/app/assets/stylesheets/mobile/compose.scss @@ -63,8 +63,7 @@ input { } a.cancel { padding-left: 7px; - float: left; - margin-top: 6px; + line-height: 30px; } .control-row { margin: 0 0 0 5px; From 74da57f77f5a4dcd811a9e35a8d304a91fb97e1d Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Tue, 15 Sep 2015 14:37:14 -0700 Subject: [PATCH 131/157] minor category page style tweaks for mobile --- app/assets/stylesheets/mobile/topic-list.scss | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss index f3f6c21eeb..a055b1a291 100644 --- a/app/assets/stylesheets/mobile/topic-list.scss +++ b/app/assets/stylesheets/mobile/topic-list.scss @@ -131,10 +131,6 @@ box-sizing: inherit; } - .main-link { - width: 80%; - } - .posts { width: 10%; } @@ -193,7 +189,7 @@ tr.category-topic-link { h3 { display: inline-block; font-size: 1.286em; - margin: 10px 0 0 5px; + margin: 0 0 0 10px; i { margin-right: 5px; } From a60a251c932a61b0686537aba433c5c701ebe32c Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Tue, 15 Sep 2015 15:04:28 -0700 Subject: [PATCH 132/157] we actually support inline replies, mostly --- config/locales/server.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 4c03b835c6..1ccc246652 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1732,9 +1732,9 @@ en: text_body_template: | We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work. - We couldn't find any content in your email. Make sure your reply is at the top of the email -- we can't process inline replies. + We couldn't find any reply content in your email. - If you're getting this and you _did_ include content, try again with HTML content included in your email (not just plain text only). + If you're getting this and you _did_ include a reply, try again with simpler formatting. email_reject_parsing: subject_template: "[%{site_name}] Email issue -- Content unrecognized" From 0a3388d19f07f655c9cbdd743ece070e0c0a0b59 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Tue, 15 Sep 2015 15:22:22 -0700 Subject: [PATCH 133/157] on mobile submit-panel must have width --- app/assets/stylesheets/mobile/compose.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/mobile/compose.scss b/app/assets/stylesheets/mobile/compose.scss index 5ee2889cb5..af5f009df1 100644 --- a/app/assets/stylesheets/mobile/compose.scss +++ b/app/assets/stylesheets/mobile/compose.scss @@ -183,6 +183,7 @@ input { bottom: 35px; } .submit-panel { + width: 50%; position: absolute; display: block; bottom: 2px; From a14d7f16c85f1865d8d2d4587a6218852c3d64d3 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Tue, 15 Sep 2015 15:39:59 -0700 Subject: [PATCH 134/157] fix reply glyph color on mobile editor --- app/assets/stylesheets/mobile/compose.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/assets/stylesheets/mobile/compose.scss b/app/assets/stylesheets/mobile/compose.scss index af5f009df1..987a34cab0 100644 --- a/app/assets/stylesheets/mobile/compose.scss +++ b/app/assets/stylesheets/mobile/compose.scss @@ -71,6 +71,9 @@ input { overflow: hidden; max-width: 92%; white-space: nowrap; + i { + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); + } } } .saving-text { From a7b34cd16b7c23f541fa56ab82c7b58024502e4a Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 15 Sep 2015 18:47:27 +1000 Subject: [PATCH 135/157] rename to badge, better more consistent name --- lib/search.rb | 2 +- spec/components/search_spec.rb | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/search.rb b/lib/search.rb index 2dccf45145..3e27befbec 100644 --- a/lib/search.rb +++ b/lib/search.rb @@ -185,7 +185,7 @@ class Search posts.where("posts.post_number = 1") end - advanced_filter(/with_badge:(.*)/) do |posts,match| + advanced_filter(/badge:(.*)/) do |posts,match| badge_id = Badge.where('name ilike ? OR id = ?', match, match.to_i).pluck(:id).first if badge_id posts.where('posts.user_id IN (SELECT ub.user_id FROM user_badges ub WHERE ub.badge_id = ?)', badge_id) diff --git a/spec/components/search_spec.rb b/spec/components/search_spec.rb index 219ca398ac..462b119112 100644 --- a/spec/components/search_spec.rb +++ b/spec/components/search_spec.rb @@ -402,7 +402,7 @@ describe Search do expect(Search.execute('group:"like a brick"').posts.length).to eq(0) end - it 'supports with_badge' do + it 'supports badge' do topic = Fabricate(:topic, created_at: 3.months.ago) post = Fabricate(:post, raw: 'hi this is a test 123 123', topic: topic) @@ -410,7 +410,8 @@ describe Search do badge = Badge.create!(name: "Like a Boss", badge_type_id: 1) UserBadge.create!(user_id: post.user_id, badge_id: badge.id, granted_at: 1.minute.ago, granted_by_id: -1) - expect(Search.execute('with_badge:"like a boss"').posts.length).to eq(1) + expect(Search.execute('badge:"like a boss"').posts.length).to eq(1) + expect(Search.execute('badge:"test"').posts.length).to eq(0) end it 'can search numbers correctly, and match exact phrases' do From 75e8fa3ee03bda30a3908966132b561811d30563 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 16 Sep 2015 08:25:53 +1000 Subject: [PATCH 136/157] document new search predicates --- config/locales/server.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 1ccc246652..b241665fcc 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -2468,9 +2468,9 @@ en:

        Options

        PositionCategory{{i18n "categories.reorder.position"}}{{i18n "categories.category"}}
        - + - + From 59c12ce35bbc15278c3a4ffc5b5876bdd44800a1 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 16 Sep 2015 08:51:11 +1000 Subject: [PATCH 137/157] Stop showing wrench for non admins on topics --- .../discourse/components/show-popup-button.js.es6 | 3 +++ app/assets/javascripts/discourse/templates/topic.hbs | 1 - .../javascripts/discourse/views/topic-footer-buttons.js.es6 | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/components/show-popup-button.js.es6 b/app/assets/javascripts/discourse/components/show-popup-button.js.es6 index 0f1a40734f..0e2447e1df 100644 --- a/app/assets/javascripts/discourse/components/show-popup-button.js.es6 +++ b/app/assets/javascripts/discourse/components/show-popup-button.js.es6 @@ -11,6 +11,9 @@ export default DButton.extend({ top: position.top }; + // TODO views/topic-footer-buttons is instansiating this via attachViewWithArgs + // attachViewWithArgs + this.appEvents = this.appEvents || this.container.lookup('app-events:main'); this.appEvents.trigger("popup-menu:open", loc); this.sendAction("action"); } diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs index bb9d854540..da8cb5b85b 100644 --- a/app/assets/javascripts/discourse/templates/topic.hbs +++ b/app/assets/javascripts/discourse/templates/topic.hbs @@ -86,7 +86,6 @@ {{#if loadedAllPosts}} {{view "topic-closing" topic=model}} - {{show-popup-button action="showTopicAdminMenu" title="topic_admin_menu" icon="wrench" position="absolute"}} {{view "topic-footer-buttons" topic=model}} {{#if model.pending_posts_count}} diff --git a/app/assets/javascripts/discourse/views/topic-footer-buttons.js.es6 b/app/assets/javascripts/discourse/views/topic-footer-buttons.js.es6 index 25c9974f79..2467d9a931 100644 --- a/app/assets/javascripts/discourse/views/topic-footer-buttons.js.es6 +++ b/app/assets/javascripts/discourse/views/topic-footer-buttons.js.es6 @@ -7,6 +7,7 @@ import ReplyButton from 'discourse/views/reply-button'; import PinnedButton from 'discourse/components/pinned-button'; import TopicNotificationsButton from 'discourse/components/topic-notifications-button'; import DiscourseContainerView from 'discourse/views/container'; +import ShowPopupButton from 'discourse/components/show-popup-button'; const MainPanel = Discourse.ContainerView.extend({ elementId: 'topic-footer-main-buttons', @@ -15,6 +16,11 @@ const MainPanel = Discourse.ContainerView.extend({ init() { this._super(); + if (Discourse.User.currentProp('staff')) { + const viewArgs = {action: 'showTopicAdminMenu', title: 'topic_admin_menu', icon: 'wrench', position: 'absolute'}; + this.attachViewWithArgs(viewArgs, ShowPopupButton); + } + const topic = this.get('topic'); if (!topic.get('isPrivateMessage')) { // We hide some controls from private messages From c9398eaef9adddc8f8ca16fa5fae5ab286a9edad Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 16 Sep 2015 08:55:05 +1000 Subject: [PATCH 138/157] fix comment --- .../discourse/components/show-popup-button.js.es6 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/components/show-popup-button.js.es6 b/app/assets/javascripts/discourse/components/show-popup-button.js.es6 index 0e2447e1df..e082f87d15 100644 --- a/app/assets/javascripts/discourse/components/show-popup-button.js.es6 +++ b/app/assets/javascripts/discourse/components/show-popup-button.js.es6 @@ -11,8 +11,10 @@ export default DButton.extend({ top: position.top }; - // TODO views/topic-footer-buttons is instansiating this via attachViewWithArgs - // attachViewWithArgs + // TODO views/topic-footer-buttons is instantiating this via attachViewWithArgs + // attachViewWithArgs does not set this.appEvents, it is undefined + // this is a workaround but a proper fix probably depends on either deprecation + // of attachViewClass et.el or correction of the methods to hydrate the depndencies this.appEvents = this.appEvents || this.container.lookup('app-events:main'); this.appEvents.trigger("popup-menu:open", loc); this.sendAction("action"); From ded23cc9c54e1d543c2bcbdc0f64a881fd874ab4 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 16 Sep 2015 09:02:53 +1000 Subject: [PATCH 139/157] FIX: don't auto select context on mobile --- app/assets/javascripts/discourse/controllers/header.js.es6 | 2 +- app/assets/javascripts/discourse/routes/full-page-search.js.es6 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/header.js.es6 b/app/assets/javascripts/discourse/controllers/header.js.es6 index 0460830bce..42c8fc8516 100644 --- a/app/assets/javascripts/discourse/controllers/header.js.es6 +++ b/app/assets/javascripts/discourse/controllers/header.js.es6 @@ -33,7 +33,7 @@ const HeaderController = Ember.Controller.extend({ var params = ""; if (context) { - params = `?context=${context.type}&context_id=${context.id}`; + params = `?context=${context.type}&context_id=${context.id}&skip_context=true`; } DiscourseURL.routeTo('/search' + params); diff --git a/app/assets/javascripts/discourse/routes/full-page-search.js.es6 b/app/assets/javascripts/discourse/routes/full-page-search.js.es6 index 9c95de0aac..3cda47e9a7 100644 --- a/app/assets/javascripts/discourse/routes/full-page-search.js.es6 +++ b/app/assets/javascripts/discourse/routes/full-page-search.js.es6 @@ -1,7 +1,7 @@ import { translateResults, getSearchKey, isValidSearchTerm } from "discourse/lib/search"; export default Discourse.Route.extend({ - queryParams: { q: {}, context_id: {}, context: {} }, + queryParams: { q: {}, context_id: {}, context: {}, skip_context: {} }, model(params) { const router = Discourse.__container__.lookup('router:main'); From ca97b325fd313d5ccc4dda2584c85efdbcdad892 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 16 Sep 2015 09:46:57 +1000 Subject: [PATCH 140/157] FIX: moderators should not have a link to site settings --- .../discourse/templates/components/hamburger-menu.hbs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs b/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs index fe7050955b..0deea8e1a7 100644 --- a/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs +++ b/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs @@ -32,7 +32,9 @@ {{/d-link}} {{/if}} -
      • {{d-link route="adminSiteSettings" icon="gear" label="admin.site_settings.title"}}
        • + {{#if currentUser.admin}} +
      • {{d-link route="adminSiteSettings" icon="gear" label="admin.site_settings.title"}}
        • + {{/if}} {{plugin-outlet "hamburger-admin"}} {{/menu-links}} From 0b2fa2b0afd5ff63ac06d834a80b859ee91adc12 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 16 Sep 2015 11:37:26 +1000 Subject: [PATCH 141/157] FIX: admin menu rendered at incorrect spot make sure we don't unsubscribe all events when menu is destroyed --- app/assets/javascripts/discourse/components/popup-menu.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/components/popup-menu.js.es6 b/app/assets/javascripts/discourse/components/popup-menu.js.es6 index 1f5de232ae..a40096153f 100644 --- a/app/assets/javascripts/discourse/components/popup-menu.js.es6 +++ b/app/assets/javascripts/discourse/components/popup-menu.js.es6 @@ -18,7 +18,7 @@ export default Ember.Component.extend({ @on('willDestroyElement') _cleanup() { $('html').off(`mouseup.popup-menu-${this.get('elementId')}`); - this.appEvents.off("popup-menu:open"); + this.appEvents.off("popup-menu:open", this, "_changeLocation"); }, _changeLocation(location) { From b2ef9a02bf7dc517b9da491551ad489bbfa74941 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 16 Sep 2015 11:37:38 +1000 Subject: [PATCH 142/157] Less words, correct copy --- config/locales/client.en.yml | 2 +- config/locales/server.en.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 0f096926ab..7805cf85c4 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -811,7 +811,7 @@ en: composer: emoji: "Emoji :smile:" - options: "Composer Options" + options: "Options" whisper: "whisper" add_warning: "This is an official warning." diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index b241665fcc..d4859e8290 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -880,7 +880,7 @@ en: email_token_grace_period_hours: "Forgot password / activate account tokens are still valid for a grace period of (n) hours after being redeemed." enable_badges: "Enable the badge system" - enable_whispers: "Allow users to whisper to moderators" + enable_whispers: "Allow users to whisper to staff" allow_index_in_robots_txt: "Specify in robots.txt that this site is allowed to be indexed by web search engines." email_domains_blacklist: "A pipe-delimited list of email domains that users are not allowed to register accounts with. Example: mailinator.com|trashmail.net" From 8cb9c348f6850785b4ba4021c2dd66575f34ccfa Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 16 Sep 2015 12:27:05 +1000 Subject: [PATCH 143/157] live posts counts is only available to logged in users --- app/controllers/about_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/about_controller.rb b/app/controllers/about_controller.rb index cc65c36e89..ccd6cdae72 100644 --- a/app/controllers/about_controller.rb +++ b/app/controllers/about_controller.rb @@ -2,6 +2,7 @@ require_dependency 'rate_limiter' class AboutController < ApplicationController skip_before_filter :check_xhr, only: [:show] + before_filter :ensure_logged_in, only: [:live_post_counts] def index @about = About.new From 922c09784b45cf13e3a06b65bd3a79b344df4a44 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 16 Sep 2015 12:33:11 +1000 Subject: [PATCH 144/157] shorten so fits better in UI --- config/locales/client.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 7805cf85c4..b8a3bcd00d 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -255,7 +255,7 @@ en: failed: "Failed" switch_to_anon: "Anonymous Mode" - switch_from_anon: "Exit Anonymous Mode" + switch_from_anon: "Exit Anonymous" banner: close: "Dismiss this banner." From 7db4ddcb6638a15231ff3113db95619d986022e4 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 16 Sep 2015 12:50:42 +1000 Subject: [PATCH 145/157] correct disappering header on mobile compose --- app/assets/javascripts/discourse/lib/safari-hacks.js.es6 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 index 647f9a6e06..e4dde154bb 100644 --- a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 +++ b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 @@ -15,6 +15,7 @@ function positioningWorkaround($fixedElement) { var done = false; var originalScrollTop = 0; + var wasDocked; var blurredNow = function(evt) { if (!done && _.include($(document.activeElement).parents(), fixedElement)) { @@ -33,6 +34,10 @@ function positioningWorkaround($fixedElement) { fixedElement.style.height = ''; $(window).scrollTop(originalScrollTop); + if (wasDocked) { + $('body').addClass('docked'); + } + if (evt) { evt.target.removeEventListener('blur', blurred); } @@ -58,6 +63,8 @@ function positioningWorkaround($fixedElement) { originalScrollTop = $(window).scrollTop(); + wasDocked = $('body').hasClass('docked'); + // take care of body $('#main-outlet').hide(); $('header').hide(); From 31d801ce2ce29f8e2643c3d3c63d62dcaebdc288 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 16 Sep 2015 13:16:08 +1000 Subject: [PATCH 146/157] don't blur on autocomplete click --- app/assets/javascripts/discourse/lib/safari-hacks.js.es6 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 index e4dde154bb..cc93ebdd68 100644 --- a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 +++ b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 @@ -93,7 +93,11 @@ function positioningWorkaround($fixedElement) { } const checkForInputs = _.debounce(function(){ - $fixedElement.find('button,a').each(function(){ + $fixedElement.find('button,a:not(.autocomplete)').each(function(idx, elem){ + if ($(elem).parents('.autocomplete').length > 0) { + return; + } + attachTouchStart(this, function(evt){ done = true; $(document.activeElement).blur(); From 77895473e57f66da8807f043488abd12482cd13f Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 16 Sep 2015 14:40:44 +1000 Subject: [PATCH 147/157] don't select text on focus --- .../javascripts/discourse/components/search-text-field.js.es6 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/assets/javascripts/discourse/components/search-text-field.js.es6 b/app/assets/javascripts/discourse/components/search-text-field.js.es6 index 0b7b3d0e36..88ae59a974 100644 --- a/app/assets/javascripts/discourse/components/search-text-field.js.es6 +++ b/app/assets/javascripts/discourse/components/search-text-field.js.es6 @@ -8,10 +8,6 @@ export default TextField.extend({ return searchContextEnabled ? "" : I18n.t('search.title'); }, - focusIn() { - Em.run.later(() => this.$().select()); - }, - @on("didInsertElement") becomeFocused() { if (this.get('hasAutofocus')) this.$().focus(); From afdb15f99f005b164917d18bc13dfdbb0ea2c8a2 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 16 Sep 2015 15:02:57 +1000 Subject: [PATCH 148/157] fix search screen looks white --- .../discourse/components/search-text-field.js.es6 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/components/search-text-field.js.es6 b/app/assets/javascripts/discourse/components/search-text-field.js.es6 index 88ae59a974..a086a51f32 100644 --- a/app/assets/javascripts/discourse/components/search-text-field.js.es6 +++ b/app/assets/javascripts/discourse/components/search-text-field.js.es6 @@ -10,6 +10,10 @@ export default TextField.extend({ @on("didInsertElement") becomeFocused() { - if (this.get('hasAutofocus')) this.$().focus(); + if (!this.get('hasAutofocus')) { return; } + // iOS is crazy, without this we will not be + // at the top of the page + $(window).scrollTop(0); + this.$().focus(); } }); From 66ec6b6e17275f7f8fcb6e3750d4a0344075826b Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 16 Sep 2015 17:41:53 +1000 Subject: [PATCH 149/157] FIX: not counting new/unread on categories --- .../discourse/models/topic-tracking-state.js.es6 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6 b/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6 index 11c8d67feb..f77f242715 100644 --- a/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6 +++ b/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6 @@ -276,15 +276,17 @@ const TopicTrackingState = Discourse.Model.extend({ this.lookupCount("unread", category); } + let categoryId = category ? Em.get(category, "id") : null; let categoryName = category ? Em.get(category, "name") : null; + if (name === "new") { - return this.countNew(categoryName); + return this.countNew(categoryId); } else if (name === "unread") { - return this.countUnread(categoryName); + return this.countUnread(categoryId); } else { categoryName = name.split("/")[1]; if (categoryName) { - return this.countCategory(categoryName); + return this.countCategory(categoryId); } } }, From 468b04db861a9847a6b6eae18ad2915414700bee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Wed, 16 Sep 2015 11:58:06 +0200 Subject: [PATCH 150/157] FIX: force wrapping on the filename of lightboxed images --- app/assets/stylesheets/common/base/lightbox.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/common/base/lightbox.scss b/app/assets/stylesheets/common/base/lightbox.scss index 818c9b0084..61a93372f2 100644 --- a/app/assets/stylesheets/common/base/lightbox.scss +++ b/app/assets/stylesheets/common/base/lightbox.scss @@ -28,6 +28,10 @@ .filename { margin: 5px; + max-width: 100%; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; &:before { font-family: "FontAwesome"; content: "\F03E"; From e211bf7d0b116158442b7a3baa1369d21e49d327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Wed, 16 Sep 2015 12:18:48 +0200 Subject: [PATCH 151/157] change smoke test timeout to 15 seconds --- spec/phantom_js/smoke_test.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/spec/phantom_js/smoke_test.js b/spec/phantom_js/smoke_test.js index 969205dc43..94e6931020 100644 --- a/spec/phantom_js/smoke_test.js +++ b/spec/phantom_js/smoke_test.js @@ -9,7 +9,7 @@ if (system.args.length !== 2) { phantom.exit(1); } -var TIMEOUT = 10000; +var TIMEOUT = 15000; var page = require("webpage").create(); page.viewportSize = { @@ -22,8 +22,8 @@ page.viewportSize = { page.onInitialized = function() { page.evaluate(function() { localStorage["disableLocalStorage"] = true; - }) -} + }); +}; // page.onConsoleMessage = function(msg) { // console.log(msg); @@ -60,19 +60,19 @@ var actions = []; var test = function(desc, fn) { actions.push({ test: fn, desc: desc }); -} +}; var exec = function(desc, fn) { actions.push({ exec: fn, desc: desc }); -} +}; var execAsync = function(desc, delay, fn) { actions.push({ execAsync: fn, delay: delay, desc: desc }); -} +}; var upload = function(input, path) { actions.push({ upload: path, input: input }); -} +}; // var screenshot = function(filename) { // actions.push({ screenshot: filename }); From cc75890cd4dd2e2cfc25705227fc19c5a2976961 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Wed, 16 Sep 2015 13:01:08 +0200 Subject: [PATCH 152/157] UX: disable 'Hide results' button when poll is closed --- .../javascripts/discourse/views/post.js.es6 | 18 ++- .../javascripts/controllers/poll.js.es6 | 110 +++++++++--------- .../javascripts/discourse/templates/poll.hbs | 4 +- .../initializers/extend-for-poll.js.es6 | 20 ++-- .../poll/assets/javascripts/views/poll.js.es6 | 7 +- 5 files changed, 82 insertions(+), 77 deletions(-) diff --git a/app/assets/javascripts/discourse/views/post.js.es6 b/app/assets/javascripts/discourse/views/post.js.es6 index e2c6631775..d8ea6559a9 100644 --- a/app/assets/javascripts/discourse/views/post.js.es6 +++ b/app/assets/javascripts/discourse/views/post.js.es6 @@ -107,21 +107,21 @@ const PostView = Discourse.GroupedView.extend(Ember.Evented, { // If it's the same topic as ours, build the URL from the topic object if (topic && topic.get('id') === topicId) { - navLink = ""; + navLink = ``; } else { // Made up slug should be replaced with canonical URL - navLink = ""; + navLink = ``; } } else if (topic = this.get('controller.content')) { // assume the same topic - navLink = ""; + navLink = ``; } } // Only add the expand/contract control if it's not a full post let expandContract = ""; if (!$aside.data('full')) { - expandContract = ""; + expandContract = ``; $('.title', $aside).css('cursor', 'pointer'); } $('.quote-controls', $aside).html(expandContract + navLink); @@ -129,20 +129,18 @@ const PostView = Discourse.GroupedView.extend(Ember.Evented, { _toggleQuote($aside) { if (this.get('expanding')) { return; } + this.set('expanding', true); $aside.data('expanded', !$aside.data('expanded')); - const self = this, - finished = function() { - self.set('expanding', false); - }; + 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()); + $aside.data('original-contents', $blockQuote.html()); const originalText = $blockQuote.text().trim(); $blockQuote.html(I18n.t("loading")); @@ -154,7 +152,7 @@ const PostView = Discourse.GroupedView.extend(Ember.Evented, { const postId = parseInt($aside.data('post'), 10); topicId = parseInt(topicId, 10); - Discourse.ajax("/posts/by_number/" + topicId + "/" + postId).then(function (result) { + Discourse.ajax(`/posts/by_number/${topicId}/${postId}`).then(result => { const div = $("
        "); div.html(result.cooked); div.highlight(originalText, {caseSensitive: true, element: 'span', className: 'highlighted'}); diff --git a/plugins/poll/assets/javascripts/controllers/poll.js.es6 b/plugins/poll/assets/javascripts/controllers/poll.js.es6 index 4e386712fa..1a9c3943d3 100644 --- a/plugins/poll/assets/javascripts/controllers/poll.js.es6 +++ b/plugins/poll/assets/javascripts/controllers/poll.js.es6 @@ -1,3 +1,5 @@ +import computed from "ember-addons/ember-computed-decorators"; + export default Ember.Controller.extend({ isMultiple: Ember.computed.equal("poll.type", "multiple"), isNumber: Ember.computed.equal("poll.type", "number"), @@ -11,12 +13,10 @@ export default Ember.Controller.extend({ showingResults: Em.computed.or("isClosed", "post.topic.closed", "post.topic.archived", "showResults"), showResultsDisabled: Em.computed.equal("poll.voters", 0), - hideResultsDisabled: Em.computed.alias("isClosed"), - - poll: function() { - const poll = this.get("model"), - vote = this.get("vote"); + hideResultsDisabled: Em.computed.or("isClosed", "post.topic.closed", "post.topic.archived"), + @computed("model", "vote") + poll(poll, vote) { if (poll) { const options = _.map(poll.get("options"), o => Em.Object.create(o)); @@ -28,44 +28,46 @@ export default Ember.Controller.extend({ } return poll; - }.property("model"), + }, - selectedOptions: function() { + @computed("poll.options.@each.selected") + selectedOptions() { return _.map(this.get("poll.options").filterBy("selected"), o => o.get("id")); - }.property("poll.options.@each.selected"), + }, - min: function() { - let min = parseInt(this.get("poll.min"), 10); + @computed("poll.min") + min(min) { + min = parseInt(min, 10); if (isNaN(min) || min < 1) { min = 1; } return min; - }.property("poll.min"), + }, - max: function() { - let options = this.get("poll.options.length"), - max = parseInt(this.get("poll.max"), 10); + @computed("poll.max", "poll.options.length") + max(max, options) { + max = parseInt(max, 10); if (isNaN(max) || max > options) { max = options; } return max; - }.property("poll.max", "poll.options.length"), + }, - votersText: function() { - return I18n.t("poll.voters", { count: this.get("poll.voters") }); - }.property("poll.voters"), + @computed("poll.voters") + votersText(count) { + return I18n.t("poll.voters", { count }); + }, - totalVotes: function() { + @computed("poll.options.@each.votes") + totalVotes() { return _.reduce(this.get("poll.options"), function(total, o) { return total + parseInt(o.get("votes"), 10); }, 0); - }.property("poll.options.@each.votes"), + }, - totalVotesText: function() { - return I18n.t("poll.total_votes", { count: this.get("totalVotes") }); - }.property("totalVotes"), - - multipleHelpText: function() { - const options = this.get("poll.options.length"), - min = this.get("min"), - max = this.get("max"); + @computed("totalVotes") + totalVotesText(count) { + return I18n.t("poll.total_votes", { count }); + }, + @computed("min", "max", "poll.options.length") + multipleHelpText(min, max, options) { if (max > 0) { if (min === max) { if (min > 1) { @@ -73,7 +75,7 @@ export default Ember.Controller.extend({ } } else if (min > 1) { if (max < options) { - return I18n.t("poll.multiple.help.between_min_and_max_options", { min: min, max: max }); + return I18n.t("poll.multiple.help.between_min_and_max_options", { min, max }); } else { return I18n.t("poll.multiple.help.at_least_min_options", { count: min }); } @@ -81,33 +83,31 @@ export default Ember.Controller.extend({ return I18n.t("poll.multiple.help.up_to_max_options", { count: max }); } } - }.property("min", "max", "poll.options.length"), + }, - canCastVotes: function() { - if (this.get("isClosed") || this.get("showingResults") || this.get("loading")) { + @computed("isClosed", "showResults", "loading", "isMultiple", "selectedOptions.length", "min", "max") + canCastVotes(isClosed, showResults, loading, isMultiple, selectedOptionCount, min, max) { + if (isClosed || showResults || loading) { return false; } - const selectedOptionCount = this.get("selectedOptions.length"); - - if (this.get("isMultiple")) { - return selectedOptionCount >= this.get("min") && selectedOptionCount <= this.get("max"); + if (isMultiple) { + return selectedOptionCount >= min && selectedOptionCount <= max; } else { return selectedOptionCount > 0; } - }.property("isClosed", "showingResults", "loading", - "selectedOptions.length", - "isMultiple", "min", "max"), + }, castVotesDisabled: Em.computed.not("canCastVotes"), - canToggleStatus: function() { + @computed("loading", "post.user_id", "post.topic.closed", "post.topic.archived") + canToggleStatus(loading, userId, topicClosed, topicArchived) { return this.currentUser && - (this.currentUser.get("id") === this.get("post.user_id") || this.currentUser.get("staff")) && - !this.get("loading") && - !this.get("post.topic.closed") && - !this.get("post.topic.archived"); - }.property("loading", "post.user_id", "post.topic.{closed,archived}"), + (this.currentUser.get("id") === userId || this.currentUser.get("staff")) && + !loading && + !topicClosed && + !topicArchived; + }, actions: { @@ -130,8 +130,6 @@ export default Ember.Controller.extend({ if (!this.get("canCastVotes")) { return; } if (!this.currentUser) { return this.send("showLogin"); } - const self = this; - this.set("loading", true); Discourse.ajax("/polls/vote", { @@ -141,13 +139,13 @@ export default Ember.Controller.extend({ poll_name: this.get("poll.name"), options: this.get("selectedOptions"), } - }).then(function(results) { - self.setProperties({ vote: results.vote, showResults: true }); - self.set("model", Em.Object.create(results.poll)); - }).catch(function() { + }).then(results => { + this.setProperties({ vote: results.vote, showResults: true }); + this.set("model", Em.Object.create(results.poll)); + }).catch(() => { bootbox.alert(I18n.t("poll.error_while_casting_votes")); - }).finally(function() { - self.set("loading", false); + }).finally(() => { + this.set("loading", false); }); }, @@ -176,11 +174,11 @@ export default Ember.Controller.extend({ poll_name: self.get("poll.name"), status: self.get("isClosed") ? "open" : "closed", } - }).then(function(results) { + }).then(results => { self.set("model", Em.Object.create(results.poll)); - }).catch(function() { + }).catch(() => { bootbox.alert(I18n.t("poll.error_while_toggling_status")); - }).finally(function() { + }).finally(() => { self.set("loading", false); }); } diff --git a/plugins/poll/assets/javascripts/discourse/templates/poll.hbs b/plugins/poll/assets/javascripts/discourse/templates/poll.hbs index e9c89f8d35..f2ce5ff56f 100644 --- a/plugins/poll/assets/javascripts/discourse/templates/poll.hbs +++ b/plugins/poll/assets/javascripts/discourse/templates/poll.hbs @@ -34,7 +34,9 @@
        {{#if isMultiple}} - {{d-button class="cast-votes" title="poll.cast-votes.title" label="poll.cast-votes.label" disabled=castVotesDisabled action="castVotes"}} + {{#unless hideResultsDisabled}} + {{d-button class="cast-votes" title="poll.cast-votes.title" label="poll.cast-votes.label" disabled=castVotesDisabled action="castVotes"}} + {{/unless}} {{/if}} {{#if showingResults}} 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 3b26263082..2e086fbc5e 100644 --- a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6 +++ b/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6 @@ -1,4 +1,5 @@ import PostView from "discourse/views/post"; +import { on } from "ember-addons/ember-computed-decorators"; function createPollView(container, post, poll, vote) { const controller = container.lookup("controller:poll", { singleton: false }), @@ -22,12 +23,14 @@ export default { messageBus.subscribe("/polls", data => { const post = container.lookup("controller:topic").get('model.postStream').findLoadedPost(data.post_id); // HACK to trigger the "postViewUpdated" event - Em.run.next(_ => post.set("cooked", post.get("cooked") + " ")); + Em.run.next(() => post.set("cooked", post.get("cooked") + " ")); }); // overwrite polls PostView.reopen({ - _createPollViews: function($post) { + + @on("postViewInserted", "postViewUpdated") + _createPollViews($post) { const post = this.get("post"), polls = post.get("polls"), votes = post.get("polls_votes") || {}; @@ -48,11 +51,11 @@ export default { pollView = createPollView(container, post, polls[pollName], votes[pollName]); $poll.replaceWith($div); - Em.run.next(_ => pollView.renderer.replaceIn(pollView, $div[0])); + Em.run.next(() => pollView.renderer.replaceIn(pollView, $div[0])); pollViews[pollName] = pollView; }); - messageBus.subscribe("/polls/" + this.get("post.id"), results => { + messageBus.subscribe(`/polls/${this.get("post.id")}`, results => { if (results && results.polls) { _.forEach(results.polls, poll => { if (pollViews[poll.name]) { @@ -63,15 +66,16 @@ export default { }); this.set("pollViews", pollViews); - }.on("postViewInserted", "postViewUpdated"), + }, - _cleanUpPollViews: function() { - messageBus.unsubscribe("/polls/" + this.get("post.id")); + @on("willClearRender") + _cleanUpPollViews() { + messageBus.unsubscribe(`/polls/${this.get("post.id")}`); if (this.get("pollViews")) { _.forEach(this.get("pollViews"), v => v.destroy()); } - }.on("willClearRender") + } }); } }; diff --git a/plugins/poll/assets/javascripts/views/poll.js.es6 b/plugins/poll/assets/javascripts/views/poll.js.es6 index 5ee730eaf3..bad40cfebf 100644 --- a/plugins/poll/assets/javascripts/views/poll.js.es6 +++ b/plugins/poll/assets/javascripts/views/poll.js.es6 @@ -1,3 +1,5 @@ +import { on } from "ember-addons/ember-computed-decorators"; + export default Em.View.extend({ templateName: "poll", classNames: ["poll"], @@ -9,8 +11,9 @@ export default Em.View.extend({ "data-poll-name": Em.computed.alias("poll.name"), "data-poll-status": Em.computed.alias("poll.status"), - _fixPollContainerHeight: function() { + @on("didInsertElement") + _fixPollContainerHeight() { const pollContainer = this.$(".poll-container"); pollContainer.height(pollContainer.height()); - }.on("didInsertElement") + } }); From f2c1dbaa6835b6def784a5dad6bb09a7b62b8751 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Wed, 16 Sep 2015 17:27:32 +0530 Subject: [PATCH 153/157] FIX: return 422 if the invite is already redeemed --- app/controllers/invites_controller.rb | 7 +++++-- app/models/invite.rb | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb index eeb55b67f4..1012248748 100644 --- a/app/controllers/invites_controller.rb +++ b/app/controllers/invites_controller.rb @@ -60,8 +60,11 @@ class InvitesController < ApplicationController end # generate invite link - invite_link = Invite.generate_invite_link(params[:email], current_user, topic, group_ids) - render_json_dump(invite_link) + if invite_link = Invite.generate_invite_link(params[:email], current_user, topic, group_ids) + render_json_dump(invite_link) + else + render json: failed_json, status: 422 + end end def create_disposable_invite diff --git a/app/models/invite.rb b/app/models/invite.rb index 8cf304d456..a2fdc3403d 100644 --- a/app/models/invite.rb +++ b/app/models/invite.rb @@ -79,7 +79,7 @@ class Invite < ActiveRecord::Base # generate invite link def self.generate_invite_link(email, invited_by, topic=nil, group_ids=nil) invite = create_invite_by_email(email, invited_by, topic, group_ids, false) - return "#{Discourse.base_url}/invites/#{invite.invite_key}" + return "#{Discourse.base_url}/invites/#{invite.invite_key}" if invite end # Create an invite for a user, supplying an optional topic From 5277ec1ac07fcddbfb240fb700dcf89b1c0992cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Wed, 16 Sep 2015 15:55:26 +0200 Subject: [PATCH 154/157] FIX: ensure we have a bucket before enabling backups to S3 --- .../admin/templates/components/site-settings/bool.hbs | 1 + config/locales/server.en.yml | 1 + lib/site_setting_validations.rb | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs b/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs index 1f441c421c..f1ac669900 100644 --- a/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs +++ b/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs @@ -1,4 +1,5 @@ diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index d4859e8290..d2d86cfa1d 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -96,6 +96,7 @@ en: max_username_length_exists: "You cannot set the maximum username length below the longest username." max_username_length_range: "You cannot set the maximum below the minimum." default_categories_already_selected: "You cannot select a category used in another list." + s3_upload_bucket_is_required: "You cannot enable uploads to S3 unless you've provided the 's3_upload_bucket'." activemodel: errors: diff --git a/lib/site_setting_validations.rb b/lib/site_setting_validations.rb index 5c5a0917fc..e69bfc2f95 100644 --- a/lib/site_setting_validations.rb +++ b/lib/site_setting_validations.rb @@ -46,4 +46,8 @@ module SiteSettingValidations validate_default_categories(new_val, default_categories_selected) end + def validate_enable_s3_uploads(new_val) + validate_error :s3_upload_bucket_is_required if new_val == "t" && SiteSetting.s3_upload_bucket.blank? + end + end From 3ba6d548430f0602e2b021f52d9cebb4bdb456de Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Wed, 16 Sep 2015 19:50:29 +0530 Subject: [PATCH 155/157] Update Translations --- config/locales/client.bs_BA.yml | 1 - config/locales/client.cs.yml | 2 - config/locales/client.da.yml | 10 +- config/locales/client.de.yml | 41 ++- config/locales/client.fa_IR.yml | 3 - config/locales/client.fi.yml | 77 +++- config/locales/client.fr.yml | 41 ++- config/locales/client.he.yml | 82 ++++- config/locales/client.it.yml | 3 - config/locales/client.ja.yml | 3 - config/locales/client.ko.yml | 625 ++++++++++++++++---------------- config/locales/client.nb_NO.yml | 3 - config/locales/client.nl.yml | 18 +- config/locales/client.pl_PL.yml | 22 +- config/locales/client.pt.yml | 22 +- config/locales/client.pt_BR.yml | 3 - config/locales/client.ro.yml | 1 - config/locales/client.ru.yml | 2 - config/locales/client.sq.yml | 3 - config/locales/client.sv.yml | 16 +- config/locales/client.tr_TR.yml | 25 +- config/locales/client.zh_CN.yml | 50 ++- config/locales/client.zh_TW.yml | 1 - config/locales/server.ar.yml | 25 +- config/locales/server.bs_BA.yml | 82 ----- config/locales/server.cs.yml | 82 ----- config/locales/server.es.yml | 31 +- config/locales/server.fa_IR.yml | 82 ----- config/locales/server.fr.yml | 131 ++++++- config/locales/server.he.yml | 109 ++---- config/locales/server.it.yml | 10 +- config/locales/server.ko.yml | 458 ++++++++++++----------- config/locales/server.nl.yml | 40 +- config/locales/server.pl_PL.yml | 6 - config/locales/server.pt.yml | 96 +---- config/locales/server.pt_BR.yml | 6 - config/locales/server.ro.yml | 81 ----- config/locales/server.ru.yml | 82 ----- config/locales/server.sq.yml | 82 ----- config/locales/server.tr_TR.yml | 258 +------------ config/locales/server.zh_CN.yml | 11 +- public/403.ko.html | 2 +- public/500.ko.html | 2 +- 43 files changed, 1143 insertions(+), 1587 deletions(-) diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml index 3723992ece..d6846241d5 100644 --- a/config/locales/client.bs_BA.yml +++ b/config/locales/client.bs_BA.yml @@ -615,7 +615,6 @@ bs_BA: title_placeholder: "O čemu je ova diskusija u jednoj rečenici?" edit_reason_placeholder: "zašto pravite izmjenu?" show_edit_reason: "(dodaj razlog izmjene)" - reply_placeholder: "Kucaj ovde. Koristi Markdown ili BBCode za formatiranje. Povuci ili paste sliku za upload." view_new_post: "Pogledaj svoj novi post." saving: "Čuvam..." saved: "Sačuvano!" diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml index 95dafdc65b..fd2448c752 100644 --- a/config/locales/client.cs.yml +++ b/config/locales/client.cs.yml @@ -722,7 +722,6 @@ cs: title_placeholder: "O čem je ve zkratce tato diskuze?" edit_reason_placeholder: "proč byla nutná úprava?" show_edit_reason: "(přidat důvod úpravy)" - reply_placeholder: "Pište sem. Můžete použít Markdown, BBCode nebo HTML. Obrázky nahrajte přetáhnutím nebo vložením." view_new_post: "Zobrazit váš nový příspěvek." saving: "Ukládám..." saved: "Uloženo!" @@ -1717,7 +1716,6 @@ cs: enabled: "Zapnutý?" is_enabled: "A" not_enabled: "N" - cant_disable: "-" change_settings: "Změnit nastavení" change_settings_short: "Nastavení" howto: "Jak nainstaluji pluginy?" diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml index 13eccd9186..868eec5bda 100644 --- a/config/locales/client.da.yml +++ b/config/locales/client.da.yml @@ -296,6 +296,8 @@ da: mods_and_admins: "Kun moderatore og administratore" members_mods_and_admins: "Kun gruppe medlemmer, moderatore og administratore" everyone: "Alle" + trust_levels: + none: "Ingen" user_action_groups: '1': "Likes givet" '2': "Likes modtaget" @@ -315,6 +317,8 @@ da: all_subcategories: "Alle" no_subcategory: "ingen" category: "Kategori" + reorder: + apply_all: "Anvend" posts: "Indlæg" topics: "Emner" latest: "Seneste" @@ -357,6 +361,7 @@ da: private_messages: "Beskeder" activity_stream: "Aktivitet" preferences: "Indstillinger" + expand_profile: "Udvid" bookmarks: "Bogmærker" bio: "Om mig" invited_by: "Inviteret af" @@ -729,7 +734,6 @@ da: title_placeholder: "Hvad handler diskussionen om i korte træk?" edit_reason_placeholder: "hvorfor redigerer du?" show_edit_reason: "(tilføj en begrundelse for ændringen)" - reply_placeholder: "skriv her. Benyt Markdown, BBCode eller HTML til at formattere. Træk eller indsæt et billede for at uploade det." view_new_post: "Se dit nye indlæg." saving: "Gemmer…" saved: "Gemt!" @@ -807,7 +811,6 @@ da: local_tip: "vælg billeder fra din enhed" local_tip_with_attachments: "vælg billeder eller filer fra din enhed ({{authorized_extensions}})" hint: "(du kan også trække og slippe ind i editoren for at uploade dem)" - hint_for_supported_browsers: "Du kan også trække og slippe eller indsætte billeder i editoren for at uploade dem" uploading: "Uploader billede" select_file: "Vælg fil" image_link: "link som dit billede vil pege på" @@ -1390,7 +1393,7 @@ da: notify_action: "Besked" topic_map: title: "Emne-resumé" - participants_title: "Hyppig forfattere" + participants_title: "Hyppige forfattere" links_title: "Populære Links" links_shown: "vis alle {{totalLinks}} links..." clicks: @@ -1692,7 +1695,6 @@ da: enabled: "Aktiveret?" is_enabled: "J" not_enabled: "N" - cant_disable: "-" change_settings: "Skift indstillinger" change_settings_short: "Indstillinger" howto: "Hvordan installerer jeg plugins?" diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml index cd6ed7972e..bd394688a7 100644 --- a/config/locales/client.de.yml +++ b/config/locales/client.de.yml @@ -220,6 +220,7 @@ de: saved: "Gespeichert!" upload: "Hochladen" uploading: "Wird hochgeladen..." + uploading_filename: "{{filename}} wird hochgeladen..." uploaded: "Hochgeladen!" enable: "Aktivieren" disable: "Deaktivieren" @@ -306,6 +307,8 @@ de: mods_and_admins: "Nur Moderatoren und Administratoren" members_mods_and_admins: "Nur Gruppenmitglieder, Moderatoren und Administratoren" everyone: "Jeder" + trust_levels: + none: "keine" user_action_groups: '1': "Abgegebene Likes" '2': "Erhaltene Likes" @@ -325,6 +328,10 @@ de: all_subcategories: "alle" no_subcategory: "keine" category: "Kategorie" + reorder: + save: "Reihenfolge speichern" + apply_all: "Anwenden" + position: "Position" posts: "Beiträge" topics: "Themen" latest: "Aktuelle Themen" @@ -367,6 +374,7 @@ de: private_messages: "Nachrichten" activity_stream: "Aktivität" preferences: "Einstellungen" + expand_profile: "Erweitern" bookmarks: "Lesezeichen" bio: "Über mich" invited_by: "Eingeladen von" @@ -512,7 +520,7 @@ de: daily: "täglich" every_three_days: "alle drei Tage" weekly: "wöchentlich" - every_two_weeks: "alle drei Tage" + every_two_weeks: "jede zweite Woche" email_direct: "Sende mir eine E-Mail, wenn mich jemand zitiert, auf meine Beiträge antwortet, meinen @Namen erwähnt oder mich zu einem Thema einlädt." email_private_messages: "Sende mir eine E-Mail, wenn mir jemand eine Nachricht sendet." email_always: "Benachrichtige mich per E-Mail auch während ich auf dieser Website aktiv bin" @@ -741,7 +749,6 @@ de: title_placeholder: "Um was geht es in dieser Diskussion? Schreib einen kurzen Satz." edit_reason_placeholder: "Warum bearbeitest du?" show_edit_reason: "(Bearbeitungsgrund hinzufügen)" - reply_placeholder: "Schreibe hier. Verwende Markdown, BBCode oder HTML zur Formatierung. Füge ein Bild ein oder ziehe es herein, um es hochzuladen." view_new_post: "Sieh deinen neuen Beitrag an." saving: "Speichere..." saved: "Gespeichert!" @@ -819,11 +826,11 @@ de: local_tip: "wähle auf deinem Gerät gespeicherte Bilder aus" local_tip_with_attachments: "wähle auf deinem Gerät gespeicherte Bilder oder Dateien aus ({{authorized_extensions}})" hint: "(du kannst Dateien auch in den Editor ziehen, um diese hochzuladen)" - hint_for_supported_browsers: "du kannst Bilder auch durch Ziehen in den Editor oder durch Einfügen aus der Zwischenablage hochladen" uploading: "Wird hochgeladen" select_file: "Datei auswählen" image_link: "Der Link deines Bildes verweist auf" search: + select_all: "Alle auswählen" title: "suche nach Themen, Beiträgen, Benutzern oder Kategorien" no_results: "Keine Ergebnisse gefunden." no_more_results: "Es wurde keine weiteren Ergebnisse gefunden." @@ -835,6 +842,7 @@ de: category: "Kategorie „{{category}}“ durchsuchen" topic: "Dieses Thema durchsuchen" private_messages: "Nachrichten durchsuchen" + new_item: "neu" go_back: 'zurückgehen' not_logged_in_user: 'Benutzerseite mit einer Zusammenfassung der Benutzeraktivitäten und Einstellungen' current_user: 'zu deiner Benutzerseite gehen' @@ -886,8 +894,8 @@ de: search: "Es gibt keine weiteren Suchergebnisse." topic: unsubscribe: - stop_notifications: "Sie werden jetzt weniger Benachrichtigungen für {{title}} empfangen" - change_notification_state: "Ihr aktueller Benachrichtigungsstatus ist " + stop_notifications: "Du wirst in Zukunft weniger Benachrichtigungen für {{title}} erhalten" + change_notification_state: "Dein aktueller Benachrichtigungsstatus ist" filter_to: "{{post_count}} Beiträge im Thema" create: 'Neues Thema' create_long: 'Ein neues Thema erstellen' @@ -1716,7 +1724,6 @@ de: enabled: "Aktiviert?" is_enabled: "J" not_enabled: "N" - cant_disable: "-" change_settings: "Einstellungen ändern" change_settings_short: "Einstellungen" howto: "Wie installiere ich Plug-ins?" @@ -2299,13 +2306,16 @@ de: image: "Bild" delete_confirm: "Möchtest du wirklich das :%{name}: Emoji löschen?" embedding: - confirm_delete: "Sind Sie sicher, dass Sie diesen Host löschen möchten?" + confirm_delete: "Möchtest du wirklich diesen Host löschen?" title: "Einbettung" host: "Erlaubte Hosts" edit: "bearbeiten" add_host: "Host hinzufügen" - settings: "Einstellungen werden eingebettet" + settings: "Einbettungseinstellungen" + feed_settings: "Feed-Einstellungen" + crawling_settings: "Crawler-Einstellungen" feed_polling_enabled: "Beiträge über RSS/ATOM importieren" + feed_polling_url: "URL des RSS/ATOM Feeds für den Import" save: "Einbettungseinstellungen speichern" permalink: title: "Permanentlinks" @@ -2337,23 +2347,27 @@ de: categories: 'g, c Kategorien' top: 'g, t Anfang' bookmarks: 'g, b Lesezeichen' + profile: 'g, p Profil' + messages: 'g, m Nachrichten' navigation: title: 'Navigation' jump: '# Zeige Beitrag #' back: 'u Zurück' up_down: 'k/j Auswahl ↑ ↓ bewegen' open: 'o oder ↵ Eingabe Ausgewähltes Thema anzeigen' - next_prev: '⇧ Umsch + J / ⇧ Umsch + K Nächster/vorheriger Abschnitt' + next_prev: '⇧ Umsch + j / ⇧ Umsch + k Nächster/vorheriger Abschnitt' application: title: 'Anwendung' create: 'c Neues Thema erstellen' notifications: 'n Benachrichtigungen anzeigen' + hamburger_menu: '= Hamburger-Menü öffnen' user_profile_menu: 'p Benutzermenü öffnen' show_incoming_updated_topics: '. Zeige aktualisierte Themen' search: '/ Suchen' help: '? Tastaturhilfe anzeigen' dismiss_new_posts: 'x, r Neue Themen / Beiträge ignorieren' dismiss_topics: 'x, t Themen ignorieren' + log_out: '⇧ Umsch + z, ⇧ Umsch + z Abmelden' actions: title: 'Aktionen' bookmark_topic: 'f Lesezeichen auf Thema setzen oder entfernen' @@ -2481,6 +2495,15 @@ de: reader: name: Leser description: Hat in einem Thema mit mehr als 100 Beiträgen jeden Beitrag gelesen + popular_link: + name: Beliebter Link + description: Hat einen externen Link veröffentlicht, der mindestens 50 Klicks erhalten hat. + hot_link: + name: Angesagter Link + description: Hat einen externen Link veröffentlicht, der mindestens 300 Klicks erhalten hat. + famous_link: + name: Berühmter Link + description: Hat einen externen Link veröffentlicht, der mindestens 1000 Klicks erhalten hat. google_search: |

        Mit Google suchen

        diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml index 55764ac69d..431df9e3c5 100644 --- a/config/locales/client.fa_IR.yml +++ b/config/locales/client.fa_IR.yml @@ -661,7 +661,6 @@ fa_IR: title_placeholder: "در یک جملهٔ‌ کوتاه، این موضوع در چه موردی است؟" edit_reason_placeholder: "چرا ویرایش می‌کنید؟" show_edit_reason: "(افزودن دلیل ویرایش)" - reply_placeholder: "اینجا تایپ کنید. استفاده کنید از Markdown, BBCode, or HTML برای فرمت. عکس را بکشید یا برگردانید برای بارگزاری آن. " view_new_post: "نوشته تازه‌تان را ببینید." saving: "در حال ذخیره سازی..." saved: "اندوخته شد!" @@ -739,7 +738,6 @@ fa_IR: local_tip: "عکس ها را از روی سیستم خود انتخاب کنید" local_tip_with_attachments: "عکس ها را از روی سیستم خود انتخاب کنید ({{authorized_extensions}})" hint: "(برای آپلود می توانید فایل را کیشده و در ویرایشگر رها کنید)" - hint_for_supported_browsers: "برای آپلود می توانید فایل را کشیده و در ویرایشگر رها کنید یا آنها را paste کنید" uploading: "در حال بروز رسانی " select_file: "انتخاب فایل" image_link: "به لینک تصویر خود اشاره کنید" @@ -1573,7 +1571,6 @@ fa_IR: enabled: "فعال شده؟" is_enabled: "Y" not_enabled: "N" - cant_disable: "-" change_settings: "تغییر تنظیمات" change_settings_short: "تنظیمات" howto: "چگونه یک افزونه نصب کنیم؟" diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml index 068c9c1e50..61f298ffb1 100644 --- a/config/locales/client.fi.yml +++ b/config/locales/client.fi.yml @@ -109,7 +109,25 @@ fi: google+: 'jaa tämä linkki Google+:ssa' email: 'lähetä tämä linkki sähköpostissa' action_codes: - split_topic: "jaa tämä ketju" + split_topic: "pilkkoi tämän ketjun" + autoclosed: + enabled: 'sulki %{when}' + disabled: 'avasi %{when}' + closed: + enabled: 'sulki %{when}' + disabled: 'avasi %{when}' + archived: + enabled: 'arkistoi %{when}' + disabled: 'palautti %{when}' + pinned: + enabled: 'kiinnitti %{when}' + disabled: 'poisti kiinnityksen %{when}' + pinned_globally: + enabled: 'kiinnitti koko palstalle %{when}' + disabled: 'poisti kiinnityksen %{when}' + visible: + enabled: 'listasi %{when}' + disabled: 'poisti listauksista %{when}' topic_admin_menu: "ketjun ylläpitotoimet" emails_are_disabled: "Ylläpitäjä on estänyt kaiken lähtevän sähköpostiliikenteen. Mitään sähköposti-ilmoituksia ei lähetetä." edit: 'muokkaa tämän ketjun otsikkoa ja aluetta' @@ -125,6 +143,7 @@ fi: admin_title: "Ylläpito" flags_title: "Liput" show_more: "näytä lisää" + show_help: "astukset" links: "Linkit" links_lowercase: one: "linkki" @@ -201,6 +220,7 @@ fi: saved: "Tallennettu!" upload: "Lähetä" uploading: "Lähettää..." + uploading_filename: "Lähettää {{filename}}..." uploaded: "Lähetetty!" enable: "Ota käyttöön" disable: "Poista käytöstä" @@ -287,6 +307,9 @@ fi: mods_and_admins: "Vain ylläpitäjät ja valvojat" members_mods_and_admins: "Vain ryhmän jäsenet, valvojat ja ylläpitäjät" everyone: "Kaikki" + trust_levels: + title: "Luottamustaso, joka annetaan automaattisesti lisättäessä tähän ryhmään:" + none: "Ei mitään" user_action_groups: '1': "Annetut tykkäykset" '2': "Saadut tykkäykset" @@ -306,6 +329,14 @@ fi: all_subcategories: "kaikki" no_subcategory: "alueettomat" category: "Alue" + reorder: + title: "Järjestä alueet uudelleen" + title_long: "Järjestä alueiden lista uudelleen" + fix_order: "Kiinteä järjestys" + fix_order_tooltip: "Kaikilla alueilla ei ole uniikkia järjestysnumeroa, joka voi aiheuttaa odottamattomia seurauksia." + save: "Tallenna järjestys" + apply_all: "Aseta" + position: "Paikka" posts: "Viestit" topics: "Ketjut" latest: "Tuoreimmat" @@ -348,6 +379,7 @@ fi: private_messages: "Viestit" activity_stream: "Toiminta" preferences: "Asetukset" + expand_profile: "Laajenna" bookmarks: "Kirjanmerkit" bio: "Tietoa minusta" invited_by: "Kutsuja" @@ -504,20 +536,35 @@ fi: label: "Tulkitse ketju uudeksi, kun" not_viewed: "en ole avannut sitä vielä" last_here: "se on luotu edellisen käyntini jälkeen" + after_1_day: "luotu päivän aikana" + after_2_days: "luotu 2 päivän aikana" + after_1_week: "luotu viikon aikana" + after_2_weeks: "luotu 2 viikon aikana" auto_track_topics: "Seuraa automaattisesti ketjuja, jotka avaan" auto_track_options: never: "ei koskaan" immediately: "heti" + after_30_seconds: "30 sekunnin jälkeen" + after_1_minute: "1 minuutin jälkeen" + after_2_minutes: "2 minuutin jälkeen" + after_3_minutes: "3 minuutin jälkeen" + after_4_minutes: "4 minuutin jälkeen" + after_5_minutes: "5 minuutin jälkeen" + after_10_minutes: "10 minuutin jälkeen" invited: search: "kirjoita etsiäksesi kutsuja..." title: "Kutsut" user: "Kutsuttu käyttäjä" + sent: "Lähetetty" + none: "Avoimia kutsuja ei ole." truncated: "Näytetään ensimmäiset {{count}} kutsua." redeemed: "Hyväksytyt kutsut" redeemed_tab: "Hyväksytyt" + redeemed_tab_with_count: "Hyväksytyt ({{count}})" redeemed_at: "Hyväksytty" pending: "Odottavat kutsut" pending_tab: "Odottavat" + pending_tab_with_count: "Avoimet ({{count}})" topics_entered: "Avatut ketjut" posts_read_count: "Luetut viestit" expired: "Tämä kutsu on rauennut." @@ -529,6 +576,8 @@ fi: days_visited: "Päiviä vierailtu" account_age_days: "Tilin ikä päivissä" create: "Lähetä kutsu" + generate_link: "Kopioi kutsulinkki" + generated_link_message: '

        Kutsulinkin kopiointi onnistui!

        Kutsulinkki kelpaa vain tällä sähköpostiosoitteella: %{invitedEmail}

        ' bulk_invite: none: "Et ole kutsunut vielä ketään. Voit lähettää yksittäisiä kutsuja tai kutsua useita ihmisiä kerralla lähettämällä massakutsun tiedostosta." text: "Lähetä massakutsu tiedostosta" @@ -585,6 +634,7 @@ fi: read_only_mode: enabled: "Olet Vain luku -tilassa. Voit jatkaa selaamista, muttet välttämättä pysty vaikuttamaan sisältöön." login_disabled: "Kirjautuminen ei ole käytössä sivuston ollessa vain luku -tilassa." + too_few_topics_notice: "Laitetaanpa keskustelu alulle! Tällä hetkellä palstalla on %{currentTopics} / %{requiredTopics} ketjua ja %{currentPosts} / %{requiredPosts} viestiä. Uudet kävijät tarvitsevat keskusteluita, joita lukea ja joihin vastata." learn_more: "opi lisää..." year: 'vuosi' year_desc: 'viimeisen 365 päivän aikana luodut ketjut' @@ -683,6 +733,7 @@ fi: composer: emoji: "Emoji :smile:" add_warning: "Tämä on virallinen varoitus." + add_whisper: "Tämä on kuiskaus, joka näytetään vain valvojille" posting_not_on_topic: "Mihin ketjuun haluat vastata?" saving_draft_tip: "tallennetaan..." saved_draft_tip: "tallennettu" @@ -709,7 +760,7 @@ fi: title_placeholder: "Kuvaile lyhyesti mistä tässä ketjussa on kyse?" edit_reason_placeholder: "miksi muokkaat viestiä?" show_edit_reason: "(lisää syy muokkaukselle)" - reply_placeholder: "Kirjoita tähän. Voit käyttää Markdown-, BBCode- tai HTML-tyylimääreitä. Vedä ja pudota kuva hiirellä tai liitä se leikepöydältä jos haluat ladata sen foorumille." + reply_placeholder: "Kirjoita tähän. Käytä Markdownia, BBCodea tai HTML:ää muotoiluun. Raahaa tai liitä kuvia." view_new_post: "Katsele uutta viestiäsi." saving: "Tallennetaan..." saved: "Tallennettu!" @@ -770,6 +821,20 @@ fi: moved_post: "

        {{username}} siirsi {{description}}

        " linked: "

        {{username}} {{description}}

        " granted_badge: "

        Ansaitsit '{{description}}'

        " + alt: + mentioned: "Viittaaja" + quoted: "Lainaaja" + replied: "Vastasi" + posted: "Kirjoittaja" + edited: "Viestieäsi muokkasi" + liked: "Viestistäsi tykkäsi" + private_message: "Yksityisviesti lähettäjältä" + invited_to_private_message: "Kutsu yksityisviestiin käyttäjältä" + invited_to_topic: "Kutsu ketjuun käyttäjältä" + invitee_accepted: "Kutsun hyväksyi" + moved_post: "Viestisi siirsi" + linked: "Linkki viestiisi" + granted_badge: "Arvomerkki myönnetty" popup: mentioned: '{{username}} mainitsi sinut ketjussa "{{topic}}" - {{site_title}}' quoted: '{{username}} lainasi sinua ketjussa "{{topic}}" - {{site_title}}' @@ -787,7 +852,7 @@ fi: local_tip: "valitse kuvia laitteeltasi" local_tip_with_attachments: "valitse kuvia tai tiedostoja laitteeltasi ({{authorized_extensions}})" hint: "(voit myös raahata ne editoriin ladataksesi ne sivustolle)" - hint_for_supported_browsers: "voit myös raahata tai liittää kuvia editoriin ladataksesi ne sivustolle" + hint_for_supported_browsers: "voit myös raahata tai liittää kuvia editoriin" uploading: "Lähettää" select_file: "Valitse tiedosto" image_link: "linkki, johon kuvasi osoittaa" @@ -851,6 +916,9 @@ fi: bookmarks: "Merkattuja ketjuja ei ole enempää." search: "Hakutuloksia ei ole enempää." topic: + unsubscribe: + stop_notifications: "Saat tästä lähtien vähemmän ilmoituksia aiheesta {{title}}" + change_notification_state: "Nykyinen ilmoitusasetuksesti on" filter_to: "{{post_count}} viestiä ketjussa" create: 'Uusi ketju' create_long: 'Luo uusi ketju' @@ -944,8 +1012,10 @@ fi: title: "Seuraa" description: "Tälle ketjulle näytetään uusien vastausten lukumäärä. Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle." regular: + title: "Tavallinen" description: "Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle." regular_pm: + title: "Tavallinen" description: "Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle." muted_pm: title: "Vaimenna" @@ -1675,7 +1745,6 @@ fi: enabled: "Otettu käyttöön?" is_enabled: "K" not_enabled: "E" - cant_disable: "-" change_settings: "Asetukset" change_settings_short: "Asetukset" howto: "Kuinka asennan lisäosia?" diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml index fecec8cd58..653aaadca8 100644 --- a/config/locales/client.fr.yml +++ b/config/locales/client.fr.yml @@ -220,6 +220,7 @@ fr: saved: "Sauvegardé !" upload: "Envoyer" uploading: "Envoi en cours..." + uploading_filename: "Téléversement de {{filename}}..." uploaded: "Envoyé !" enable: "Activer" disable: "Désactiver" @@ -306,6 +307,9 @@ fr: mods_and_admins: "Seulement les modérateurs et les administrateurs " members_mods_and_admins: "Seulement les membres du groupe, les modérateurs et les administrateurs " everyone: "Tout le monde" + trust_levels: + title: "Niveau de confiance automatiquement attribué lorsque les membres sont ajoutés à :" + none: "Aucun" user_action_groups: '1': "J'aime donnés" '2': "J'aime reçus" @@ -325,6 +329,13 @@ fr: all_subcategories: "toutes" no_subcategory: "aucune" category: "Catégorie" + reorder: + title: "Réordonner les catégories" + title_long: "Réorganiser la liste des catégories" + fix_order_tooltip: "Toutes les catégories n'ont pas une position unique. Cela peut provoquer des résultats non souhaités." + save: "Enregistrer l'ordre" + apply_all: "Appliquer" + position: "Position" posts: "Messages" topics: "Sujets" latest: "Récents" @@ -367,6 +378,7 @@ fr: private_messages: "Messages privés" activity_stream: "Activité" preferences: "Préférences" + expand_profile: "Développer" bookmarks: "Signets" bio: "À propos de moi" invited_by: "Invité par" @@ -746,7 +758,7 @@ fr: title_placeholder: "Quel est votre sujet en une phrase descriptive ?" edit_reason_placeholder: "pourquoi éditez-vous ?" show_edit_reason: "(ajouter la raison de l'édition)" - reply_placeholder: "Écrivez ici. Pour mettre en forme le texte, vous pouvez utiliser Markdown, BBCode ou HTML. Glissez ou collez une image pour l'importer." + reply_placeholder: "Écrivez ici. Utilisez Markdown, BBCode, ou HTML pour formatter. Glissez ou collez des images." view_new_post: "Voir votre nouveau message." saving: "Sauvegarde…" saved: "Sauvegardé !" @@ -807,6 +819,20 @@ fr: moved_post: "

        {{username}} a déplacé {{description}}

        " linked: "

        {{username}} {{description}}

        " granted_badge: "

        Vous avez gagné {{description}}

        " + alt: + mentioned: "Mentionné par" + quoted: "Cité par" + replied: "Répondu" + posted: "Message par" + edited: "Editer votre message par" + liked: "Aime votre message" + private_message: "Message privé de" + invited_to_private_message: "Invité pour un message privé par" + invited_to_topic: "Invité à un sujet par" + invitee_accepted: "Invitation acceptée par" + moved_post: "Votre message a été déplacé par" + linked: "Lien vers votre message" + granted_badge: "Badge attribué" popup: mentioned: '{{username}} vous a mentionné dans « {{topic}} » - {{site_title}}' quoted: '{{username}} vous a cité dans « {{topic}} » - {{site_title}}' @@ -824,11 +850,13 @@ fr: local_tip: "sélectionnez des images depuis votre appareil" local_tip_with_attachments: "sélectionnez des images depuis votre appareil ({{authorized_extensions}})" hint: "(vous pouvez également faire un glisser-déposer dans l'éditeur pour les télécharger)" - hint_for_supported_browsers: "vous pouvez aussi glisser et déposer ou coller des images dans l'éditeur pour les envoyer" + hint_for_supported_browsers: "vous pouvez aussi glisser/déposer ou coller des images dans l'éditeur" uploading: "Fichier en cours d'envoi" select_file: "Sélectionner Fichier" image_link: "lien vers lequel pointe l'image" search: + select_all: "Tout sélectionner" + clear_all: "Tout supprimer" title: "Rechercher les sujets, messages, utilisateurs ou catégories" no_results: "Aucun résultat." no_more_results: "Pas davantage de résultats." @@ -841,6 +869,7 @@ fr: topic: "Rechercher dans ce sujet" private_messages: "Rechercher des messages" hamburger_menu: "se rendre dans une autre liste de sujet ou catégorie" + new_item: "nouveau" go_back: 'retour' not_logged_in_user: 'page utilisateur avec un résumé de l''activité en cours et les préférences ' current_user: 'voir la page de l''utilisateur' @@ -1346,6 +1375,7 @@ fr: topic_template: "Modèle de Sujet" delete: 'Supprimer la catégorie' create: 'Nouvelle catégorie' + create_long: 'Créer une nouvelle catégorie' save: 'Enregistrer la catégorie' slug: 'Identifiant de la catégorie' slug_placeholder: '(Facultatif) insérer tirets entre mots dans url' @@ -1375,6 +1405,7 @@ fr: email_in_allow_strangers: "Accepter les courriels d'utilisateurs anonymes sans compte" email_in_disabled: "La possibilité de créer des nouveaux sujets via courriel est désactivé dans les Paramètres. Pour l'activer," email_in_disabled_click: 'activer le paramètre "email in".' + suppress_from_homepage: "Supprimer cette catégorie de la page d'accueil" allow_badges_label: "Autoriser les badges à être accordé dans cette catégorie" edit_permissions: "Éditer les permissions" add_permission: "Ajouter une Permission" @@ -1731,7 +1762,6 @@ fr: enabled: "Activé ?" is_enabled: "O" not_enabled: "N" - cant_disable: "-" change_settings: "Changer les paramètres" change_settings_short: "Paramètres" howto: "Comment installer des plugins ?" @@ -2367,6 +2397,8 @@ fr: categories: 'g, c Catégories' top: 'g, t Haut' bookmarks: 'g, b Favoris' + profile: 'g, p Profil' + messages: 'g, m Messages' navigation: title: 'Navigation' jump: '# Aller au message #' @@ -2385,6 +2417,7 @@ fr: help: '? Ouvrir l''aide au clavier' dismiss_new_posts: 'x, r Marquer comme lu les nouveaux messages' dismiss_topics: 'x, r Marquer comme lu les sujets' + log_out: 'shift+z shift+z Se déconnecter' actions: title: 'Actions' bookmark_topic: 'f Modifier signet pour ce sujet' @@ -2519,7 +2552,7 @@ fr: name: Lien tendance description: A posté un lien externe avec au moins 300 clics famous_link: - name: Lien populaire + name: Lien célèbre description: A posté un lien externe avec au moins 1000 clics google_search: |

        Rechercher avec Google

        diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml index e6cee16c72..7579cc74d6 100644 --- a/config/locales/client.he.yml +++ b/config/locales/client.he.yml @@ -220,6 +220,7 @@ he: saved: "נשמר!" upload: "העלה" uploading: "מעלה..." + uploading_filename: "מעלה {{filename}}..." uploaded: "הועלה!" enable: "לאפשר" disable: "לנטרל" @@ -306,6 +307,9 @@ he: mods_and_admins: "רק מנחים ומנהלים" members_mods_and_admins: "רק חברי הקבוצה, מנחים ומנהלים" everyone: "כולם" + trust_levels: + title: "רמת אמון הניתנת אוטומטית למשתמשים כשהם נוספים:" + none: "ללא" user_action_groups: '1': "לייקים שניתנו" '2': "לייקים שהתקבלו" @@ -325,6 +329,14 @@ he: all_subcategories: "הכל" no_subcategory: "ללא" category: "קטגוריה" + reorder: + title: "שנה סדר קטגוריות" + title_long: "ארגן מחדש את רשימת הקטגוריות" + fix_order: "סדר מיקומים" + fix_order_tooltip: "לא לכל הקטגוריות יש מספר סידורי יחודי, זה עלול לגרום לבעיות." + save: "שמור סדר" + apply_all: "הפעל" + position: "מיקום" posts: "פרסומים" topics: "נושאים" latest: "לאחרונה" @@ -367,6 +379,7 @@ he: private_messages: "הודעות" activity_stream: "פעילות" preferences: "העדפות" + expand_profile: "הרחב" bookmarks: "מועדפים" bio: "אודותיי" invited_by: "הוזמן/הוזמנה על ידי" @@ -678,7 +691,7 @@ he: title: "התחברות" username: "משתמש" password: "סיסמה" - email_placeholder: "דואר אלקטרוני או סיסמה" + email_placeholder: "דואר אלקטרוני או שם משתמש/ת" caps_lock_warning: "מקש Caps Lock לחוץ" error: "שגיאה לא ידועה" rate_limit: "בבקשה המתן לפני שתנסה להתחבר שוב." @@ -720,6 +733,7 @@ he: composer: emoji: "Emoji :smile:" add_warning: "זוהי התראה רשמית." + add_whisper: "זו לחישה, שנראת רק לצוות האתר" posting_not_on_topic: "לאיזה נושא רצית להגיב?" saving_draft_tip: "שמירה..." saved_draft_tip: "נשמר" @@ -746,7 +760,7 @@ he: title_placeholder: " במשפט אחד, במה עוסק הדיון הזה?" edit_reason_placeholder: "מדוע ערכת?" show_edit_reason: "(הוספת סיבת עריכה)" - reply_placeholder: "הקלד כאן. השתמש בMarkdown BBCode או HTML לערוך. גרור והדבק תמונה כדי להעלות אותה." + reply_placeholder: "הקלד כאן. השתמש ב Markdown, BBCode או HTML לערוך. גרור או הדבק תמונות." view_new_post: "הצגת את ההודעה החדשה שלך." saving: "שומר..." saved: "נשמר!" @@ -807,6 +821,20 @@ he: moved_post: "

        {{username}} הזיז/ה {{description}}

        " linked: "

        {{username}} {{description}}

        " granted_badge: "

        הרוויח/ה '{{description}}'

        " + alt: + mentioned: "הוזכר על ידי" + quoted: "צוטט על ידי" + replied: "השיב" + posted: "פורסם על ידי" + edited: "ערוך את פרסומך על ידי" + liked: "אהב את הפרסום שלך" + private_message: "הודעה פרטית מ" + invited_to_private_message: "הזמנה להודעה פרטית מ" + invited_to_topic: "הוזמנת לנושא חדש מ" + invitee_accepted: "הזמנה התקבלה על ידי" + moved_post: "הפרסום שלך הוזז על ידי" + linked: "קישור לפרסום שלך" + granted_badge: "תג הוענק" popup: mentioned: '{{username}} הזכיר אותך ב{{topic}}" - {{site_title}}"' quoted: '{{username}} ציטט אותך ב"{{topic}}" - {{site_title}}' @@ -824,11 +852,13 @@ he: local_tip: "בחר תמונות ממכשירך" local_tip_with_attachments: "בחר תמונות או קבצים ממכשירך ({{authorized_extensions}})" hint: "(ניתן גם לגרור לעורך להעלאה)" - hint_for_supported_browsers: "אתה יכול גם לגרור או להדביק תמונות לעורך כדי להעלות אותם" + hint_for_supported_browsers: "תוכלו גם לגרור או להדביק תמונות לעורך" uploading: "מעלה" select_file: "בחר קובץ" image_link: "קישור לתמונה יצביע ל" search: + select_all: "בחר הכל" + clear_all: "נקה הכל" title: "חיפוש נושאים, פרסומים, משתמשים או קטגוריות" no_results: "אין תוצאות." no_more_results: "לא נמצאו עוד תוצאות." @@ -841,6 +871,7 @@ he: topic: "חפשו בנושא זה" private_messages: "חיפוש הודעות" hamburger_menu: "עבור לרשימת נושאים אחרת או קטגוריה" + new_item: "חדש" go_back: 'חזור אחורה' not_logged_in_user: 'עמוד משתמש עם סיכום פעילות נוכחית והעדפות' current_user: 'לך לעמוד המשתמש שלך' @@ -1182,6 +1213,7 @@ he: no_value: "לא, שמור אותה" yes_value: "כן, נטוש" via_email: "פרסום זה הגיע באמצעות דוא\"ל" + whisper: "פרסום זה הוא לחישה פרטית לצוות האתר" wiki: about: "פרסום זה הינו ויקי; משתמשים בסיסיים יכולים לערוך אותו" archetypes: @@ -1342,6 +1374,7 @@ he: topic_template: "תבנית נושא" delete: 'מחק קטגוריה' create: 'קטגוריה חדשה' + create_long: 'צור קטגוריה חדשה' save: 'שמור קטגוריה' slug: 'כתובת חלזונית לקטגוריה' slug_placeholder: '(אופציונאלי) מלים-מחוברות-במקפים-לכתובת-URL' @@ -1364,6 +1397,7 @@ he: change_in_category_topic: "ערוך תיאור" already_used: 'הצבע הזה בשימוש על ידי קטגוריה אחרת' security: "אבטחה" + special_warning: "Warning: This category is a pre-seeded category and the security settings cannot be edited. If you do not wish to use this category, delete it instead of repurposing it." images: "תמונות" auto_close_label: "נעל נושאים אוטומטית אחרי:" auto_close_units: "שעות" @@ -1371,6 +1405,7 @@ he: email_in_allow_strangers: "קבלת דוא\"ל ממשתמשים אנונימיים ללא חשבונות במערכת הפורומים" email_in_disabled: "האפשרות פרסום נושאים חדשים דרך הדוא\"ל נוטרלה דרך הגדרות האתר. לאפשר פרסום באמצעות משלוח דוא\"ל." email_in_disabled_click: 'אפשרו את את ההגדרה "דוא"ל נכנס"' + suppress_from_homepage: "הרחק קטגוריה זו מהעמוד הראשי" allow_badges_label: "הרשו לתגים (badges) להיות מוענקים בקטגוריה זו" edit_permissions: "ערוך הרשאות" add_permission: "הוסף הרשאה" @@ -1727,7 +1762,6 @@ he: enabled: "מאופשר?" is_enabled: "Y" not_enabled: "N" - cant_disable: "-" change_settings: "שינוי הגדרות" change_settings_short: "הגדרות" howto: "איך אני מתקין/מתקינה הרחבות?" @@ -2315,6 +2349,24 @@ he: confirm_delete: "האם אתה בטוח שאתה רוצה למחוק את הhost הזה? " sample: "השתמש בקוד HTML הבא באתר שלך על מנת ליצור נושאי דיסקורס משולבים. החלף REPLACE_ME בURL הקאנוני של העמוד שבו אתה מכניס נושא מכונן. " title: "שילוב (embedding)" + host: "מארחים הורשו" + edit: "ערוך" + category: "פרסם לקטגוריה" + add_host: "הוסיפו מארח" + settings: "הגדרות הטמעה" + feed_settings: "הגדרות פיד" + feed_description: "לספק פיד RSS/ATOM לאתרך יכול לשפר את היכולת של דיסקורס ליבא את התוכן שלך." + crawling_settings: "Crawler 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: "שם משתמש ליצירת נושא" + embed_post_limit: "מספר מקסימלי של פרסומים להטמעה." + embed_username_key_from_feed: "מפתח למשיכת שם המשתמש ב-discourse מהפיד." + embed_truncate: "חיתוך הפרסומים המוטמעים." + embed_whitelist_selector: "בוררי CSS לאלמנטים שיותר להטמיע." + embed_blacklist_selector: "בוררי CSS לאלמנטים שיוסרו מן ההטמעות." + feed_polling_enabled: "יבוא פרסומים דרך RSS/ATOM" + feed_polling_url: "URL of RSS/ATOM feed to crawl" + save: "שמור הגדרות הטמעה" permalink: title: "קישורים קבועים" url: "כתובת" @@ -2345,6 +2397,8 @@ he: categories: 'g, c Categories' top: 'g, t Top' bookmarks: 'סימניות g, b' + profile: 'g, p פרופיל' + messages: 'g, m הודעות' navigation: title: 'ניווט' jump: '# מעבר לפרסום #' @@ -2356,12 +2410,14 @@ he: title: 'יישום' create: 'c צור נושא חדש' notifications: 'n פתח התראות' + hamburger_menu: '= פתח תפריט המבורגר' user_profile_menu: 'pפתיחת תפריט משתמש/ת' show_incoming_updated_topics: '. הצגת נושאים שעודכנו' search: '/ חיפוש' help: '? הצגת עזרת מקלדת' dismiss_new_posts: 'x, r שחרור הודעות/חדשות' dismiss_topics: 'x, t שחרור נושאים' + log_out: 'shift+z shift+z התנתק' actions: title: 'פעולות' bookmark_topic: 'f החלפת נושא סימניה' @@ -2489,3 +2545,21 @@ he: reader: name: מקראה description: קראו כל פרסום בנושא עם יותר מ-100 פרסומים + popular_link: + name: לינק פופלארי + description: פרסם קישור חיצוני עם לפחות 50 לחיצות + hot_link: + name: קישור חם + description: פרסם קישור חיצוני עם לפחות 300 לחיצות + famous_link: + name: קישור מפורסם + description: פרסם קישור חיצוני עם לפחות 1000 לחיצות + google_search: | +

        חפש עם גוגל

        +

        + + + + + +

        diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml index 2ab2f8668d..aa3b25d03c 100644 --- a/config/locales/client.it.yml +++ b/config/locales/client.it.yml @@ -740,7 +740,6 @@ it: title_placeholder: "In breve, di cosa tratta questo argomento?" edit_reason_placeholder: "perché stai scrivendo?" show_edit_reason: "(aggiungi motivo della modifica)" - reply_placeholder: "Scrivi qui. Per formattare il testo usa Markdown, BBCode o HTML. Trascina o incolla una immagine per caricarla." view_new_post: "Visualizza il tuo nuovo messaggio." saving: "Salvataggio..." saved: "Salvato!" @@ -818,7 +817,6 @@ it: local_tip: "seleziona immagina dal tuo dispositivo" local_tip_with_attachments: "seleziona immagini o file dal tuo dispositivo ({{authorized_extensions}})" hint: "(puoi anche trascinarle nell'editor per caricarle)" - hint_for_supported_browsers: "puoi anche trascinare o fare \"copia & incolla\" delle immagini all'interno dell'editor per caricarle" uploading: "In caricamento" select_file: "Seleziona File" image_link: "collegamento a cui la tua immagine punterà" @@ -1709,7 +1707,6 @@ it: enabled: "Abilitato?" is_enabled: "S" not_enabled: "N" - cant_disable: "-" change_settings: "Cambia Impostazioni" change_settings_short: "Impostazioni" howto: "Come installo i plugin?" diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml index 9af856e528..1109b022a4 100644 --- a/config/locales/client.ja.yml +++ b/config/locales/client.ja.yml @@ -678,7 +678,6 @@ ja: title_placeholder: "トピックのタイトルを入力してください。" edit_reason_placeholder: "編集する理由は何ですか?" show_edit_reason: "(編集理由を追加)" - reply_placeholder: "ここに入力してください。Markdown、BBCode、HTMLが利用できます。ドラッグもしくはペーストで画像をアップロードできます。" view_new_post: "新規ポストを見る。" saving: "保存中..." saved: "保存完了!" @@ -756,7 +755,6 @@ ja: local_tip: "ローカルからアップロードする画像を選択" local_tip_with_attachments: "ローカルからアップロードする画像またはファイルを選択 ({{authorized_extensions}})" hint: "(アップロードする画像をエディタにドラッグ&ドロップすることもできます)" - hint_for_supported_browsers: "アップロードする画像をエディタにドラッグ&ドロップまたは貼り付けることもできます" uploading: "アップロード中" select_file: "ファイル選択" image_link: "イメージのリンク先" @@ -1599,7 +1597,6 @@ ja: enabled: "有効" is_enabled: "有効" not_enabled: "無効" - cant_disable: "-" change_settings: "設定変更" change_settings_short: "設定" howto: "プラグインをインストールするには？" diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml index 6ec6c70699..95dce22062 100644 --- a/config/locales/client.ko.yml +++ b/config/locales/client.ko.yml @@ -90,7 +90,7 @@ ko: google+: 'Google+로 공유' email: '이메일로 공유' action_codes: - split_topic: "이 토픽을 분리" + split_topic: "이 글타래를 분리" autoclosed: enabled: '%{when} 닫기' disabled: '%{when} 열기' @@ -303,7 +303,7 @@ ko: latest_by: "가장 최근" toggle_ordering: "정렬 컨트롤 토글" subcategories: "하위 카테고리" - topic_stats: "새 토픽 수" + topic_stats: "새 글타래 수" topic_stat_sentence: other: "지난 %{unit} 동안 %{count}개의 새로운 토픽이 있습니다." post_stats: "새 게시글 수" @@ -369,13 +369,13 @@ ko: suspended_notice: "이 사용자는 {{date}}까지 접근 금지 되었습니다." suspended_reason: "이유: " github_profile: "Github" - mailing_list_mode: "(토픽이나 카테고리의 알림을 끄지 않는 한) 모든 새로운 글에 대해 메일을 보내주세요." + mailing_list_mode: "(글타래가나 카테고리의 알림을 끄지 않는 한) 모든 새로운 글에 대해 메일을 보내주세요." watched_categories: "지켜보기" - watched_categories_instructions: "이 카테고리 내의 새로운 토픽들을 지켜보도록 자동으로 설정됩니다. 새로운 게시글이나 토픽에 대하여 알림을 받게되며 토픽 옆에 읽지 않은 게시글의 수가 표시됩니다." + watched_categories_instructions: "이 카테고리 내의 새로운 글타래들을 지켜보도록 자동으로 설정됩니다. 새로운 글이나 글타래에 대하여 알림을 받게되며 글타래 옆에 읽지 않은 글의 수가 표시됩니다." tracked_categories: "추적하기" - tracked_categories_instructions: "이 카테고리 내의 새로운 토픽들을 추적하도록 자동으로 설정됩니다. 토픽 옆에 읽지 않은 게시글의 수가 표시됩니다." + tracked_categories_instructions: "이 카테고리 내의 새로운 글타래들을 추적하도록 자동으로 설정됩니다. 글타래 옆에 읽지 않은 글의 수가 표시됩니다." muted_categories: "알림 끄기" - muted_categories_instructions: "이 카테고리들에 새로 작성되는 새로운 토픽에 대한 알림이 오지 않도록 합니다. '읽지 않은'탭에서도 보이지 않게 됩니다." + muted_categories_instructions: "이 카테고리들에 새로 작성되는 새로운 글타래에 대한 알림이 오지 않도록 합니다. '읽지 않은'탭에서도 보이지 않게 됩니다." delete_account: "내 계정 삭제" delete_account_confirm: "영구적으로 계정을 삭제해도 되겠습니까? 이 작업은 되돌릴 수 없습니다." deleted_yourself: "성공적으로 계정이 삭제 되었습니다." @@ -387,7 +387,7 @@ ko: muted_users_instructions: "이 사용자들이 보낸 알림 모두 숨김" staff_counters: flags_given: "유용한 신고" - flagged_posts: "신고된 게시글" + flagged_posts: "신고된 글" deleted_posts: "삭제된 글" suspensions: "정지시킨 계정" warnings_received: "경고" @@ -484,7 +484,7 @@ ko: every_three_days: "매 3일마다" weekly: "매주" every_two_weeks: "격주" - email_direct: "누군가 나를 인용했을 때, 내 글에 답글을 달았을때, 내 이름을 멘션했을때 혹은 토픽에 나를 초대했을 떄 이메일 보내기" + email_direct: "누군가 나를 인용했을 때, 내 글에 답글을 달았을때, 내 이름을 멘션했을때 혹은 글타래에 나를 초대했을 떄 이메일 보내기" email_private_messages: "누군가 나에게 메시지를 보냈을때 이메일 보내기" email_always: "사이트를 이용중 일 때도 이메일 알림 보내기" other_settings: "추가 사항" @@ -492,12 +492,12 @@ ko: new_topic_duration: label: "새글을 정의해주세요." not_viewed: "아직 보지 않았습니다." - last_here: "마지막 방문이후 작성된 토픽" - after_1_day: "지난 하루간 생성된 토픽" - after_2_days: "지난 2일간 생성된 토픽" - after_1_week: "최근 일주일간 생성된 토픽" - after_2_weeks: "지난 2주간 생성된 토픽" - auto_track_topics: "마지막 방문이후 작성된 토픽" + last_here: "마지막 방문이후 작성된 글타래" + after_1_day: "지난 하루간 생성된 글타래" + after_2_days: "지난 2일간 생성된 글타래" + after_1_week: "최근 일주일간 생성된 글타래" + after_2_weeks: "지난 2주간 생성된 글타래" + auto_track_topics: "마지막 방문이후 작성된 글타래" auto_track_options: never: "하지않음" immediately: "즉시" @@ -520,8 +520,8 @@ ko: pending: "초대를 보류합니다." pending_tab: "보류" pending_tab_with_count: "지연 ({{count}})" - topics_entered: "토픽이 입력되었습니다." - posts_read_count: "게시물 읽기" + topics_entered: "글타래가 입력되었습니다." + posts_read_count: "글 읽기" expired: "이 초대장의 기한이 만료되었습니다." rescind: "삭제" rescinded: "초대가 제거되었습니다." @@ -563,7 +563,7 @@ ko: posted_by: "에 의해 작성되었습니다" sent_by: "에 의해 전송되었습니다" private_message: "메시지" - the_topic: "토픽" + the_topic: "글타래" loading: "로딩 중..." errors: prev_page: "로드하는 중" @@ -591,27 +591,27 @@ ko: login_disabled: "사이트가 읽기 전용모드로 되면서 로그인은 비활성화되었습니다." learn_more: "더 배우기" year: '년' - year_desc: '지난 365일간 생성된 토픽' + year_desc: '지난 365일간 생성된 글타래' month: '월' - month_desc: '지난 30일간 생성된 토픽' + month_desc: '지난 30일간 생성된 글타래' week: '주' - week_desc: '지난 7일간 생성된 토픽' + week_desc: '지난 7일간 생성된 글타래' day: '일' - first_post: 첫 번째 게시물 + first_post: 첫 번째 글 mute: 음소거 unmute: 음소거 해제 - last_post: 최근 게시물 + last_post: 최근 글 last_reply_lowercase: 마지막 답글 replies_lowercase: other: 답글 summary: - enabled_description: "현재 토픽에서 가장 인기 있는 몇 개의 글들을 보고 있습니다." + enabled_description: "현재 글타래에서 가장 인기 있는 몇 개의 글들을 보고 있습니다." description: "{{count}}개의 답글이 있습니다." description_time: "총 {{count}}개의 댓글이 있습니다. 예상 소요 시간은 {{readingTime}}분입니다.." - enable: '이 토픽을 요약' + enable: '이 글타래를 요약' disable: 'Show All Posts' deleted_filter: - enabled_description: "이 토픽은 삭제된 글들을 포함하고 있습니다. 삭제된 글을 보이지 않습니다." + enabled_description: "이 글타래는 삭제된 글들을 포함하고 있습니다. 삭제된 글을 보이지 않습니다." disabled_description: "삭제된 글들을 표시하고 있습니다." enable: "삭제된 글 숨김" disable: "삭제된 글 보기" @@ -686,41 +686,40 @@ ko: composer: emoji: "Emoji :smile:" add_warning: "공식적인 경고입니다." - posting_not_on_topic: "어떤 토픽에 답글을 작성하시겠습니까?" + posting_not_on_topic: "어떤 글타래에 답글을 작성하시겠습니까?" saving_draft_tip: "저장 중..." saved_draft_tip: "저장 완료" saved_local_draft_tip: "로컬로 저장됩니다." - similar_topics: "작성하려는 내용과 비슷한 토픽들..." + similar_topics: "작성하려는 내용과 비슷한 글타래들..." drafts_offline: "초안" error: title_missing: "제목은 필수 항목입니다" title_too_short: "제목은 최소 {{min}} 글자 이상이어야 합니다." title_too_long: "제목은 {{max}} 글자 이상일 수 없습니다." - post_missing: "게시글 내용은 필수 입니다." - post_length: "게시글은 최소 {{min}} 글자 이상이어야 합니다." + post_missing: "글 내용은 필수 입니다." + post_length: "글은 최소 {{min}} 글자 이상이어야 합니다." try_like: ' 버튼을 사용해 보셨나요?' category_missing: "카테고리를 선택해주세요." save_edit: "편집 저장" - reply_original: "기존 토픽에 대해 답글을 작성합니다." + reply_original: "기존 글타래에 대해 답글을 작성합니다." reply_here: "여기에 답글을 작성하세요." reply: "답글 전송" cancel: "취소" - create_topic: "토픽(글) 쓰기" + create_topic: "글타래(글) 쓰기" create_pm: "메시지" title: "혹은 Ctrl + Enter 누름" users_placeholder: "사용자 추가" title_placeholder: "이야기 나누고자 하는 내용을 한문장으로 적는다면?" edit_reason_placeholder: "why are you editing?" show_edit_reason: "(add edit reason)" - reply_placeholder: "여기에 입력하세요. 마크 다운이나 BBCode 혹은 HTML 형식을 사용하세요. 이미지는 드래그나 붙여넣고로 업로드 할 수 있어요." - view_new_post: "새로운 게시물을 볼 수 있습니다." + view_new_post: "새로운 글을 볼 수 있습니다." saving: "저장 중..." saved: "저장 완료!" saved_draft: "작성중인 글이 있습니다. 계속 작성하려면 여기를 클릭하세요." uploading: "업로딩 중..." show_preview: '미리보기를 보여줍니다 «' hide_preview: '« 미리보기를 숨기기' - quote_post_title: "전체 게시물을 인용" + quote_post_title: "전체 글을 인용" bold_title: "굵게" bold_text: "굵게하기" italic_title: "강조" @@ -737,7 +736,7 @@ ko: upload_description: "업로드 설명을 입력" olist_title: "번호 매기기 목록" ulist_title: "글 머리 기호 목록" - list_item: "토픽" + list_item: "글타래" heading_title: "표제" heading_text: "표제" hr_title: "수평선" @@ -745,21 +744,21 @@ ko: redo_title: "다시" help: "마크다운 편집 도움말" toggler: "작성 패널을 숨기거나 표시" - admin_options_title: "이 토픽에 대한 옵션 설정" + admin_options_title: "이 글타래에 대한 옵션 설정" auto_close: - label: "자동-닫기 토픽 시간:" + label: "자동-닫기 글타래 시간:" error: "유효한 값은 눌러주세요." - based_on_last_post: "적어도 토픽의 마지막 글이 이만큼 오래되지 않았으면 닫지 마세요." + based_on_last_post: "적어도 글타래의 마지막 글이 이만큼 오래되지 않았으면 닫지 마세요." all: examples: '시간을 숫자(24이하)로 입력하거나 분을 포함한 시간(17:30) 혹은 타임스탬프(2013-11-22 14:00) 형식으로 입력하세요.' limited: units: "(# 시간)" examples: '시간에 해당하는 숫자를 입력하세요. (24)' notifications: - title: "@name 멘션, 게시글과 토픽에 대한 답글, 개인 메시지 등에 대한 알림" + title: "@name 멘션, 글과 글타래에 대한 답글, 개인 메시지 등에 대한 알림" none: "현재 알림을 불러올 수 없습니다." more: "이전 알림을 볼 수 있습니다." - total_flagged: "관심 표시된 총 게시글" + total_flagged: "관심 표시된 총 글" mentioned: "

        {{username}} {{description}}

        " quoted: "

        {{username}} {{description}}

        " replied: "

        {{username}} {{description}}

        " @@ -779,7 +778,7 @@ ko: replied: '"{{topic}}" - {{site_title}}에서 {{username}} 님이 내게 답글을 달았습니다' posted: '"{{topic}}" - {{site_title}}에서 {{username}}님이 글을 게시하였습니다' private_message: '{{username}}가 비공개 메시지를 "{{topic}}" - {{site_title}} 에 작성했습니다' - linked: '{{username}}님이 "{{topic}}" - {{site_title}}에 내 게시물을 링크했습니다' + linked: '{{username}}님이 "{{topic}}" - {{site_title}}에 내 글을 링크했습니다' upload_selector: title: "이미지 추가하기" title_with_attachments: "이미지 또는 파일 추가하기" @@ -790,12 +789,11 @@ ko: local_tip: "기기에서 이미지 선택" local_tip_with_attachments: "기기에서이미지 또는 파일을 선택 ({{authorized_extensions}})" hint: "(드래그&드랍으로 업로드 가능)" - hint_for_supported_browsers: "이미지 파일을 드래그&드랍하거나 붙여넣기하여 업로드 할 수 있습니다." uploading: "업로드 중입니다..." select_file: "파일 선택" image_link: "이 이미지를 누르면 이동할 링크" search: - title: "토픽, 게시글, 사용자, 카테고리 검색" + title: "글타래, 글, 사용자, 카테고리 검색" no_results: "검색 결과가 없습니다" no_more_results: "더 이상 결과가 없습니다." search_help: 검색 도움말 @@ -804,144 +802,144 @@ ko: context: user: "@{{username}}의 글 검색" category: "\"{{category}}\" 카테고리 검색" - topic: "이 토픽을 검색" + topic: "이 글타래를 검색" private_messages: "메시지 검색" - hamburger_menu: "다른 토픽 목록이나 카테고리로 가기" + hamburger_menu: "다른 글타래 목록이나 카테고리로 가기" go_back: '돌아가기' not_logged_in_user: 'user page with summary of current activity and preferences' current_user: '사용자 페이지로 이동' topics: bulk: reset_read: "읽기 초기화" - delete: "토픽 삭제" - dismiss_posts: "게시글 닫기" - dismiss_posts_tooltip: "이 토픽들의 '읽지 않은' 표시를 없애고 새 토픽이 발생하면 내 '읽지 않은' 목록에 표시하기" - dismiss_topics: "토픽 닫기" + delete: "글타래 삭제" + dismiss_posts: "글 닫기" + dismiss_posts_tooltip: "이 글타래들의 '읽지 않은' 표시를 없애고 새 글타래가 발생하면 내 '읽지 않은' 목록에 표시하기" + dismiss_topics: "글타래 닫기" dismiss_topics_tooltip: "새글이 발생할 때 내 '읽지 않은' 목록에 표시하지 않기" dismiss_new: "새글 제거" - toggle: "복수토픽 선택 기능" + toggle: "복수글타래 선택 기능" actions: "일괄 적용" change_category: "카테고리 변경" - close_topics: "토픽 닫기" - archive_topics: "토픽 보관하기" + close_topics: "글타래 닫기" + archive_topics: "글타래 보관하기" notification_level: "알림 설정 변경" - choose_new_category: "토픽의 새로운 카테고리를 선택" + choose_new_category: "글타래의 새로운 카테고리를 선택" selected: - other: "{{count}}개의 토픽이 선택되었습니다." + other: "{{count}}개의 글타래가 선택되었습니다." none: - unread: "읽지 않은 토픽이 없습니다." - new: "읽을 새로운 토픽이 없습니다." - read: "아직 어떠한 토픽도 읽지 않았습니다." - posted: "아직 어떠한 토픽도 작성되지 않았습니다." - latest: "최신 토픽이 없습니다." - hot: "인기있는 토픽이 없습니다." - bookmarks: "아직 북마크한 토픽이 없습니다." - category: "{{category}}에 토픽이 없습니다." - top: "Top 토픽이 없습니다." + unread: "읽지 않은 글타래가 없습니다." + new: "읽을 새로운 글타래가 없습니다." + read: "아직 어떠한 글타래도 읽지 않았습니다." + posted: "아직 어떠한 글타래도 작성되지 않았습니다." + latest: "최신 글타래가 없습니다." + hot: "인기있는 글타래가 없습니다." + bookmarks: "아직 북마크한 글타래가 없습니다." + category: "{{category}}에 글타래가 없습니다." + top: "Top 글타래가 없습니다." search: "검색 결과가 없습니다." educate: - new: '

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

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

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

        ' - unread: '

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

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

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

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

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

        ' + new: '

        새로운 글타래는 여기에서 볼 수 있습니다.

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

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

        ' + unread: '

        읽지 않은 글타래는 여기에서 볼 수 있습니다.

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

        • 글타래를 만든 경우
        • 글타래에 리플을 단 경우
        • 글타래를 4분 이상 읽은 경우

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

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

        ' bottom: - latest: "더 이상 읽을 최신 토픽이 없습니다" - hot: "더 이상 읽을 인기있는 토픽이 없습니다" - posted: "더 이상 작성된 토픽이 없습니다" - read: "더 이상 읽을 토픽이 없습니다" - new: "더 이상 읽을 새로운 토픽이 없습니다." - unread: "더 이상 읽지 않은 토픽이 없습니다" - category: "더 이상 {{category}}에 토픽이 없습니다" - top: "더 이상 인기 토픽이 없습니다." - bookmarks: "더이상 북마크한 토픽이 없습니다." + latest: "더 이상 읽을 최신 글타래가 없습니다" + hot: "더 이상 읽을 인기있는 글타래가 없습니다" + posted: "더 이상 작성된 글타래가 없습니다" + read: "더 이상 읽을 글타래가 없습니다" + new: "더 이상 읽을 새로운 글타래가 없습니다." + unread: "더 이상 읽지 않은 글타래가 없습니다" + category: "더 이상 {{category}}에 글타래가 없습니다" + top: "더 이상 인기 글타래가 없습니다." + bookmarks: "더이상 북마크한 글타래가 없습니다." search: "더이상 검색 결과가 없습니다." topic: unsubscribe: change_notification_state: "현재 당신의 알림 설정 : " - filter_to: "이 토픽에서 {{username}}님의 {{post_count}}건의 게시물만 보기" - create: '새 토픽 만들기' - create_long: '새로운 토픽을 개설' + filter_to: "이 글타래에서 {{username}}님의 {{post_count}}건의 글만 보기" + create: '새 글타래 만들기' + create_long: '새로운 글타래를 개설' private_message: '메시지 시작' - list: '토픽 목록' - new: '새로운 토픽' + list: '글타래 목록' + new: '새로운 글타래' unread: '읽지 않은' new_topics: - other: '{{count}}개의 새로운 토픽' + other: '{{count}}개의 새로운 글타래' unread_topics: - other: '{{count}}개의 읽지 않은 토픽' - title: '토픽' + other: '{{count}}개의 읽지 않은 글타래' + title: '글타래' invalid_access: - title: "이 토픽은 비공개입니다" - description: "죄송합니다. 그 토픽에 접근 할 수 없습니다!" - login_required: "해당 토픽을 보려면 로그인이 필요합니다." + title: "이 글타래는 비공개입니다" + description: "죄송합니다. 그 글타래에 접근 할 수 없습니다!" + login_required: "해당 글타래를 보려면 로그인이 필요합니다." server_error: - title: "토픽을 불러오지 못했습니다" - description: "죄송합니다. 연결 문제로 인해 해당 토픽을 불러올 수 없습니다. 다시 시도하십시오. 문제가 지속되면 문의해 주시기 바랍니다" + title: "글타래를 불러오지 못했습니다" + description: "죄송합니다. 연결 문제로 인해 해당 글타래를 불러올 수 없습니다. 다시 시도하십시오. 문제가 지속되면 문의해 주시기 바랍니다" not_found: - title: "토픽을 찾을 수 없습니다" - description: "죄송합니다. 토픽을 찾을 수 없습니다. 아마도 운영자에 의해 삭제된 것 같습니다." + title: "글타래를 찾을 수 없습니다" + description: "죄송합니다. 글타래를 찾을 수 없습니다. 아마도 운영자에 의해 삭제된 것 같습니다." total_unread_posts: - other: "이 토픽에 {{count}}개의 읽지 않을 게시 글이 있습니다." + other: "이 글타래에 {{count}}개의 읽지 않을 게시 글이 있습니다." unread_posts: - other: "이 토픽에 {{count}}개의 읽지 않을 게시 글이 있습니다." + other: "이 글타래에 {{count}}개의 읽지 않을 게시 글이 있습니다." new_posts: - other: "최근 읽은 이후 {{count}}개 글이 이 토픽 작성되었습니다." + other: "최근 읽은 이후 {{count}}개 글이 이 글타래 작성되었습니다." likes: - other: "이 토픽에 {{count}}개의 '좋아요'가 있습니다." - back_to_list: "토픽 리스트로 돌아갑니다." - options: "토픽 옵션" - show_links: "이 토픽에서 링크를 표시합니다." - toggle_information: "토픽의 세부 정보를 토글합니다." - read_more_in_category: "더 많은 토픽들은 {{catLink}} 또는 {{latestLink}}에서 찾으실 수 있습니다" - read_more: "{{catLink}} 또는 {{latestLink}}에서 더 많은 토픽들을 찾으실 수 있습니다" - read_more_MF: "이 카테고리에 { UNREAD, plural, =0 {} one { is 1개의 안 읽은 } other { are #개의 안 읽은 } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} 1개의 새로운 토픽이} other { {BOTH, select, true{and } false {are } other{}} # 새로운 토픽이} } 남아 있고, {CATEGORY, select, true {{catLink} 토픽도 확인해보세요.} false {{latestLink}} other {}}" + other: "이 글타래에 {{count}}개의 '좋아요'가 있습니다." + back_to_list: "글타래 리스트로 돌아갑니다." + options: "글타래 옵션" + show_links: "이 글타래에서 링크를 표시합니다." + toggle_information: "글타래의 세부 정보를 토글합니다." + read_more_in_category: "더 많은 글타래들은 {{catLink}} 또는 {{latestLink}}에서 찾으실 수 있습니다" + read_more: "{{catLink}} 또는 {{latestLink}}에서 더 많은 글타래들을 찾으실 수 있습니다" + read_more_MF: "이 카테고리에 { UNREAD, plural, =0 {} one { is 1개의 안 읽은 } other { are #개의 안 읽은 } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} 1개의 새로운 글타래가} other { {BOTH, select, true{and } false {are } other{}} # 새로운 글타래가} } 남아 있고, {CATEGORY, select, true {{catLink} 글타래도 확인해보세요.} false {{latestLink}} other {}}" browse_all_categories: 모든 카테고리 보기 - view_latest_topics: 최신 토픽 보기 + view_latest_topics: 최신 글타래 보기 suggest_create_topic: 토픽(글)을 작성 해 보실래요? jump_reply_up: 이전 답글로 이동 jump_reply_down: 이후 답글로 이동 - deleted: "토픽이 삭제되었습니다" - auto_close_notice: "이 토픽은 곧 자동으로 닫힙니다. %{timeLeft}." - auto_close_notice_based_on_last_post: "이 토픽은 마지막 답글이 달린 %{duration} 후 닫힙니다." + deleted: "글타래가 삭제되었습니다" + auto_close_notice: "이 글타래는 곧 자동으로 닫힙니다. %{timeLeft}." + auto_close_notice_based_on_last_post: "이 글타래는 마지막 답글이 달린 %{duration} 후 닫힙니다." auto_close_title: '자동으로 닫기 설정' auto_close_save: "저장" - auto_close_remove: "이 토픽을 자동으로 닫지 않기" + auto_close_remove: "이 글타래를 자동으로 닫지 않기" progress: - title: 진행 중인 토픽 + title: 진행 중인 글타래 go_top: "맨위" go_bottom: "맨아래" go: "이동" - jump_bottom: "최근 게시글로 이동" + jump_bottom: "최근 글로 이동" jump_bottom_with_number: "jump to post %{post_number}" - total: 총 게시글 - current: 현재 게시글 + total: 총 글 + current: 현재 글 position: "post %{current} of %{total}" notifications: reasons: '3_6': '이 카테고리를 보고 있어서 알림을 받게 됩니다.' - '3_5': '자동으로 이 게시물을 보고있어서 알림을 받게 됩니다.' - '3_2': '이 토픽을 보고있어서 알림을 받게 됩니다.' - '3_1': '이 토픽을 생성하여서 알림을 받게 됩니다.' - '3': '이 토픽을 보고있어서 알림을 받게 됩니다.' - '2_8': '이 토픽을 추적하고 있어서 알림을 받게 됩니다.' - '2_4': '이 토픽에 답글을 게시하여서 알림을 받게 됩니다.' - '2_2': '이 토픽을 추적하고 있어서 알림을 받게 됩니다.' - '2': '이 토픽을 읽어서 알림을 받게 됩니다. (설정)' + '3_5': '자동으로 이 글을 보고있어서 알림을 받게 됩니다.' + '3_2': '이 글타래를 보고있어서 알림을 받게 됩니다.' + '3_1': '이 글타래를 생성하여서 알림을 받게 됩니다.' + '3': '이 글타래를 보고있어서 알림을 받게 됩니다.' + '2_8': '이 글타래를 추적하고 있어서 알림을 받게 됩니다.' + '2_4': '이 글타래에 답글을 게시하여서 알림을 받게 됩니다.' + '2_2': '이 글타래를 추적하고 있어서 알림을 받게 됩니다.' + '2': '이 글타래를 읽어서 알림을 받게 됩니다. (설정)' '1_2': '누군가 내 @아아디 으로 멘션했거나 내 글에 답글이 달릴 때 알림을 받게 됩니다.' '1': '누군가 내 @아아디 으로 멘션했거나 내 글에 답글이 달릴 때 알림을 받게 됩니다.' - '0_7': '이 토픽에 관한 모든 알림을 무시하고 있습니다.' - '0_2': '이 토픽에 관한 모든 알림을 무시하고 있습니다.' - '0': '이 토픽에 관한 모든 알림을 무시하고 있습니다.' + '0_7': '이 글타래에 관한 모든 알림을 무시하고 있습니다.' + '0_2': '이 글타래에 관한 모든 알림을 무시하고 있습니다.' + '0': '이 글타래에 관한 모든 알림을 무시하고 있습니다.' watching_pm: title: "알림 : 주시 중" description: "이 메시지에 새로운 답글이 있을 때 알림을 받게 되며 새로운 답글의 개수는 표시됩니다." watching: title: "주시 중" - description: "이 토픽에 새로운 답글이 있을 때 알림을 받게 되며 새로운 답글의 개수는 표시됩니다." + description: "이 글타래에 새로운 답글이 있을 때 알림을 받게 되며 새로운 답글의 개수는 표시됩니다." tracking_pm: title: "알림 : 새 글 표시 중" description: "이 메시지의 읽지않은 응답의 수가 표시됩니다. 누군가 내 @아이디를 멘션했거나 내게 답글을 작성하면 알림을 받습니다." tracking: title: "새 글 표시 중" - description: "이 토픽의 새로운 답글의 수가 표시됩니다. 누군가 내 @아이디를 멘션했거나 내게 답글을 작성하면 알림을 받습니다." + description: "이 글타래의 새로운 답글의 수가 표시됩니다. 누군가 내 @아이디를 멘션했거나 내게 답글을 작성하면 알림을 받습니다." regular: title: "알림 : 일반" description: "누군가 내 @아아디 으로 멘션했거나 내 글에 답글이 달릴 때 알림을 받게 됩니다." @@ -955,64 +953,64 @@ ko: title: "알림 없음" description: "아무 알림도 없습니다. '읽지 않은 글' 탭에 나타나지 않습니다." actions: - recover: "토픽 다시 복구" - delete: "토픽 삭제" - open: "토픽 열기" - close: "토픽 닫기" - multi_select: "게시글 선택" + recover: "글타래 다시 복구" + delete: "글타래 삭제" + open: "글타래 열기" + close: "글타래 닫기" + multi_select: "글 선택" auto_close: "자동으로 닫기..." - pin: "토픽 고정..." - unpin: "토픽 고정 취소..." - unarchive: "보관 안된 토픽" - archive: "보관된 토픽" + pin: "글타래 고정..." + unpin: "글타래 고정 취소..." + unarchive: "보관 안된 글타래" + archive: "보관된 글타래" invisible: "목록에서 제외하기" visible: "목록에 넣기" reset_read: "값 재설정" feature: - pin: "토픽 고정" - unpin: "토픽 고정 취소" - pin_globally: "전역적으로 토픽 고정" - make_banner: "배너 토픽" - remove_banner: "배너 토픽 제거" + pin: "글타래 고정" + unpin: "글타래 고정 취소" + pin_globally: "전역적으로 글타래 고정" + make_banner: "배너 글타래" + remove_banner: "배너 글타래 제거" reply: title: '답글' - help: '이 토픽에 대한 답글 구성 시작' + help: '이 글타래에 대한 답글 구성 시작' clear_pin: title: "고정 취소" - help: "더 이상 목록의 맨 위에 표시하지 않도록 이 토픽의 고정 상태를 해제합니다." + help: "더 이상 목록의 맨 위에 표시하지 않도록 이 글타래의 고정 상태를 해제합니다." share: title: '공유' - help: '이 토픽의 링크를 공유' + help: '이 글타래의 링크를 공유' flag_topic: title: '신고' help: '운영자에게 이 글을 신고합니다.' - success_message: '성공적으로 토픽을 신고 하였습니다.' + success_message: '성공적으로 글타래를 신고 하였습니다.' feature_topic: - title: "Feature 토픽" - pin: " {{categoryLink}} 카테고리 토픽 목록 상단에 고정 until" - confirm_pin: "이미 {{count}}개의 고정된 토픽이 있습니다. 너무 많은 토픽이 고정되어 있으면 새로운 사용자나 익명사용자에게 부담이 될 수 있습니다. 정말로 이 카테고리에 추가적으로 토픽을 고정하시겠습니까?" - unpin: "이 토픽을 {{categoryLink}} 카테고리 상단에서 제거 합니다." - unpin_until: "{{categoryLink}} 카테고리 토픽 목록 상단에서 이 토픽을 제거하거나 %{until}까지 기다림." - pin_note: "개별적으로 사용자가 토픽 고정을 취소할 수 있습니다." + title: "Feature 글타래" + pin: " {{categoryLink}} 카테고리 글타래 목록 상단에 고정 until" + confirm_pin: "이미 {{count}}개의 고정된 글타래가 있습니다. 너무 많은 글타래가 고정되어 있으면 새로운 사용자나 익명사용자에게 부담이 될 수 있습니다. 정말로 이 카테고리에 추가적으로 글타래를 고정하시겠습니까?" + unpin: "이 글타래를 {{categoryLink}} 카테고리 상단에서 제거 합니다." + unpin_until: "{{categoryLink}} 카테고리 글타래 목록 상단에서 이 글타래를 제거하거나 %{until}까지 기다림." + pin_note: "개별적으로 사용자가 글타래 고정을 취소할 수 있습니다." already_pinned: - zero: " {{categoryLink}} 카테고리에 고정된 토픽이 없습니다." - one: "{{categoryLink}} 카테고리에 고정된 토픽: 1." - other: "{{categoryLink}} 카테고리에 고정된 토픽: {{count}}." - pin_globally: "모든 토픽 목록 상단 고정 until" - confirm_pin_globally: "이미 {{count}}개의 토픽이 전역적으로 고정되어 있습니다. 너무 많은 토픽이 고정되어 있으면 새로운 사용자나 익명사용자에게 부담이 될 수 있습니다. 정말로 이 토픽을 전역적으로 고정하시겠습니까?" - unpin_globally: "모든 토픽 목록 상단에서 이 토픽을 제거" - unpin_globally_until: "모든 토픽 목록 상단에서 이 토픽을 제거하거나 %{until}까지 기다림." - global_pin_note: "개별적으로 사용자가 토픽 고정을 취소할 수 있습니다." + zero: " {{categoryLink}} 카테고리에 고정된 글타래가 없습니다." + one: "{{categoryLink}} 카테고리에 고정된 글타래: 1." + other: "{{categoryLink}} 카테고리에 고정된 글타래: {{count}}." + pin_globally: "모든 글타래 목록 상단 고정 until" + confirm_pin_globally: "이미 {{count}}개의 글타래가 전역적으로 고정되어 있습니다. 너무 많은 글타래가 고정되어 있으면 새로운 사용자나 익명사용자에게 부담이 될 수 있습니다. 정말로 이 글타래를 전역적으로 고정하시겠습니까?" + unpin_globally: "모든 글타래 목록 상단에서 이 글타래를 제거" + unpin_globally_until: "모든 글타래 목록 상단에서 이 글타래를 제거하거나 %{until}까지 기다림." + global_pin_note: "개별적으로 사용자가 글타래 고정을 취소할 수 있습니다." already_pinned_globally: - zero: "전역적으로 고정된 토픽이 없습니다." - one: "전역적으로 고정된 토픽: 1." - other: "전역적으로 고정된 토픽: {{count}}." - make_banner: "이 토픽을 모든 페이지의 상단에 나타나는 배너로 만들기" + zero: "전역적으로 고정된 글타래가 없습니다." + one: "전역적으로 고정된 글타래: 1." + other: "전역적으로 고정된 글타래: {{count}}." + make_banner: "이 글타래를 모든 페이지의 상단에 나타나는 배너로 만들기" remove_banner: "모든 페이지에서 나타나는 배너에서 제거" - banner_note: "사용자는 배너를 닫음으로써 배너를 나타나지 않게 할 수 있습니다. 단지 어떤 기간동안 딱 하나의 토픽만이 배너로 지정 가능합니다." + banner_note: "사용자는 배너를 닫음으로써 배너를 나타나지 않게 할 수 있습니다. 단지 어떤 기간동안 딱 하나의 글타래만이 배너로 지정 가능합니다." already_banner: - zero: "배너 토픽이 없습니다." - one: "현재 배너토픽이 존재합니다." + zero: "배너 글타래가 없습니다." + one: "현재 배너글타래가 존재합니다." inviting: "초대 중..." automatically_add_to_groups_optional: "이 초대는 다음 그룹에 대한 접근 권한을 포함합니다: (선택, 관리자만 가능)" automatically_add_to_groups_required: "이 초대는 다음 그룹에 대한 접근 권한을 포함합니다: (필수, 관리자만 가능)" @@ -1028,16 +1026,16 @@ ko: title: '초대하기' username_placeholder: "아이디" action: '초대장 보내기' - help: '이메일을 통해 다른 사람을 이 토픽에 초대합니다.' + help: '이메일을 통해 다른 사람을 이 글타래에 초대합니다.' to_forum: "친구에게 요약 이메일을 보내고 이 포럼에 가입할 수 있도록 링크를 전송합니다." - sso_enabled: "이 토픽에 초대하고 싶은 사람의 아이디를 입력하세요." - to_topic_blank: "이 토픽에 초대하고 싶은 사람의 아이디나 이메일주소를 입력하세요." - to_topic_email: "이메일 주소를 입력하셨습니다. 친구들에게 이 토픽에 답변 달기가 가능하도록 조치하는 초대장을 보내겠습니다." - to_topic_username: "아이디를 입력하셨습니다. 이 토픽에 초대하는 링크와 함께 알림을 보내겠습니다." - to_username: "초대하려는 사용자의 아이디를 입력하세요. 이 토픽에 초대하는 링크와 함께 알림을 보내겠습니다." + sso_enabled: "이 글타래에 초대하고 싶은 사람의 아이디를 입력하세요." + to_topic_blank: "이 글타래에 초대하고 싶은 사람의 아이디나 이메일주소를 입력하세요." + to_topic_email: "이메일 주소를 입력하셨습니다. 친구들에게 이 글타래에 답변 달기가 가능하도록 조치하는 초대장을 보내겠습니다." + to_topic_username: "아이디를 입력하셨습니다. 이 글타래에 초대하는 링크와 함께 알림을 보내겠습니다." + to_username: "초대하려는 사용자의 아이디를 입력하세요. 이 글타래에 초대하는 링크와 함께 알림을 보내겠습니다." email_placeholder: '이메일 주소' success_email: "{{emailOrUsername}}로 초대장을 발송했습니다. 초대를 수락하면 알려 드리겠습니다. 초대상태를 확인하려면 사용자 페이지에서 '초대장' 탭을 선택하세요." - success_username: "사용자가 이 토픽에 참여할 수 있도록 초대했습니다." + success_username: "사용자가 이 글타래에 참여할 수 있도록 초대했습니다." error: "그 사람을 초대할 수 없습니다. 혹시 이미 초대하진 않았나요? (Invites are rate limited)" login_reply: '로그인하고 답글 쓰기' filters: @@ -1045,18 +1043,18 @@ ko: other: "{{count}} 글" cancel: "필터 제거" split_topic: - title: "새로운 토픽으로 이동" - action: "새로운 토픽으로 이동" - topic_name: "새로운 토픽 이름" - error: "새로운 토픽으로 이동시키는데 문제가 발생하였습니다." + title: "새로운 글타래로 이동" + action: "새로운 글타래로 이동" + topic_name: "새로운 글타래 이름" + error: "새로운 글타래로 이동시키는데 문제가 발생하였습니다." instructions: - other: "새로운 토픽을 생성하여, 선택한 {{count}}개의 글로 채우려고 합니다." + other: "새로운 글타래를 생성하여, 선택한 {{count}}개의 글로 채우려고 합니다." merge_topic: - title: "이미 있는 토픽으로 옮기기" - action: "이미 있는 토픽으로 옮기기" - error: "이 토픽을 이동시키는데 문제가 발생하였습니다." + title: "이미 있는 글타래로 옮기기" + action: "이미 있는 글타래로 옮기기" + error: "이 글타래를 이동시키는데 문제가 발생하였습니다." instructions: - other: " {{count}}개의 게시물을 옮길 토픽을 선택해주세요." + other: " {{count}}개의 글을 옮길 글타래를 선택해주세요." change_owner: title: "글 소유자 변경" action: "작성자 바꾸기" @@ -1082,9 +1080,9 @@ ko: quote_reply: "인용한 답글" edit: "{{link}} {{replyAvatar}} {{username}} 편집" edit_reason: "Reason: " - post_number: "{{number}}번째 게시물" + post_number: "{{number}}번째 글" last_edited_on: "마지막으로 편집:" - reply_as_new_topic: "링크된 토픽으로 답글 작성하기" + reply_as_new_topic: "링크된 글타래로 답글 작성하기" continue_discussion: "{{postLink}}에서 토론을 계속:" follow_quote: "인용 글로 이동" show_full: "전체 글 보기" @@ -1101,14 +1099,14 @@ ko: has_likes: other: "{{count}} 좋아요" has_likes_title: - other: "{{count}}명이 이 게시글을 좋아합니다" + other: "{{count}}명이 이 글을 좋아합니다" has_likes_title_you: - zero: "이 게시글을 좋아합니다." - one: "당신과 다른 1명이 이 게시글을 좋아합니다." - other: "당신과 {{count}}명이 이 게시글을 좋아합니다." + zero: "이 글을 좋아합니다." + one: "당신과 다른 1명이 이 글을 좋아합니다." + other: "당신과 {{count}}명이 이 글을 좋아합니다." errors: - create: "죄송합니다. 게시물을 만드는 동안 오류가 발생했습니다. 다시 시도하십시오." - edit: "죄송합니다. 게시물을 수정하는 중에 오류가 발생했습니다. 다시 시도하십시오." + create: "죄송합니다. 글을 만드는 동안 오류가 발생했습니다. 다시 시도하십시오." + edit: "죄송합니다. 글을 수정하는 중에 오류가 발생했습니다. 다시 시도하십시오." upload: "죄송합니다. 파일을 업로드하는 동안 오류가 발생했습니다. 다시 시도하십시오." attachment_too_large: "업로드하려는 파일의 크기가 너무 큽니다. 최대 크기는 {{max_size_kb}}kb 입니다." file_too_large: "업로드하시려는 파일이 너무 커요. (최대 허용 파일 크기는 {{max_size_kb}}kb입니다)" @@ -1119,31 +1117,31 @@ ko: attachment_upload_not_allowed_for_new_user: "죄송합니다. 새로운 유저는 파일 첨부를 업로드 하실 수 없습니다." attachment_download_requires_login: "죄송합니다. 첨부 파일을 받으려면 로그인이 필요합니다." abandon: - confirm: "게시물 작성을 취소 하시겠습니까?" + confirm: "글 작성을 취소 하시겠습니까?" no_value: "아니오" yes_value: "예" - via_email: "이 토픽은 이메일을 통해 등록되었습니다." + via_email: "이 글타래는 이메일을 통해 등록되었습니다." wiki: - about: "이 게시글은 위키입니다. 누구나 수정할 수 있습니다." + about: "이 글은 위키입니다. 누구나 수정할 수 있습니다." archetypes: save: '옵션 저장' controls: - reply: "이 게시물에 대한 답글을 작성합니다." - like: "이 게시물을 좋아합니다." - has_liked: "이 게시글을 좋아합니다." + reply: "이 글에 대한 답글을 작성합니다." + like: "이 글을 좋아합니다." + has_liked: "이 글을 좋아합니다." undo_like: "'좋아요' 취소" - edit: "이 게시글 편집" - edit_anonymous: "이 토픽을 수정하려면 먼저 로그인을 해야합니다." + edit: "이 글 편집" + edit_anonymous: "이 글타래를 수정하려면 먼저 로그인을 해야합니다." flag: "운영자에게 이 글을 신고합니다." - delete: "이 게시물을 삭제합니다." - undelete: "이 게시물 삭제를 취소합니다." - share: "이 게시물에 대한 링크를 공유합니다." + delete: "이 글을 삭제합니다." + undelete: "이 글 삭제를 취소합니다." + share: "이 글에 대한 링크를 공유합니다." more: "더" delete_replies: confirm: - other: "이 게시글에 작성된 {{count}}개의 댓글도 삭제하시겠습니까?" + other: "이 글에 작성된 {{count}}개의 댓글도 삭제하시겠습니까?" yes_value: "예, 답글도 삭제합니다." - no_value: "아니오, 게시글만 삭제합니다." + no_value: "아니오, 글만 삭제합니다." admin: "관리자 기능" wiki: "위키 만들기" unwiki: "위키 제거하기" @@ -1171,29 +1169,29 @@ ko: like: "좋아요 취소" vote: "투표 취소" people: - off_topic: "{{icons}}님이 이 게시물을 토픽에서 제외했습니다." + off_topic: "{{icons}}님이 이 글을 글타래에서 제외했습니다." spam: "{{icons}} 스팸으로 신고되었습니다" spam_with_url: "{{icons}} 스팸으로 표시됨" inappropriate: "{{icons}} 부적절하다고 신고했습니다" - notify_moderators: "{{icons}}님은 이 게시물을 운영자에게 보고했습니다." - notify_moderators_with_url: "{{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: "이 게시물을 스팸으로 신고함" - inappropriate: "이 게시물을 부적절로 신고함" - notify_moderators: "이 게시물을 운영자에게 보고함" + off_topic: "이 글을 글타래에서 벗어남으로 신고함" + spam: "이 글을 스팸으로 신고함" + inappropriate: "이 글을 부적절로 신고함" + notify_moderators: "이 글을 운영자에게 보고함" notify_user: "이 사용자에게 메시지를 보냈습니다." - bookmark: "이 게시물을 북마크함" + bookmark: "이 글을 북마크함" like: "'좋아요' 했습니다" - vote: "이 게시글에 투표함" + vote: "이 글에 투표함" by_you_and_others: off_topic: - other: "나와 {{count}}명의 다른 사용자가 이 게시물을 토픽에서 제외했습니다." + other: "나와 {{count}}명의 다른 사용자가 이 글을 글타래에서 제외했습니다." spam: other: "나와 {{count}}명의 다른 사람들이 스팸이라고 신고했습니다" inappropriate: @@ -1210,28 +1208,28 @@ ko: other: "나와 {{count}}명의 다른 사람들이 이 포스트에 투표했습니다." by_others: off_topic: - other: "{{count}}명의 사용자가 이 게시물을 토픽에서 제외했습니다." + other: "{{count}}명의 사용자가 이 글을 글타래에서 제외했습니다." spam: other: "{{count}}명의 사람들이 스팸이라고 신고했습니다" inappropriate: other: "{{count}}명의 사람들이 부적절하다고 신고했습니다" notify_moderators: - other: "{{count}}명의 사람들이 이 게시물을 운영자에게 신고했습니다" + other: "{{count}}명의 사람들이 이 글을 운영자에게 신고했습니다" notify_user: other: "{{count}}명이 이 사용자에게 메시지를 보냈습니다." bookmark: - other: "{{count}}명의 사용자가 이 게시물을 북마크했습니다." + other: "{{count}}명의 사용자가 이 글을 북마크했습니다." like: other: "{{count}}명이 이 글을 좋아합니다" vote: - other: "{{count}}명의 사용자가 이 게시물을 추천했습니다." + other: "{{count}}명의 사용자가 이 글을 추천했습니다." edits: one: 하나 편집 other: "{{count}}개 편집" zero: 편집 안함 delete: confirm: - other: "모든 게시물들을 삭제하시겠습니까?" + other: "모든 글들을 삭제하시겠습니까?" revisions: controls: first: "초판" @@ -1258,10 +1256,10 @@ ko: choose: '카테고리를 선택하세요…' edit: '편집' edit_long: "카테고리 편집" - view: '카테고리안의 토픽보기' + view: '카테고리안의 글타래보기' general: '일반' settings: '설정' - topic_template: "토픽 템플릿" + topic_template: "글타래 템플릿" delete: '카테고리 삭제' create: '새 카테고리' save: '카테고리 저장' @@ -1271,7 +1269,7 @@ ko: save_error: 카테고리 저장 중 오류가 발생했습니다. name: "카테고리 이름" description: "설명" - topic: "카테고리 토픽" + topic: "카테고리 글타래" logo: "카테고리 로고 이미지" background_image: "카테고리 백그라운드 이미지" badge_colors: "뱃지 색상" @@ -1287,11 +1285,11 @@ ko: already_used: '이 색은 다른 카테고리에서 사용되고 있습니다.' security: "보안" images: "이미지" - auto_close_label: "토픽 자동 닫기 :" + auto_close_label: "글타래 자동 닫기 :" auto_close_units: "시간" email_in: "incoming 메일 주소 수정" email_in_allow_strangers: "계정이 없는 익명 유저들에게 이메일을 받습니다." - email_in_disabled: "이메일로 새 토픽 작성하기 기능이 비활성화되어 있습니다. 사이트 설정에서 '이메일로 새 토픽작성하기'를 활성화 해주세요." + email_in_disabled: "이메일로 새 글타래 작성하기 기능이 비활성화되어 있습니다. 사이트 설정에서 '이메일로 새 글타래작성하기'를 활성화 해주세요." email_in_disabled_click: '"email in" 활성화' allow_badges_label: "뱃지가 이 카테고리에서 주어질 수 있도록 허용" edit_permissions: "권한 수정" @@ -1305,32 +1303,32 @@ ko: notifications: watching: title: "주시 중" - description: "이 카테고리 내의 새로운 토픽들을 지켜보도록 자동으로 설정됩니다. 새로운 게시글이나 토픽에 대하여 알림을 받게되며 토픽 옆에 읽지 않은 게시글의 수가 표시됩니다." + description: "이 카테고리 내의 새로운 글타래들을 지켜보도록 자동으로 설정됩니다. 새로운 글이나 글타래에 대하여 알림을 받게되며 글타래 옆에 읽지 않은 글의 수가 표시됩니다." tracking: title: "새 글 표시 중" - description: "이 카테고리 내의 새로운 토픽들을 추적하도록 자동으로 설정됩니다. 토픽 옆에 읽지 않은 게시글의 수가 표시됩니다." + description: "이 카테고리 내의 새로운 글타래들을 추적하도록 자동으로 설정됩니다. 글타래 옆에 읽지 않은 글의 수가 표시됩니다." regular: title: "알림: 일반" description: "누군가 내 @아아디 으로 멘션했거나 당신의 글에 답글이 달릴 때 알림을 받게 됩니다." muted: title: "알림 꺼짐" - description: "이 카테고리의 새로운 토픽에 대한 알림을 받지 않고 읽지 않\x1C은 탭에도 표시하지 않습니다." + description: "이 카테고리의 새로운 글타래에 대한 알림을 받지 않고 읽지 않\x1C은 탭에도 표시하지 않습니다." flagging: title: '우리 커뮤니티에 기여해 주셔서 감사합니다.' private_reminder: '신고는 오직 관리자만 볼 수 있습니다.' - action: '게시물 신고하기' + action: '글 신고하기' take_action: "조치를 취하기" notify_action: '메시지' delete_spammer: "스팸 사용자 삭제" - delete_confirm: "이 사용자의 %{posts}개의 게시글과 %{topics}개의 토픽을 삭제하고 IP주소 %{ip_address}와 이메일 %{email}을 영구 블락하려고 합니다. 이 사용자가 악성 사용자임이 확실합니까? " + delete_confirm: "이 사용자의 %{posts}개의 글과 %{topics}개의 글타래를 삭제하고 IP주소 %{ip_address}와 이메일 %{email}을 영구 블락하려고 합니다. 이 사용자가 악성 사용자임이 확실합니까? " yes_delete_spammer: "예, 스팸 사용자 삭제." ip_address_missing: "(알 수 없음)" hidden_email_address: "(감춰짐)" submit_tooltip: "신고 접수하기" take_action_tooltip: "커뮤니티의 신고 수가 채워지기 기다리지 않고, 바로 신고 수를 제재 수준까지 채웁니다." - cant: "죄송합니다, 지금 이 게시물을 신고 할 수 없습니다." + cant: "죄송합니다, 지금 이 글을 신고 할 수 없습니다." formatted_name: - off_topic: "오프 토픽입니다." + off_topic: "오프 글타래입니다." inappropriate: "부적절함" spam: "스팸입니다" custom_placeholder_notify_user: "구체적이고, 건설적이며, 항상 친절하세요." @@ -1341,10 +1339,10 @@ ko: left: "{{n}} 나머지" flagging_topic: title: "우리 커뮤니티에 기여해 주셔서 감사합니다." - action: "신고된 토픽" + action: "신고된 글타래" notify_action: "메시지" topic_map: - title: "토픽 요약" + title: "글타래 요약" participants_title: "빈번한 게시자" links_title: "인기 링크" links_shown: "show all {{totalLinks}} links..." @@ -1354,37 +1352,37 @@ ko: warning: help: "공식적인 주의입니다." bookmarked: - help: "북마크한 토픽" + help: "북마크한 글타래" locked: - help: "이 토픽은 폐쇄되었습니다. 더 이상 새 답글을 받을 수 없습니다." + help: "이 글타래는 폐쇄되었습니다. 더 이상 새 답글을 받을 수 없습니다." archived: - help: "이 토픽은 보관중입니다. 고정되어 변경이 불가능합니다." + help: "이 글타래는 보관중입니다. 고정되어 변경이 불가능합니다." unpinned: title: "핀 제거" - help: "이 토픽은 핀 제거 되었습니다. 목록에서 일반적인 순서대로 표시됩니다." + help: "이 글타래는 핀 제거 되었습니다. 목록에서 일반적인 순서대로 표시됩니다." pinned_globally: title: "핀 지정됨 (전역적)" - help: "이 토픽은 전역적으로 핀 지정 되었습니다. 모든 목록의 최상위에 표시됩니다." + help: "이 글타래는 전역적으로 핀 지정 되었습니다. 모든 목록의 최상위에 표시됩니다." pinned: title: "핀 지정됨" - help: "이 토픽은 고정되었습니다. 카테고리의 상단에 표시됩니다." + help: "이 글타래는 고정되었습니다. 카테고리의 상단에 표시됩니다." invisible: - help: "이 토픽은 목록에서 제외됩니다. 토픽 목록에 표시되지 않으며 링크를 통해서만 접근 할 수 있습니다." - posts: "게시물" - posts_lowercase: "게시글" - posts_long: "이 토픽의 게시물 수는 {{number}}개 입니다." + help: "이 글타래는 목록에서 제외됩니다. 글타래 목록에 표시되지 않으며 링크를 통해서만 접근 할 수 있습니다." + posts: "글" + posts_lowercase: "글" + posts_long: "이 글타래의 글 수는 {{number}}개 입니다." posts_likes_MF: | This topic has {count, plural, one {1 reply} other {# replies}} {ratio, select, low {with a high like to post ratio} med {with a very high like to post ratio} high {with an extremely high like to post ratio} other {}} - original_post: "원본 게시물" + original_post: "원본 글" views: "조회수" views_lowercase: other: "조회" replies: "답변" - views_long: "이 토픽은 {{number}}번 읽혔습니다." + views_long: "이 글타래는 {{number}}번 읽혔습니다." activity: "활동" likes: "좋아요" likes_lowercase: @@ -1401,33 +1399,33 @@ ko: not_available: "Raw 이메일이 가능하지 않습니다." categories_list: "카테고리 목록" filters: - with_topics: "%{filter} 토픽" - with_category: "%{filter} %{category} 토픽" + with_topics: "%{filter} 글타래" + with_category: "%{filter} %{category} 글타래" latest: title: zero: "최근" one: "최근 (1)" other: "최근 ({{count}})" - help: "가장 최근 토픽" + help: "가장 최근 글타래" hot: title: "인기 있는 글" - help: "가장 인기있는 토픽 중 하나를 선택" + help: "가장 인기있는 글타래 중 하나를 선택" read: title: "읽기" - help: "마지막으로 순서대로 읽은 토픽" + help: "마지막으로 순서대로 읽은 글타래" search: title: "검색" - help: "모든 토픽 검색" + help: "모든 글타래 검색" categories: title: "카테고리" title_in: "카테고리 - {{categoryName}}" - help: "카테고리별로 그룹화 된 모든 토픽" + help: "카테고리별로 그룹화 된 모든 글타래" unread: title: zero: "읽지 않은" one: "읽지 않은(1)" other: "읽지 않은({{count}})" - help: "지켜보거나 추적 중인 읽지 않은 토픽 " + help: "지켜보거나 추적 중인 읽지 않은 글타래 " lower_title_with_count: one: "1개의 읽지 않은 글" other: "{{count}}개의 읽지 않은 글" @@ -1440,22 +1438,22 @@ ko: zero: "새로운" one: "새로운(1)" other: "새로운({{count}})" - help: "며칠 내에 만들어진 토픽" + help: "며칠 내에 만들어진 글타래" posted: - title: "내 게시물" + title: "내 글" help: "내가 게시한 글" bookmarks: title: "북마크" - help: "북마크된 토픽들" + help: "북마크된 글타래들" category: title: zero: "{{categoryName}}" one: "{{categoryName}} (1)" other: "{{categoryName}} ({{count}})" - help: "{{categoryName}}카테고리의 최신 토픽" + help: "{{categoryName}}카테고리의 최신 글타래" top: title: "인기" - help: "작년 또는 지난 달, 지난 주, 어제에 활발했던 토픽" + help: "작년 또는 지난 달, 지난 주, 어제에 활발했던 글타래" all: title: "전체 시간" yearly: @@ -1543,27 +1541,27 @@ ko: 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_restore_post_title: "게시글을 복원하기" + agree_flag_restore_post: "동의하기(글 복원)" + agree_flag_restore_post_title: "글을 복원하기" agree_flag: "신고에 동의함" - agree_flag_title: "신고에 동의하며 게시글이 수정되지 않도록 유지하기" + agree_flag_title: "신고에 동의하며 글이 수정되지 않도록 유지하기" defer_flag: "연기" defer_flag_title: "신고 제거하기. 현재 어떠한 행위를 할 필요 없음" delete: "삭제" - delete_title: "신고에서 멘션된 게시글 삭제하기" - delete_post_defer_flag: "게시글을 삭제하고 신고에 결정을 따름" - delete_post_defer_flag_title: "게시글을 삭제하고 첫번째 게시글이면 토픽 삭제하기" - delete_post_agree_flag: "게시글을 삭제하고 신고에 동의함" - delete_post_agree_flag_title: "게시글을 삭제하고 첫번째 게시글이면 토픽 삭제하기" + delete_title: "신고에서 멘션된 글 삭제하기" + 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: "사용자와 사용자가 작성한 모든 토픽과 게시글을 삭제함 " + delete_spammer_title: "사용자와 사용자가 작성한 모든 글타래과 글을 삭제함 " disagree_flag_unhide_post: "Disagree (글 감추기 취소)" - disagree_flag_unhide_post_title: "게시글의 모든 신고를 삭제하고 게시글을 볼 수 있도록 변경" + disagree_flag_unhide_post_title: "글의 모든 신고를 삭제하고 글을 볼 수 있도록 변경" disagree_flag: "Disagree" disagree_flag_title: "신고를 유효하지 않거나 올바르지 않은 것으로 거부함" clear_topic_flags: "완료" - clear_topic_flags_title: "이 토픽을 조사하였고 이슈는 해결되었습니다. 플래그를 지우기 위해 완료를 클리하세요" + clear_topic_flags_title: "이 글타래를 조사하였고 이슈는 해결되었습니다. 플래그를 지우기 위해 완료를 클리하세요" more: "(더 많은 답글...)" dispositions: agreed: "agreed" @@ -1576,10 +1574,10 @@ ko: error: "뭔가 잘못 됐어요" reply_message: "답글" no_results: "신고가 없습니다." - topic_flagged: "이 토픽은 신고 되었습니다." - visit_topic: "처리하기 위해 토픽으로 이동" - was_edited: "첫 신고 이후에 게시글이 수정되었음" - previous_flags_count: "이 게시글은 이미 {{count}}번 이상 신고 되었습니다." + topic_flagged: "이 글타래은 신고 되었습니다." + visit_topic: "처리하기 위해 글타래로 이동" + was_edited: "첫 신고 이후에 글이 수정되었음" + previous_flags_count: "이 글은 이미 {{count}}번 이상 신고 되었습니다." summary: action_type_3: other: "off-topic x{{count}}" @@ -1626,9 +1624,9 @@ ko: revoke: "폐지" confirm_regen: "API 키를 새로 발급 받으시겠습니까?" confirm_revoke: "API 키를 폐지하겠습니까?" - info_html: "당신의 API 키는 JSON콜을 이용하여 토픽을 생성하거나 수정할 수 있습니다." + info_html: "당신의 API 키는 JSON콜을 이용하여 글타래를 생성하거나 수정할 수 있습니다." all_users: "전체 유저" - note_html: "이 키의 보안에 특별히 주의하세요. 이 키를 아는 모든 사용자는 다른 사용자의 이름으로 게시물을 작성할 수 있습니다." + note_html: "이 키의 보안에 특별히 주의하세요. 이 키를 아는 모든 사용자는 다른 사용자의 이름으로 글을 작성할 수 있습니다." plugins: title: "플러그인" installed: "설치된 플러그인" @@ -1638,7 +1636,6 @@ ko: enabled: "활성화?" is_enabled: "예" not_enabled: "아니요" - cant_disable: "-" change_settings: "설정 변경" change_settings_short: "설정" howto: "플러그인은 어떻게 설치하나요?" @@ -1695,7 +1692,7 @@ ko: title: "데이터베이스를 이전 workiong state로 되돌리기" confirm: "정말로 이전 작업 상태로 데이터베이스를 롤백하시겠습니까?" export_csv: - user_archive_confirm: "정말로 내 게시글을 다운로드 받습니까?" + user_archive_confirm: "정말로 내 글을 다운로드 받습니까?" success: "Export initiated, you will be notified via message when the process is complete." failed: "내보내기가 실패했습니다. 로그를 확인해주세요" rate_limit_error: "글은 하루에 한번 다운로드 받을 수 있습니다. 내일 다시 시도해주십시요." @@ -1778,7 +1775,7 @@ ko: description: "사이트 헤더에 텍스트와 아이콘" highlight: name: '하이라이트' - description: '페이지 내에 강조된 글 및 토픽 등의 배경색' + description: '페이지 내에 강조된 글 및 글타래 등의 배경색' danger: name: '위험' description: '글 삭제 등에 사용되는 강조색' @@ -1790,7 +1787,7 @@ ko: description: "좋아요 버튼 색" wiki: name: '위키' - description: "위키 게시글의 배경색으로 사용될 기본 색상" + description: "위키 글의 배경색으로 사용될 기본 색상" email: title: "이메일" settings: "설정" @@ -1834,8 +1831,8 @@ ko: last_match_at: "마지막 방문" match_count: "방문" ip_address: "IP" - topic_id: "토픽 ID" - post_id: "게시글 ID" + topic_id: "글타래 ID" + post_id: "글 ID" delete: '삭제' edit: '편집' save: '저장' @@ -1871,8 +1868,8 @@ ko: grant_badge: "뱃지 부여" revoke_badge: "뱃지 회수" check_email: "이메일 확인" - delete_topic: "토픽 삭제" - delete_post: "게시글 삭제" + delete_topic: "글타래 삭제" + delete_post: "글 삭제" impersonate: "대역" anonymize_user: "anonymize user" roll_up: "roll up IP blocks" @@ -1966,7 +1963,7 @@ ko: suspend_reason: "Reason" suspended_by: "접근 금지자" delete_all_posts: "모든 글을 삭제합니다" - delete_all_posts_confirm: "%{posts}개의 게시글과 %{topics}개의 토픽을 지우려고 합니다. 확실합니까?" + delete_all_posts_confirm: "%{posts}개의 글과 %{topics}개의 글타래를 지우려고 합니다. 확실합니까?" suspend: "접근 금지" unsuspend: "접근 허용" suspended: "접근 금지?" @@ -1994,10 +1991,10 @@ ko: activity: 활동 like_count: 준/받은 '좋아요' last_100_days: '지난 100일간' - private_topics_count: 개인적인 토픽 수 - posts_read_count: 게시글 읽은 수 - post_count: 게시글 수 - topics_entered: 읽은 토픽 수 + private_topics_count: 개인적인 글타래 수 + posts_read_count: 글 읽은 수 + post_count: 글 수 + topics_entered: 읽은 글타래 수 flags_given_count: 작성한 신고 flags_received_count: 받은 신고 warnings_received_count: 받은 경고 @@ -2036,7 +2033,7 @@ ko: block_failed: '사용자 블락에 문제가 있습니다.' deactivate_explanation: "비활성화 사용자는 이메일 인증을 다시 받아야합니다." suspended_explanation: "접근 금지된 유저는 로그인 할 수 없습니다." - block_explanation: "블락 사용자는 게시글을 작성하거나 토픽을 작성할 수 없습니다." + block_explanation: "블락 사용자는 글을 작성하거나 글타래를 작성할 수 없습니다." trust_level_change_failed: "신뢰도 변경에 문제가 있습니다." suspend_modal_title: "Suspend User" trust_level_2_users: "신뢰도 2 사용자들" @@ -2052,9 +2049,9 @@ ko: requirement_heading: "필수" visits: "방문수" days: "일" - topics_replied_to: "답글 달린 토픽" - topics_viewed: "읽은 토픽 수" - topics_viewed_all_time: "읽은 토픽 수 (전체 기간)" + topics_replied_to: "답글 달린 글타래" + topics_viewed: "읽은 글타래 수" + topics_viewed_all_time: "읽은 글타래 수 (전체 기간)" posts_read: "읽은 글 수" posts_read_all_time: "읽은 글 수 (전체 기간)" flagged_posts: "신고된 글" @@ -2124,7 +2121,7 @@ ko: required: '필수' basic: '기본 설정' users: '사용자' - posting: '게시물' + posting: '글' email: '이메일' files: '파일' trust: '신뢰도' @@ -2155,7 +2152,7 @@ ko: modal_title: 뱃지 그룹으로 나누기 granted_by: 배지 부여자 granted_at: 배지 수여일 - reason_help: ( 토픽이나 게시글 링크) + reason_help: ( 글타래가나 글 링크) save: 저장 delete: 삭제 delete_confirm: 정말로 이 뱃지를 삭제하시겠습니까? @@ -2180,7 +2177,7 @@ ko: query: 뱃지 Query(SQL) target_posts: 포스트들을 타겟으로 하는 query auto_revoke: 매일 회수 query를 실행한다. - show_posts: 뱃지 페이지에서 뱃지를 받게한 게시글을 보여줍니다. + show_posts: 뱃지 페이지에서 뱃지를 받게한 글을 보여줍니다. trigger: Trigger trigger_type: none: "매일 업데이트" @@ -2228,10 +2225,10 @@ ko: permalink: title: "고유링크" url: "URL" - topic_id: "토픽 ID" - topic_title: "토픽" - post_id: "게시글 ID" - post_title: "게시글" + topic_id: "글타래 ID" + topic_title: "글타래" + post_id: "글 ID" + post_title: "글" category_id: "카테고리 ID" category_title: "카테고리" external_url: "외부 URL" @@ -2257,41 +2254,41 @@ ko: bookmarks: 'g, b 북마크' navigation: title: 'Navigation' - jump: '# 게시글 번호로' + jump: '# 글 번호로' back: 'u Back' - up_down: 'k/j 선택된 게시글 이동 ↑ ↓' - open: 'o or Enter 선택한 토픽에 들어갑니다.' + up_down: 'k/j 선택된 글 이동 ↑ ↓' + open: 'o or Enter 선택한 글타래에 들어갑니다.' next_prev: 'shift+j/shift+k 이전/다음 섹션' application: title: 'Application' - create: 'c 새 토픽을 만듭니다.' + create: 'c 새 글타래를 만듭니다.' notifications: 'n Open notifications' hamburger_menu: '= 햄버거 메뉴 열기' user_profile_menu: 'p 사용자 메뉴 열기' - show_incoming_updated_topics: '. 갱신된 토픽 보기' + show_incoming_updated_topics: '. 갱신된 글타래 보기' search: '/ Search' help: '? 키보드 도움말 열기' dismiss_new_posts: 'x, r 새글을 읽은 상태로 표시하기' - dismiss_topics: 'x, t 토픽 무시하기' + dismiss_topics: 'x, t 글타래 무시하기' actions: title: 'Actions' - bookmark_topic: 'f 토글 북마크 토픽' + bookmark_topic: 'f 토글 북마크 글타래' pin_unpin_topic: 'shift+p 핀고정/핀해제' - share_topic: 'shift+s 토픽 공유' - share_post: 's 게시글 공유' - reply_as_new_topic: 't 링크된 토픽으로 답글 작성하기' - reply_topic: 'shift+r 토픽에 답글 달기' - reply_post: 'r 게시글에 답글 달기' + share_topic: 'shift+s 글타래 공유' + share_post: 's 글 공유' + reply_as_new_topic: 't 링크된 글타래로 답글 작성하기' + reply_topic: 'shift+r 글타래에 답글 달기' + reply_post: 'r 글에 답글 달기' quote_post: 'q 인용 글' like: 'l Like post' flag: '! Flag post' bookmark: 'b Bookmark post' edit: 'e Edit post' delete: 'd Delete post' - mark_muted: 'm, m 토픽 알람 : 끄기' - mark_regular: 'm, r 토픽 알람 : 일반(기본)으로 설정하기' - mark_tracking: 'm, t 토픽 알람 : 추적하기' - mark_watching: 'm, w 토픽 알람 : 주시하기' + mark_muted: 'm, m 글타래 알람 : 끄기' + mark_regular: 'm, r 글타래 알람 : 일반(기본)으로 설정하기' + mark_tracking: 'm, t 글타래 알람 : 추적하기' + mark_watching: 'm, w 글타래 알람 : 주시하기' badges: title: 뱃지 allow_title: "can be used as a title" @@ -2350,13 +2347,13 @@ ko: name: 굉장히 좋은 글 description: 작성한 글이 좋아요를 50개 받았습니다. 이 뱃지는 중복 수여 가능합니다. nice_topic: - name: Nice 토픽 + name: Nice 글타래 description: 10개의 '좋아요'를 받았습니다. 이 뱃지는 여러번 받을 수 있습니다. good_topic: - name: Good 토픽 + name: Good 글타래 description: 25개의 '좋아요'를 받았습니다. 이 뱃지는 여러번 받을 수 있습니다. great_topic: - name: Great 토픽 + name: Great 글타래 description: 50개의 '좋아요'를 받았습니다. 이 뱃지는 여러번 받을 수 있습니다. nice_share: name: Nice 공유 @@ -2387,7 +2384,7 @@ ko: description: 처음으로 글을 공유했습니다. first_link: name: 첫 링크 - description: 글 작성시, 다른 토픽으로 가는 링크를 처음으로 추가하였습니다. + description: 글 작성시, 다른 글타래로 가는 링크를 처음으로 추가하였습니다. first_quote: name: 첫 인용 description: 글 작성시 다른 사용자의 글을 인용하였습니다. @@ -2396,7 +2393,7 @@ ko: description: 커뮤니티 가이드라인 을 읽었습니다. reader: name: 독서가 - description: 100개가 넘는 댓글이 달린 토픽의 댓글을 모두 읽었습니다. + description: 100개가 넘는 댓글이 달린 글타래의 댓글을 모두 읽었습니다. popular_link: name: 인기 링크 description: 50회 이상 클릭이 발생한 외부 링크 게시 diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml index c5002097b8..bdc3020807 100644 --- a/config/locales/client.nb_NO.yml +++ b/config/locales/client.nb_NO.yml @@ -719,7 +719,6 @@ nb_NO: title_placeholder: "Oppsummert i en setning, hva handler denne diskusjonen om?" edit_reason_placeholder: "hvorfor endrer du?" show_edit_reason: "(legg till endringsbegrunnelse)" - reply_placeholder: "Skriv her. Bruk Markdown, BBCode eller HTML for formattering. Dra og slipp et bilde for å laste det opp." view_new_post: "Se ditt nye innlegg." saving: "Lagrer..." saved: "Lagret!" @@ -797,7 +796,6 @@ nb_NO: local_tip: "velg bilder fra din enhet" local_tip_with_attachments: "velg bilder eller filer fra din enhet ({{authorized_extensions}})" hint: "(du kan også drag & drop inn i editoren for å laste dem opp)" - hint_for_supported_browsers: "du kan også dra og slippe eller lime inn bilder i editoren for å laste dem opp" uploading: "Laster opp bilde" select_file: "Velg Fil" image_link: "lenken som bildet skal peke til" @@ -1681,7 +1679,6 @@ nb_NO: enabled: "Aktivert?" is_enabled: "J" not_enabled: "N" - cant_disable: "-" change_settings: "Endre instillinger" change_settings_short: "Innstillinger" howto: "Hvordan installerer jeg utvidelser?" diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml index 684c83590d..5816bc4d73 100644 --- a/config/locales/client.nl.yml +++ b/config/locales/client.nl.yml @@ -194,7 +194,7 @@ nl: title: "Voeg toe aan favorieten" clear_bookmarks: "Verwijder favorieten" help: - bookmark: "Klik om het eerste bericht van dit topic toe te voegen aan je favorieten" + bookmark: "Klik om het eerste bericht van deze topic toe te voegen aan je favorieten" unbookmark: "Klik om alle favorieten in dit topic te verwijderen" bookmarks: not_logged_in: "sorry, je moet ingelogd zijn om berichten aan je favorieten toe te kunnen voegen" @@ -328,6 +328,10 @@ nl: all_subcategories: "alle" no_subcategory: "geen" category: "Categorie" + reorder: + title: "Categorieën Herschikken " + save: "Volgorde Opslaan" + apply_all: "Toepassen" posts: "Berichten" topics: "Topics" latest: "Laatste" @@ -750,7 +754,6 @@ nl: title_placeholder: "Waar gaat de discussie over in één korte zin?" edit_reason_placeholder: "vanwaar de wijziging?" show_edit_reason: "(geef een reden)" - reply_placeholder: "Schrijf hier je bericht. Gebruik Markdown, BBCode of HTML voor de tekstopmaak. Sleep of plak een afbeelding in dit vak om deze te uploaden." view_new_post: "Bekijk je nieuwe bericht." saving: "Opslaan..." saved: "Opgeslagen!" @@ -842,7 +845,6 @@ nl: local_tip: "selecteer afbeeldingen van uw apparaat" local_tip_with_attachments: "Selecteer afbeeldingen of bestanden van je apparaat ({{authorized_extensions}})" hint: "(je kan afbeeldingen ook slepen in de editor om deze te uploaden)" - hint_for_supported_browsers: "je kunt afbeeldingen ook slepen of plakken in de editor om ze te uploaden" uploading: "Uploaden" select_file: "Selecteer een bestand" image_link: "de link waar je afbeelding naar verwijst" @@ -863,7 +865,6 @@ nl: not_logged_in_user: 'gebruikerspagina met samenvatting van huidige activiteit en voorkeuren' current_user: 'ga naar je gebruikerspagina' topics: - too_many_tracked: "Let op: je hebt te veel topics staan onder nieuw en ongelezen, maak wat ruimte door Dismiss New of Dismiss Posts te gebruiken" bulk: reset_read: "markeer als ongelezen" delete: "Verwijder topics" @@ -1182,8 +1183,8 @@ nl: other: "{{count}} mensen vinden dit bericht leuk" has_likes_title_you: zero: "Je vind dit bericht leuk" - one: "Jij en 1 ander persoon vinden dit leuk" - other: "Jij en {{count}} anderen vinden dit leuk" + one: "jij en 1 ander persoon 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." @@ -1747,7 +1748,6 @@ nl: enabled: "Ingeschakeld?" is_enabled: "J" not_enabled: "N" - cant_disable: "-" change_settings: "Wijzig instellingen" change_settings_short: "Instellingen" howto: "Hoe kan ik plugins installeren" @@ -2407,12 +2407,12 @@ nl: actions: title: 'Acties' bookmark_topic: 'f Toggle bladwijzer van topic' - pin_unpin_topic: 'shift+p Vastpinnen/Ontpin topic' + pin_unpin_topic: 'shift+p Vastpinnen/Ontpinnen topic' share_topic: 'shift+s Deel topic' share_post: 's Deel bericht' reply_as_new_topic: 't Reageer als verwezen topic' reply_topic: 'shift+r Reageer op topic' - reply_post: 'shift r Reageer op topic' + reply_post: 'shift r Reageer op bericht' quote_post: 'q Citeer bericht' like: 'l Vind bericht leuk' flag: '! Markeer bericht' diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml index 37d0925066..11e1a3f0d2 100644 --- a/config/locales/client.pl_PL.yml +++ b/config/locales/client.pl_PL.yml @@ -244,6 +244,7 @@ pl_PL: saved: "Zapisano!" upload: "Dodaj" uploading: "Wysyłam…" + uploading_filename: "Wysyłanie {{filename}}..." uploaded: "Wgrano!" enable: "Włącz" disable: "Wyłącz" @@ -356,6 +357,14 @@ pl_PL: all_subcategories: "wszystkie" no_subcategory: "żadne" category: "Kategoria" + reorder: + title: "Zmień kolejność kategorii" + title_long: "Zmień kolejność listy kategorii" + fix_order: "Popraw pozycje" + fix_order_tooltip: "Nie wszystkie kategorie posiadają unikalny numer porządkowy, co może wygenerować nieoczekiwane wyniki." + save: "Zapisz kolejność" + apply_all: "Zastosuj" + position: "Pozycja" posts: "Wpisy" topics: "Tematy" latest: "Aktualne" @@ -755,6 +764,7 @@ pl_PL: composer: emoji: "Emoji :smile:" add_warning: "To jest oficjalne ostrzeżenie." + add_whisper: "Ta notatka jest widoczna jedynie dla moderatorów" posting_not_on_topic: "W którym temacie chcesz odpowiedzieć?" saving_draft_tip: "zapisuję..." saved_draft_tip: "zapisano" @@ -781,7 +791,7 @@ pl_PL: title_placeholder: "O czym jest ta dyskusja w jednym zwartym zdaniu. " edit_reason_placeholder: "z jakiego powodu edytujesz?" show_edit_reason: "(dodaj powód edycji)" - reply_placeholder: "Pisz w tym miejscu. Wspierane formatowanie to Markdown, BBCode lub HTML. Przeciągnij i upuść grafikę, aby dołączyć do treści." + reply_placeholder: "Pisz w tym miejscu. Wspierane formatowanie to Markdown, BBCode lub HTML. Możesz też przeciągnąć tu obrazek." view_new_post: "Zobacz Twój nowy wpis." saving: "Zapisuję…" saved: "Zapisano!" @@ -873,11 +883,13 @@ pl_PL: local_tip: "wybierz obrazy ze swojego urządzenia" local_tip_with_attachments: "wybierz obrazy lub pliki ze swojego urządzenia ({{authorized_extensions}})" hint: "(możesz także upuścić plik z katalogu komputera w okno edytora)" - hint_for_supported_browsers: "aby wgrać obrazy przeciągnij lub wklej je do edytora" + hint_for_supported_browsers: "możesz też przeciągać lub wklejać grafiki do edytora" uploading: "Wgrywanie" select_file: "Wybierz plik" image_link: "odnośnik do którego Twój obraz będzie kierował" search: + select_all: "Zaznacz wszystkie" + clear_all: "Wyczyść wszystkie" title: "szukaj tematów, wpisów, użytkowników lub kategorii" no_results: "Brak wyników wyszukiwania" no_more_results: "Nie znaleziono więcej wyników." @@ -890,11 +902,11 @@ pl_PL: topic: "Szukaj w tym temacie" private_messages: "Wyszukiwanie wiadomości" hamburger_menu: "przejdź do innej listy lub kategorii" + new_item: "nowy" go_back: 'wróć' not_logged_in_user: 'strona użytkownika z podsumowaniem bieżących działań i ustawień' current_user: 'idź do swojej strony użytkowanika' topics: - too_many_tracked: "Uwaga: posiadasz zbyt wiele wpisów w nowych i śledzonych tematach. Aby kontynuować, wyczyść Nowe lub Śledzone" bulk: reset_read: "Wyzeruj przeczytane" delete: "Usuń tematy" @@ -1250,6 +1262,7 @@ pl_PL: no_value: "Nie, pozostaw" yes_value: "Tak, porzuć" via_email: "ten wpis został dodany emailem" + whisper: "ten wpis jest prywatną notatką dla moderatorów" wiki: about: "to wpis typu Wiki: zwykli użytkownicy mogą go edytować" archetypes: @@ -1429,6 +1442,7 @@ pl_PL: topic_template: "Szablon tematu" delete: 'Usuń kategorię' create: 'Nowa kategoria' + create_long: 'Utwórz nową kategorię' save: 'Zapisz kategorię' slug: 'Slug kategorii' slug_placeholder: '(opcjonalne) słowa-z-myślnikiem dla URLi' @@ -1451,6 +1465,7 @@ pl_PL: change_in_category_topic: "Edytuj opis" already_used: 'Ten kolor jest używany przez inną kategorię' security: "Bezpieczeństwo" + special_warning: "Uwaga: Ta kategoria jest generowana automatycznie i jej ustawienia bezpieczeństwa nie mogą być edytowane. Jeśli nie zamierzasz jej używać, skasuj ją, zamiast zmieniać jej przeznaczenie." images: "Obrazy" auto_close_label: "Automatycznie zamykaj tematy po:" auto_close_units: "godzin" @@ -1818,7 +1833,6 @@ pl_PL: enabled: "Włączono?" is_enabled: "T" not_enabled: "N" - cant_disable: "-" change_settings: "Zmień ustawienia" change_settings_short: "Ustawienia" howto: "Jak zainstalować wtyczkę?" diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml index 33759f113d..8282e550c9 100644 --- a/config/locales/client.pt.yml +++ b/config/locales/client.pt.yml @@ -220,6 +220,7 @@ pt: saved: "Guardado!" upload: "Carregar" uploading: "A carregar…" + uploading_filename: "A carregar {{filename}}..." uploaded: "Carregado!" enable: "Ativar " disable: "Desativar" @@ -328,6 +329,14 @@ pt: all_subcategories: "todas" no_subcategory: "nenhuma" category: "Categoria" + reorder: + title: "Re-organizar Categorias" + title_long: "Re-organizar a lista de categorias" + fix_order: "Fixar Posições" + fix_order_tooltip: "Nem todas as categorias têm um número único de posição, o que pode causar resultados inesperados." + save: "Guardar Ordem" + apply_all: "Aplicar" + position: "Posição" posts: "Mensagens" topics: "Tópicos" latest: "Recentes" @@ -724,6 +733,7 @@ pt: composer: emoji: "Emoji :smile:" add_warning: "Este é um aviso oficial." + add_whisper: "Este é um susurro visível apenas para os moderadores" posting_not_on_topic: "A que tópico quer responder?" saving_draft_tip: "a guardar..." saved_draft_tip: "guardado" @@ -750,7 +760,7 @@ pt: title_placeholder: "Numa breve frase, de que se trata esta discussão?" edit_reason_placeholder: "Porque está a editar?" show_edit_reason: "(adicione a razão para a edição)" - reply_placeholder: "Digite aqui. Utilize Markdown, BBCode, ou HTML para formatar. Arraste ou cole uma imagem para carregá-la." + reply_placeholder: "Digite aqui. Utilize Markdown, BBCode, ou HTML para formatar. Arraste ou cole imagens." view_new_post: "Ver a sua nova mensagem." saving: "A Guardar..." saved: "Guardado!" @@ -842,11 +852,13 @@ pt: local_tip: "selecionar imagens do seu dispositivo" local_tip_with_attachments: "selecionar imagens ou ficheiros do seu dispositivo ({{authorized_extensions}})" hint: "(pode também arrastar o ficheiro para o editor para fazer o carregamento)" - hint_for_supported_browsers: "pode também arrastar e largar ou colar imagens no editor de forma a carregá-las" + hint_for_supported_browsers: "pode também arrastar e largar ou colar imagens no editor" uploading: "A carregar" select_file: "Selecionar Ficheiro" image_link: "hiperligação da imagem irá apontar para" search: + select_all: "Selecionar Tudo" + clear_all: "Limpar Tudo" title: "pesquisar tópicos, mensagens, utilizadores, ou categorias" no_results: "Não foi encontrado nenhum resultado." no_more_results: "Mais nenhum resultado encontrado." @@ -859,11 +871,11 @@ pt: topic: "Pesquisar este tópico" private_messages: "Pesquisar mensagens" hamburger_menu: "ir para outra lista de tópicos ou categorias" + new_item: "novo" go_back: 'voltar atrás' not_logged_in_user: 'página de utilizador com resumo da atividade atual e preferências ' current_user: 'ir para a sua página de utilizador' topics: - too_many_tracked: "Aviso: tem demasiados tópicos novos e não lidos a serem acompanhados, limpe alguns utilizando Destituir Novos ou Destituir Mensagens" bulk: reset_read: "Repor Leitura" delete: "Eliminar Tópicos" @@ -1201,6 +1213,7 @@ pt: no_value: "Não, manter" yes_value: "Sim, abandonar" via_email: "esta mensagem chegou por email" + whisper: "esta mensagem é um susurro privado para os moderadores" wiki: about: "esta mensagem é uma wiki; utilizadores comuns podem editá-la" archetypes: @@ -1361,6 +1374,7 @@ pt: topic_template: "Modelo do Tópico" delete: 'Eliminar Categoria' create: 'Nova Categoria' + create_long: 'Criar uma nova categoria' save: 'Guardar Categoria' slug: 'Título da Categoria' slug_placeholder: '(Opcional) palavras com travessão no URL' @@ -1383,6 +1397,7 @@ pt: change_in_category_topic: "Editar Descrição" already_used: 'Esta cor já foi usada para outra categoria' security: "Segurança" + special_warning: "Aviso: Esta categoria é uma categoria pré-preenchida e as configurações de segurança não podem ser editadas. Se não deseja utilizar esta categoria, elimine-a em vez de lhe dar um novo propósito." images: "Imagens" auto_close_label: "Fechar tópicos automaticamente depois de:" auto_close_units: "horas" @@ -1747,7 +1762,6 @@ pt: enabled: "Ativado?" is_enabled: "S" not_enabled: "N" - cant_disable: "-" change_settings: "Alterar Configurações" change_settings_short: "Configurações" howto: "Como instalo plugins?" diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml index 187c9b9d38..5bef5fb061 100644 --- a/config/locales/client.pt_BR.yml +++ b/config/locales/client.pt_BR.yml @@ -700,7 +700,6 @@ pt_BR: title_placeholder: "Sobre o que é esta discussão em uma pequena frase?" edit_reason_placeholder: "por que você está editando?" show_edit_reason: "(adicione motivo da edição)" - reply_placeholder: "Escreva aqui. Use Markdown, BBCode ou HTML para formatar. Arraste ou cole uma imagem para carregá-la." view_new_post: "Ver sua nova resposta." saving: "Salvando..." saved: "Salvo!" @@ -777,7 +776,6 @@ pt_BR: remote_tip_with_attachments: "link da imagem ou arquivo ({{authorized_extensions}})" local_tip: "selecione imagens a partir do seu dispositivo" hint: "(Você também pode arrastar e soltar para o editor para carregá-las)" - hint_for_supported_browsers: "você também pode arrastar ou colar imagens no editor para enviá-las" uploading: "Enviando" select_file: "Selecionar Arquivo" image_link: "link da sua imagem" @@ -1654,7 +1652,6 @@ pt_BR: enabled: "Habilitado?" is_enabled: "S" not_enabled: "N" - cant_disable: "-" change_settings: "Mudar Configurações" change_settings_short: "Configurações" howto: "Como eu instalo plugins?" diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml index b9d195509a..387ae5f51c 100644 --- a/config/locales/client.ro.yml +++ b/config/locales/client.ro.yml @@ -690,7 +690,6 @@ ro: title_placeholder: "Care este tema discuției într-o singură propoziție?" edit_reason_placeholder: "de ce editați?" show_edit_reason: "(adaugă motivul editării)" - reply_placeholder: "Scrie aici. Folosește Markdown sau BBCode pentru format. Trage sau lipește o imagine ca să o încarci." view_new_post: "Vizualizează noua postare." saving: "Salvează..." saved: "Salvat!" diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml index 51574007e8..bb398e7008 100644 --- a/config/locales/client.ru.yml +++ b/config/locales/client.ru.yml @@ -751,7 +751,6 @@ ru: title_placeholder: "Название: суть обсуждения коротким предложением" edit_reason_placeholder: "почему вы хотите изменить?" show_edit_reason: "(добавить причину редактирования)" - reply_placeholder: "Для форматирования текста используйте Markdown и BBCode. Перетяните или вставьте изображение, чтобы загрузить его на сервер." view_new_post: "Посмотреть созданное вами сообщение." saving: "Сохранение..." saved: "Сохранено!" @@ -1788,7 +1787,6 @@ ru: enabled: "Включен?" is_enabled: "Y" not_enabled: "N" - cant_disable: "-" change_settings: "Настроить" change_settings_short: "Настройки" howto: "Как установить плагин?" diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml index 84e72ad583..cefe6057da 100644 --- a/config/locales/client.sq.yml +++ b/config/locales/client.sq.yml @@ -709,7 +709,6 @@ sq: title_placeholder: "What is this discussion about in one brief sentence?" edit_reason_placeholder: "pse jeni duke e redaktuar?" show_edit_reason: "(arsye redaktimit)" - reply_placeholder: "Type here. Use Markdown, BBCode, or HTML to format. Drag or paste images." view_new_post: "Shikoni postimin tuaj te ri." saving: "Duke ruajtur..." saved: "U Ruajt!" @@ -787,7 +786,6 @@ sq: local_tip: "select images from your device" local_tip_with_attachments: "select images or files from your device ({{authorized_extensions}})" hint: "(you can also drag & drop into the editor to upload them)" - hint_for_supported_browsers: "you can also drag and drop or paste images into the editor" uploading: "Duke ngarkaur" select_file: "Select File" image_link: "link your image will point to" @@ -1675,7 +1673,6 @@ sq: enabled: "Aktivizuar?" is_enabled: "Y" not_enabled: "N" - cant_disable: "-" change_settings: "Ndrysho Rregullimet" change_settings_short: "Rregullimet" howto: "How do I install plugins?" diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml index 8f4db72c6c..f2d7e4c494 100644 --- a/config/locales/client.sv.yml +++ b/config/locales/client.sv.yml @@ -290,6 +290,8 @@ sv: mods_and_admins: "Bara moderatorer och administratörer" members_mods_and_admins: "Bara gruppmedlemmar, moderatorer och administratörer" everyone: "Alla" + trust_levels: + none: "Inga" user_action_groups: '1': "Gillningar givna" '2': "Gillningar mottagna" @@ -309,6 +311,11 @@ sv: all_subcategories: "alla" no_subcategory: "ingen" category: "Kategori" + reorder: + title: "Sortera kategorier" + title_long: "Sortera litan av katergorier" + apply_all: "Tillämpa" + position: "Position" posts: "Inlägg" topics: "Ämnen" latest: "Senaste" @@ -366,6 +373,7 @@ sv: admin: "{{user}} är en admin" moderator_tooltip: "Den här användaren är moderator" admin_tooltip: "Den här användaren är administrator" + blocked_tooltip: "Den här användaren är blockerad" suspended_notice: "Den här användaren är avstängd till {{date}}." suspended_reason: "Anledning:" github_profile: "Github" @@ -491,6 +499,9 @@ sv: label: "Betrakta ämnen som nya när" not_viewed: "Jag har inte tittat dom än" last_here: "skapade sen mitt senaste besök" + after_1_day: "skapade de senaste dagarna" + after_2_days: "skapade de senaste 2 dagarna" + after_1_week: "skapade den senaste veckan" auto_track_topics: "Följ automatiskt nya ämnen jag går in i" auto_track_options: never: "aldrig" @@ -693,7 +704,6 @@ sv: title_placeholder: "Vad handlar denna diskussion om i en kort mening?" edit_reason_placeholder: "varför redigerar du?" show_edit_reason: "(lägg till anledningar för redigering)" - reply_placeholder: "Skriv här. Använd Markdown, BBCode eller HTML för formatering. Dra och släpp en bild här för att ladda upp den." view_new_post: "Visa ditt nya inlägg." saving: "Sparar..." saved: "Sparat!" @@ -2335,3 +2345,7 @@ sv: reader: name: Läsare description: Läs varje inlägg i en diskussion med över 100 inlägg + popular_link: + name: Populär länk + hot_link: + name: Het länk diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml index 4e637adb13..30038eda2b 100644 --- a/config/locales/client.tr_TR.yml +++ b/config/locales/client.tr_TR.yml @@ -196,6 +196,7 @@ tr_TR: saved: "Kaydedildi!" upload: "Yükle" uploading: "Yükleniyor..." + uploading_filename: "{{filemame}} yükleniyor..." uploaded: "Yüklendi!" enable: "Etkinleştir" disable: "Devredışı Bırak" @@ -302,8 +303,12 @@ tr_TR: category: "Kategori" reorder: title: "Kategorileri Yeniden Sırala" + title_long: "Kategori listesini yeniden yapılandır" + fix_order: "Konumları Onar" + fix_order_tooltip: "Bütün kategoriler eşsiz bir konum numarasına sabit değil, bu beklenmedik sonuçlara neden olabilir." save: "Sıralamayı Kaydet" apply_all: "Uygula" + position: "Konum" posts: "Gönderiler" topics: "Konular" latest: "En Son" @@ -697,6 +702,7 @@ tr_TR: composer: emoji: "Emoji :smile:" add_warning: "Bu resmi bir uyarıdır." + add_whisper: "Bu sadece yöneticilere görünen bir fısıltıdır." posting_not_on_topic: "Hangi konuyu cevaplamak istiyorsun?" saving_draft_tip: "kaydediliyor..." saved_draft_tip: "kaydedildi" @@ -723,7 +729,7 @@ tr_TR: title_placeholder: "Bir cümlede açıklamak gerekirse bu tartışmanın konusu nedir?" edit_reason_placeholder: "neden düzenleme yapıyorsunuz?" show_edit_reason: "(düzenleme sebebi ekle)" - reply_placeholder: "Buraya yazın. Markdown, BBCode veya HTML formatı kullanarak biçimlendirin. Görsel yüklemek için sürükleyip bırakın ya da kopyalayıp yapıştırın." + reply_placeholder: "Buraya yazın. Biçimlendirmek için Markdown, BBCode ya da HTML kullanabilirsin. Resimleri sürükleyebilir ya da yapıştırabilirsin." view_new_post: "Yeni gönderinizi görüntüleyin." saving: "Kaydediliyor..." saved: "Kaydedildi!" @@ -815,11 +821,13 @@ tr_TR: local_tip: "cihazınızdan resimler seçin" local_tip_with_attachments: "cihazınızdan resim veya dosyalar seçin ({{authorized_extensions}})" hint: "(editöre sürekle & bırak yaparak da yükleyebilirsiniz)" - hint_for_supported_browsers: "resimleri, editöre sürükle & bırak yaparak ya da yapıştırarak da yükleyebilirsiniz" + hint_for_supported_browsers: "ayrıca resimleri düzenleyiciye sürükleyip bırakabilir ya da yapıştırabilirsiniz" uploading: "Yükleniyor" select_file: "Dosya seçin" image_link: "resminizin yönleneceği bağlantı" search: + select_all: "Tümünü Seç" + clear_all: "Tümünü Temizle" title: "konu, gönderi, kullanıcı veya kategori ara" no_results: "Hiç bir sonuç bulunamadı." no_more_results: "Başka sonuç yok." @@ -832,7 +840,7 @@ tr_TR: topic: "Bu konuda ara" private_messages: "Mesajlarda ara" hamburger_menu: "bir diğer konu ya da kategoriye git" - new_item: "Yeni!" + new_item: "yeni" go_back: 'geri dön' not_logged_in_user: 'güncel aktivitelerin ve ayarların özetinin bulunduğu kullanıcı sayfası' current_user: 'kendi kullanıcı sayfana git' @@ -992,8 +1000,8 @@ tr_TR: unpin: "Baştan Kaldır..." unarchive: "Konuyu Arşivden Kaldır" archive: "Konuyu Arşivle" - invisible: "Listelenmemiş Yap" - visible: "Listelenmiş Yap" + invisible: "Gizle" + visible: "Görünür Yap" reset_read: "Görüntüleme Verilerini Sıfırla" feature: pin: "Başa Tuttur" @@ -1157,6 +1165,7 @@ tr_TR: no_value: "Hayır, kalsın" yes_value: "Evet, vazgeç" via_email: "bu gönderi e-posta ile iletildi" + whisper: "bu gönderi yöneticiler için özel bir fısıltıdır" wiki: about: "bu gönderi bir wiki; acemi kullanıcılar düzenleyebilir" archetypes: @@ -1298,6 +1307,7 @@ tr_TR: topic_template: "Konu Şablonu" delete: 'Kategoriyi Sil' create: 'Yeni Kategori' + create_long: 'Yeni bir kategori oluştur' save: 'Kategoriyi Kaydet' slug: 'Kategori Kalıcı Bağlantısı' slug_placeholder: '(Opsiyonel) bağlantı için tire ile ayırılmış kelimeler' @@ -1320,6 +1330,7 @@ tr_TR: change_in_category_topic: "Açıklamayı Düzenle" already_used: 'Bu renk başka bir kategori için kullanıldı' security: "Güvenlik" + special_warning: "Uyarı: Bu kategori önceden ayarlanmış bir kategoridir ve güvenlik ayarları değiştirilemez. Eğer bu kategoriyi kullanmak istemiyorsanız, başka bir amaçla kullanmak yerine silin." images: "Resimler" auto_close_label: "Şu kadar süreden sonra konuları otomatik olarak kapat: " auto_close_units: "saat" @@ -1333,7 +1344,6 @@ tr_TR: add_permission: "İzin Ekle" this_year: "bu yıl" position: "pozisyon" - reorder: "Yeniden Sırala" default_position: "Varsayılan Pozisyon" position_disabled: "Kategoriler etkinlik sıralarına göre görünecekler. Listelerdeki kategorilerin sıralamalarını kontrol edebilmek için," position_disabled_click: '"sabitlenmiş kategori pozisyonları" ayarını etklinleştirin.' @@ -1407,7 +1417,7 @@ tr_TR: title: "Başa Tutturuldu" help: "Bu konu sizin için başa tutturuldu; kendi kategorisinin en üstünde görünecek" invisible: - help: "Bu konu listelenmemiş; konu listelerinde görünmeyecek, ve sadece doğrudan bağlantı aracılığıyla erişilebilecek" + help: "Bu konu gizli; konu listelerinde görünmeyecek, ve sadece doğrudan bağlantı aracılığıyla erişilebilecek" posts: "Gönderi" posts_lowercase: "gönderi" posts_long: "bu konuda {{number}} gönderi var" @@ -1676,7 +1686,6 @@ tr_TR: enabled: "Etkinleştirildi mi?" is_enabled: "E" not_enabled: "H" - cant_disable: "-" change_settings: "Ayarları Değiştir" change_settings_short: "Ayarlar" howto: "Nasıl eklenti yükleyebilirim?" diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml index b351c12c3c..934eba5bd8 100644 --- a/config/locales/client.zh_CN.yml +++ b/config/locales/client.zh_CN.yml @@ -196,6 +196,7 @@ zh_CN: saved: "已保存！" upload: "上传" uploading: "上传中..." + uploading_filename: "上传“{{filename}}”中……" uploaded: "上传完成！" enable: "启用" disable: "禁用" @@ -300,6 +301,14 @@ zh_CN: all_subcategories: "全部" no_subcategory: "无" category: "分类" + reorder: + title: "重排序分类" + title_long: "重新排序分类列表" + fix_order: "固定位置" + fix_order_tooltip: "不是所有的分类都有不同的位置数字，这可能导致一些问题。" + save: "保存顺序" + apply_all: "应用" + position: "位置" posts: "新帖子" topics: "近期" latest: "最新" @@ -693,6 +702,7 @@ zh_CN: composer: emoji: "Emoji :smile:" add_warning: "这是一个正式的警告。" + add_whisper: "这是一个只有版主可见的悄悄话" posting_not_on_topic: "你想回复哪一个主题？" saving_draft_tip: "保存中……" saved_draft_tip: "已保存" @@ -719,7 +729,7 @@ zh_CN: title_placeholder: "简述此讨论内容是关于什么？" edit_reason_placeholder: "编辑理由" show_edit_reason: "（添加编辑理由）" - reply_placeholder: "在这输入。可使用 Markdown、BBCode 或 HTML 格式化内容。拖拽或粘贴图片即可上传。" + reply_placeholder: "在这输入。使用 Markdown、BBCode 或 HTML 格式化内容。拖拽或粘贴图片。" view_new_post: "浏览你的新帖子。" saving: "保存中..." saved: "已保存！" @@ -811,11 +821,13 @@ zh_CN: local_tip: "从你的设备中选择图片" local_tip_with_attachments: "从你的设备中选择图片或文件（{{authorized_extensions}}）" hint: "（你也可以通过拖放至编辑器的方式来上传）" - hint_for_supported_browsers: "你也可以通过拖放或粘帖图片至编辑器的方式来上传" + hint_for_supported_browsers: "你也可以通过拖放或复制粘帖至编辑器" uploading: "上传中" select_file: "选择文件" image_link: "链接你的图片到" search: + select_all: "全选" + clear_all: "清除所有" title: "搜索主题、帖子、用户或分类" no_results: "没有找到结果。" no_more_results: "没有找到更多结果。" @@ -828,11 +840,11 @@ zh_CN: topic: "只搜索本主题" private_messages: "搜索消息" hamburger_menu: "去另一个主题列表或分类" + new_item: "新" go_back: '返回' not_logged_in_user: '显示当前活动和设置的用户页面' current_user: '去你的用户页面' topics: - too_many_tracked: "警告：你有太多追踪的新主题和未读主题，使用“设为已读”或忽略帖子清除一些" bulk: reset_read: "设为未读" delete: "删除主题" @@ -862,8 +874,8 @@ zh_CN: top: "没有最佳主题。" search: "没有搜索结果。" educate: - new: '

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

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

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

        ' - unread: '

        这里是你的未读主题。

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

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

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

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

        ' + new: '

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

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

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

        ' + unread: '

        这里是你的未读主题。

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

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

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

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

        ' bottom: latest: "没有更多主题可看了。" hot: "没有更多热门主题可看了。" @@ -948,8 +960,8 @@ zh_CN: '2_4': '因为你在此主题内发表了回复，所以你将收到相关通知。' '2_2': '因为你在追踪此主题，所以你将收到相关通知。' '2': '因为你阅读了此主题，所以你将收到相关通知。' - '1_2': '如果某人@你或者回复你,你将收到通知。' - '1': '如果某人@你或者回复你,你将收到通知。' + '1_2': '如果某人@你或者回复你，你将收到通知。' + '1': '如果某人@你或者回复你，你将收到通知。' '0_7': '你将忽略关于此分类的所有通知。' '0_2': '你将忽略关于此主题的所有通知。' '0': '你将忽略关于此主题的所有通知。' @@ -1142,9 +1154,9 @@ zh_CN: upload: "抱歉，在上传文件时发生了错误。请重试。" attachment_too_large: "抱歉，你上传的附件太大了（最大不能超过 {{max_size_kb}}kb）。" file_too_large: "抱歉，你上传的附件太大了（最大限制 {{max_size_kb}}kb）。" - too_many_uploads: "抱歉, 你只能一次上传一张图片。" + too_many_uploads: "抱歉，你只能一次上传一张图片。" too_many_dragged_and_dropped_files: "抱歉，你一次只能拖放最多 10 个文件。" - upload_not_authorized: "抱歉, 你不能上传此类型文件（可上传的文件类型有: {{authorized_extensions}}）。" + upload_not_authorized: "抱歉，你不能上传此类型文件（可上传的文件类型有: {{authorized_extensions}}）。" image_upload_not_allowed_for_new_user: "抱歉，新注册用户无法上传图片。" attachment_upload_not_allowed_for_new_user: "抱歉，新注册用户无法上传附件。" attachment_download_requires_login: "抱歉，但是你需要登录后才能下载附件。" @@ -1153,6 +1165,7 @@ zh_CN: no_value: "否" yes_value: "是" via_email: "通过电子邮件发送的帖子" + whisper: "这个帖子是只给版主可见的悄悄话" wiki: about: "这个帖子是维基；基础用户能编辑它" archetypes: @@ -1294,6 +1307,7 @@ zh_CN: topic_template: "主题模板" delete: '删除分类' create: '新分类' + create_long: '创建新的分类' save: '保存分类' slug: '分类 Slug' slug_placeholder: '（可选）用于分类的 URL' @@ -1316,6 +1330,7 @@ zh_CN: change_in_category_topic: "访问分类主题来编辑描述信息" already_used: '此色彩已经被另一个分类使用' security: "安全性" + special_warning: "警告：这个分类是已经自动建立好的分类，它的安全设置不能被更改。如果你不想要使用这个分类，直接删除它，而不是另作他用。" images: "图片" auto_close_label: "该时间段后自动关闭主题：" auto_close_units: "小时" @@ -1358,7 +1373,7 @@ zh_CN: ip_address_missing: "（N/A）" hidden_email_address: "（隐藏）" submit_tooltip: "提交私有标记" - take_action_tooltip: "与其等待更多的社区的标志, 不如立刻到达标志." + take_action_tooltip: "立即采取标记到达限制值时的措施，而不是等待更多的社群标记" cant: "抱歉，当前你不能报告本帖。" formatted_name: off_topic: "偏题" @@ -1650,7 +1665,7 @@ zh_CN: primary_group: "自动设置为主要群组" api: generate_master: "生成主 API 密钥" - none: "当前没有活动的 API 密钥。" + none: "当前没有可用的 API 密钥。" user: "用户" title: "API" key: "API 密钥" @@ -1671,7 +1686,6 @@ zh_CN: enabled: "启用？" is_enabled: "是" not_enabled: "否" - cant_disable: "-" change_settings: "更改设置" change_settings_short: "设置" howto: "如何安装插件？" @@ -1857,7 +1871,7 @@ zh_CN: title: "过滤器" user_placeholder: "username" address_placeholder: "name@example.com" - type_placeholder: "digest, signup..." + type_placeholder: "摘要、注册…" reply_key_placeholder: "回复键" skipped_reason_placeholder: "原因" logs: @@ -2298,7 +2312,7 @@ zh_CN: new: 'g 然后 n 近期主题' unread: 'g 然后 u 未读主题' categories: 'g 然后 c 分类列表' - top: 'g, t 顶部' + top: 'g 然后 t 顶部' bookmarks: 'g 然后 b 书签' profile: 'g 然后 p 个人页面' messages: 'g 然后 m 消息' @@ -2306,9 +2320,9 @@ zh_CN: title: '导航' jump: '# 跳转到帖子 #' back: 'u 返回' - up_down: 'k 和 j 移动选择焦点 ↑ ↓' + up_down: 'k 或 j 移动选择焦点 ↑ ↓' open: 'o 或者 Enter 打开选中的主题' - next_prev: 'shift+j/shift+k 下一个/前一个段落' + next_prev: 'shift+j 或 shift+k 下一个/前一个段落' application: title: '应用' create: 'c 创建一个新主题' @@ -2318,8 +2332,8 @@ zh_CN: show_incoming_updated_topics: '. 显示更新过的主题' search: '/ 搜索' help: '? 打开键盘快捷键帮助' - dismiss_new_posts: 'x, r 解除新/帖子提示' - dismiss_topics: 'x, t 解除主题提示' + dismiss_new_posts: 'x 然后 r 解除新/帖子提示' + dismiss_topics: 'x 然后 t 解除主题提示' log_out: 'shift+z shift+z 登出' actions: title: '动作' diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml index 6df19a62b1..eb6ceda2c3 100644 --- a/config/locales/client.zh_TW.yml +++ b/config/locales/client.zh_TW.yml @@ -668,7 +668,6 @@ zh_TW: title_placeholder: "用一個簡短的句子來描述想討論的內容。" edit_reason_placeholder: "你為什麼做編輯?" show_edit_reason: "(請加入編輯原因)" - reply_placeholder: "在此輸入。請使用 Markdown (http://markdown.tw/) 與 BBCode (http://www.bbcode.org/reference.php) 調整格式，拖曳或貼上圖片可以直接上傳。" view_new_post: "檢視你的新文章。" saving: "正在儲存..." saved: "儲存完畢!" diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml index 4889db9180..1c7340b9c4 100644 --- a/config/locales/server.ar.yml +++ b/config/locales/server.ar.yml @@ -85,7 +85,7 @@ ar: min_username_length_exists: "لا يمكنك تعيين الحد الأدنى لطول اسم المستخدم أعلى من أقصر اسم المستخدم." min_username_length_range: "لا يمكنك تعيين الحد الأدنى أعلى من الحد الأقصى." max_username_length_exists: "لا يمكنك تعيين الحد الأقصى لطول اسم المستخدم أدنى من أطول اسم المستخدم." - max_username_length_range: "لا يمكنك تعيين الحد الأقصى أعلى من الحد الأدنى." + max_username_length_range: "لا يمكنك تعيين الحد الأقصى أقل من الحد الأدنى." default_categories_already_selected: "لا يمكنك تحديد فئة تستخدم في قائمة أخرى." bulk_invite: file_should_be_csv: "الملف المرفوع يجب أن يكون بنسق وامتداد txt أو csv" @@ -770,9 +770,17 @@ ar: facebook_config_warning: 'تم تكوين الخادم للسماح بالتسجيل وتسجيل الدخول مع Facebook (enable_facebook_logins), لكن معرف العميل وعميل القيم السرية لم يعين. أذهب إلى إعدادات الموقعوتحديث الإعدادات. أنظر لهذا الدليل لمزيد من المعلومات.' twitter_config_warning: 'تم تكوين الخادم للسماح بالتسجيل وتسجيل الدخول مع Twitter (enable_twitter_logins), لكن معرف العميل وعميل القيم السرية لم يعين. أذهب إلى إعدادات الموقع وتحديث الإعدادات. أنظر لهذا الدليل لمزيد من المعلومات.' github_config_warning: 'تم تكوين الخادم للسماح بالتسجيل وتسجيل الدخول مع GitHub (enable_github_logins), لكن معرف العميل وعميل القيم السرية لم يعين. أذهب إلى إعدادات الموقع وتحديث الإعدادات. أنظر لهذا الدليل لمزيد من المعلومات.' + s3_config_warning: 'تم تهيئة الخادم لرفع ملفات إلى s3، لكن واحدة على الأقل من الإعدادات التالية لم تضبط: s3_access_key_id, s3_secret_access_key or s3_upload_bucket. أذهب إلى إعدادات الموقع وتحديث الإعدادات. انظر "كيف ترفع الصور المرفوعة إلى S3؟" لتعلم المزيد.' + s3_backup_config_warning: 'تم تهيئة الخادم لرفع نسخة احتياطية إلى s3، لكن واحدة على الأقل من الإعدادات التالية لم تضبط: s3_access_key_id, s3_secret_access_key or s3_backup_bucket. أذهب إلى إعدادات الموقع وتحديث الإعدادات. انظر "كيف ترفع الصور المرفوعة إلى S3؟" لتعلم المزيد.' + image_magick_warning: 'تم تهيئة الخادم لإنشاء صور مصغرة للصور الكبيرة، لكن ImageMagick لم يثبت. ثبته باستخدام مدير الحزم المفضل لك أو حمل أحدث نسخة.' + failing_emails_warning: 'يوجد %{num_failed_jobs} مهام بريد الكتروني فشلت. تحقق من ملف config/discourse.conf الخاص بك وتأكد أن إعدادات خادم البريد صحيحة. انظر للمهام الفاشلة في Sidekiq.' + default_logo_warning: "ضع الشعارات الرسومية لموقعك. حدث logo_url, logo_small_url, و favicon_url in إعدادات الموقع." + contact_email_missing: "أدخل عنوان البريد الإلكتروني لجهة اتصال الموقع لتكون على وصول بالأمور العاجلة حول موقعك. حدثه في إعدادات الموقع." contact_email_invalid: "البريد الالكتروني للموقع معطل. حدّثه Site Settings." title_nag: "أدخل اسم موقعك. حدث العنوان في الاعدادات Site Settings." site_description_missing: "أدخل جملة وصفية واحدة لموقعك والتي ستظهر في نتائج البحث. حدّث وصف_الموقع في اعدادات الموقع Site Settings." + consumer_email_warning: "موقعك مهيئ لاستخدام Gmail (أو مستهلك خدمة بريد إلكتروني أخر) لإرسال بريد إلكتروني. حدود Gmail كمية رسائل البريد الإلكتروني التي يمكنك إرسالها. فكر باستخدام مزود خدمة بريد إلكتروني مثل mandrill.com لضمان أهداف البريد الإلكتروني." + site_contact_username_warning: "أدخل اسم حسابات الأعضاء العاملين الودودين لإرسال رسالة مهمة آليا من تحديث site_contact_username في إعدادات الموقع." notification_email_warning: "رسائل التنبية البريدية لم تكن مرسلة من عنوان بريدي صالح على مجالك؛ توصيل البريد سيكون غير منتظم ولايمكن الاعتماد عليها. الرجاء وضع رسائل التنبية في عنوان بريدي صالح في إعدادات الموقع Site Settings." content_types: education_new_reply: @@ -825,11 +833,17 @@ ar: show_subcategory_list: "اعرض قائمة الفئات الفرعية بدلاً من قائمة المواضيع عند ادخال فئة ما." fixed_category_positions: "إذا تم التحقق, ستتمكن من ترتيب الفئات على شكل المطلوب. وإذا لم يتم التحقق, ستسرد الفئات على حسب الفعالية." post_excerpt_maxlength: "الحد الأقصى لطول وظيفة مقتطف / ملخص." + post_onebox_maxlength: "الحد الأقصى لطول مشاركة oneboxed Discourse بالأحرف." logo_url: "صورة الشعار في الجزء العلوي الأيسر من موقع الويب الخاص بك، يجب أن تكون على شكل مستطيل واسع. إذا كان سيتم إظهار غادر نص عنوان موقع على بياض." logo_small_url: "صورة الشعار صغيرة في الجزء العلوي الأيسر من موقع الويب الخاص بك، يجب أن تكون على شكل مربع، وينظر عند التمرير لأسفل. وإذا ترك فارغا أن أظهرت الصورة الرمزية المنزل." summary_score_threshold: "الحد الأدنى للنقاط المطلوبة لتضمين مشاركة في \"تلخيص هذا الموضوع\"" + summary_posts_required: "الحد الأدنى للمشاركات في الموضوع قبل \"تلخيص هذا الموضوع\" مفعل." + summary_likes_required: "الحد الأدنى للإعجابات في الموضوع قبل \"تلخيص هذا الموضوع\" مفعل." + summary_percent_filter: "عندما يضغط المستخدم على \"تلخيص هذا الموضوع\"، يظهر أعلى % o المشاركات." summary_max_results: "الحد الأقصى للمشاركات العائدة بـ 'ملخص هذا الموضوع'" enable_private_messages: "يسمح مستوى الثقة 1 للمستخدمين بإنشاء والرد على الرسائل" + enable_long_polling: "ناقل الرسالة المستخدم للاشعارات يمكن أن يستخدم التصويت الطويل." + anon_polling_interval: "المرات التي يجب الاستعلام فيها عن العملاء المجهولين بالملي ثانية." cooldown_minutes_after_hiding_posts: "عدد الدقائق يجب على المستخدم الانتظار قبل أن يتمكنوا من تعديل موضوع مخفي عن طريق رفع الأعلام المجتمع" max_topics_in_first_day: "الحد الأقصى لعدد الموضوعات يسمح للمستخدم لإنشاء في يومهم الأول على الموقع" max_replies_in_first_day: "الحد الأقصى لعدد الردود يسمح للمستخدم لإنشاء في يومهم الأول على الموقع" @@ -946,6 +960,11 @@ ar: delete_drafts_older_than_n_days: حذف المسودات مضى عليها أكثر من (ن) يوما. enable_emoji: "تمكين الرموز التعبيرية " emoji_set: "كيف تريد الرموز التعبيرية الخاصة بك؟" + enforce_square_emoji: "أجبر نسبة جانب المربع لكل الرموز التعبيرية." + approve_post_count: "كمية مشاركات العضو الجديد التي يجب أن تتم الموافقة عليها" + approve_unless_trust_level: "مشاركات للأعضاء أدنى من مستوى الثقة هذا يجب أن تتم الموافقة عليها." + default_email_digest_frequency: "عدد المرات التي يتلقى الأعضاء فيها ملخص لبريدهم الإلكتروني إفتراضيا." + default_email_mailing_list_mode: "ارسل بريد إلكتروني لكل مشاركة جديدة افتراضيا." default_other_external_links_in_new_tab: "أفتح الروابط الخارجية في تبويب جديد إفتراضيا." default_other_enable_quoting: "فعل إقتباس الردود لتحديد النص إفتراضيا." default_other_dynamic_favicon: "إعرض عدد المواضيع الجديدة/الحديثة في أيقونة المتصفح إفتراضيا." @@ -1042,7 +1061,6 @@ ar: characters: "يجب ان تحتوي الارقام والاحرف الصغيرة فقط " unique: "يجب أن يكون فريدا" blank: "يجب أن يكون موجود" - must_end_with_alphanumeric: "يجب أن ينتهي بحرف أو رقم." must_not_contain_two_special_chars_in_seq: "يجب أن لا يحتوي على تسلسل من 2 أو رموز خاصة (.-_)" must_not_contain_confusing_suffix: "يجب أن لا تحتوي على ملحقة مربكة مثل : json. أو png. الخ." email: @@ -1107,8 +1125,7 @@ ar: text_body_template: "نحن آسفون ، ولكن رسالة البريد الإلكتروني إلى %{destination} (titled %{former_title}) لا تعمل. \n\nليس هنالك حساب عضو يمتلك هذا البريد الالكتروني. حاول أن ترسل من بريد الكتروني مختلف، أو أتصل بـ أحد المشرفين.\n\n" email_reject_empty: subject_template: "[%{site_name}] بريد الكتروني -- بدون محتوى" - text_body_template: "نحن آسفون ، ولكن رسالة البريد الإلكتروني إلى %{destination} (titled %{former_title}) لا تعمل. \n\nلم نتمكن من العثور على أي محتوى في البريد الإلكتروني الخاص بك. تأكد من الرد الخاص بك هو في الجزء العلوي من البريد الإلكتروني -- نحن لا يمكننا معالجة الردود في سطر .\n\nإذا كنت الحصول على هذا وانت_ قمت _ بتضمين المحتوى، حاول مرة أخرى مع محتوى HTML المضمنه في بريدك الالكتروني\ - \ ( ليس مجرد نص عادي).\n" + text_body_template: "نحن آسفون ، ولكن رسالة البريد الإلكتروني إلى %{destination} (titled %{former_title}) لا تعمل. \n\nلم نتمكن من العثور على أي محتوى في البريد الإلكتروني الخاص بك. تأكد من الرد الخاص بك هو في الجزء العلوي من البريد الإلكتروني -- نحن لا يمكننا معالجة الردود في سطر .\n\nإذا كنت الحصول على هذا وانت_ قمت _ بتضمين المحتوى، حاول مرة أخرى مع محتوى HTML المضمنه في بريدك الالكتروني ( ليس مجرد نص عادي).\n" email_reject_parsing: subject_template: "[%{site_name}] بريد الكتروني -- محتواه غير معروف" text_body_template: "نحن آسفون ، ولكن رسالة البريد الإلكتروني إلى %{destination} (titled %{former_title}) لا تعمل. \n\nلم نتمكن من العثور على أي محتوى في البريد الإلكتروني الخاص بك. **تأكد من الرد الخاص بك هو في الجزء العلوي من البريد الإلكتروني -- نحن لا يمكننا معالجة الردود في سطر .\n" diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml index b093fa26c7..7b83392361 100644 --- a/config/locales/server.bs_BA.yml +++ b/config/locales/server.bs_BA.yml @@ -1285,85 +1285,3 @@ bs_BA: title: "Terms of Service" privacy_topic: title: "Privacy Policy" - body: | - - - ## [What information do we collect?](#collect) - - We collect information from you when you register on our site and gather data when you participate in the forum by reading, writing, and evaluating the content shared here. - - When registering on our site, you may be asked to enter your name and e-mail address. You may, however, visit our site without registering. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address. - - When registered and posting, we record the IP address that the post originated from. We also may retain server logs which include the IP address of every request to our server. - - - - ## [What do we use your information for?](#use) - - Any of the information we collect from you may be used in one of the following ways: - - * To personalize your experience — your information helps us to better respond to your individual needs. - * To improve our site — we continually strive to improve our site offerings based on the information and feedback we receive from you. - * To improve customer service — your information helps us to more effectively respond to your customer service requests and support needs. - * To send periodic emails — The email address you provide may be used to send you information, notifications that you request about changes to topics or in response to your user name, respond to inquiries, and/or other requests or questions. - - - - ## [How do we protect your information?](#protect) - - We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. - - - - ## [What is your data retention policy?](#data-retention) - - We will make a good faith effort to: - - * Retain server logs containing the IP address of all requests to this server no more than 90 days. - * Retain the IP addresses associated with registered users and their posts no more than 5 years. - - - - ## [Do we use cookies?](#cookies) - - Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account. - - We use cookies to understand and save your preferences for future visits and compile aggregate data about site traffic and site interaction so that we can offer better site experiences and tools in the future. We may contract with third-party service providers to assist us in better understanding our site visitors. These service providers are not permitted to use the information collected on our behalf except to help us conduct and improve our business. - - - - ## [Do we disclose any information to outside parties?](#disclose) - - We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety. However, non-personally identifiable visitor information may be provided to other parties for marketing, advertising, or other uses. - - - - ## [Third party links](#third-party) - - Occasionally, at our discretion, we may include or offer third party products or services on our site. These third party sites have separate and independent privacy policies. We therefore have no responsibility or liability for the content and activities of these linked sites. Nonetheless, we seek to protect the integrity of our site and welcome any feedback about these sites. - - - - ## [Children's Online Privacy Protection Act Compliance](#coppa) - - Our site, products and services are all directed to people who are at least 13 years old or older. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA ([Children's Online Privacy Protection Act](http://en.wikipedia.org/wiki/Children)), do not use this site. - - - - ## [Online Privacy Policy Only](#online) - - This online privacy policy applies only to information collected through our site and not to information collected offline. - - - - ## [Your Consent](#consent) - - By using our site, you consent to our web site privacy policy. - - - - ## [Changes to our Privacy Policy](#changes) - - If we decide to change our privacy policy, we will post those changes on this page. - - This document is CC-BY-SA. It was last updated May 31, 2013. diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml index 8366c878d5..4c6a775518 100644 --- a/config/locales/server.cs.yml +++ b/config/locales/server.cs.yml @@ -902,85 +902,3 @@ cs: title: "Podmínky používání" privacy_topic: title: "Ochrana soukromí" - body: | - - - ## [Jaké informace sbíráme?](#collect) - - Sbíráme informace od vaší registrace a shromažďujeme data o tom když se účastníte chodu fóra čtením, přispíváním a hodnocením zdejšího obsahu. - - Při registraci na náš web můžete být požádání o jméno a emailovou adresu. Můžete ale tento web navštěvovat i bez registrace. Vaše emailová adresa bude ověřena emailem obsahujícím unikátní odkaz. Po návštěvě tohoto odkazu víme, že spravujete onu emailovou adresu. - - Při registraci a při přispívání uchováváme IP adresu ze které byl požadavek odeslán. Dále také můžeme mít na serveru logy které uchovávají IP adresu každého požadavku na tento server. - - - - ## [Na co vaše informace používáme?](#use) - - Každá informace kterou shromažďujeme může být použivate následovně: - - * Přizpůsobení webu — vaše informace nám pomáhá lépe upravit fórum pro vaše osobní potřeby. - * Zdokonalování našeho webu — neustále se na základě vaší odezvy snažíme náš web vylepšovat. - * Lepší uživatelská podpora — vaše informace nám pomáhají efektivněji řešit uživatelskou podporu. - * Odesílání periodických emailů — Emailová adresa kterou nám poskytnete může být použita k tomu, že vám odešleme informace a nebo upozornění na změny na webu a nebo akce ostatních uživatelů nebo další otázky, požadavky nebo odpovědi. - - - - ## [Jak chráníme vaše informace?](#protect) - - Zavedli jsme celou řadu bezpečnostních opatření abychom zajistili bezpočnost vašich soukromých informací vždy když vkládáte, odesíláte nebo čtete vaše soukromé informace. - - - - ## [Jaká je vaše politika uchovávání osobních údajů?](#data-retention) - - Snažíme se: - - * Uchovávat logy obsahující IP adresu všech požadavků na tento server méně než 90 dní. - * Uchovávat IP adresu asociovanou s registrovaným uživatelem a jejich příspěvky méně než 5 let. - - - - ## [Používáme cookies?](#cookies) - - Samozřejmě. Cookies jsou miniaturní soubory, které stránka nebo její provozovatel vytvoří na vašem počítači skrz webový prohlížeč (pokud to ten povolí). Tato cookies umožňují rozpoznat váš prohlížeč a, pokud máte registrovaný účet, asociovat vás s registrovaným účtem. - - Používáme cookie k pochopení a uložení vašich preferencí pro budoucí návštěvi a kompilujeme souhrná data o provozu na webu a interakcí s webem tak, že můžeme nabídnout lepší uživatelský zážitek a nástroje. Můžeme tato souhrnná data poskytnout třetí straně, která nám pomůže lépe porozumět uživatelům našeho webu. Tyto třetí strany nemají povoleno tyto souhrné informace využívat kromě toho, když nám pomáhají vylepšovat náš web. - - - - ## [Prozrazujeme libovolné informace cizím stranám?](#disclose) - - Neprodáváme, neobchodujeme s, ani jinak nepřenášíme cizím stranám vaše osobní údaje. Toto se nevztahuje na důvěryhodné třetí strany které nám pomáhají provozovat tento web, vést podnikání, dokud tyto strany souhlasí, že vaše osobní data zůstanou důvěrná. Můžeme také uvolnit informace v důsledku dodržování zákonů, pro vynucování politiky tohoto webu, k ochranně našich nebo cizích práv, majetku nebo bezpečnosti. Neosobní informace ale můžeme poskytnout třetím stranám pro účely marketingu, reklamy nebo další použití. - - - - ## [Odkazy třetích stran](#third-party) - - Podle našeho uvážení můžeme příležitostně na tomto webu zobrazovat produkty a služby třetích stran. Tyto třetí strany mohou mít jiné a nezávislé zásady ochrany osobních údajů. Nemáme tedy žádnou odpovědnost ani ručení za obsah těchto stran. Snažíme se nicméně ochraňovat integritu tohoto webu a vítáme zpětnou vazbu o obsahu cizích stran na tomto webu. - - - - ## [Children's Online Privacy Protection Act Compliance](#coppa) - - Tento web, produkty a služby jsou určeny pro lidi staré alespoň 13 let. Pokud je tento server v USA a jste mladší než 13 let, nesmíte podle požadavků COPPA ([Children's Online Privacy Protection Act](http://en.wikipedia.org/wiki/Children)) tento web používat. - - - - ## [Pouze online zásady](#online) - - Tyto zásady ochrany osobních údajů jsou platné pouze online a nevztahují se na informace sbírané offline. - - - - ## [Váš souhlas](#consent) - - Používáním tohoto webu souhlasíte s těmito zásadami ochrany osobních údajů. - - - - ## [Změny v zásadách ochrany osobních údajů](#changes) - - Pokud se rozhodneme změnit naše zásady ochrany osobních údajů, oznámíme tyto změny na této stránce. - - Tento text je pod licencí CC-BY-SA. Naposledy byl změněn 22. listopadu 2014. diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml index 42eceed134..5b7beff509 100644 --- a/config/locales/server.es.yml +++ b/config/locales/server.es.yml @@ -69,7 +69,7 @@ es: min_username_length_exists: "No se puede establecer una longitud mínima para nombre de usuario mayor que el nombre de usuario más corto ya existente." min_username_length_range: "No se puede establecer el mínimo por encima del máximo." max_username_length_exists: "No se puede establecer una longitud máxima de nombre de usuario menor que el nombre de usuario más largo ya existente." - max_username_length_range: "No se puede establecer el máximo por debajo del mínimo." + max_username_length_range: "No puedes poner el máximo por debajo del mínimo." default_categories_already_selected: "No se puede seleccionar una categoría ya utilizada en otra lista." bulk_invite: file_should_be_csv: "El archivo a subir debe tener formato csv o txt." @@ -779,6 +779,7 @@ es: email_token_valid_hours: "Los tokens para restablecer contraseña olvidada / activar cuenta son válidos durante (n) horas." email_token_grace_period_hours: "Los tokens para restablecer contraseña olvidada / activar cuenta son válidos durante (n) horas de periodo de gracia, después de ser redimidos." enable_badges: "Activar el sistema de distintivos" + enable_whispers: "Permitir a los usuarios susrrar a los moderadores" allow_index_in_robots_txt: "Especificar en robots.txt que este sitio puede ser indexado por los motores de búsqueda web." email_domains_blacklist: "Una lista de dominios de correo electrónico con los que los usuarios no se podrán registrar. Ejemplo: mailinator.com|trashmail.net" email_domains_whitelist: "Una lista de dominios de email con los que los usuarios DEBERÁN registrar sus cuentas. AVISO: ¡los usuarios con un email con diferente dominio a los listados no estarán permitidos!" @@ -856,6 +857,8 @@ es: s3_region: "El nombre de región de Amazon S3 que se utilizará para subir imágenes." s3_cdn_url: "URL de un CDN a utilizar para todos los activos s3 (por ejemplo: https://cdn.somewhere.com). AVISO: después de cambiar esta opción debes hacer un rebake de todos los posts antiguos." avatar_sizes: "Lista de tamaños de avatar generados automáticamente." + 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}" 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." @@ -935,6 +938,7 @@ es: min_first_post_typing_time: "Mínimo período de tiempo en milisegundos en el que un usuario debe estar tecleando durante su primer post, si no se llega a este umbral entrará automáticamente a la cola de moderación. Establece esta opción a 0 para desactivarla (no recomendado)." auto_block_fast_typers_on_first_post: "Bloquear automáticamente a usuarios que no cumplan el umbral establecido en min_first_post_typing_time" auto_block_fast_typers_max_trust_level: "Máximo nivel de confianza por debajo del cual se podrán bloquearán usuarios que escriban demasiado rápido en su primer post" + auto_block_first_post_regex: "Expresión regular que no distingue mayúsculas y minúsculas que si es detectada hará que el primer post de un usuario sea bloqueado y enviado a la cola de aprobacion. Ejemplo: raging|a[bc]a hará que todos los posts que contengan gaging, aba o aca sean bloqueados. Sólo tiene efecto en el primer mensaje de un usuario." reply_by_email_enabled: "Habilitar la respuesta a temas por email." reply_by_email_address: "Plantilla para la dirección de email que aparecerá al recibir correos con la función de respuesta por email: %{reply_key}@respuesta.ejemplo.com o respuestas+%{reply_key}@ejemplo.com" disable_emails: "Impedir que Discourse envié cualquier tipo de e-mail." @@ -1017,6 +1021,20 @@ es: approve_unless_trust_level: "Los posts de usuarios con un nivel de confianza inferior a este deberán ser aprobados" notify_about_queued_posts_after: "Si hay posts esperando a ser revisados por este número de horas, se enviará un email al correo de contacto. Establece este valor a 0 para desactivar estos emails." default_email_digest_frequency: "Frecuencia por defecto con la que se reciben los emails resumen." + default_email_private_messages: "Enviar un email cuando alguien envíe un mensaje al usuario por defecto." + 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_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." + default_other_enable_quoting: "Activar respuesta citando texto seleccionado por defecto." + default_other_dynamic_favicon: "Mostrar temas nuevos/actualizados en el icono del navegador por defecto" + default_other_disable_jump_reply: "No ir a un nuevo post tras publicarlo por defecto" + default_other_edit_history_public: "Hacer la lista de ediciones pública por defecto." + default_categories_watching: "Lista de categorías que están vigiladas por defecto." + default_categories_tracking: "Lista de categorías que están seguidas por defecto" + default_categories_muted: "Lista de categorías que están silenciadas por defecto." errors: invalid_email: "Dirección de correo electrónico inválida. " invalid_username: "No existe ningún usuario con ese nombre de usuario. " @@ -1138,6 +1156,10 @@ 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_not_contain_two_special_chars_in_seq: "no debe contener una secuencia de 2 o más caracteres especiales (.-_)" + must_not_contain_confusing_suffix: "no debe contener un sufijo confuso como .json, .png, etc." email: not_allowed: "este proveedor de email no está permitido. Por favor, utiliza otra dirección de email." blocked: "no está permitido." @@ -1704,6 +1726,7 @@ es: unauthorized: "Lo sentimos, el archivo que estás intentando subir no está autorizado (extensiones autorizadas: %{authorized_extensions})." pasted_image_filename: "Imagen pegada" store_failure: "Falló el almacenamiento de la subida #%{upload_id} para el usuario #%{user_id}." + file_missing: "Lo sentimos, debes incluir un archivo a subir." attachments: too_large: "Lo sentimos, el archivo que estás intentando subir es demasiado grande (el tamaño máximo es %{max_size_kb}%KB)." images: @@ -1744,6 +1767,12 @@ es: title: "Términos de Servicio" privacy_topic: title: "Políticas de Privacidad" + body: "\n\n## [¿Qué información recolectamos?](#collect)\n\nRecolectamos información tuya cuando te registras en nuestra web, y recopilamos información cuando participas en ella leyendo, escribiendo y evaluando el contenido compartido aquí.\n\nAl registrarte en nuestra web, puede que se te pida que indiques tu nombre y tu email. Sin embargo, puedes visitarnos sin registrarte. Tu email será verificado a través de un mensaje que contendrá un enlace único. Si ese enlace es visitado, sabremos que controlas el email.\n\nCuando estés registrado y publiques, guardamos la dirección IP de donde el mensaje ha sido publicado. Puede que guardemos registros que incluyan la dirección IP de cada intercambio de datos con nuestro servidor.\n\n\n\n## [¿Para qué usamos tu información?](#use)\n\nCualquier información recolectada puede ser usada en una de las siguientes\ + \ maneras:\n\n* Para personalizar tu experiencia — tu información nos ayuda a responder a tus necesidades individuales.\n* Para mejorar nuestra web — intentamos continuamente mejorar nuestro sitio web ofreciéndote contenido basado en la información que recibimos de ti.\n* Para mejorar el servicio de soporte — tu información nos ayuda a responder de una forma más efectiva a tus dudas y problemas.\n* Para enviar emails cada cierto tiempo — La direccion de email que nos proporciones puede ser usada para enviarte información, notificaciones que tú solicites sobre cambios en temas, sobre respuestas a tu nombre, respuestas a consultas y/o cualquier otro tipo de solicitudes o cuestiones.\n\n\n\n## [¿Cómo protegemos tu información?](#protect)\n\nTenemos implementadas varias medidas de seguridad para mantener tu información personal segura cuuando la introduces\ + \ o accedes a ella.\n\n\n\n## [¿Cuál es la política de retención de datos?](#data-retention)\n\nIntentamos:\n\n* No retener los registros de los servidores conteniendo la dirección IP de todas las solicitudes durante más de 90 días.\n* No retener las direcciones IP asociadas con usuarios registrados y sus mensajes durante no más de 5 años.\n\n\n\n\n## [¿Usamos cookies?](#cookies)\n\nSí. Las cookies con pequeños archivos que una web o su proveedor de servicios transfiere a tu disco duro a través de tu navegador (si lo permites).\nEstas cookies permiten a la web reconocer tu navegador y, si tienes una cuenta registrada, asociarlo con ella.nt.\n\nUsamos cookies para entender y guardar tus preferencias para futuras visitas y para recolectar información sobre el tráfico y la interacción con este sitio web para que podamos ofrecer mejores experiencias\ + \ y herramientas en un futuro. Puede que nos asociemos con terceras personas para que nos asisten a entender mejor a nuestros visitantes. Estos proveedores de servicios no tienen permitido usar esta información para otro propósito que no sea ayudarnos a mejorar.\n\n\n\n## [¿Revelamos alguna información a terceros?](#disclose)\n\nNo vendemos, intercambiamos o transferimos a terceros tu información personal. Esto no incluye a terceros que nos ayuden a operar correctamente este sitio web, a administrar nuestro negocio o a ofrecerte un servicio, siempre y cuando acepten mantener esta información confidencial.\nPuede que revelemos tu información cuando creamos que sea apropiado para cumplir con la ley, hacer cumplir con nuestras políticas, derechos, propiedades, o seguridad nuestros o de terceros. Sin embargo, la información no personal de los visitantes puede que sea entregada\ + \ debidamente a terceros con propósitos de marketing, publicidad u otros usos. \n\n\n\n## [Enlaces de terceros](#third-party)\n\nOcasionalmente, es posible que incluyamos u ofrezcamos enlaces a productos o servicios de terceros en esta web. Estos sitios webs de terceros tienen otras políticas de privacidad, por lo que no nos hacemos responsables del contenido y actividades de estos sitios. Sin embargo, intentamos proteger la integridad de nuestra web y aceptamos opiniones sobre estos sitios de terceros.\n\n\n\n## [Cumplimiento del Acta de Protección de la Privacidad Online de los Niños de 1998](#coppa)\n\nNuestra web, sus productos y servicios están dirigidos a personas que tengan 13 o más años de edas. Si este servidor está en EEUU, y tienes menos de 13 años de edad, a causa del Acta de Protección de la Privacidad Online de los Niños de 1998\ + \ ([Children's Online Privacy Protection Act](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)) de EEUU, no uses este sitio web.\n\n\n\n## [Política de privacidad online](#online)\n\nEsta política de privacidad sólo tiene validez para la información recolectada a través de nuestro sitio web, y no para aquella recolectada offline.\n\n\n\n## [Consentimiento](#consent)\n\nAl usar nuestra web, aceptas esta política.\n\n\n\n## [Cambios a nuestra política de privacidad](#changes)\n\nSi decidimos cambiar nuestra política de privacidad, publicaremos los cambios en esta misma página.\n\nEste documento tiene una licencia \"CC-BY-SA\". Última actualización: 31 de mayo del 2013.\n" static: search_help: |

        Consejos

        diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml index f617f6f9ac..90c39ef8c8 100644 --- a/config/locales/server.fa_IR.yml +++ b/config/locales/server.fa_IR.yml @@ -1442,88 +1442,6 @@ fa_IR: title: "شرایط استفاده از خدمات" privacy_topic: title: "سیاست حفظ حریم خصوصی" - body: | - - - ## [What information do we collect?](#collect) - - We collect information from you when you register on our site and gather data when you participate in the forum by reading, writing, and evaluating the content shared here. - - When registering on our site, you may be asked to enter your name and e-mail address. You may, however, visit our site without registering. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address. - - When registered and posting, we record the IP address that the post originated from. We also may retain server logs which include the IP address of every request to our server. - - - - ## [What do we use your information for?](#use) - - Any of the information we collect from you may be used in one of the following ways: - - * To personalize your experience — your information helps us to better respond to your individual needs. - * To improve our site — we continually strive to improve our site offerings based on the information and feedback we receive from you. - * To improve customer service — your information helps us to more effectively respond to your customer service requests and support needs. - * To send periodic emails — The email address you provide may be used to send you information, notifications that you request about changes to topics or in response to your user name, respond to inquiries, and/or other requests or questions. - - - - ## [How do we protect your information?](#protect) - - We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. - - - - ## [What is your data retention policy?](#data-retention) - - We will make a good faith effort to: - - * Retain server logs containing the IP address of all requests to this server no more than 90 days. - * Retain the IP addresses associated with registered users and their posts no more than 5 years. - - - - ## [Do we use cookies?](#cookies) - - Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account. - - We use cookies to understand and save your preferences for future visits and compile aggregate data about site traffic and site interaction so that we can offer better site experiences and tools in the future. We may contract with third-party service providers to assist us in better understanding our site visitors. These service providers are not permitted to use the information collected on our behalf except to help us conduct and improve our business. - - - - ## [Do we disclose any information to outside parties?](#disclose) - - We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety. However, non-personally identifiable visitor information may be provided to other parties for marketing, advertising, or other uses. - - - - ## [Third party links](#third-party) - - Occasionally, at our discretion, we may include or offer third party products or services on our site. These third party sites have separate and independent privacy policies. We therefore have no responsibility or liability for the content and activities of these linked sites. Nonetheless, we seek to protect the integrity of our site and welcome any feedback about these sites. - - - - ## [Children's Online Privacy Protection Act Compliance](#coppa) - - Our site, products and services are all directed to people who are at least 13 years old or older. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA ([Children's Online Privacy Protection Act](http://en.wikipedia.org/wiki/Children)), do not use this site. - - - - ## [Online Privacy Policy Only](#online) - - This online privacy policy applies only to information collected through our site and not to information collected offline. - - - - ## [Your Consent](#consent) - - By using our site, you consent to our web site privacy policy. - - - - ## [Changes to our Privacy Policy](#changes) - - If we decide to change our privacy policy, we will post those changes on this page. - - This document is CC-BY-SA. It was last updated May 31, 2013. admin_login: success: "ایمیل ارسال شد " error: "خطا!" diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml index 58e438ddb0..06ba8415a1 100644 --- a/config/locales/server.fr.yml +++ b/config/locales/server.fr.yml @@ -69,7 +69,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: "Il n'est pas possible de définir un maximum plus petit que le minimum." + max_username_length_range: "Vous ne pouvez pas mettre le maximum sous le minimum" default_categories_already_selected: "Vous ne pouvez pas séléctionner une catégorie qui est utilisée dans une autre liste." bulk_invite: file_should_be_csv: "Le fichier envoyé doit être au format csv ou txt." @@ -402,6 +402,7 @@ fr: please_continue: "Continuer vers %{site_name}" error: "Il y a eu une erreur lors de la modification de votre adresse de courriel. Elle est peut-être déjà utilisée ?" activation: + action: "Cliquer ici pour activer votre compte" already_done: "Désolé, ce lien de confirmation n'est plus valide. Votre compte est peut-être déjà activé ?" please_continue: "Votre nouveau compte est confirmé; vous allez être redirigé vers la page d'accueil." continue_button: "Continuer vers %{site_name}" @@ -752,6 +753,7 @@ fr: notify_mods_when_user_blocked: "Si un utilisateur est bloqué automatiquement, envoyer un message à tous les modérateurs." flag_sockpuppets: "Si un nouvel utilisateur répond à un sujet avec la même adresse I¨P que le nouvel utilisateur qui a commencé le sujet, alors leurs messages seront automatiquement marqués comme spam." traditional_markdown_linebreaks: "Utiliser le retour à la ligne traditionnel dans Markdown, qui nécessite deux espaces pour un saut de ligne." + allow_html_tables: "Permet le rendu des tableaux HTML au sein de Markdown, les balises TABLE, THEAD, TD, TR, TH sont autorisées (nécessite un full rebake sur tous les anciens sujets contenant des tableaux)" post_undo_action_window_mins: "Nombre de minutes pendant lesquelles un utilisateur peut annuler une action sur un message (j'aime, signaler, etc.)" must_approve_users: "Les responsables doivent approuver les nouveaux utilisateurs afin qu'ils puissent accéder au site. ATTENTION : activer cette option sur un site en production suspendra l'accès des utilisateurs existants qui ne sont pas des responsables !" ga_tracking_code: "Google Analytics (ga.js) code de suivi, par exemple: UA-12345678-9; voir http://google.com/analytics" @@ -1010,6 +1012,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. + show_logout_in_header: "Afficher le lien de déconnexion dans la liste utilisateur du header" vacuum_db_days: "Exécuter VACUUM FULL ANALYZE pour récupérer de l'espace dans la base de donnée après une migration (0 pour désactivé) " 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." @@ -1024,8 +1027,6 @@ 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_other_new_topic_duration_minutes: "Nombre de minutes pendant lesquelles un sujet est considéré comme nouveau, les utilisateurs peuvent adapter (-1 pour toujours, -2 pour dernière visite)" - default_other_auto_track_topics_after_msecs: "Combien de millisecondes avant qu'un sujet soit automatiquement suivie, les utilisateurs peuvent adapter (0 pour toujours, -1 pour jamais)" 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." @@ -1155,6 +1156,10 @@ 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_not_contain_two_special_chars_in_seq: "ne doit pas contenir une séquence de 2 caractères spéciaux ou plus (.-_)" + must_not_contain_confusing_suffix: "ne doit pas contenir un sufix déroutant comme .json ou .png etc." email: not_allowed: "n'est pas autorisé pour ce fournisseur de courriels. Merci d'utiliser une autre adresse." blocked: "n'est pas autorisé." @@ -1805,18 +1810,122 @@ fr: Modifier le premier message de ce sujet pour changer le contenu de la page %{page_name}. guidelines_topic: title: "FAQ/Règlement" + body: "\n\n## [Ceci est un endroit civilisé, merci de le respecter](#civilized)\n\nMerci de traiter ce forum de discussion avec le même respect que vous pourriez avoir dans un parc public. Nous, aussi, sommes une ressource partagée par la communauté — un endroit pour partager des compétences, savoirs et intérêts au travers de conversations.\n\nIl ne s'agit pas de règles absolues, uniquement d'aide au bon sens de notre communauté. Suivez ces instructions pour garder cet endroit propre et bien éclairé pour un débat public civilisé.\n\n\n\n## [Améliorez la discussion](#improve)\n\nAidez nous à faire de cet endroit un lieu idéal pour la discussion en améliorant constamment le débat d'une certaine façon, même minime. Si vous n'êtes pas sûr que votre message soit utile à la discussion\ + \ ou pourrait nuire à son utilité, pensez à ce que vous voulez dire et essayer de nouveau plus tard.\n\nLes sujets abordés ici sont importants pour nous et nous voulons que vous agissiez comme s'ils comptaient également pour vous. Soyez respectueux des sujets et des autres utilisateurs, même si vous êtes en désaccord avec une partie de ce qui est dit.\n\nUne façon d'améliorer la discussion est de découvrir celles qui sont déjà en cours. Essayez de passez un peu de temps à parcourir les sujets avant de répondre ou démarrer votre propre discussion. De fait, vous aurez de plus grandes chances de rencontrer d'autres personnes qui partagent vos intérêts.\n\n\n\n## [Soyez agréable, même si vous n'êtes pas d'accord](#agreeable)\n\nLa critique peut être constructive. Vous pouvez répondre à une personne en étant\ + \ en désaccord avec elle. C'est très bien. Mais n'oubliez pas de *critiquer les idées, pas les gens*. Merci d'éviter :\n\n* les injures,\n* les attaques ad hominem,\n* de répondre à la tonalité d'un sujet plutôt qu'à son contenu réel,\n* les contradictions primaires.\n \nAu lieu de cela, fournissez des contre-arguments motivés qui améliorent la conversation.\n\n\n\n## [Votre participation compte](#participate)\n\nLes conversations que nous avons ici donnent le ton pour tout le monde. Aidez-nous à influencer l'avenir de cette communauté en choisissant de vous engager dans des discussions qui font de ce forum un lieu intéressant — et en évitant celles qui n'y participent pas.\n\nDiscourse fournit des outils qui permettent à la communauté d'identifier collectivement le meilleur (et le pire) des contributions\ + \ : favoris, signets, des *J'aime*, des signalements, des réponses, des vérifications et ainsi de suite. Utilisez ces outils pour améliorer votre propre expérience et celle de tous les autres aussi.\n\nEssayons de laisser notre parc mieux que nous l'avons trouvé.\n\n\n\n## [Si vous voyez un problème, signaler le](#flag-problems)\n\nLes modérateurs ont un rôle spécial ; ils sont responsables de ce forum. Mais vous aussi. Avec votre aide, les modérateurs peuvent être des facilitateurs de la vie de la communauté et pas seulement des concierges ou des policiers.\n\nQuand vous voyez un mauvais comportement, ne répondez pas. Votre reconnaissance encourage le mauvais comportement, il consomme votre énergie et fait perdre du temps à chacun. *Signalez-le*. Si suffisamment de signalements s'accumulent, des\ + \ mesures seront prises, automatiquement ou par l'intervention d'un modérateur.\n\nAfin de maintenir notre communauté, les modérateurs se réservent le droit de supprimer tout contenu et n'importe quel compte utilisateur pour une raison quelconque, et ce à n'importe quel moment. Les modérateurs ne disposent pas d'un aperçu des nouveaux messages avant leur publication, les modérateurs et opérateurs du site n'assument aucune responsabilité pour tout contenu affiché par la communauté.\n\n\n\n## [Soyez toujours civilisé](#be-civil)\n\nRien ne sabote une conversation saine mieux que la grossièreté :\n\n* Soyez civilisé. Ne postez pas ce qu'une personne raisonnable jugerait offensif, ni de discours violent ou haineux.\n* Gardez-le forum propre. Ne publiez rien d'obscène ou sexuellement explicite.\n* Se respecter\ + \ mutuellement est primordial. Ne pas harceler ou chagriner quelqu'un, ni usurper l'identité de quelqu'un ou exposer des informations privées le concernant.\n* Respecter notre forum. Ne postez pas de spam ou tout autre forme de vandalisme.\n \nIl ne s'agit pas ici de choses concrètes avec des définitions précises - évitez *même d'avoir l'air* d'agir de la sorte. Si vous avez un doute, demandez-vous comment vous vous sentiriez si votre sujet était publié sur la première page du Monde.\n\nIl s'agit d'un forum public et les moteurs de recherche indexent ces discussions. Utilisez un langage, des liens et des images sans danger pour votre famille et vos amis.\n\n\n\n## [Gardez cet endroit propre](#keep-tidy)\n\nFaites l'effort de mettre les choses au bon endroit, afin que nous puissions passer plus de temps\ + \ à discuter et moins à ranger. Ainsi :\n\n* Ne commencez pas un sujet dans la mauvaise catégorie.\n* Ne postez pas le même contenu dans plusieurs discussions.\n* Ne postez pas de message sans contenu.\n* Ne pas détourner un sujet en le changeant en cours de route.\n* Ne signez pas vos messages — chaque message dispose d'informations sur le profil qui s'y rattache.\n\nPlutôt que de poster \"+1\", \"lol\", \"mdr\" ou \"d'accord\", utilisez le bouton 'J'aime'. Plutôt que de faire prendre à une discussion existante une direction radicalement différente, utilisez \"Répondre en créant un sujet lié\". \n\n\n\n## [Postez seulement vos propres trucs](#stealing)\n\nVous ne pouvez pas poster n'importe quel contenu numérique s'il appartient à quelqu'un d'autre sans son autorisation. Vous ne pouvez pas poster\ + \ des descriptions, des liens ou des méthodes pour voler la propriété intellectuelle de quelqu'un (logiciels, vidéo, audio, images), ou pour transgresser toute autre loi.\n\n\n\n## [Powered by You](#power)\n\nCe site est géré par votre [équipe de responsables](/about) ainsi que *vous*, la communauté. Si vous avez d'autres questions sur comment les choses devraient fonctionner ici, créez un nouveau sujet dans [la catégorie meta](/c/meta) et discutons-en ! S'il y un problème critique ou urgent qui ne peut pas être résolu par un sujet meta ou un signalement, contactez nous [ici](/about). \n\n\n\n## [Lisez les conditions générales d'utilisation](#tos)\n\nOui, le jargon juridique est ennuyeux, mais nous devons nous protéger – et par extension, vous et vos données – contre des gens\ + \ hostiles. Nous avons des [Conditions générales d'utilisation](/tos) décrivant votre (et notre) comportement et les droits liés au contenu, la confidentialité et les lois. Pour utiliser ce service, vous devez accepter de respecter nos [CGU](/tos).\n" tos_topic: title: "Conditions générales d'utilisation" privacy_topic: title: "Protection des données" - body: "\n\n## [Quelles sont les informations que nous recueillons ?](#collect)\n\nNous recueillons des informations lorsque vous vous inscrivez sur notre site et nous recueillons des données lorsque vous participez au forum en lisant, en écrivant et en évaluant le contenu partagé ici.\n\nLorsque vous vous inscrivez sur notre site, vous pouvez être invité à entrer votre nom et votre adresse de courriel. Vous pouvez, toutefois, visitez notre site sans vous inscrire. Votre adresse de courriel sera vérifiée par un courriel contenant un lien unique. Si ce lien est visité, nous savons que vous êtres propriétaire de l'adresse de courriel.\n\nUne fois enregistré et lorsque vous postez, nous enregistrons l'adresse IP de provenance du poste. Nous pouvons également conserver les journaux des serveurs qui comprennent\ - \ l'adresse IP de chaque demande à notre serveur.\n\n\n\n## [Comment utilisons-nous vos informations ?](#use)\n\nToute l'information que nous recueillons auprès de vous peuvent être utilisés dans l'une des façons suivantes :\n\n* Pour personnaliser votre expérience - vos informations nous aide à mieux répondre à vos besoins individuels.\n* Pour améliorer notre site - nous nous efforçons continuellement d'améliorer nos fonctionnalités basés sur les informations et les commentaires que nous recevons de votre part.\n* Pour améliorer le service client — vos informations nous aide à répondre plus efficacement à vos demandes de service et de support.\n* Pour envoyer des courriels périodiques - L'adresse de courriel que vous fournissez peut être utilisée pour vous envoyer des informations, des notifications que vous\ - \ avez demandé tels que des modifications apportées à thèmes, des réponses mentionnant votre nom d'utilisateur, des réponses a des demandes de renseignements et / ou d'autres demandes ou questions.\n\n\n\n## [Comment protégeons-nous vos informations ?](#protect)\n\nNous mettons en œuvre une variété de mesures de sécurité pour maintenir la sécurité de vos informations personnelles lorsque vous saisissez, soumettez, ou d'accédez à vos renseignements personnels.\n\n\n\n## [Quelle est votre politique de conservation des données ?](#data-retention)\n\nNous ferons un effort de bonne foi pour :\n* Conserver les logs du serveur contenant l'adresse IP de toutes les requêtes vers ce serveur sans dépasser les 90 jours.\n* Conserver les adresses IP associées à des utilisateurs enregistrés\ - \ et leurs messages pas plus de 5 ans.\n\n\n\n## [Utilisons-nous des cookies ?](#cookies)\n\nOui. Les cookies sont de petits fichiers qu'un site ou son prestataire de services transfert sur le disque dur de votre ordinateur via votre navigateur Web (si vous permettez). Ces cookies permettent au site de reconnaître votre navigateur et, si vous avez un compte enregistré, l'associer à votre compte enregistré.\n\nNous utilisons des cookies pour comprendre et sauvegarder vos préférences pour de futures visites et compiler des données globales sur le trafic du site et les interactions avec le site afin que nous puissions offrir de meilleures expériences de navigation et de meilleurs outils à l'avenir. Nous pouvons conclure des contrats avec des fournisseurs de services tiers pour nous aider à mieux comprendre\ - \ les visiteurs du site. Ces fournisseurs de services ne sont pas autorisés à utiliser les renseignements recueillis en notre nom, sauf pour nous aider à mener et à améliorer notre entreprise.\n\n\n\n## [Divulguons-nous des informations à des tiers?](#disclose)\n\nNous ne vendons pas, ni échangeons, ou même transférerons vos renseignements personnelles à des tiers. Ceci n'inclut pas les tiers de confiance qui nous aident à exploiter notre site, la conduite de nos affaires, ou vous servir, tant que ces parties conviennent à garder ces informations confidentiels. Nous pouvons également divulguer vos informations lorsque nous croyons nécessaire de se conformer à la loi, appliquer nos politiques de site, ou la nôtre ou d'autres droits, la propriété ou la sécurité. Toutefois, des informations non personnelles\ - \ des visiteurs peuvent être fournis à d'autres parties pour le marketing, la publicité, ou d'autres utilisations.\n\n\n\n## [Liens vers des tiers](#third-party)\n\nParfois, à notre discrétion, nous pouvons inclure ou offrir des produits ou services de tiers sur notre site. Ces sites tiers ont des politiques de confidentialité distinctes et indépendantes. Nous n'avons donc aucune responsabilité pour le contenu et les activités de ces sites. Néanmoins, nous cherchons à protéger l'intégrité de notre site et sommes disposés à accueillir tous les commentaires au sujet de ces sites. \n\n\n\n## [Protection des mineurs](#coppa)\n\nNotre site, produits et services sont dirigés vers les personnes qui ont au moins 13 ans ou plus. Si ce serveur est aux Etats-Unis, et que vous êtes sous l'âge\ - \ de 13 ans, conformément aux exigences de la COPPA ([Children's Online Privacy Protection Act](http://fr.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)), n'utiliser pas ce site. ## [Politique de confidentialité en ligne](#online) Cette politique de confidentialité en ligne s'applique uniquement aux informations collectées sur notre site et non aux informations recueillies hors connexion. ## [Votre consentement](#consent) En utilisant notre site, vous consentez à la Politique de confidentialité de notre site web.\n\n\n\n## [Changements à notre politique de confidentialité](#changes)\n\nSi nous décidons de changer notre politique de confidentialité, nous afficherons ces modifications sur cette page.\n\nCe document est soumis à la licence creative\ - \ commons CC-BY-SA.\n" + body: | + + + ## [Quelles sont les informations que nous recueillons ?](#collect) + + Nous recueillons des informations lorsque vous vous inscrivez sur notre site et nous recueillons des données lorsque vous participez au forum en lisant, en écrivant et en évaluant le contenu partagé ici. + + Lorsque vous vous inscrivez sur notre site, vous pouvez être invité à entrer votre nom et votre adresse de courriel. Vous pouvez, toutefois, visitez notre site sans vous inscrire. Votre adresse de courriel sera vérifiée par un courriel contenant un lien unique. Si ce lien est visité, nous savons que vous êtres propriétaire de l'adresse de courriel. + + Une fois enregistré et lorsque vous postez, nous enregistrons l'adresse IP de provenance du poste. Nous pouvons également conserver les journaux des serveurs qui comprennent l'adresse IP de chaque demande à notre serveur. + + + + ## [Comment utilisons-nous vos informations ?](#use) + + Toute l'information que nous recueillons auprès de vous peuvent être utilisés dans l'une des façons suivantes : * Pour personnaliser votre expérience - vos informations nous aide à mieux répondre à vos besoins individuels. + + * Pour améliorer notre site - nous nous efforçons continuellement d'améliorer nos fonctionnalités basés sur les informations et les commentaires que nous recevons de votre part. + * Pour améliorer le service client — vos informations nous aide à répondre plus efficacement à vos demandes de service et de support. + * Pour envoyer des courriels périodiques - L'adresse de courriel que vous fournissez peut être utilisée pour vous envoyer des informations, des notifications que vous avez demandé tels que des modifications apportées à thèmes, des réponses mentionnant votre nom d'utilisateur, des réponses a des demandes de renseignements et / ou d'autres demandes ou questions. + + + + ## [Comment protégeons-nous vos informations ?](#protect) + + Nous mettons en œuvre une variété de mesures de sécurité pour maintenir la sécurité de vos informations personnelles lorsque vous saisissez, soumettez, ou d'accédez à vos renseignements personnels. + + + + ## [Quelle est votre politique de conservation des données ?](#data-retention) + + Nous ferons un effort de bonne foi pour : + + * Conserver les logs du serveur contenant l'adresse IP de toutes les requêtes vers ce serveur sans dépasser les 90 jours. + * Conserver les adresses IP associées à des utilisateurs enregistrés et leurs messages pas plus de 5 ans. + + + + ## [Utilisons-nous des cookies ?](#cookies) + + Oui. Les cookies sont de petits fichiers qu'un site ou son prestataire de services transfert sur le disque dur de votre ordinateur via votre navigateur Web (si vous permettez). Ces cookies permettent au site de reconnaître votre navigateur et, si vous avez un compte enregistré, l'associer à votre compte enregistré. + + Nous utilisons des cookies pour comprendre et sauvegarder vos préférences pour de futures visites et compiler des données globales sur le trafic du site et les interactions avec le site afin que nous puissions offrir de meilleures expériences de navigation et de meilleurs outils à l'avenir. Nous pouvons conclure des contrats avec des fournisseurs de services tiers pour nous aider à mieux comprendre les visiteurs du site. Ces fournisseurs de services ne sont pas autorisés à utiliser les renseignements recueillis en notre nom, sauf pour nous aider à mener et à améliorer notre entreprise. + + + + ## [Divulguons-nous des informations à des tiers?](#disclose) + + Nous ne vendons pas, ni échangeons, ou même transférerons vos renseignements personnelles à des tiers. Ceci n'inclut pas les tiers de confiance qui nous aident à exploiter notre site, la conduite de nos affaires, ou vous servir, tant que ces parties conviennent à garder ces informations confidentiels. Nous pouvons également divulguer vos informations lorsque nous croyons nécessaire de se conformer à la loi, appliquer nos politiques de site, ou la nôtre ou d'autres droits, la propriété ou la sécurité. Toutefois, des informations non personnelles des visiteurs peuvent être fournis à d'autres parties pour le marketing, la publicité, ou d'autres utilisations. + + + + ## [Liens vers des tiers](#third-party) + + Parfois, à notre discrétion, nous pouvons inclure ou offrir des produits ou services de tiers sur notre site. Ces sites tiers ont des politiques de confidentialité distinctes et indépendantes. Nous n'avons donc aucune responsabilité pour le contenu et les activités de ces sites. Néanmoins, nous cherchons à protéger l'intégrité de notre site et sommes disposés à accueillir tous les commentaires au sujet de ces sites. + + + + ## [Protection des mineurs](#coppa) + + Notre site, produits et services sont dirigés vers les personnes qui ont au moins 13 ans ou plus. Si ce serveur est aux Etats-Unis, et que vous êtes sous l'âge de 13 ans, conformément aux exigences de la COPPA ([Children's Online Privacy Protection Act](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)), n'utiliser pas ce site. + + + + ## [Politique de confidentialité en ligne](#online) + + Cette politique de confidentialité en ligne s'applique uniquement aux informations collectées sur notre site et non aux informations recueillies hors connexion. + + + + ## [Votre consentement](#consent) + + En utilisant notre site, vous consentez à la Politique de confidentialité de notre site web. + + + + ## [Changements à notre politique de confidentialité](#changes) + + Si nous décidons de changer notre politique de confidentialité, nous afficherons ces modifications sur cette page. Ce document est soumis à la licence creative commons CC-BY-SA. Il a été mis à jour le 31 mai 2013. + static: + search_help: | +

        Tips

        +

        +

          +
        • Les résultats dont le titre correspond à la recherche sont retournés en priorité – en cas de doutes, recherchez dans les titres
          • +
        • Pour obtenir de meilleurs résultats, utilisez toujours des mots rares ou peu fréquents
          • +
        • Dès que possible, limitez vos recherches à une catégorie en particulier, à un utilisateur ou à un sujet
          • +
        +

        +

        Options

        +

        +

        order:viewsorder:latest
        order:viewsorder:latestorder:likes
        status:openstatus:closedstatus:archivedstatus:norepliesstatus:single_user
        category:foouser:foo
        category:foouser:foogroup:foobadge:foo
        in:likesin:postedin:watchingin:trackingin:private
        in:bookmarksin:first
        posts_count:nummin_age:daysmax_age:days
        + + + + + + +
        order:viewsorder:latest
        status:openstatus:closedstatus:archivedstatus:norepliesstatus:single_user
        category:foouser:foo
        in:likesin:postedin:watchingin:trackingin:private
        in:bookmarksin:first
        posts_count:nummin_age:daysmax_age:days
        +

        +

        + rainbows category:parks status:open order:latest recherchera les sujets qui contiennent le mot "rainbows", qui sont dans la catégorie "parks" et qui ne sont ni fermés ni archivé. Les résultats seront triés par la date du dernier message publié. +

        badges: long_descriptions: autobiographer: | diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml index f63e60d745..bb4a6ae7eb 100644 --- a/config/locales/server.he.yml +++ b/config/locales/server.he.yml @@ -69,7 +69,7 @@ he: min_username_length_exists: "לא ניתן לקבוע את אורך שם המשתמש המינימלי לארוך יותר משם משתמש שקיים כבר. " min_username_length_range: "לא ניתן לקבוע את המינימום מעל המקסימום" max_username_length_exists: "לא ניתן לקבוע את אורך שם המשתמש המקסימלי לקצר יותר משם משתמש שקיים כבר. " - max_username_length_range: "לא ניתן לקבוע את המקסימום מעל המינימום" + max_username_length_range: "לא ניתן לקבוע את המקסימום מתחת למינימום." default_categories_already_selected: "לא ניתן לבחור קטגוריה שהשתמשו בה ברשימה אחרת" bulk_invite: file_should_be_csv: "הקובץ המועלה צריך להיות בפורמט csv או txt." @@ -387,6 +387,7 @@ he: please_continue: "המשך ל-%{site_name}" error: "הייתה שגאיה בעדכון כתובת הדואר האלקטרוני. אולי היא כבר בשימוש?" activation: + action: "לחץ כאן להפעיל את חשבונך" already_done: "סליחה, כתובת אישור החשבון הזו אינה זמינה יותר. אולי החשבון שלך כבר פעיל?" please_continue: "חשבונך החדש אושר; הנכם מועברים לעמוד הבית." continue_button: "המשך ל-%{site_name}" @@ -737,6 +738,7 @@ he: notify_mods_when_user_blocked: "If a user is automatically blocked, send a message to all moderators." flag_sockpuppets: "אם משתמש/ת חדשים מגיבים לנושא מכתובת IP זהה לזו של מי שהחל את הנושא, סמנו את הפרסומים של שניהם כספאם פוטנציאלי." traditional_markdown_linebreaks: "שימוש בשבירת שורות מסורתית בסימון, מה שדורש שני רווחים עוקבים למעבר שורה." + allow_html_tables: "Allow tables to be entered in Markdown using HTML tags, TABLE, THEAD, TD, TR, TH are whitelisted (requires full rebake on all old posts containing tables)" post_undo_action_window_mins: "מספר הדקות בהן מתאפשר למשתמשים לבטל פעולות אחרות בפרסום (לייק, סימון, וכו')." must_approve_users: "על הצוות לאשר את כל המשתמשים החדשים לפני שהם מקבלים גישה לאתר. אזהרה: בחירה זו עבור אתר קיים תשלול גישה ממשתמשים קיימים שאינם מנהלים." ga_tracking_code: "Google analytics (ga.js) tracking code code, eg: UA-12345678-9; see http://google.com/analytics" @@ -766,6 +768,7 @@ he: email_token_valid_hours: "סיסמאות שכחת סיסמא / הפעלת חשבון תקפים במשך (n) שעות." email_token_grace_period_hours: "סיסמאות שכחת סיסמא / הפעלת חשבון עדיין זמינים לזמן חסד של (n) שעות לאחר שהופקו." enable_badges: "הפעלת מערכת התגים (badges)" + enable_whispers: "Allow users to whisper to moderators" allow_index_in_robots_txt: "פרטו ב-robots.txt שלאתר זה מותר להיות מאונדקס על ידי מנועי חיפוש." email_domains_blacklist: "A pipe-delimited list of email domains that users are not allowed to register accounts with. Example: mailinator.com|trashmail.net" email_domains_whitelist: "A pipe-delimited list of email domains that users MUST register accounts with. WARNING: Users with email domains other than those listed will not be allowed!" @@ -843,6 +846,8 @@ he: s3_region: "שם האזור (region name) של Amazon S3 שישמש להעלאת תמונות." s3_cdn_url: "The CDN URL to use for all s3 assets (for example: https://cdn.somewhere.com). WARNING: after changing this setting you must rebake all old posts." avatar_sizes: "רשימה של גדלי אווטרים שנוצרת אוטומטית. " + external_system_avatars_enabled: "Use external system avatars service." + external_system_avatars_url: "URL of the external system avatars service. Allowed substitions are {username} {first_letter} {color} {size}" enable_flash_video_onebox: "אפשרו הטמעת קישורי swf ו-flv (פלאש של אדובי) בפרסומים. אזהרה: עלול להביא לבעיות בטיחות באתר." default_invitee_trust_level: "ברירת מחדל של דרגת אמון (0-4) של משתמשים מוזמנים." default_trust_level: "Default trust level (0-4) for all new users. WARNING! Changing this will put you at serious risk for spam." @@ -995,6 +1000,7 @@ he: enable_cdn_js_debugging: "אפשרו ל-/logs להציג שגיאות בצורה נכונה באמצעות הוספת הרשאות לגישה בין אתרים (crossorigin permissions) בכל ה-js הכלולים." show_create_topics_notice: "אם לאתר פחות מ-5 נושאים פומביים, הציגו הודעה המבקשת מן המנהלים/מנהלות ליצור עוד נושאים." delete_drafts_older_than_n_days: Delete drafts older than (n) days. + show_logout_in_header: "Show log out in user dropdown in header" vacuum_db_days: "הריצו VACUUM FULL ANALYZE כדי להשיב שטח בסיס הנתונים אחרי העברות (כוונו ל-0 כדי לנטרל)" prevent_anons_from_downloading_files: "מונע ממשתמשים אנונימיים להוריד צרופות (attachments). אזהרה: דבר זה ימנע מכל משאב שאינו תמונה ופורסם כצרופה לעבוד." slug_generation_method: "Choose a slug generation method. 'encoded' will generate percent encoding string. 'none' will disable slug at all." @@ -1009,8 +1015,8 @@ he: default_email_direct: "שלח מייל כשמישהו מצטט/ מגיב ל/מזכיר או מזמין משתמש, בתור ברירת מחדל. " default_email_mailing_list_mode: "שלח מייל עבור כל פרסום חדש בתור ברירת מחדל. " default_email_always: "שלח התרעות למייל גם כאשר המשתמש פעיל, בתור ברירת מחדל." - default_other_new_topic_duration_minutes: "Global default number of minutes a topic is considered new, users can override (-1 for always, -2 for last visit)" - default_other_auto_track_topics_after_msecs: "Global default milliseconds before a topic is automatically tracked, users can override (0 for always, -1 for never)" + 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: "פתח קישורים חיצונים בטאב חדש, בתור ברירת מחדל. " default_other_enable_quoting: "Enable quote reply for highlighted text by default." default_other_dynamic_favicon: "Show new/updated topic count on browser icon by default." @@ -1140,6 +1146,10 @@ he: characters: "חייב לכלול מספרים, אותיות ומקפים תחתונים בלבד." unique: "חייב להיות ייחודי" blank: "חייב להיות מלא" + must_begin_with_alphanumeric: "חייב להתחיל עם אות, מספר או קו תחתון" + must_end_with_alphanumeric: "חייב להסתיים עם אות, מספר, או קו תחתון" + must_not_contain_two_special_chars_in_seq: "לא יכול להכיל רצף של 2 או יותר תווים מיוחדים (.-_)" + must_not_contain_confusing_suffix: "לא יכול להכיל סיומת מבלבלת כמו png." email: not_allowed: "לא מורשה מכתובת הדואר האלקטרוני הזו. בבקשה השתמש בכתובת אחרת." blocked: "לא מורשה." @@ -1669,91 +1679,6 @@ he: title: "תנאי השימוש" privacy_topic: title: "מדיניות פרטיות" - body: | - - - ## [איזה מידע אנחנו אוספים?](#collect) - - אנחנו אוספים מכם מידע כאשר אתם נרשמים לאתרנו ואוספים מידע כאשר אתם משתתפים בפורום בקריאה, כתיבה ובהערכת התוכן שנחלק אתכם. - - כאשר אתם נרשמים לאתר שלנו ייתכן ותתבקשו להזין את שמכם וכתובת הדוא"ל שלכם. אתם יכולים, עם זאת, לבקר באתר ללא הרשמה. כתובת הדוא"ל שלכם תיבדק באמצעות מייל שכולל קישור (link) ייחדוי. אם תבקרו בקישור זה, נדע שאתם שוטלים בכתובת הדוא"ל. - - כאשר אתם נרשמים ומפרסמים, אנחנו רושמים את כתובת ה-IP שממנה נוצר הפרסום. אנחנו גם עשויים לשמור רישומי שרת אשר כוללים את כתובת ה-IP של כל בבקשה מהשרת שלנו. - - - - - ## [למה אנחנו משתמשים במידע אודותיך?](#use) - - כל סוג של מידע שאנחנו אוספים אודותיכם עשוי לשמש באחת הדרכים הבאות: - - * כדי להתאים אישית את חוויית השימוש שלך mdash; המידע שלך עוזר לנו להגיב טוב יותר לצריכך האישיים. - * לשפר את האתר שלנו mdash; אנחנו שואפים ללהמשיך ולשפר את מה שמציע האתר על בסיס המידע והפידבקים שנקבל מכם. - * לשפר את שירות הלקוחות mdash; המידע שלכם עוזר לנו להגיב בצורה אפקטיבית יותר לבקשות שירות הלקוחות שלכם ולתמוך בצרכים. - * לשלוח מיילים תקופתיים mdash; כתובת המייל שתספקו עשויה לשמש לשלוח לכם מידע, התראות שתבקשו על שינויים בנושא או שאלות. - - - - ## [איך אנו מגנים על המידע שלכם](#protect) - - אנחנו נוקטים במספר אמצעים בטיחות כדי לתחזק את בטחון המידע האישי אליו תגשו, אותו שתזינו תשלחו. - - - - - ## [מהי מדיניות החזקת המידע שלנו?](#data-retention) - - אנחנו נעשה מאמץ כנה ל: - * לשמור רישומי יומן השרת שמכילים כתובות IP של כל הבקשות משרת זה לא יותר מ-90 יום. - * לשמור את כתובות ה-IP המקושרות למשתמשים רשומים והפרסומים שלהם לא יותר מ-5 שנים. - - - - - ## [האם אנחנו משתמשים ב"עוגיות"?](#cookies) - - כן. עוגיות הן קבצים קטנים שאתר או שספק השירותים שלו מעביר לכונן הקשיח במחשב שלכם באמצעות דפדפן הרשת (אם אתם מאפשרים זאת). עוגיות אלו ממאפשרות לאתר לזהות את הדפדפן שלכם ואם יש לכם חשבון רשום, מקשרת את הדפדפן עם החשבון הרשום. - - אנו משתמשים בעוגיות כדי להבין ולשמור את העדפותיכם לביקורים עתידיים וכדי לאסוף נתונים על תנועה מצטברת באתר ואינטרקציה באתר כך שנוכל להציע חוויית משתמשים טובה יותרו וכלים נוספים בעתיד. אנחנו עשויים להתקשר בחוזה עם ספקי שירות צד שלישי כדי לסייע לנו להבין טוב יותר את קהל המבקרים באתר. ספקים אלו לא יורשו להשתמש במידע הנאסף על ידנו מלבד לסייע לנו לקיים ולקדם את עניינינו. - - - - - ## [האם אנחנו מוסרים איזהשהו מידע לגופים חיצוניים?](#disclose) - - איננו מוכרים, סוחרים או מעבירים באופן אחר מידע אישי מזהה אודותיך. זה אינו כולל גופים שלישיים אמינים אשר מסייעים לנו בהפעלת האתר, קידום העסק שלנו או מתן השרות, כל עוד גופים אלה מסכימים לשמור על המידע חסוי. אנחנו עשויים גם לשחרר את המידע אודותיך כאשר נאמין שהשחרור ראוי במסגרת הציות לחוק, אכיפת כללי האתר או הגנה על זכויות, רכוש או בטיחות שלנו של אחרים. בכל אופן, מידע בלתי מזהה אישית אודות מבקרים באתר עשוי להיות מועבר או מסופק לצדדים אחרים לשם שיווק, פרסום או שימושים אחרים. - - - ## [קישורים לצד שלישי](#third-party) - - מידי פעם, על פי החלטתנו, אנו עשויים לכלול הצעות למוצרים של צד שלישי או שירותים באתר שלנו. לאתרי צד שלישי כאלה יש מדיניות פרטיות נפרדת. לכן, אין לנו שום אחריות לתוכן ולפעילויות של האתרים המקשורים האלה. זאת ועוד, אנו שואפים להגן על האמינות של האתר שלנו ונשמח לכל משוב אודות אתריםא לו. - - - - - ## [Children's Online Privacy Protection Act Compliance](#coppa) - - האתר שלנו, המוצרים והשירותים, מכוונים לאנשים בני 13 ומעלה. אם שרת זה נמצא בארה"ב ואתם תחת גיל 13, על פי הדרישות של COPPA ([Children's Online Privacy Protection Act](http://en.wikipedia.org/wiki/Children)), אל תשתמשו באתר זה. - - - - ## [מדיניות פרטיות מקוונת בלבד](#online) - - מדיניות פרטיות מקוונת זו תקפה רק ביחס למידע שנאסף דרך האתר שלנו ולא ביחס למידע שנאסף בצורות לא מקוונות. - - - - ## [Your Consent](#consent) - - בשימוש באתר שלנו אתם מקבלים את מדיניות הפרטיות של האתר שלנו. - - - - ## [שינויים במדיניות הפרטיות](#changes) - - א0 נחליט לשנות את מדיניות הפרטיות שלנו, נפרסם שינויים אלו בעמוד זה. - - מסמך זה מפורסם תחת רשיון CC-BY-SA. הוא עודכן לאחרונה ב-31 למאי, 2013. static: search_help: |

        Tips

        @@ -1783,6 +1708,14 @@ he: autobiographer: "אות יוענק לך כשתמלא את פרופיל המשתמש שלך ותבחר תמונת פרופיל. לשתף את הקהילה לגבי מי אתה ובמה אתה מעוניין עוזר ליצור קהילה יותר טובה ומחוברת. \n" first_like: | אות מוענק בפעם הראשונה שאתה עושה "לייק" לפרסום בעזרת כפתור ה :heart: . לעשות לייק לפרסומים היא דרך מעולה לידע את חברך בקהילה שמה שהם פרסמו היה מעניין, שימושי או מגניב. חלוק את האהבה! + first_link: | + תג זה מוענק בפעם הראשונה ששמים קישור לנושא אחר בתגובה. קישור נושאים עוזר לקוראים למצוא שיחות מעניינות קשורות לנושא. + first_quote: | + תג זה מוענק בפעם הראשונה שמצטטים פרסום בתגובה. ציטוט חלקים רלוונטים של פרסומים קודמים בתגובתך עוזר לשמור על דיונים מפוקסים. + first_share: | + תג זה מוענק בפעם הראשונה שמשתפים קישור לתגובה או נושא באמצעות כפתור השיתוף. שיתוף קישורים היא דרך מעולה להראות דיונים מעניינים עם שאר העולם ולהגדיל את הקהילה. + read_guidelines: | + תג זה מוענק על קריאת נהלי הקהילה. מעקב ושיתוף של הקוים המנחים עוזר ליצור קהילה בטוחה, כיפית ובת קימא. admin_login: success: "דוא\"ל נשלח" error: "שגיאה!" diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml index 32c0364930..cba295e53a 100644 --- a/config/locales/server.it.yml +++ b/config/locales/server.it.yml @@ -65,6 +65,8 @@ it: other: '%{count} errori hanno impedito il salvataggio di questo %{model}' embed: load_from_remote: "Si è verificato un errore nel caricamento del messaggio." + site_settings: + min_username_length_range: "Non puoi impostare il minimo al di sopra del massimo" bulk_invite: file_should_be_csv: "Il file caricato deve essere in formato csv o txt." backup: @@ -357,6 +359,7 @@ it: please_continue: "Procedi su %{site_name}." error: "Si è verificato un errore durante la modifica del tuo indirizzo email. Forse l'indirizzo è già in uso?" activation: + action: "Clicca qui per attivare il tuo account" already_done: "Spiacenti, questo collegamento di attivazione non è più valido. Forse il tuo account è già attivo?" please_continue: "Il tuo nuovo account è confermato; verrai ora rediretto alla pagina iniziale." continue_button: "Procedi su %{site_name}." @@ -1306,13 +1309,6 @@ it: title: "Termini del Servizio" privacy_topic: title: "Politica della Privacy" - body: "\n\n## [Quali informazioni memorizziamo?](#collect)\nQuando ti registri sul nostro sito memorizziamo alcune informazioni e raccogliamo dati quando partecipi al forum leggendo, scrivendo e valutando il contenuto qui condiviso.\n\nQuando ti registri sul sito, ti potrebbe venir chiesto di inserire il tuo nome e il tuo indirizzo email. Puoi comunque visitare il sito senza registrarti. Il tuo indirizzo email sarà verificato attraverso l’invio di una email che contiene un collegamento univoco. Se il collegamento viene visitato, sapremo che sei tu ad avere il controllo di quell'indirizzo email.\n\nUna volta registrato, quando invii del contenuto noi registriamo l’indirizzo IP da cui il tuo messaggio ha avuto origine. Potremmo anche mantenere dei log sul server che contengono gli indirizzi IP di ogni richiesta effettuata verso il nostro server.\n\n\n\n## [A che\ - \ ci servono le tue informazioni?](#use)\n\nQualunque tua informazione che memorizziamo può essere usata in uno dei modi seguenti:\n\n * Per personalizzare l’esperienza — tali informazioni ci servono a rispondere meglio alle esigenze individuali.\n * Per migliorare il nostro sito — ci sforziamo continuamente di migliorare il nostro sito usando le informazioni e i ritorni ricevuti.\n * Per inviare email periodiche — l’indirizzo email che fornisci può essere usato per inviarti informazioni, notifiche da te richieste circa modifiche agli argomenti o in risposta al tuo nome utente, rispondere a domande e/o altre richieste o domande.\n\n\n\n## [Come proteggiamo le tue informazioni?](#protect)\n\nImplementiamo diverse misure di sicurezza per salvaguardare le tue informazioni personali, ogni volta che le inserisci, le modifichi o vi accedi.\n\n\n\n## [Qual è la vostra politica di conservazione dei dati?](#data-retention)\n\nCi impegniamo a:\n\n * Conservare i log contenenti gli indirizzi IP di tutte le richieste giunte sui nostri server per non più di 90 giorni.\n * Conservare gli indirizzi IP associati agli utenti registrati ed ai loro messaggi per non più di 5 anni.\n\n\n\n## [Usate i cookie?](#cookies)\n\nSì. I cookie sono dei piccoli file che un sito copia sul tuo disco fisso attraverso il browser web (se lo permetti). Tali cookie permettono al sito di riconoscere il browser e di associarlo con il tuo account registrato, se presente. \n\nUsiamo i cookie per comprendere e memorizzare le tue preferenze per le visite future e per raccogliere dati aggregati circa il traffico sul sito e le interazioni, in modo da offrire successivamente una migliore esperienza di navigazione e migliori strumenti. Potremmo accordarci\ - \ con fornitori di servizio terzi che per aiutarci a comprendere meglio i visitatori del nostro sito. Tali fornitori di servizi non hanno il permesso di usare le informazioni raccolte per nostro conto, tranne quando lo scopo è aiutarci a portare avanti e migliorare la nostra attività.\n\n \n\n## [Rivelate informazioni a terze parti?](#disclose)\n\nNon vendiamo, scambiamo né trasferiamo a terze parti le informazioni che ti identificano personalmente. Ciò ad esclusione di quelle parti che ci aiutano gestire il sito, a portare avanti le attività o i servizi, fintanto che tali parti acconsentano a mantenere le informazioni confidenziali. Potremmo inoltre rilasciare le informazioni quando pensiamo che il rilascio sia appropriato per il rispetto della legge, per far rispettare le regole del sito, o per proteggere i nostri o gli altrui diritti, la proprietà o la sicurezza. Tuttavia,\ - \ informazioni dei visitatori che non personalmente identificanti potrebbero essere fornite ad altri soggetti per fini di marketing, pubblicità, o per altri usi.\n\n\n\n## [Collegamenti con terze parti](#third-party)\n\nA volte, a nostra discrezione, potremmo includere sul nostro sito offerte di prodotti o servizi di terze parti. I siti delle terze parti hanno politiche sulla privacy separate ed indipendenti dalle nostre. Pertanto non ci assumiamo alcuna responsabilità per il contenuto e le attività di tali siti collegati. Tuttavia, cercheremo di proteggere l'integrità del nostro sito pertanto accettiamo eventuali riscontri negativi sui siti terzi.\n\n\n\n\n## [Rispetto della legge sulla protezione della privacy online dei minori - Children's Online Privacy Protection Act Compliance - COPPA](#coppa)\n\nIl nostro sito, nonché i prodotti ed i servizi ad\ - \ esso collegati, sono tutti diretti a persone maggiorenni. Se non si è maggiorenni secondo le leggi del proprio Paese, per il rispetto della COPPA ([Legge sulla protezione della privacy online dei minori]( http://en.wikipedia.org/wiki/Children's_Online_Privacy_Protection_Act)), non usare questo sito.\n\n\n\n## [Politica sulla privacy online](#online)\n\nLa presente politica sulla privacy online si applica soltanto alle informazioni raccolte attraverso il nostro sito e non alle informazioni fuori linea.\n\n\n\n## [Consenso](#consent)\n\nUsando il nostro sito, accetti senza riserve la presente politica sulla privacy.\n\n\n\n## [Cambiamenti alla politica sulla privacy](#changes)\n\nQualora decidessimo di cambiare la nostra politica sulla privacy, invieremo tali modifiche su questa pagina.\n\nQuesto documento è CC-BY-SA (http://it.wikipedia.org/wiki/Licenze_Creative_Commons).\ - \ \nAggiornato il 31 maggio 2013.\n" admin_login: success: "email Inviata" error: "Errore!" diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml index c467025fbb..4dd56b4d6b 100644 --- a/config/locales/server.ko.yml +++ b/config/locales/server.ko.yml @@ -11,15 +11,15 @@ ko: short_date: "YYYY-M-D" long_date: "YYYY-M-D a h:mm" title: "Discourse" - topics: "토픽들" - posts: "게시물들" + topics: "글타래" + posts: "글" loading: "로딩중" powered_by_html: 'Powered by Discourse, best viewed with JavaScript enabled' log_in: "로그인" via: "%{site_name}의 %{username}" is_reserved: "예약됨" purge_reason: "비활성화된 계정은 자동적으로 삭제됩니다." - disable_remote_images_download_reason: "서버에 저장공간이 부족해서 원격 이미지 저장이 비활성화됨. " + disable_remote_images_download_reason: "디스크저장공간이 부족하여 원격 이미지 다운로드 기능이 비활성화 되었습니다." anonymous: "익명" errors: format: '%{attribute} %{message}' @@ -27,7 +27,7 @@ ko: too_long_validation: "%{length}자를 입력하셨습니다. 최대 %{max}자까지 입력 가능합니다. " invalid_boolean: "잘못된 값" taken: "이미 가져옴" - accepted: 허가되야 함 + accepted: 승인 필요 blank: 비어있으면 안됨 present: 비어야 함 confirmation: " %{attribute} 속성과 맞지 않음" @@ -37,7 +37,7 @@ ko: exclusion: 예약됨 greater_than: '%{count}보다 커야 함' greater_than_or_equal_to: '%{count}보다 크거나 같아야 함' - inclusion: 리스트에 포함 안됨 + inclusion: 리스트에 없음 invalid: 올바르지 않음 less_than: '%{count}보다 작아야 함' less_than_or_equal_to: '%{count}보다 작거나 같아야 함' @@ -72,7 +72,7 @@ ko: invalid_access: "요청한 리소스를 볼 권한이 없습니다." read_only_mode_enabled: "현재 읽기 전용 모드입니다." too_many_replies: - other: "죄송합니다. 신규 가입자들은 같은 주제에 %{count}개까지만 댓글을 달 수 있습니다." + other: "죄송합니다. 신규 가입자는 글 하나에 %{count}개까지만 댓글을 달 수 있습니다." embed: start_discussion: "토론 시작" continue: "토론 계속하기" @@ -80,33 +80,33 @@ ko: other: "추가 %{count} 개 댓글" loading: "토론 불러오는 중..." permalink: "Permalink" - imported_from: "%{link}에 있는 원글과 유사한 주제를 가진 토론 주제입니다." + imported_from: "%{link}에 있는 원글과 유사한 토론 글입니다." in_reply_to: "▶ %{username}" replies: other: "댓글 %{count}개" too_many_mentions: - zero: "죄송합니다. 당신은 다른 사용자를 언급할 수 없습니다." - one: "죄송합니다. 당신은 한 게시물에서 한 사용자만 언급할 수 있습니다." - other: "죄송합니다. 당신은 한 게시물에서 %{count}명의 사용자만 언급할 수 있습니다." + zero: "죄송합니다. 회원님은 다른 사용자를 언급할 수 없습니다." + one: "죄송합니다. 회원님은 한 댓글에서 한 사용자만 언급할 수 있습니다." + other: "죄송합니다. 회원님은 한 댓글에서 %{count}명의 사용자만 언급할 수 있습니다." too_many_mentions_newuser: - zero: "죄송합니다. 새로운 사용자는 다른 사용자를 언급할 수 없습니다." - one: "죄송합니다. 새로운 사용자는 한 게시물에서 한 사용자만 언급할 수 있습니다." - other: "죄송합니다. 새로운 사용자는 한 게시물에서 %{count}명의 사용자만 언급할 수 있습니다." + zero: "죄송합니다. 신규회원은 다른 사용자를 언급할 수 없습니다." + one: "죄송합니다. 신규회원은 글 하나에 한 사용자만 언급할 수 있습니다." + other: "죄송합니다. 신규회원은 글 하나에 %{count}명의 사용자만 언급할 수 있습니다." too_many_images: - zero: "죄송합니다. 새로운 사용자는 게시물에 이미지를 넣을 수 없습니다." - one: "죄송합니다. 새로운 사용자는 한 게시물에 하나의 이미지만 넣을 수 있습니다." - other: "죄송합니다. 새로운 사용자는 한 게시물에 %{count}개의 이미지만 넣을 수 있습니다." + zero: "죄송합니다. 신규회원은 글에 이미지를 넣을 수 없습니다." + one: "죄송합니다. 신규회원은 글 하나에 이미지 한 개만 넣을 수 있습니다." + other: "죄송합니다. 신규회원은 글 하나에 이미지 %{count}개만 넣을 수 있습니다." too_many_attachments: - zero: "죄송합니다. 새로운 사용자는 게시물에 파일을 첨부 하실 수 없습니다." - one: "죄송합니다. 새로운 사용자는 한 게시물에 하나의 파일만 첨부 하실 수 있습니다." - other: "죄송합니다. 새로운 사용자는 한 게시물에 %{count}개의 파일만 첨부 하실 수 있습니다." + zero: "죄송합니다. 신규회원은 글에 파일을 첨부 할 수 없습니다." + one: "죄송합니다. 신규회원은 글 하나에 파일 한 개만 첨부할 수 있습니다." + other: "죄송합니다. 신규회원은 글 하나에 파일 %{count}개만 첨부한 수 있습니다." too_many_links: - zero: "죄송합니다. 새로운 사용자는 게시물에 링크를 넣을 수 없습니다." - one: "죄송합니다. 새로운 사용자는 한 게시물에 하나의 링크만 넣을 수 있습니다." - other: "죄송합니다. 새로운 사용자는 한 게시물에 %{count}개의 링크만 넣을 수 있습니다." - spamming_host: "죄송합니다. 링크를 첨부 하실 수 없습니다." - user_is_suspended: "가입이 보류된 사용자는 게시물을 작성할 수 없습니다." - topic_not_found: "뭔가 잘못됐네요. 아마 클릭한 순간 이 토픽이 닫혔거나 지워졌거나 그러지 않았을까요?" + zero: "죄송합니다. 신규회원은 글에 링크를 넣을 수 없습니다." + one: "죄송합니다. 신규회원은 글 하나에 링크 한 개만 넣을 수 있습니다." + other: "죄송합니다. 신규회원은 글 하나에 링크 %{count}개까지만 넣을 수 있습니다." + spamming_host: "죄송합니다. 회원님은 링크를 첨부할 수 없습니다." + user_is_suspended: "가입이 보류된 회원은 글을 쓸 수 없습니다." + topic_not_found: "뭔가 잘못됐네요. 아마 글 보려는 도중에 글타래가 닫혔거나 지워진 건 아닐까요?" just_posted_that: "당신이 이전에 게시한 것과 너무 비슷합니다." has_already_been_used: "이미 사용되었습니다." invalid_characters: "사용할 수 없는 문자를 포함하고 있습니다." @@ -115,69 +115,67 @@ ko: prev_page: "← 이전 페이지" page_num: "%{num}페이지 " home_title: "홈" - topics_in_category: "'%{category}' 카테고리의 토픽들" + topics_in_category: "'%{category}' 카테고리의 글타래들" rss_posts_in_topic: "'%{topic}' 의 RSS 피드" rss_topics_in_category: "'%{category}' 카테고리의 RSS 피드 " author_wrote: "%{author} 게시:" - num_posts: "게시글 수:" + num_posts: "글 수:" num_participants: "참여자:" - read_full_topic: "전체 토픽 읽기" + read_full_topic: "전체 글타래 읽기" private_message_abbrev: "MSG" rss_description: - latest: "최신 토픽" - hot: "인기 토픽들" - posts: "가장 최근 게시글" + latest: "최신 글타래" + hot: "인기 글타래" + posts: "최근 글" too_late_to_edit: "이 글은 작성된 지 너무 오랜 기간이 지났습니다. 수정 또는 삭제할 수 없습니다." excerpt_image: "이미지" queue: - delete_reason: "게시글 심의 공간moderation queue에서 삭제 됨" + delete_reason: "운영팀이 글을 지웠습니다." groups: errors: can_not_modify_automatic: "자동 그룹은 수정 하실 수 없습니다." member_already_exist: "'%{username}'은 이미 이 그룹의 멤버입니다." default_names: everyone: "모든 사람" - admins: "운영자들" + admins: "관리자" moderators: "운영자" staff: "스태프" - trust_level_0: "신뢰도_0" - trust_level_1: "신뢰도 1" - trust_level_2: "신뢰도 2" - trust_level_3: "신뢰도 3" - trust_level_4: "신뢰도 4" + trust_level_0: "회원등급 0" + trust_level_1: "회원등급 1" + trust_level_2: "회원등급 2" + trust_level_3: "회원등급 3" + trust_level_4: "회원등급 4" education: until_posts: - other: "%{count} 글" + other: "글 %{count}개" new-topic: | %{site_name}에 오신 것을 환영합니다 — **새로운 대화를 시작해서 감사합니다.** - - 제목이 큰소리로 읽어봤을 때 재밌게 들리던가요? 글을 잘 요약하고 있나요? + - 제목을 큰소리로 읽어봤을 때 흥미롭게 들리던가요? 좋은 요약문인가요? - - 누가 이 주제에 관심있을까요? 왜 신경쓰여야죠? 어떤 대답을 듣고 싶나요? + - 누가 무엇때문에 관심을 보일까요? 어떤 대답을 듣고 싶나요? - - 쉽게 잘 쓰이는 단어를 사용해야 다른사람들이 많이 *검색*해 들어올 수 있어요. 관련 토픽들을 엮으려면 카테고리를 선택하세요. + - 사람들이 *검색*할 수 있도록 글타래에 흔히 사용하는 단어를 집어넣으세요. 관련 글타래와 같이 엮으려면 해당 카테고리를 선택하시고요. - 다 알고 싶으시면, [커뮤니티 가이드라인으로](/guidelines). 이 글은 당신의 첫 %{education_posts_text} 에서만 나옵니다. + 이 글은 당신의 첫 %{education_posts_text} 에서만 나옵니다. 자세한 내용은 [커뮤니티 가이드라인](/guidelines)을 참조하세요. new-reply: | %{site_name}에 오신것을 환영합니다! - - 당신의 답글이 주제에 도움이 될 수 있도록 참여해주세요. + - 당신의 댓글이 어떤 식으로든 토론을 발전시키나요? - - 커뮤니티 사용자들의 의견을 존중하여 주시고 그들에게 예의를 갖춰주세요. + - 당신의 커뮤니티 회원에게 예의를 갖춰주세요. - - 건설적인 비판은 환영입니다, 하지만 사용자들이 아닌 그들의 아이디어를 비판해주세요. + - 건설적인 비판은 환영입니다만, 사람 말고 *아이디어*를 비판해주세요. - 더 자세한 사용방법은 [커뮤니티 가이드라인](/guidelines)를 참조하여 주세요. - - 이 도움말은 최초 %{education_posts_text}번 글을 올릴 때까지만 나타납니다. + 이 도움말은 최초 %{education_posts_text}번 글을 올릴 때까지만 나타납니다. 자세한 내용은 [커뮤니티 가이드라인](/guidelines)를 참조하여 주세요. sequential_replies: | - ### 여러 게시글에 답글 한번에 달아보세요. + ### 여러 글에 답글 한번에 달아보세요. - 답글을 연속으로 한 토픽에 달기 보다는 지난 게시글을 인용하거나 @사용자이름 해서 답글 하나로 작성해보세요. + 답글을 연속으로 한 글타래에 달기 보다는 지난 글을 인용하거나 @사용자이름 해서 답글 하나로 작성해보세요. 원하시는 글을 선택하시고 답글을 인용 버튼을 선택함으로써 이전에 쓰셨던 답글에 추가로 인용을 달거나 수정하실 수 있습니다. - 작은 답글을 여러개 다는 것보다 한개의 상세한 답글이 모두에게 토픽을 읽기 편하게 만듭니다. + 작은 답글을 여러개 다는 것보다 한개의 상세한 답글이 모두에게 글타래를 읽기 편하게 만듭니다. dominating_topic: | ### 다른 유저들도 이 대화에 참여할 수 있도록 해주세요 @@ -188,13 +186,13 @@ ko: ### 댓글 개수 제한에 걸렸습니다. 죄송합니다. 신규 사용자들은 같은 주제에 %{count}개까지만 댓글을 달 수 있습니다. - 댓글을 다는 대신 이전 댓글의 내용을 수정하거나, 다른 토픽을 읽어보는 건 어떨까요? + 댓글을 다는 대신 이전 댓글의 내용을 수정하거나, 다른 글타래를 읽어보는 건 어떨까요? reviving_old_topic: | - ### 이 토픽을 부활시키겠습니까? + ### 이 글타래를 부활시키겠습니까? - 이 토픽에 달린 마지막 댓글은 이미 %{days}일 이전에 달렸습니다. 댓글을 새로 달면 이 토픽이 글 목록의 최상단으로 올라가게 되고, 글에 참여한 사람들에게 알림이 됩니다. + 이 글타래에 달린 마지막 댓글은 이미 %{days}일 이전에 달렸습니다. 댓글을 새로 달면 이 글타래가 글 목록의 최상단으로 올라가게 되고, 글에 참여한 사람들에게 알림이 됩니다. - 이 토픽에 대한 논의를 재개하고 싶으신 게 확실하신가요? + 이 글타래에 대한 논의를 재개하고 싶으신 게 확실하신가요? activerecord: attributes: category: @@ -236,12 +234,12 @@ ko: meta_category_description: "이 사이트의 운영 방식에 대해 건의하고 토론하는 곳입니다." staff_category_name: "스태프" staff_category_description: "스태프들의 논의를 위한 비공개 카테고리입니다. 관리자 및 운영자에게만 보입니다." - assets_topic_body: "이 토픽은 스태프에게만 보이는 영구적인 토픽입니다. 사이트 디자인을 위한 이미지를 저장할 수 있습니다. 지우지 마세요!\n\n다음처럼 하세요:\n\n1. 이 토픽에 답글을 작성하세요.\n2. 로고, 파비콘 등으로 사용하고 싶은 모든 이미지들을 업로드한다. (포스트 에디터 툴바의 업로드 아이콘을 사용하거나, 드래그 앤 드롭으로 이미지를 올려주세요.)\n3. 답글을 제출합니다.\n4. 답글의 업로드된 이미지를 우클릭하거나, 수정 버튼을 눌러 이미지의 경로를 확인하세요. 해당 이미지의 경로를 복사하세요.\n5. 복사한 이미지 경로를 [basic settings](/admin/site_settings/category/required)에 붙여넣으세요.\n\n\n다른 유형의 이미지를 사용해야한다면 [file settings](/admin/site_settings/category/files)의 `authorized_extensions` 를 수정하세요." + assets_topic_body: "이 글타래는 스태프에게만 보이는 영구적인 글타래입니다. 사이트 디자인을 위한 이미지를 저장할 수 있습니다. 지우지 마세요!\n\n다음처럼 하세요:\n\n1. 이 글타래에 답글을 작성하세요.\n2. 로고, 파비콘 등으로 사용하고 싶은 모든 이미지들을 업로드한다. (포스트 에디터 툴바의 업로드 아이콘을 사용하거나, 드래그 앤 드롭으로 이미지를 올려주세요.)\n3. 답글을 제출합니다.\n4. 답글의 업로드된 이미지를 우클릭하거나, 수정 버튼을 눌러 이미지의 경로를 확인하세요. 해당 이미지의 경로를 복사하세요.\n5. 복사한 이미지 경로를 [basic settings](/admin/site_settings/category/required)에 붙여넣으세요.\n\n\n다른 유형의 이미지를 사용해야한다면 [file settings](/admin/site_settings/category/files)의 `authorized_extensions` 를 수정하세요." lounge_welcome: title: "라운지에 오신 것을 환영합니다." body: |2 - 축하합니다! :confetti_ball: 당신의 신뢰도가 **지도자** (신뢰도 3등급)로 올라갔기 때문에 이 토픽을 볼 수 있게 되었습니다. 이제부터 아래의 행동들을 할 수 있습니다 … * 토픽을 제목을 수정할 수 있습니다 * 토픽의 카테고리를 수정할 수 있습니다 * 링크가 follow로 처리됩니다 ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) 가 제거됩니다) * 신뢰도 3 이상인 사용자가 접근할 수 있는 비공개 카테고리인 라운지에 접근할 수 있습니다 * 좋아요와 신고의 가중치가 높아집니다 [정규 멤버 목록](/badges/3/regular)을 확인할 수 있습니다. 인사하는 것을 잊지마세요. 이 커뮤니티의 중요한 역할을 해주신 것에 감사드립니다! (신뢰도에 관한 더 자세한 정보를 보시려면, [이 토픽을 확인하세요][trust]. 기준에 맞는 사람만 정규 회원으로 자격이 유지됩니다.) [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924 + 축하합니다! :confetti_ball: 당신의 신뢰도가 **지도자** (신뢰도 3등급)로 올라갔기 때문에 이 글타래를 볼 수 있게 되었습니다. 이제부터 아래의 행동들을 할 수 있습니다 … * 글타래를 제목을 수정할 수 있습니다 * 글타래의 카테고리를 수정할 수 있습니다 * 링크가 follow로 처리됩니다 ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) 가 제거됩니다) * 신뢰도 3 이상인 사용자가 접근할 수 있는 비공개 카테고리인 라운지에 접근할 수 있습니다 * 좋아요와 신고의 가중치가 높아집니다 [정규 멤버 목록](/badges/3/regular)을 확인할 수 있습니다. 인사하는 것을 잊지마세요. 이 커뮤니티의 중요한 역할을 해주신 것에 감사드립니다! (신뢰도에 관한 더 자세한 정보를 보시려면, [이 글타래를 확인하세요][trust]. 기준에 맞는 사람만 정규 회원으로 자격이 유지됩니다.) [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924 category: topic_prefix: "'%{category}' 카테고리의 설명" replace_paragraph: "[이 첫번째 문단을 당신의 새로운 카테고리의 짧은 설명으로 바꿔주세요. 이 지침은 카테고리 선택 화면에 나타날 것입니다. 200자 이하로 적어주세요.]" @@ -255,8 +253,8 @@ ko: uncategorized: "Uncategorized는 삭제할 수 없습니다." has_subcategories: "하위 카테고리가 있어, 삭제할 수 없습니다." topic_exists: - other: "%{count}개의 토픽이 이 카테고리 내에 있어 삭제할 수 없습니다. 가장 오래된 토픽은 %{topic_link}입니다." - topic_exists_no_oldest: "%{count}개의 토픽이 이 카테고리 내에 있어 삭제할 수 없습니다." + other: "%{count}개의 글타래가 이 카테고리 내에 있어 삭제할 수 없습니다. 가장 오래된 글타래는 %{topic_link}입니다." + topic_exists_no_oldest: "%{count}개의 글타래가 이 카테고리 내에 있어 삭제할 수 없습니다." trust_levels: newuser: title: "새로운 사용자" @@ -349,30 +347,30 @@ ko: missing_session: "계정이 생성되었는지 확인을 못 하고 있습니다. 쿠키 설정이 켜졌는지 다시 한번 확인바랍니다." post_action_types: off_topic: - title: '오프 토픽' - description: '이 게시물은 이곳의 토픽과 관련된것 같지 않습니다. 다른 토픽으로 옮기거나 새로운 토픽을 시작하는 것이 어떤가요?' - long_form: '오프 토픽으로 신고하기' + title: '오프 글타래' + description: '이 글은 이곳의 글타래과 관련된것 같지 않습니다. 다른 글타래로 옮기거나 새로운 글타래를 시작하는 것이 어떤가요?' + long_form: '오프 글타래으로 신고하기' spam: title: '스팸' - description: '이 게시물은 광고성으로 판단되어집니다. 이 글은 현재 대화에서 유용하지도, 관련되지 않습니다.' + description: '이 글은 광고성으로 판단되어집니다. 이 글은 현재 대화에서 유용하지도, 관련되지 않습니다.' long_form: '스팸으로 신고하기' email_title: '"%{title}" 스팸으로 지목됨' email_body: "%{link}\n\n%{message}" inappropriate: title: '부적절함' - description: '이 게시물은 다른 사용자들에게 공격적이나 모욕적 또는 침해적인 글을 담고 있습니다.' + description: '이 글은 다른 사용자들에게 공격적이나 모욕적 또는 침해적인 글을 담고 있습니다.' long_form: '부적절함으로 신고하기' notify_user: title: '메세지 @{{username}}' - description: '이 게시물에 내가 작성자와 직접 대화하고 싶은 내용이 있습니다. 신고에서 제외해주세요.' + description: '이 글에 내가 작성자와 직접 대화하고 싶은 내용이 있습니다. 신고에서 제외해주세요.' long_form: '메세지한 유저' - email_title: '"%{title}" 내의 당신의 게시글' + email_title: '"%{title}" 내의 당신의 글' email_body: "%{link}\n\n%{message}" notify_moderators: title: "뭔가 다른것" - description: '이 게시물은 리스트에 없는 이유로 관리자의 주의가 필요합니다.' + description: '이 글은 리스트에 없는 이유로 관리자의 주의가 필요합니다.' long_form: '관리자의 주의를 위해 신고' - email_title: '"%{title}" 게시물에 대한 운영자의 확인이 필요합니다' + email_title: '"%{title}" 글에 대한 운영자의 확인이 필요합니다' email_body: "%{link}\n\n%{message}" bookmark: title: '북마크' @@ -393,27 +391,27 @@ ko: long_form: '스팸으로 신고하였습니다.' inappropriate: title: '부적절함' - description: '이 게시물은 평균적인 사람들의 관점에서 볼 때 공격적이나 모욕적인 글을 담고 있거나, + description: '이 글은 평균적인 사람들의 관점에서 볼 때 공격적이나 모욕적인 글을 담고 있거나, 커뮤니티 가이드라인에 맞지 않습니다.' long_form: '부적절함으로 신고하였습니다.' notify_moderators: title: "뭔가 다른것" - description: '이 게시물은 가이드라인, 이용약관, 또는 다른 이유와 관련해서 운영자의 주의가 필요합니다.' + description: '이 글은 가이드라인, 이용약관, 또는 다른 이유와 관련해서 운영자의 주의가 필요합니다.' long_form: '관리자의 주의를 위해 신고' - email_title: '토픽 "%{title}" 은 운영자의 확인이 필요합니다' + email_title: '글타래 "%{title}" 은 운영자의 확인이 필요합니다' email_body: "%{link}\n\n%{message}" flagging: - you_must_edit: '

        회원님의 게시글이 신고되었습니다. 메세지를 확인 해주세요.

        ' - user_must_edit: '

        게시물이 신고되었기 때문에 일시적으로 보이지 않습니다.

        ' + you_must_edit: '

        회원님의 글이 신고되었습니다. 메세지를 확인 해주세요.

        ' + user_must_edit: '

        글이 신고되었기 때문에 일시적으로 보이지 않습니다.

        ' archetypes: regular: - title: "자주보는 토픽" + title: "자주보는 글타래" banner: - title: "배너 토픽" + title: "배너 글타래" message: - make: "이 토픽은 배너에 올라왔습니다. 사용자가 내리기 전까지 모든 페이지의 상단에 표시됩니다." - remove: "이 토픽은 배너에서 내려왔습니다. 더 이상 모든 페이지의 상단에 표시되지 않습니다." + make: "이 글타래는 배너에 올라왔습니다. 사용자가 내리기 전까지 모든 페이지의 상단에 표시됩니다." + remove: "이 글타래는 배너에서 내려왔습니다. 더 이상 모든 페이지의 상단에 표시되지 않습니다." unsubscribed: title: '구독 해지"' description: "구독이 해지되었습니다." @@ -436,13 +434,13 @@ ko: xaxis: "일" yaxis: "새로운 사용자 수" topics: - title: "토픽들" + title: "글타래들" xaxis: "일" - yaxis: "새로운 토픽의 개수" + yaxis: "새로운 글타래의 개수" posts: - title: "게시물들" + title: "글들" xaxis: "일" - yaxis: "새로운 게시물의 개수" + yaxis: "새로운 글의 개수" likes: title: "좋아요" xaxis: "일" @@ -491,16 +489,16 @@ ko: title: "가장 많이 언급된 사용자들" xaxis: "사용자" num_clicks: "클릭" - num_topics: "토픽들" + num_topics: "글타래들" top_traffic_sources: title: "트래픽 소스 순위" xaxis: "도메인" num_clicks: "클릭" - num_topics: "토픽들" + num_topics: "글타래들" num_users: "사용자들" top_referred_topics: - title: "가장 많이 참조된 토픽들" - xaxis: "토픽" + title: "가장 많이 참조된 글타래들" + xaxis: "글타래" num_clicks: "클릭" page_view_anon_reqs: title: "익명" @@ -578,8 +576,8 @@ ko: title: "새로운 사용자 교육: 첫번째 답글들" description: "새로운 사용자가 첫 두개의 답글을 작성하면 자동 팝업됩니다." education_new_topic: - title: "새로운 사용자 교육: 첫번째 토픽들" - description: "새로운 사용자가 첫 두개의 토픽을 작성하면 자동 팝업됩니다." + title: "새로운 사용자 교육: 첫번째 글타래들" + description: "새로운 사용자가 첫 두개의 글타래를 작성하면 자동 팝업됩니다." usage_tips: title: "새로운 사용자 가이드" description: "새로운 사용자를 위한 가이드와 팁." @@ -600,7 +598,7 @@ ko: description: " 태그 사이에 추가할 HTML" top: title: "페이지 상단" - description: "모든 페이지 상단에 추가할 HTML(헤더 아래, 네비게이션이나 토픽 제목 위)." + description: "모든 페이지 상단에 추가할 HTML(헤더 아래, 네비게이션이나 글타래 제목 위)." bottom: title: "페이지 하단" description: "모든 페이지 하단에 추가할 HTML" @@ -610,16 +608,16 @@ ko: default_locale: "Discourse 인스턴스가 사용하는 기본 언어 (ISO 639-1 Code)" allow_user_locale: "사용자에게 자신이 원하는 언어를 선택 허용" min_post_length: "포스트의 최소 글자 수" - min_first_post_length: "첫 게시글 (내용)의 최소 길이" + min_first_post_length: "첫 글 (내용)의 최소 길이" min_private_message_post_length: "메세지 내용의 최소 길이" max_post_length: "포스트의 최대 글자 수" - min_topic_title_length: "토픽 제목의 최소 글자 수" - max_topic_title_length: "토픽 제목의 최대 글자 수" + min_topic_title_length: "글타래 제목의 최소 글자 수" + max_topic_title_length: "글타래 제목의 최대 글자 수" min_private_message_title_length: "메세지 제목의 최소 길이" min_search_term_length: "검색을 하기 위한 최소 글자 수" - allow_uncategorized_topics: "카테고리 없이 게시 허용. 주의: 카테고리 없는 게시글은 이 항목을 비활성화에 하기전에 카테고리 설정을 해야 합니다." + allow_uncategorized_topics: "카테고리 없이 게시 허용. 주의: 카테고리 없는 글은 이 항목을 비활성화에 하기전에 카테고리 설정을 해야 합니다." uncategorized_description: "'카테고리 없음' 카테고리의 설명, 설명을 쓰지 않으려면 빈칸으로 놔둔다." - allow_duplicate_topic_titles: "같은 제목의 동일한 토픽 허용" + allow_duplicate_topic_titles: "같은 제목의 동일한 글타래 허용" unique_posts_mins: "같은 컨텐츠를 다시 포스트 할 수 있는 기간(분)" educate_until_posts: "새로운 사용자가 포스트를 작성할 시 포스트 작성 방법에 대한 교육패널을 보여주는데, 해당 패널이 보여지는 초기 포스트 개수" title: "타이틀 태그에 쓰일 이 사이트의 이름" @@ -633,17 +631,17 @@ ko: disabled_image_download_domains: "이 도메인을 통해서 원격 이미지를 다운로드 하지 않는다. ` | `를 구분자로 한 리스트" ninja_edit_window: "편집을 결과가 새로운 버전을 생성하지 않는 포스팅 이후에 경과할 시간(초)" post_edit_time_limit: "글 작성자가 해당 글을 편집하거나 삭제할 수 있도록 허용되는 시간(분). 0으로 설정하면 언제든지 편집이나 삭제가 허용됨." - edit_history_visible_to_public: "모든 사용자가 게시글의 수정 내역을 볼 수 있도록 허용. 비활성화시 스태프 맴버만 수정 내역을 볼 수 있음." - delete_removed_posts_after: "작성자에 의해 삭제된 게시물은 (n) 시간 뒤 자동으로 삭제됩니다. 0으로 설정 시, 즉시 삭제됩니다." + edit_history_visible_to_public: "모든 사용자가 글의 수정 내역을 볼 수 있도록 허용. 비활성화시 스태프 맴버만 수정 내역을 볼 수 있음." + delete_removed_posts_after: "작성자에 의해 삭제된 글은 (n) 시간 뒤 자동으로 삭제됩니다. 0으로 설정 시, 즉시 삭제됩니다." max_image_width: "글에서 사용할 수 있는 썸네일 이미지의 최대 너비" max_image_height: "글에서 사용할 수 있는 썸네일 이미지의 최대 높이" - category_featured_topics: "카테고리 페이지에서 한 카테고리당 보여질 토픽의 수" - show_subcategory_list: "카테고리에 들어갈 경우 토픽 리스트 대신 하위카테고리의 리스트를 보여준다." + category_featured_topics: "카테고리 페이지에서 한 카테고리당 보여질 글타래의 수" + show_subcategory_list: "카테고리에 들어갈 경우 글타래 리스트 대신 하위카테고리의 리스트를 보여준다." fixed_category_positions: "활성화하면 고정된 순서의 카테고리들을 바꿀 수 있다. 활성화 하지 않으면 카테고리는 활동적인 순서에 따라 정렬된다." fixed_category_positions_on_create: "선택 시, 카테고리 정렬이 유지됩니다. (fixed_category_positions가 체크돼 있어야 합니다.)" add_rel_nofollow_to_user_content: "사용자 생성 컨텐츠에 대해서 rel nofollow 를 설정함. parent domain을 포함한 internal link는 예외임. 이 설정을 바꾸려면 모든 baked markdown을 \"rake posts:rebake\" 명령으로 변경해주서야 함" exclude_rel_nofollow_domains: "nofollow 도메인 리스트에 넣으면 링크에 추가가 안됩니다. tld.com은 자동으로 sub.tld.com도 포함합니다. 최소한, 이 사이트의 top-level 도메인은 허가해서 웹크롤러가 모든 자료를 검색할 수 있게 해야합니다. 다른 도메인으로도 이 사이트가 들어가진다면 그것도 추가해야 합니다." - post_excerpt_maxlength: "게시글 인용에 허용되는 최대 글자수" + post_excerpt_maxlength: "글 인용에 허용되는 최대 글자수" post_onebox_maxlength: "onebox가 적용된 Discourse 포스트에 허용되는 최대 글자수" onebox_domains_whitelist: "onebox 사용을 허가할 도메일 리스트; 이 도메인은 OpenGraph나 oEmbed를 지원하여야합니다. 테스트: http://iframely.com/debug" apple_touch_icon_url: "애플 디바이스는 144px의 아이콘을 사용함. 144px X 144px 사이즈를 추천함" @@ -651,9 +649,9 @@ ko: email_custom_headers: "커스텀 이메일 해더의 pipe-delimited" email_subject: "일반 메일을 위한 제목 커스터마이징. 이곳을 참고 https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801" use_https: "사이트의 사이트의 전체 url((Discourse.base_url)이 http인가 아니면 https인가? 이미 HTTPS를 설정하고 동작중이 아니라면 활성화하지 마세요." - summary_score_threshold: "요약본에 포함되기 위한 게시글의 최소 점수 값" - summary_posts_required: "하나의 토픽에 대하여 요약본 보기 모드가 활성화되기 전까지 요구되는 최소 게시글 수" - summary_likes_required: "하나의 토픽에 대하여 요약본 보기 모드가 활성화되기 전까지 요구되는 최소 좋아요 수" + summary_score_threshold: "요약본에 포함되기 위한 글의 최소 점수 값" + summary_posts_required: "하나의 글타래에 대하여 요약본 보기 모드가 활성화되기 전까지 요구되는 최소 글 수" + summary_likes_required: "하나의 글타래에 대하여 요약본 보기 모드가 활성화되기 전까지 요구되는 최소 좋아요 수" summary_percent_filter: "요약본 보기를 클릭시, 글 중에 몇 %의 상위 글을 보여줄 것인가?" summary_max_results: "이 주제에 대한 요약 글 최대 갯수" enable_private_messages: "신뢰도 1인 유저들에게 메세지 작성과 메세지 답변을 허용하기" @@ -665,17 +663,17 @@ ko: background_polling_interval: "(페이지를 안 보고 있을 때) 클라이언트가 몇 밀리초마다 poll해야 하는 지" flags_required_to_hide_post: "Number of flags that cause a post to be automatically hidden and PM sent to the user (0 for never)" cooldown_minutes_after_hiding_posts: "신고 당해서 숨겨진 글을 사용자가 편집할 수 있기 전까지 기대려야 하는 시간(분)" - max_topics_in_first_day: "사용 첫 날에 토픽을 생성할 수 있는 최대 허용 개수" + max_topics_in_first_day: "사용 첫 날에 글타래를 생성할 수 있는 최대 허용 개수" max_replies_in_first_day: "사용 첫 날에 사용자가 생성할 수 있는 답글의 최대 허용 개수" tl2_additional_likes_per_day_multiplier: "tl2 (회원)의 일별 좋아요 제한을 올릴 배수" tl3_additional_likes_per_day_multiplier: "tl3 (정회원)의 일별 좋아요 제한을 올릴 배수" tl4_additional_likes_per_day_multiplier: "tl4 (리더)의 일별 좋아요 제한을 올릴 배수" - num_flags_to_block_new_user: "신규 사용자가 n명의 다른 사용자들로부터 이 수치에 해당하는 스팸 신고를 받으면, 작성한 모든 게시글을 숨기고 더 이상 글 게시를 금지 (0으로 설정하면 이기능을 사용하지 않음)" - num_users_to_block_new_user: "신규 사용자가 이 수치에 해당하는 다른 사용자들로부터 x개의 스팸 신고를 받으면, 작성한 모든 게시글을 숨기고 더 이상 글 게시를 금지 (0으로 설정하면 이기능을 사용하지 않음)" + num_flags_to_block_new_user: "신규 사용자가 n명의 다른 사용자들로부터 이 수치에 해당하는 스팸 신고를 받으면, 작성한 모든 글을 숨기고 더 이상 글 게시를 금지 (0으로 설정하면 이기능을 사용하지 않음)" + num_users_to_block_new_user: "신규 사용자가 이 수치에 해당하는 다른 사용자들로부터 x개의 스팸 신고를 받으면, 작성한 모든 글을 숨기고 더 이상 글 게시를 금지 (0으로 설정하면 이기능을 사용하지 않음)" notify_mods_when_user_blocked: "만약 사용자가 자동 블락되면 중간 운영자에게 메시지 보내기" - flag_sockpuppets: "어떤 신규 사용자(예:24이내 가입자)가 토픽을 생성하고 같은 IP주소의 또 다른 신규 사용자가 댓글을 쓰면 자동 스팸 신고" + flag_sockpuppets: "어떤 신규 사용자(예:24이내 가입자)가 글타래를 생성하고 같은 IP주소의 또 다른 신규 사용자가 댓글을 쓰면 자동 스팸 신고" traditional_markdown_linebreaks: "Markdown에서 전통적인 linebreak를 사용, linebreak시 두개의 trailing space를 사용하는 것." - post_undo_action_window_mins: "사용자가 어떤 게시글에 대해서 수행한 작업(신고 등)을 취소하는 것이 허용되는 시간(초)" + post_undo_action_window_mins: "사용자가 어떤 글에 대해서 수행한 작업(신고 등)을 취소하는 것이 허용되는 시간(초)" must_approve_users: "스태프는 반드시 사이트 엑세스권한을 허용하기 전에 모든 신규가입계정을 승인해야 합니다. 경고: 이것을 활성화하면 기존 스태프 아닌 회원들의 엑세스권한이 회수됩니다." ga_tracking_code: "Google analytics (ga.js)의 트래킹 코드, 예: UA-12345678-9; 참고 http://google.com/analytics" ga_domain_name: "Google analytics (ga.js)의 도메인 이름, 예: mysite.com; 참고 http://google.com/analytics" @@ -686,19 +684,19 @@ ko: allow_moderators_to_create_categories: "운영자가 새로운 카테고리를 만드는 것을 허용" cors_origins: "Allowed origins cross-origin requests (CORS). 각 origin은 반드시 http:// 나 https:// 를 포함해야합니다. DISCOURSE_ENABLE_CORS 환경 변수를 true로 지정해줘야 CORS를 활성화할 수 있습니다." top_menu: "첫페이지 메뉴에 어떤 아이템이 뜨고 어떤 순서로 뜰지 정합니다 예 최근|새로씀|안읽음|카테고리|위로|읽음|쓴글|북마크" - post_menu: "게시물 메뉴에 어떤 사항들이 무슨 순서로 올라올지 결정합니다. 예: like(좋아요)|edit(수정)|flag(신고)|delete(삭제)|share(공유)|bookmark(북마크)|reply(답글)" + post_menu: "글 메뉴에 어떤 사항들이 무슨 순서로 올라올지 결정합니다. 예: like(좋아요)|edit(수정)|flag(신고)|delete(삭제)|share(공유)|bookmark(북마크)|reply(답글)" post_menu_hidden_items: "게시 메뉴에서 기본으로 숨길 메뉴 아이템들" share_links: "공유 다이얼로그에 어떤 아이템이 어떤 순서로 나올지 결정" track_external_right_clicks: "우클릭한 외부 링크를 추적한다 (에: 새 탭 열기) 이 설정을 위해선 해당 URL를 다시 써야하는 이유로 기본값은 비활성화이다." site_contact_username: "자동 메세지를 보낼 올바른 스태프 아이디. 빈칸으로 놔두면 기본 시스템 계정이 사용됩니다." send_welcome_message: "모든 신규 유저들에게 시작 매뉴얼과 함께 환영 메세지 보내기" - suppress_reply_directly_below: "게시글의 바로 아래에 단 하나의 댓글만 있는 경우 '댓글 수'를 보여주지 않음" - suppress_reply_directly_above: "단 하나의 댓글 위의 게시글이 하나 있는 상황에서 '~에 대한 댓글'을 보여주지 않음." - suppress_reply_when_quoting: "게시물안에 답글이 인용될 때 in-reply-to를 보여주지 않습니다." + suppress_reply_directly_below: "글의 바로 아래에 단 하나의 댓글만 있는 경우 '댓글 수'를 보여주지 않음" + 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: "인기 토픽에서 '더 보기'를 요청할 시 보여질 토픽 수" + topics_per_period_in_top_summary: "인기 글타래 요약에 기본으로 보여질 글타래 수" + topics_per_period_in_top_page: "인기 글타래에서 '더 보기'를 요청할 시 보여질 글타래 수" redirect_users_to_top_page: "자동으로 신규 사용자와 오래간만에 들어온 사용자를 탑 페이지로 리다이렉트 시킴" show_email_on_profile: "사용자 프로필에서 자신의 이메일 주소 보기( 오직 본인과 관리자만 볼 수 있음)" email_token_valid_hours: "비밀번호 찾기, 계정 활성화에 사용되는 토큰의 유효 기간(시간)" @@ -716,7 +714,7 @@ ko: invite_expiry_days: "사용자 초대키 유효 기간, 일" invite_passthrough_hours: "사용되어진 방문키를 로그인하는데 재사용할 수 있는 기간, 시간" invite_only: "공개 가입은 불가하도록 설정됨. 초대를 받아야만 신규 가입 가능함." - login_required: "게시글을 읽으려면 인증(로그인)이 필요함" + login_required: "글을 읽으려면 인증(로그인)이 필요함" min_password_length: "비밀번호 최소 글자수." block_common_passwords: "가장 흔히 사용되는 10,000개 비밀번호 목록에 있는 비밀번호를 사용하는 것을 허용하지 않음." enable_sso: "외부사이트 Single Sign On, SSO를 통해 로그인 활성화(경고: 유저의 이메일 주소는 반드시 외부에서 확인해야합니다!)" @@ -750,20 +748,20 @@ ko: active_user_rate_limit_secs: "'last_seen_at'을 업데이트 하는 주기(초)" verbose_localization: "UI에 언어 팁을 확장해 보여줌" previous_visit_timeout_hours: "최근 방문한 시간을 저장할 주기(시간)" - rate_limit_create_topic: "사용자가 토픽을 생성하고 난 후 다음 토픽을 생성할 때 까지의 대기 기간(초)" + rate_limit_create_topic: "사용자가 글타래를 생성하고 난 후 다음 글타래를 생성할 때 까지의 대기 기간(초)" rate_limit_create_post: "사용자가 포스팅을하고 난 후 다음 포스팅까지 대기 기간(초)" - rate_limit_new_user_create_topic: "새로운 사용자 토픽을 생성하고 난 후 다음 토픽을 생성할 때 까지의 대기 기간(초)" + rate_limit_new_user_create_topic: "새로운 사용자 글타래를 생성하고 난 후 다음 글타래를 생성할 때 까지의 대기 기간(초)" rate_limit_new_user_create_post: "새로운 사용자 포스팅을하고 난 후 다음 포스팅까지 대기 기간(초)" max_likes_per_day: "사용자가 하루동안 할 수 있는 최대 좋아요 개수" max_flags_per_day: "사용자가 하루동안 할 수 있는 최대 신고 개수" max_bookmarks_per_day: "사용자가 하루동안 할 수 있는 최대 북마크 개수" max_edits_per_day: "사용자가 하루동안 할 수 있는 최대 편집 수" - max_topics_per_day: "사용자가 하루동안 생성할 수 있는 최대 토픽 개수" + max_topics_per_day: "사용자가 하루동안 생성할 수 있는 최대 글타래 개수" max_private_messages_per_day: "하루에 유저가 쓸 수 있는 최대 메세지 갯수" max_invites_per_day: "하루에 보낼 수 있는 초대장의 최대치입니다." - max_topic_invitations_per_day: "하루에 유저가 최대로 보낼 수 있는 토픽 초대장 수" - suggested_topics: "토픽 아랫부분에 몇개의 토픽을 제안하여 보여준다." - limit_suggested_to_category: "제안된 토픽은 현재의 카테고리에 있는 토픽 중에서만 보여준다." + max_topic_invitations_per_day: "하루에 유저가 최대로 보낼 수 있는 글타래 초대장 수" + suggested_topics: "글타래 아랫부분에 몇개의 글타래를 제안하여 보여준다." + limit_suggested_to_category: "제안된 글타래는 현재의 카테고리에 있는 글타래 중에서만 보여준다." clean_up_uploads: "불법 호스팅을 막기 위해서 참조되지 않은 업로드 파일은 제거합니다. 주의 : 이 설정을 활성화 하기 전에 `/uploads` 디렉토리를 백업하는 것이 좋습니다." clean_orphan_uploads_grace_period_hours: "참조되지 않은 업로드 파일을 제거하기 전 기간(시간)" purge_deleted_uploads_grace_period_days: "참조되지 않은 업로드 파일을 완전 삭제하지 전 기간(일)" @@ -774,85 +772,85 @@ ko: s3_access_key_id: "이미지를 업로드 할 때 사용할 Amazon S3의 access key id" s3_secret_access_key: "이미지를 업로드 할 때 사용할 Amazon S3의 secret access key" s3_region: "이미지를 업로드 할 때 사용할 Amazon S3 region" - s3_cdn_url: "s3 에셋에 사용될 CDN URL (예: https://cdn.somewhere.com). 경고: 이 설정 뒤에는 모든 게시물을 다시 구워야rebake 합니다." + s3_cdn_url: "s3 에셋에 사용될 CDN URL (예: https://cdn.somewhere.com). 경고: 이 설정 뒤에는 모든 글을 다시 구워야rebake 합니다." avatar_sizes: "자동 생성 아바타 사이즈 목록" enable_flash_video_onebox: "swf, flv(어도비 플래쉬)링크를 embed 할 수 있도록 함. 주의: 보안에 대한 위험성을 알려주는 것이 좋다." default_invitee_trust_level: "사용자를 초대하기 위한 기본 신뢰도(0-4)" default_trust_level: "모든 신규가입자의 기본 신뢰도 (0-4). 경고: 변경시에 스팸 문제가 생길 가능성이 높습니다." - tl1_requires_topics_entered: "새로운 사용자가 신뢰받는 사용자-1 이 되기 위해 들어가봐야되는 토픽의 개수" + tl1_requires_topics_entered: "새로운 사용자가 신뢰받는 사용자-1 이 되기 위해 들어가봐야되는 글타래의 개수" tl1_requires_read_posts: "새로운 사용자가 신뢰받는 사용자-1 가 되기 위해 읽어야 하는 포스트 개수" tl1_requires_time_spent_mins: "새로운 사용자가 신뢰받는 사용자-1 이 되기 위해 몇 분 동안 포스트를 읽어야 하는지." - tl2_requires_topics_entered: "기본 사용자가 자주오는 사용자-2 가 되기 위해 들어가 봐야 되는 토픽 갯수" - tl2_requires_read_posts: "기본 사용자가 자주오는 사용자-2 가 되기 위해 읽어야 하는 토픽 갯수" + tl2_requires_topics_entered: "기본 사용자가 자주오는 사용자-2 가 되기 위해 들어가 봐야 되는 글타래 갯수" + tl2_requires_read_posts: "기본 사용자가 자주오는 사용자-2 가 되기 위해 읽어야 하는 글타래 갯수" tl2_requires_time_spent_mins: "기본 사용자가 자주오는 사용자-2 가 되기 위해 몇 분 동안 포스트를 읽어야 하는지." tl2_requires_days_visited: "기본 사용자가 자주오는 사용자-2 가 되기 위해 몇 일을 방문해야 하는지." tl2_requires_likes_received: "기본 사용자가 자주오는 사용자-2 가 되기 위해 받아야 하는 좋아요 갯수" tl2_requires_likes_given: "기본 사용자가 자주오는 사용자-2 가 되기 위해 눌러야하는 좋아요 수" tl2_requires_topic_reply_count: "기본 사용자가 자주오는 사용자-2 가 되기 위해 달아야 하는 덧글 수" tl3_requires_days_visited: "VIP 사용자-3 이 되기 위해 지난 100일 동안 최소한 사이트에 방문해야 하는 수 (0 ~ 100)" - tl3_requires_topics_replied_to: "VIP 사용자-3 이 되기 위해 지난 100일 동안 답글을 달아야하는 최소 토픽수(0 ~ )" - tl3_requires_topics_viewed: "VIP 사용자-3 이 되기 위해 지난 100일 동안 생성된 전체 토픽 중 본 토픽의 비율(%, 0 ~ 100)" + tl3_requires_topics_replied_to: "VIP 사용자-3 이 되기 위해 지난 100일 동안 답글을 달아야하는 최소 글타래수(0 ~ )" + tl3_requires_topics_viewed: "VIP 사용자-3 이 되기 위해 지난 100일 동안 생성된 전체 글타래 중 본 글타래의 비율(%, 0 ~ 100)" tl3_requires_posts_read: "VIP 사용자-3 이 되기 위해 지난 100일 동안 생성된 전체 포스트 중 본 포스트의 비율(%, 0 ~ 100)" - tl3_requires_topics_viewed_all_time: "VIP 사용자-3 이 되기 위해 꼭 보아야 하는 토픽의 전체 개수" - tl3_requires_posts_read_all_time: "VIP 사용자-3 이 되기 위해 꼭 보아야 하는 토픽의 전체 개수" + tl3_requires_topics_viewed_all_time: "VIP 사용자-3 이 되기 위해 꼭 보아야 하는 글타래의 전체 개수" + tl3_requires_posts_read_all_time: "VIP 사용자-3 이 되기 위해 꼭 보아야 하는 글타래의 전체 개수" tl3_requires_max_flagged: "사용자가 VIP 사용자-3 이 되기 위해 지난 100일동안 서로 다른 사용자에게 최소한으로 받지 말아야하는 신고된 포스트 수(0 ~ )" tl3_promotion_min_duration: "신뢰도가 2로 떨어진 후 다시 VIP 사용자-3 이 될 수 있는 최소 일 수" tl3_requires_likes_given: "VIP 사용자-3 이 되기 위해 지난 100일 동안 해야 할 좋아요 수" tl3_requires_likes_received: "VIP 사용자-3 이 되기 위해 지난 100일 동안 받아야 할 좋아요 수" tl3_links_no_follow: "VIP 사용자-3 의 글에 있는 링크에서 rel=nofollow 를 제거하지 마시오." - min_trust_to_create_topic: "새로운 토픽을 생성하기 위한 최소 신뢰도" + min_trust_to_create_topic: "새로운 글타래를 생성하기 위한 최소 신뢰도" min_trust_to_edit_wiki_post: "위키로 설정된 포스트를 수정할 수 있는 최소 신뢰도" newuser_max_links: "새로운 사용자가 포스트에 붙일 수 있는 최대 링크 개수" newuser_max_images: "새로운 사용자가 포스트에 붙일 수 있는 최대 이미지 개수" newuser_max_attachments: "새로운 사용자가 포트에 붙일 수 있는 최대 첨부파일 개수" newuser_max_mentions_per_post: "새료운 사용자가 포스트에 사용할 수 있는 최대 @name 알림 개수" - newuser_max_replies_per_topic: "다른 사용자가 답글을 달기 전, 새로운 사용자가 개별 토픽에 달 수 있는 최대 답글 개수" + newuser_max_replies_per_topic: "다른 사용자가 답글을 달기 전, 새로운 사용자가 개별 글타래에 달 수 있는 최대 답글 개수" max_mentions_per_post: "포스트 당 사용할 수 있는 최대 @name 알림의 수" create_thumbnails: "포스트의 너무 큰 크기의 이미지는 thumnails와 lightbox를 만든다." email_time_window_mins: "알림 메일을 보내기 전 대기 기간(분), 사용자에게 포스트의 변경하고 완료할 수 있는 기회를 준다." email_posts_context: "알림메일의 내용에 추가할 기존 답글 수" flush_timings_secs: "사용자의 이용 시간 데이터를 서버로 보내는 기간(초)" - title_max_word_length: "토픽 제목안에 단어들의 최대 길이" - title_min_entropy: "토픽 제목에 필요한 최소 엔트로피(서로 다른 글자들이 몇개 존재해야하는지)" + title_max_word_length: "글타래 제목안에 단어들의 최대 길이" + title_min_entropy: "글타래 제목에 필요한 최소 엔트로피(서로 다른 글자들이 몇개 존재해야하는지)" body_min_entropy: "포스트 본문에 필요한 최소 엔트로피(서로 다른 글자들이 몇개 존재해야하는지)" - title_fancy_entities: "토픽 제목에 일반 ASCII 문자로 만든 기호들을 보기 좋은 HTML로 변환시켜준다. 참고: SmartyPants http://daringfireball.net/projects/smartypants/" - min_title_similar_length: "유사 토픽에 대한 체크가 있기 전, 최소 제목 글자 수" - min_body_similar_length: "유사 토픽에 대한 체크가 있기 전, 포스트의 최소 본문 글자 수" + title_fancy_entities: "글타래 제목에 일반 ASCII 문자로 만든 기호들을 보기 좋은 HTML로 변환시켜준다. 참고: SmartyPants http://daringfireball.net/projects/smartypants/" + min_title_similar_length: "유사 글타래에 대한 체크가 있기 전, 최소 제목 글자 수" + min_body_similar_length: "유사 글타래에 대한 체크가 있기 전, 포스트의 최소 본문 글자 수" category_colors: "허용된 카테고리에 사용될 hexadecimal 색상 값의 리스트" category_style: "카테고리 뱃지 시각 스타일" max_image_size_kb: "최대 이미지 업로드 사이즈(kB). 이 설정은 꼭 nginx / apache와 proxy에도 적용해야 합니다." max_attachment_size_kb: "최대 첨부파일 업로드 사이즈(kB). 이 설정은 꼭 nginx / apache와 proxy에도 적용해야 합니다." authorized_extensions: "파일 업로드에 허용되는 확장자 리스트 ('*'을 사용하면 모든 타입의 파일이 가능합니다.)" - max_similar_results: "새로운 토픽을 작성할 때, 에디터 위에 보여줄 비슷한 토픽들의 개수. 제목과 본문을 바탕으로 비교합니다." + max_similar_results: "새로운 글타래를 작성할 때, 에디터 위에 보여줄 비슷한 글타래들의 개수. 제목과 본문을 바탕으로 비교합니다." title_prettify: "일반적인 제목의 오타 및 오류를 수정해준다. 모두 대문자로 쓰거나, 첫자가 소문자이거나(영문), 복수의 !, ? 혹은 마침표(.)가 중복으로 들어간 것 등" - topic_views_heat_low: "토픽이 연하게 하이라이트 되기 위한 조회수" - topic_views_heat_medium: "토픽이 적당하게 하이라이트 되기 위한 조회수" - topic_views_heat_high: "토픽이 진하게 하이라이트 되기 위한 조회수" - cold_age_days_low: "게시글의 마지막 활동 날짜가 조금 희미해지기 시작하는 일 수" - cold_age_days_medium: "게시글의 마지막 활동 날짜가 어느정도 희미해지기 시작하는 일 수" - cold_age_days_high: "게시글의 마지막 활동 날짜가 많이 희미해지기 시작하는 일 수" - history_hours_low: "게시글이 수정 뒤에 수정됐다는 표시가 조금 희미해지는 시간" - history_hours_medium: "게시글이 수정 뒤에 수정됐다는 표시가 어느정도 희미해지는 시간" - history_hours_high: "게시글이 수정 뒤에 수정됐다는 표시가 많이 희미해지는 시간" - topic_post_like_heat_low: "조회수가 조금 희미해지는 이 게시글:좋아요 비율" - topic_post_like_heat_medium: "조회수가 어느정도 희미해지는 이 게시글:좋아요 비율" - topic_post_like_heat_high: "조회수가 많이 희미해지는 이 게시글:좋아요 비율" + topic_views_heat_low: "글타래가 연하게 하이라이트 되기 위한 조회수" + topic_views_heat_medium: "글타래가 적당하게 하이라이트 되기 위한 조회수" + topic_views_heat_high: "글타래가 진하게 하이라이트 되기 위한 조회수" + cold_age_days_low: "글의 마지막 활동 날짜가 조금 희미해지기 시작하는 일 수" + cold_age_days_medium: "글의 마지막 활동 날짜가 어느정도 희미해지기 시작하는 일 수" + cold_age_days_high: "글의 마지막 활동 날짜가 많이 희미해지기 시작하는 일 수" + history_hours_low: "글이 수정 뒤에 수정됐다는 표시가 조금 희미해지는 시간" + history_hours_medium: "글이 수정 뒤에 수정됐다는 표시가 어느정도 희미해지는 시간" + history_hours_high: "글이 수정 뒤에 수정됐다는 표시가 많이 희미해지는 시간" + topic_post_like_heat_low: "조회수가 조금 희미해지는 이 글:좋아요 비율" + topic_post_like_heat_medium: "조회수가 어느정도 희미해지는 이 글:좋아요 비율" + topic_post_like_heat_high: "조회수가 많이 희미해지는 이 글:좋아요 비율" faq_url: "FAQ주소가 있으면 전체 URL을 적어주세요." tos_url: "이용약관이 있으면 전체 URL을 적어주세요." privacy_policy_url: "개인정보 보호가 있으면 전체 URL을 적어주세요." newuser_spam_host_threshold: "스팸인가 결정하는 새로운 사용자가 게시한 같은 링크 수 `newuser_spam_host_posts`" white_listed_spam_host_domains: "스팸 호스트 테스트로부터 제외할 도메인 리스트. 새로운 사용자는 새로운 사용자는 헤당 도메인에 대한 링크를 포함하는 포스트를 생성하는데 제한되지 않는다." staff_like_weight: "스태프가 좋아요를 눌렀을 때 부여할 가산점" - topic_view_duration_hours: "N 시간마다 IP/User 별로 새 토픽 조회수를 셉니다." + topic_view_duration_hours: "N 시간마다 IP/User 별로 새 글타래 조회수를 셉니다." levenshtein_distance_spammer_emails: "스패머 메일을 체크할 때, 허용할 다른 글자 개수(fuzzy match)" max_new_accounts_per_registration_ip: "(n) 신뢰도의 0개의 계정(스태프도 tl2 이상도 아닌 계정만)이 이 IP에 있으면, 새로운 회원가입 방지." min_ban_entries_for_roll_up: "Roll up 버튼을 눌렀을 때, 적어도 (N)개의 엔트리가 있다면 새 subnet ban 엔트리를 만듭니다." max_age_unmatched_emails: "(N)일 뒤에 안 맞는 막힌 이메일 접근을 지웁니다." max_age_unmatched_ips: "(N)일 뒤에 안 맞는 막힌 IP 접근을 지웁니다." - num_flaggers_to_close_topic: "추후 중재를 위해 자동으로 토픽을 일시정지시킬 최소 신고자 수" - num_flags_to_close_topic: "추후 중재를 위해 자동으로 토픽을 일시정지시킬 최소 신고 횟수" + num_flaggers_to_close_topic: "추후 중재를 위해 자동으로 글타래를 일시정지시킬 최소 신고자 수" + num_flags_to_close_topic: "추후 중재를 위해 자동으로 글타래를 일시정지시킬 최소 신고 횟수" auto_respond_to_flag_actions: "신고 기각 시 자동 답변 활성화" - reply_by_email_enabled: "이메일을 통해 토픽에 댓글을 달 수 있음." + reply_by_email_enabled: "이메일을 통해 글타래에 댓글을 달 수 있음." reply_by_email_address: "이메일 주소로 답글을 다는 템플릿. 예: %{reply_key}@reply.myforum.com" disable_emails: "Discourse가 어떤 메일로 보내지 못하도록 합니다." strip_images_from_short_emails: "2800바이트, 즉 2.73 KB 이내 사이즈를 가지도록 이미지를 빼주세요." @@ -864,21 +862,21 @@ ko: pop3_polling_host: "이메일 설문조사를 위한 POP3 호스트" pop3_polling_username: "이메일 설문조사를 위한 POP3 사용자 계정 이름" pop3_polling_password: "이메일 설문조사를 위한 POP3 사용자 비밀번호" - email_in: "이메일을 통해 새로운 토픽을 포스팅할 수 있도록 허가한다.(POP3 polling 필요) 각 카테고리의 \"Setting\" 탭에서 주소를 설정합니다." - email_in_min_trust: "이메일을 통해 새 토픽을 포스팅 할 수 있는 최소 사용자 신뢰도" + email_in: "이메일을 통해 새로운 글타래를 포스팅할 수 있도록 허가한다.(POP3 polling 필요) 각 카테고리의 \"Setting\" 탭에서 주소를 설정합니다." + email_in_min_trust: "이메일을 통해 새 글타래를 포스팅 할 수 있는 최소 사용자 신뢰도" email_prefix: "이메일 제목에 쓰일 [라벨]. 설정하지 않으면 기본적으로 'title(필수 설정의)' 이 된다." email_site_title: "사이트에서 전송되는 이메일의 보내는 이를 사이트 이름으로 설정. 설정하지 않으면 'title(필수 설정의)'이 된다. 만약 'title'에 보내는 이에 허용되지 않는 글자가 포함되어 있으면 이 설정이 사용된다." - minimum_topics_similar: "새로운 토픽을 작성할 때, 유사한 토픽들을 보여주기 위해 존재해야 할 최소 토픽 개수" - relative_date_duration: "절대적 날짜(9월 3일) 대신 상대적 날짜(7일 전)가 사용될 일 수 (토픽이 작성된 이후부터)" + minimum_topics_similar: "새로운 글타래를 작성할 때, 유사한 글타래들을 보여주기 위해 존재해야 할 최소 글타래 개수" + relative_date_duration: "절대적 날짜(9월 3일) 대신 상대적 날짜(7일 전)가 사용될 일 수 (글타래가 작성된 이후부터)" delete_user_max_post_age: "(x)일 이전의 첫 포스트가 있는 유저는 삭제할 수 없음." - delete_all_posts_max: "전체 게시글 지우기 버튼을 통해 한번에 삭제할 수 있는 최대 게시글 수. 만약 사용자가 이것보다 많은 게시글을 가지고 있으면 한번에 삭제 할 수 없다." + delete_all_posts_max: "전체 글 지우기 버튼을 통해 한번에 삭제할 수 있는 최대 글 수. 만약 사용자가 이것보다 많은 글을 가지고 있으면 한번에 삭제 할 수 없다." username_change_period: "등록 후 사용자 이름 최소 유지 일 수(0은 사용자 이름 변경을 막음)" email_editable: "등록 후 이메일 주소를 바꿀수 있는 있음" logout_redirect: "로그아웃 후에 이동할 위치 예: (http://somesite.com/logout)" allow_animated_thumbnails: "움직이는 gif로 썸네일을 만듭니다." default_avatars: "신규가입자가 받게될 기본 아바타 URL" automatically_download_gravatars: "사용자가 계정을 만들거나 이메일을 변경하자마자 Gravatar를 다운로드합니다." - digest_topics: "요약 이메일에서 보여질 최대 토픽 개수" + digest_topics: "요약 이메일에서 보여질 최대 글타래 개수" digest_min_excerpt_length: "요약 이메일에서 최소 포스트 발췌 수" suppress_digest_email_after_days: "(n)일동안 사이트에서 보지 못한 사용자에게는 이메일 요약을 보내지 않습니다." disable_digest_emails: "모든 유저들 이메일 다이제스트 못하게 하기" @@ -890,34 +888,34 @@ ko: anonymous_posting_min_trust_level: "익명 게시 할 수 있는 최소 신뢰도" anonymous_account_duration_minutes: "한 익명이 익명계정을 만들 때 빨리 만드는 걸 막을 분 단위 시간 예: 600으로 정해놓으면 마지막 게시하고 익명 전환 후로 600분이 지나는 즉시 새 계정이 만들어 집니다." allow_profile_backgrounds: "사용자에게 프로필 배경 이미지 업로드를 허용합니다." - sequential_replies_threshold: "한 유저가 한 토픽에 너무 연속으로 답글 달았다고 알리게 될 연속 게시글 수" + sequential_replies_threshold: "한 유저가 한 글타래에 너무 연속으로 답글 달았다고 알리게 될 연속 글 수" enable_mobile_theme: "모바일 디바이스는 모바일 환경에 친화적인 테마를 사용합니다, 그리고 PC용 화면으로 전환할 수 있습니다. 만약 커스텀 스타일 시트를 사용한다면 이것을 비활성화 시키세요." - dominating_topic_minimum_percent: "한 토픽에서 한 사용자의 영향력을 결정하는 게시글 수의 퍼센트" - daily_performance_report: "NGINX 일별 로그를 분석하고 상세정보를 스태프들에게 토픽 게시" - suppress_uncategorized_badge: "토픽 리스트에서 카테고리가 없는 토픽에 대한 훈장을 보여주지 않는다." + dominating_topic_minimum_percent: "한 글타래에서 한 사용자의 영향력을 결정하는 글 수의 퍼센트" + daily_performance_report: "NGINX 일별 로그를 분석하고 상세정보를 스태프들에게 글타래 게시" + suppress_uncategorized_badge: "글타래 리스트에서 카테고리가 없는 글타래에 대한 훈장을 보여주지 않는다." global_notice: "긴급, 비상 전체 배너를 모든 방문자에게 표시합니다. 숨기려면 빈칸으로 바꾸면 됩니다(HTML 허용)." disable_edit_notifications: "'download_remote_images_to_local'가 활성화되있으면 시스템 사용자에 의한 수정 알림을 비활성화합니다." full_name_required: "사용자 정보에서 실명은 필수입니다." enable_names: "사용자의 실명을 프로필, 사용자카드, 이메일에서 보여줍니다. 실명을 아무데서도 안보이게 하려면 비활성화하세요." display_name_on_posts: "포스트에 @username 뿐만 아니라 사용자의 전체 이름도 보여준다." - show_time_gap_days: "두 게시물의 일차를 보여주기 위해 두 게시물이 떨어져 있어야 할 일수" + show_time_gap_days: "두 글의 일차를 보여주기 위해 두 글이 떨어져 있어야 할 일수" invites_per_page: "사용자 페이지에 방문자를 표시합니다." - short_progress_text_threshold: "토픽의 포스트 개수가 이 값을 넘어서면, 포스트 프로그래스바는 오직 현재 포스트 넘버만 보여준다. 만약 포스트 프로그래스바의 넓이는 변경하면, 이 숫자도 변경해야합니다." + short_progress_text_threshold: "글타래의 포스트 개수가 이 값을 넘어서면, 포스트 프로그래스바는 오직 현재 포스트 넘버만 보여준다. 만약 포스트 프로그래스바의 넓이는 변경하면, 이 숫자도 변경해야합니다." default_code_lang: "기본 programming language syntax highlighting은 GitHub code blocks이 적용된다. (lang-auto, ruby, python etc.)" - warn_reviving_old_topic_age: "이 값보다 오래된 토픽에 답글을 달면, 오래된 토론이라는 것을 상기시키기 위해 주의 알림이 보여진다. 비활성화 값음 0 이다. " + warn_reviving_old_topic_age: "이 값보다 오래된 글타래에 답글을 달면, 오래된 토론이라는 것을 상기시키기 위해 주의 알림이 보여진다. 비활성화 값음 0 이다. " autohighlight_all_code: "형식이 지정되기 전의(되지 않은) 모든 코드 블럭들에 대해, 사용자가 언어를 지정하지 않아도 강제로 code highlighting이 적용된다." highlighted_languages: "구문 강조 규칙 포함. (경고: 너무 많은 언어를 넣으면 성능에 영향을 미칩니다.) 보기: https://highlightjs.org/static/demo/ ← 예제" - feed_polling_enabled: "EMBEDDING 전용: RSS/ATOM도 게시글로 embed할 것인지" + feed_polling_enabled: "EMBEDDING 전용: RSS/ATOM도 글로 embed할 것인지" feed_polling_url: "EMBEDDING 전용: RSS/ATOM의 URL도 embed로 받도록 하기" - embed_by_username: "embed 토픽을 작성한 Discourse 사용자 아이디 " + embed_by_username: "embed 글타래를 작성한 Discourse 사용자 아이디 " embed_username_key_from_feed: "feed에서 Discourse 아이디 가져올 때 쓰는 Key" - embed_truncate: "임베드된 게시글 비우기" + embed_truncate: "임베드된 글 비우기" embed_post_limit: "포스트 개수가 최대치입니다." embed_whitelist_selector: "embed에서 보여져야 할 DOM element 선택하는 CSS 셀렉터" embed_blacklist_selector: "embed에서 지워져야 할 DOM element 선택하는 CSS 셀렉터" notify_about_flags_after: "이 시간동안 처리되지 않은 신고가 들어와 있으면, contact_email 주소로 이메일을 보냅니다. 0으로 넣으면 비활성화됩니다." enable_cdn_js_debugging: "/logs에서 적절한 모든 js를 포함해 crossorigin 권한 오류가 뜨도록 합니다." - show_create_topics_notice: "이 사이트에 5개 이하의 공개 토픽이 있으면, 관리자에게 토픽 좀 만들라고 알려줍니다." + show_create_topics_notice: "이 사이트에 5개 이하의 공개 글타래가 있으면, 관리자에게 글타래 좀 만들라고 알려줍니다." delete_drafts_older_than_n_days: (n) 일지난 임시 보관글 삭제하기 vacuum_db_days: "VACUUM FULL ANALYZE를 실행해서 통합 후 DB 공간 재확인 (0으로 설정하면 비활성화)" prevent_anons_from_downloading_files: "익명 사용자가 다운로드를 받지 못하게 합니다. 경고: 이미지 파일 외 모든 첨부파일이 다운로드 받지 못하게 됩니다." @@ -925,9 +923,9 @@ ko: enable_emoji: "emoji 활성화" emoji_set: "어떤 emoji가 좋은가요?" enforce_square_emoji: "모든 emoji를 정사각형 비율로 강제로 바꿉니다." - approve_post_count: "신규가입자가 올릴 수 있는 게시글 수" + approve_post_count: "신규가입자가 올릴 수 있는 글 수" approve_unless_trust_level: "허가 받고 글 올려야 하는 유저들 최저 신뢰도" - notify_about_queued_posts_after: "게시물이 리뷰가 되길 기다리면서 이 시간이 지나면 문의처 메일로 연락을 보냅니다. 0으로 두면 보내지 않습니다." + notify_about_queued_posts_after: "글이 리뷰가 되길 기다리면서 이 시간이 지나면 문의처 메일로 연락을 보냅니다. 0으로 두면 보내지 않습니다." errors: invalid_email: "유효하지 않은 이메일 주소입니다." invalid_username: "해당 이름의 사용자가 없습니다." @@ -945,14 +943,14 @@ ko: notification_types: mentioned: "%{display_username} 사용자가 %{link} 에서 당신을 언급하였습니다." liked: "%{display_username} 사용자가 %{link} 를 좋아합니다." - replied: "%{display_username} 사용자가 %{link} 에 당신의 게시글에 답글을 달았습니다." - quoted: "%{display_username} 사용자가 %{link} 에서 당신의 게시글을 인용했습니다." + replied: "%{display_username} 사용자가 %{link} 에 당신의 글에 답글을 달았습니다." + quoted: "%{display_username} 사용자가 %{link} 에서 당신의 글을 인용했습니다." edited: "%{display_username} 사용자가 %{link} 에서 당신의 글을 수정하였습니다." posted: "%{display_username} 사용자가 %{link} 에 글을 게시 했습니다." - moved_post: "%{display_username} 사용자가 %{link} 에 당신의 게시글을 이동하였습니다." + moved_post: "%{display_username} 사용자가 %{link} 에 당신의 글을 이동하였습니다." private_message: "%{display_username} 회원님이 메세지를 보냈습니다: %{link}" invited_to_private_message: "%{display_username} 회원님이 메세지에 초대했습니다: %{link}" - invited_to_topic: "%{display_username} 회원님이 토픽에 초대했습니다: %{link}" + invited_to_topic: "%{display_username} 회원님이 글타래에 초대했습니다: %{link}" invitee_accepted: "%{display_username} 사용자가 당신의 초대를 수락하였습니다." linked: "%{display_username} 사용자가 %{link} 에서 당신을 링크했습니다." granted_badge: "당신은 %{link}를 획득했습니다." @@ -972,8 +970,8 @@ ko: most_recent_poster: "최근 게시자" frequent_poster: "빈번한 게시자" redirected_to_top_reasons: - new_user: "우리 커뮤니티에 오신 것을 환영합니다! 다음은 우리 사이트에서 가장 인기 많은 최근 토픽들입니다." - not_seen_in_a_month: "잘 돌아오셨습니다. 다음은 당신이 오지 않은 동안 가장 인기있던 토픽들입니다." + new_user: "우리 커뮤니티에 오신 것을 환영합니다! 다음은 우리 사이트에서 가장 인기 많은 최근 글타래들입니다." + not_seen_in_a_month: "잘 돌아오셨습니다. 다음은 당신이 오지 않은 동안 가장 인기있던 글타래들입니다." change_owner: post_revision_text: "소유권이 %{old_user}에서 %{new_user}으로 이전되었습니다." emoji: @@ -981,30 +979,30 @@ ko: name_already_exists: "죄송합니다. '%{name}'은/는 이미 다른 이모티콘이 사용하고 있습니다." error_while_storing_emoji: "죄송합니다, emoji를 저장하는 도중 오류가 발생했습니다." topic_statuses: - archived_enabled: "이 토픽은 보관되었고 더이상 변경하실 수 없습니다." - archived_disabled: "이 토픽의 보관이 풀렸고 이제 변경하실 수 있습니다." - closed_enabled: "이 토픽은 이제 닫혔습니다. 새로운 답글을 다실 수 없습니다." - closed_disabled: "이 토픽은 이제 열렸습니다. 새로운 답글을 다실 수 있습니다." + archived_enabled: "이 글타래는 보관되었고 더이상 변경하실 수 없습니다." + archived_disabled: "이 글타래의 보관이 풀렸고 이제 변경하실 수 있습니다." + closed_enabled: "이 글타래는 이제 닫혔습니다. 새로운 답글을 다실 수 없습니다." + closed_disabled: "이 글타래는 이제 열렸습니다. 새로운 답글을 다실 수 있습니다." autoclosed_enabled_days: - other: "이 토픽은 %{count}일 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다." + other: "이 글타래는 %{count}일 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다." autoclosed_enabled_hours: - other: "이 토픽은 %{count}시간 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다." + other: "이 글타래는 %{count}시간 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다." autoclosed_enabled_minutes: - other: "이 토픽은 %{count}분 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다." + other: "이 글타래는 %{count}분 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다." autoclosed_enabled_lastpost_days: - other: "이 토픽은 마지막 답글이 달리고 %{count}일 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다." + other: "이 글타래는 마지막 답글이 달리고 %{count}일 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다." autoclosed_enabled_lastpost_hours: - other: "마지막 댓글로부터 %{count} 시간이 지나 토픽이 자동으로 닫혔습니다. 새로운 댓글을 다실 수 없습니다." + other: "마지막 댓글로부터 %{count} 시간이 지나 글타래가 자동으로 닫혔습니다. 새로운 댓글을 다실 수 없습니다." autoclosed_enabled_lastpost_minutes: - other: "이 토픽은 마지막 답글이 달리고 %{count}분 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다." - autoclosed_disabled: "이 토픽은 이제 열렸습니다. 새로운 답글을 허용합니다." - autoclosed_disabled_lastpost: "이 토픽은 이제 열렸습니다. 새로운 답글을 허용합니다." - pinned_enabled: "이 토픽은 고정되었습니다. 고정이 해제되기 전까지 카테고리의 상단에 나타납니다." - pinned_disabled: "이 토픽은 이제 고정이 풀렸습니다. 더이상 카테고리 상단에 보이지 않을 것입니다." - pinned_globally_enabled: "이 토픽은 이제 전역적으로 고정되었습니다. 카테고리와 모든 토픽 리스트에서 상단에 나타납니다." - pinned_globally_disabled: "이 토픽은 이제 고정이 풀렸습니다. 더이상 카테고리 상단에 보이지 않을 것입니다." - visible_enabled: "이 토픽은 리스트에 추가되었습니다. 토픽 리스트에 나타나게 될 것입니다." - visible_disabled: "이 토픽은 이제 리스트에서 해제되었습니다. 더이상 토픽 리스트에 나타나지 않습니다. 링크를 통해서만 접근할 수 있습니다." + other: "이 글타래는 마지막 답글이 달리고 %{count}분 뒤 자동적으로 닫혔습니다. 새로운 답글을 다실 수 없습니다." + autoclosed_disabled: "이 글타래는 이제 열렸습니다. 새로운 답글을 허용합니다." + autoclosed_disabled_lastpost: "이 글타래는 이제 열렸습니다. 새로운 답글을 허용합니다." + pinned_enabled: "이 글타래는 고정되었습니다. 고정이 해제되기 전까지 카테고리의 상단에 나타납니다." + pinned_disabled: "이 글타래는 이제 고정이 풀렸습니다. 더이상 카테고리 상단에 보이지 않을 것입니다." + pinned_globally_enabled: "이 글타래는 이제 전역적으로 고정되었습니다. 카테고리와 모든 글타래 리스트에서 상단에 나타납니다." + pinned_globally_disabled: "이 글타래는 이제 고정이 풀렸습니다. 더이상 카테고리 상단에 보이지 않을 것입니다." + visible_enabled: "이 글타래는 리스트에 추가되었습니다. 글타래 리스트에 나타나게 될 것입니다." + visible_disabled: "이 글타래는 이제 리스트에서 해제되었습니다. 더이상 글타래 리스트에 나타나지 않습니다. 링크를 통해서만 접근할 수 있습니다." login: not_approved: "당신의 계정은 아직 활성화되지 않았습니다. 이메일을 확인하시고 로그인 해주세요." incorrect_username_email_or_password: "계정 아이디, 이메일 또는 패스워드가 다릅니다." @@ -1151,44 +1149,44 @@ ko: flags_were_submitted: other: "이 신고들은 %{count}시간 전에 접수 됐습니다." please_review: "후기를 써주세요." - post_number: "게시글" + post_number: "글" how_to_disable: '"notify about flags after" 설정을 통해 이메일 알림의 빈도를 변경하거나 비활성화할 수 있습니다.' subject_template: other: "%{count}개의 신고가 접수 대기 중" queued_posts_reminder: subject_template: - other: "[%{site_name}]의 %{count}개의 게시글이 검토를 기다리고 있습니다." + other: "[%{site_name}]의 %{count}개의 글이 검토를 기다리고 있습니다." text_body_template: | 안녕하세요, 새 유저가 쓴 포스트가 심의를 기다리고 있습니다. [여기서 승인 또는 거절합니다](%{base_url}/queued-posts). flag_reasons: - off_topic: "내가 올린 토픽이 **주제 벗어난 이야기**으로 신고 되었습니다. 사람들이 이 토픽의 제목이랑 글 내용이 안 맞는다고 느끼나 봅니다. " - inappropriate: "내가 올린 토픽이 **부적절**로 신고 되었습니다. 사람들이 이 토픽이 [가이드라인](/guidelines)에서 벗어나 공격적, 모욕적, 폭력적이라고 느낍니다." - spam: "내가 올린 토픽이 **스팸**으로 신고 되었습니다. 커뮤니티가 이 토픽이 생각보다 광고성, 선동적이라고 느끼나 봅니다." - notify_moderators: "내가 올린 토픽이 **관리자의 관심 필요**로 신고 되었습니다. 커뮤니티가 관리자의 세심한 중재가 필요하다고 느낍니다." + off_topic: "내가 올린 글타래가 **주제 벗어난 이야기**으로 신고 되었습니다. 사람들이 이 글타래의 제목이랑 글 내용이 안 맞는다고 느끼나 봅니다. " + inappropriate: "내가 올린 글타래가 **부적절**로 신고 되었습니다. 사람들이 이 글타래가 [가이드라인](/guidelines)에서 벗어나 공격적, 모욕적, 폭력적이라고 느낍니다." + spam: "내가 올린 글타래가 **스팸**으로 신고 되었습니다. 커뮤니티가 이 글타래가 생각보다 광고성, 선동적이라고 느끼나 봅니다." + notify_moderators: "내가 올린 글타래가 **관리자의 관심 필요**로 신고 되었습니다. 커뮤니티가 관리자의 세심한 중재가 필요하다고 느낍니다." flags_dispositions: agreed: "알려줘서 감사합니다. 문제가 있음에 동의하며 내용을 살펴보겠습니다." agreed_and_deleted: "알려줘서 감사합니다. 문제가 있음에 동의하며 해당 글을 삭제했습니다." disagreed: "알려줘서 감사합니다. 살펴보겠습니다." deferred: "알려줘서 감사합니다. 살펴보겠습니다." deferred_and_deleted: "알려줘서 감사합니다. 해당 글을 삭제했습니다." - temporarily_closed_due_to_flags: "이 토픽은 많은 신고가 들어와 임시로 닫힌 상태입니다." + temporarily_closed_due_to_flags: "이 글타래는 많은 신고가 들어와 임시로 닫힌 상태입니다." system_messages: post_hidden: - subject_template: "포럼 신고로 인한 게시글 숨김" + subject_template: "포럼 신고로 인한 글 숨김" text_body_template: | 안녕하세요, - %{site_name}에서 내 게시글이 숨겨진 것을 알리기 위해 보내진 자동 메세입니다.. + %{site_name}에서 내 글이 숨겨진 것을 알리기 위해 보내진 자동 메세입니다.. %{base_url}%{url} %{flag_reason} - 이 게시글이 가려지기 전에 커뮤니티 여러 사용자가 신고를 했습니다. 사용자들의 피드백을 반영해 게시글을 수정해주세요. **%{edit_delay}분 뒤에 게시글을 수정할 수 있으며 자동으로 숨김 해제됩니다..** + 이 글이 가려지기 전에 커뮤니티 여러 사용자가 신고를 했습니다. 사용자들의 피드백을 반영해 글을 수정해주세요. **%{edit_delay}분 뒤에 글을 수정할 수 있으며 자동으로 숨김 해제됩니다..** - 하지만 게시글이 한번 더 커뮤니티에서 숨김이 된 경우 스태프가 풀어주기 전까지 숨김해제가 안되며 계정 정지 등의 조치가 취해질 수 있습니다. + 하지만 글이 한번 더 커뮤니티에서 숨김이 된 경우 스태프가 풀어주기 전까지 숨김해제가 안되며 계정 정지 등의 조치가 취해질 수 있습니다. 조언을 얻기 위해, [커뮤니티 가이드라인](%{base_url}/guidelines)을 참고해 주세요. welcome_user: @@ -1280,7 +1278,7 @@ ko: text_body_template: | 죄송합니다, 이메일 메세지 %{destination} (titled %{former_title})가 안 됐습니다. - 새 토픽을 작성하는 데 필요한 신뢰도가 없습니다. 오류라고 생각되면 스태프에게 연락주세요. + 새 글타래를 작성하는 데 필요한 신뢰도가 없습니다. 오류라고 생각되면 스태프에게 연락주세요. email_reject_no_account: subject_template: "[%{site_name}] 이메일 문제 -- 모르는 계정" text_body_template: | @@ -1306,13 +1304,13 @@ ko: text_body_template: | 죄송합니다, 이메일 메세지 %{destination} (titled %{former_title})가 안 됐습니다. - 이 카테고리에서 새 토픽을 작성하는 데 필요한 신뢰도가 없습니다. 오류라고 생각되면 스태프에게 연락주세요. + 이 카테고리에서 새 글타래를 작성하는 데 필요한 신뢰도가 없습니다. 오류라고 생각되면 스태프에게 연락주세요. email_reject_post_error: subject_template: "[%{site_name}] 이메일 문제 -- 게시 오류" text_body_template: | 죄송합니다, 이메일 메세지 %{destination} (titled %{former_title})가 안 됐습니다. - 복잡한 포매팅, 대용량 메세지, 너무 짧은 메세지가 문제일 수 있습니다. 다시 시도 해보고 계속 문제 된다면 웹사이트를 통해 게시물을 올리세요. + 복잡한 포매팅, 대용량 메세지, 너무 짧은 메세지가 문제일 수 있습니다. 다시 시도 해보고 계속 문제 된다면 웹사이트를 통해 글을 올리세요. email_reject_post_error_specified: subject_template: "[%{site_name}] 이메일 문제 -- 게시 오류" text_body_template: "죄송합니다, 이메일 메세지 %{destination} (titled %{former_title})가 안 됐습니다. \n\n이유:\n\n%{post_error}\n\n문제를 고치고 다시 시도해 보세요.\n" @@ -1329,11 +1327,11 @@ ko: 목적지 이메일 주소 전부가 식별되지 않습니다. 사이트 주소가 To: 줄(Cc:나 Bcc:는 안됨)에 들어 있는지 스태프에게 받은 올바른 이메일 주소로 보내고 있는지 확인해주세요. email_reject_topic_not_found: - subject_template: "[%{site_name}] 이메일 문제 -- 토픽 못 찾음" - text_body_template: "죄송합니다, 이메일 메세지 %{destination} (titled %{former_title})가 안 됐습니다. \n\n답글하려는 토픽이 더이상 존재하지 않습니다, 아마 지워졌을 수도 있습니다. 오류라고 생각되면 스태프에게 연락주세요.\n" + 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" + subject_template: "[%{site_name}] 이메일 문제 -- 글타래 닫힘" + 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" @@ -1348,9 +1346,9 @@ ko: text_body_template: | 안녕하세요 - %{site_name}에서 게시물이 신고가 접수되어 자동으로 숨겨져 이 알림 메세지를 보냅니다. + %{site_name}에서 글이 신고가 접수되어 자동으로 숨겨져 이 알림 메세지를 보냅니다. - 만일의 사태를 대비하기 위해 이 계정은 새 답글이나 토픽을 다는 것을 막았으며 스태프가 확인 후 풀어드립니다. + 만일의 사태를 대비하기 위해 이 계정은 새 답글이나 글타래를 다는 것을 막았으며 스태프가 확인 후 풀어드립니다. 추가적인 조언은 [커뮤니티 가이드라인](%{base_url}/guidelines)에서 확인하실 수 있습니다. blocked_by_staff: @@ -1366,7 +1364,7 @@ ko: text_body_template: | 자동 생성 메세지입니다. - 새 사용자 [%{username}](%{base_url}%{user_url})님이 여러 사용자가 %{username}님의 게시물(들)을 신고하여 자동으로 블락되었습니다. + 새 사용자 [%{username}](%{base_url}%{user_url})님이 여러 사용자가 %{username}님의 글(들)을 신고하여 자동으로 블락되었습니다. [신고 접수](%{base_url}/admin/flags) 확인 바랍니다. %{username}님이 잘못 블락 되었으면, [사용자 관리 페이지](%{base_url}%{user_url})에서 블락해제해 주세요. @@ -1376,7 +1374,7 @@ ko: text_body_template: | 자동 생성 메세지입니다. - 새 사용자 [%{username}](%{base_url}%{user_url})님이 %{domains} 링크로 여러 게시물을 올려서 스팸이 의심되어 블락되었습니다. 다만, 이 사용자는 %{domains} 링크가 없는 게시물은 계속 올릴 수 있습니다. + 새 사용자 [%{username}](%{base_url}%{user_url})님이 %{domains} 링크로 여러 글을 올려서 스팸이 의심되어 블락되었습니다. 다만, 이 사용자는 %{domains} 링크가 없는 글은 계속 올릴 수 있습니다. [사용자 관리 페이지](%{base_url}%{user_url})에서 확인 바랍니다. @@ -1388,7 +1386,7 @@ ko: 이 메세지는 당신의 계정이 블락 해제 되었다는 것을 알리기 위해 %{site_name}에서 자동으로 생성되었습니다. - 당신은 이제 새로운 토픽과 답글을 게시할 수 있습니다. + 당신은 이제 새로운 글타래과 답글을 게시할 수 있습니다. pending_users_reminder: subject_template: other: "%{count}명의 새로운 사용자가 가입 승인 대기중 입니다." @@ -1410,7 +1408,7 @@ ko: visit_link_to_respond: "응답하시려면 %{base_url}%{url} 를 방문하세요." posted_by: "%{username} 사용자가 %{post_date}에 게시하였습니다." user_invited_to_private_message_pm: - subject_template: "[%{site_name}] %{username} 회원님이 '%{topic_title}' 토픽에 초대했습니다" + subject_template: "[%{site_name}] %{username} 회원님이 '%{topic_title}' 글타래에 초대했습니다" text_body_template: |2 %{username} 회원님이 메세지에 초대했습니다. @@ -1425,7 +1423,7 @@ ko: %{base_url}%{url} 로 들어가서 메세지를 확인하기 user_invited_to_topic: - subject_template: "[%{site_name}] %{username} 회원님이 '%{topic_title}' 토픽에 초대했습니다." + subject_template: "[%{site_name}] %{username} 회원님이 '%{topic_title}' 글타래에 초대했습니다." text_body_template: |2 %{username} 회원님이 토의에 초대하였습니다. @@ -1449,7 +1447,7 @@ ko: --- %{respond_instructions} user_quoted: - subject_template: "[%{site_name}] %{username}님께서 '%{topic_title}' 토픽에 당신을 인용하였습니다" + subject_template: "[%{site_name}] %{username}님께서 '%{topic_title}' 글타래에 당신을 인용하였습니다" text_body_template: | %{message} @@ -1467,7 +1465,7 @@ ko: --- %{respond_instructions} user_posted: - subject_template: "[%{site_name}] %{subject_prefix} '%{topic_title}'에 새로운 게시물이 등록되었습니다" + subject_template: "[%{site_name}] %{subject_prefix} '%{topic_title}'에 새로운 글이 등록되었습니다" text_body_template: | %{message} @@ -1487,14 +1485,14 @@ ko: digest: why: "%{last_seen_at}부터 지금까지 %{site_link} 사이트 근황" subject_template: "[%{site_name}] 근황" - new_activity: "당신의 토픽과 게시물에 등록된 새로운 활동:" - top_topics: "인기 게시글" - other_new_topics: "인기 토픽" + new_activity: "당신의 글타래과 글에 등록된 새로운 활동:" + top_topics: "인기 글" + other_new_topics: "인기 글타래" unsubscribe: "%{site_link} 근황은 한동안 접속을 안해서 보냈어요. 스팸 같아서 보기도 싫으면 %{unsubscribe_link}." click_here: "클릭" from: "%{site_name} 요약" read_more: "더 읽기" - more_topics: "%{new_topics_since_seen}개의 토픽이 새로 올라왔어요." + more_topics: "%{new_topics_since_seen}개의 글타래가 새로 올라왔어요." more_topics_category: "더 많은 새글:" forgot_password: subject_template: "[%{site_name}] 패스워드 재설정" @@ -1562,7 +1560,7 @@ ko: 만약 위의 링크를 클릭 할 수 없으면 주소를 복사하여 당신의 웹브라우저에 붙여넣으세요. page_not_found: - title: "당신이 요청한 페이지를 찾을 수 없습니다. 혹시 아래와 같은 토픽을 찾으신 것은 아닌가요?" + title: "당신이 요청한 페이지를 찾을 수 없습니다. 혹시 아래와 같은 글타래를 찾으신 것은 아닌가요?" popular_topics: "인기" recent_topics: "최근" see_more: "더" @@ -1587,7 +1585,7 @@ ko: too_large: "죄송합니다, 업로드하려는 이미지가 너무 큽니다. (최대 크기 %{max_size_kb}KB). 크기를 줄여서 다시 시도해보세요." size_not_found: "죄송합니다. 이미지 사이즈가 잘못 되었습니다. 혹시 깨진 이미지가 아닌가요?" flag_reason: - sockpuppet: "새로운 사용자가 토픽을 만들었습니다. 그리고 같은 IP를 사용하는 새 사용자가 답글을 달았습니다. 사이트 설정의 flag_sockpuppets를 확인하세요." + sockpuppet: "새로운 사용자가 글타래를 만들었습니다. 그리고 같은 IP를 사용하는 새 사용자가 답글을 달았습니다. 사이트 설정의 flag_sockpuppets를 확인하세요." spam_hosts: "이 신규 가입자가 같은 주소로 여러번 게시하려고 했습니다. 사이트 설정의 newuser_spam_host_threshold 항목을 참고하세요." email_log: no_user: "ID %{user_id} 인 사용자를 찾을 수 없습니다" @@ -1614,7 +1612,7 @@ ko: boolean_yes: "네" boolean_no: "아니오" static_topic_first_reply: |+ - 이 토픽인 %{page_name} 페이지의 첫글 수정. + 이 글타래인 %{page_name} 페이지의 첫글 수정. guidelines_topic: title: "FAQ/가이드" @@ -1630,5 +1628,5 @@ ko: discourse_hub: access_token_problem: "관리자에게 말하기: 제발 웹사이트 설정 업데이트해서 맞는 discourse_org_access_key를 포함하게 해주세요." performance_report: - initial_post_raw: 이 토픽은 웹사이트의 일일 성능 보고를 포함하고 있습니다. + initial_post_raw: 이 글타래는 웹사이트의 일일 성능 보고를 포함하고 있습니다. initial_topic_title: 웹사이트 성능 보고 diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml index 716af22365..4a80fa43be 100644 --- a/config/locales/server.nl.yml +++ b/config/locales/server.nl.yml @@ -69,7 +69,6 @@ nl: min_username_length_exists: "Je kan de minimale gebruikersnaam lengte niet hoger instellen dan de kortste gebruikersnaam." min_username_length_range: "Je kan het minimum niet hoger instellen dan het maximum." max_username_length_exists: "Je kan de maximale gebruikersnaam lengte niet lager instellen dan de langste gebruikersnaam." - max_username_length_range: "Ja kan het maximum niet lager instellen dan het minimum." default_categories_already_selected: "Je kan geen categorie selecteren die wordt gebruikt in een andere lijst." bulk_invite: file_should_be_csv: "Het bestand moet in csv- of txt-formaat zijn." @@ -986,6 +985,9 @@ nl: omniauth_error_unknown: "Er is iets misgegaan bij het inloggen. Probeer het opnieuw." new_registrations_disabled: "Het registeren van nieuwe accounts is niet toegestaan op dit moment." password_too_long: "Wachtwoorden mogen maximaal 200 tekens lang zijn." + reserved_username: "Die gebruikersnaam is niet toegestaan." + missing_user_field: "Je hebt niet alle velden ingevuld." + close_window: "Authenticatie is voltooid. Sluit dit venster om verder te gaan." user: no_accounts_associated: "Geen accounts gekoppeld" username: @@ -994,11 +996,47 @@ 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_not_contain_two_special_chars_in_seq: "mag niet 2 of meer opvolgende speciale karakters bevatten (.-_)" + must_not_contain_confusing_suffix: "mag geen verwarrend achtervoegsel bevatten, zoals b.v.: .json of .png " email: not_allowed: "is niet toegestaan vanaf die e-mailprovider. Gebruik een ander e-mailadres." blocked: "is niet toegestaan." + 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." + invite_mailer: + subject_template: "%{invitee_name} nodigt je uit voor '%{topic_title}' op %{site_domain_name}" + text_body_template: | + %{invitee_name} nodigt je uit voor een discussie + + > **%{topic_title}** + > + > %{topic_excerpt} + + op + + > %{site_title} -- %{site_description} + + Ben je geïnteresseerd, klik dan op de onderstaande link: + + %{invite_link} + + Deze uitnodiging komt van een vertrouwde gebruiker, je kunt direct deelnemen aan de discussie. invite_forum_mailer: subject_template: "%{invitee_name} heeft je uitgenodigd voor %{site_domain_name}" + text_body_template: | + %{invitee_name} nodigt je uit voor + + > **%{site_title}** + > + > %{site_description} + + Ben je geïnteresseerd, klik dan op de onderstaande link: + + %{invite_link} + + Deze uitnodiging is van een vertrouwde gebruiker, het is daarom niet nodig om in te loggen. test_mailer: subject_template: "[%{site_name}] E-mail Bezorgtest" new_version_mailer: diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml index 7dab533c04..a25e7664ba 100644 --- a/config/locales/server.pl_PL.yml +++ b/config/locales/server.pl_PL.yml @@ -1147,12 +1147,6 @@ pl_PL: title: "Warunki użytkowania" privacy_topic: title: "Polityka prywatności" - body: "\n\n## [Jakie dane o Tobie zbieramy?](#collect)\n\nZbieramy takie informacje jak: kiedy zarejestrowałeś się na naszej stronie; kiedy uczestniczyłeś w życiu forum poprzez czytanie, pisanie oraz udoskolananie zawartości tu udostępnianej.\n\nPodczas rejestracji na naszej stronie mogłeś być zapytany o twoje imię i nazwisko oraz adres email. Możesz też przeglądać naszą stronę bez konieczności rejestracji. Twój adres email będzie weryfikowany poprzez przesłanie na niego unikalnego linku. Jeżeli kilknołeś ten link, wiemy że ten adres email należy do Ciebie. \n\nPodczas rejestracji oraz pisania treści zbieramy dane o twoim adresie IP. Możemy też zachowywać logi serwera, które\ - \ pobierają dane o twoim adresie IP zawsze kiedy logujesz się na nasz serwer. \n\n\n\n## [Do czego używamy twoich danych?](#use)\n\nKażda z informacji jakie od Ciebie zbieramy może być wykorzystana w następujący sposób:\n\n* Aby przystosować naszą stronę dla Ciebie — twoje informacje pomagają nam lepiej odpowiadać na twoje indywidualne potrzeby. \n* Aby ulepszyć naszą strone — cały czas ulepszamy naszą stronę na podstawie informacji otrzymanych od Ciebie.\n* Aby ulepszyć obsługę klienta — twoje informacje pomagają nam na efektywniejsze obsługiwanie twoich prośb. \n* Aby wysyłać Tobie okresowe wiadomości email — Adres email, który podałeś może być użyty\ - \ aby wysyłać Tobie informację o stronie, powiadomienia, odpowiedzi, wiadomości i wątki skierowane do Ciebie. \n\n\n\n## [Jak chronimy twoje dane?](#protect)\n\nWdrażamy różne środki bezpieczeństwa, aby podnosić poziom bezpieczeństwa twoich danych osobowych, kiedy podajesz, potwierdzasz albo udzielasz dostępu do informacji osobistych. \n\n\n\n## [Jaką mamy politykę przechowywania danych?](#data-retention)\n\nDokładamy wszelkich starań, aby:\n\n* Nie przechowywać danych o twoim adresie IP dłużej niż 90 dni. \n* Nie przechowywać danych o adresie IP przypisanym do twojego konta dłużej niż 5 lat.\n\n\n\n\n## [Czy używamy\ - \ plików cookies?](#cookies)\n\nTak. Cookies to małe pliki, wysyłane przez serwis internetowy, który odwiedzamy i zapisywane na urządzeniu końcowym (komputerze, laptopie, smartfonie), z którego korzystamy podczas przeglądania stron internetowych. Pozwalają naszej stronie na rozpoznanie czy jesteś naszym użytkownikiem.\n\nUżywamy ich, aby zrozumieć i zapisać twoje preferencje. Dzięki nim możemy zapewnić Tobie lepszą jakość dostarczanych usług. Możemy teżudostępniać je firmom trzecim, aby mogły rozpoznawać twoje zachowania. \n\n\n\n## [Czy udostępniamy jakiekolwiek informacje osobom trzecim?](#disclose)\n\nNie sprzedajemy, anie nie oddajemy żadnych informacji naszym partnerom.\ - \ emy używa do celów komercyjnych, marketingowych i innych. \n\n\n\n## [Linki osób trzecich](#third-party)\n\nNa naszej stronie możemy promować linki osób trzecich. Strony te mają swoją oddzielną politykę prywatności. Nie bierzemy żadnej odpowiedzialności za te strony. \n\n\n\n## [Children's Online Privacy Protection Act Compliance](#coppa)\n\nOur site, products and services are all directed to people who are at least 13 years old or older. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA ([Children's Online Privacy Protection Act](http://en.wikipedia.org/wiki/Children)), do not use this site.\n\n\n\n## [Online Privacy Policy Only](#online)\n\nTa polityka prywatności odnosi się tylko do danych zbieranych przez przez naszą strone, nie odnosi się ona do informacji zbieranych w trybie offline. \n\n\n\n## [Twoja Zgoda](#consent)\n\nKorzystając z tej strony zgadzasz się na jej politykę prywatności.\n\n\n\n## [Zmiany w polityce prywatności](#changes)\n\nJeżeli zostaną zmienione zasady polityki prywatności, zostaną one opublikowane na tej stronie. \n\nThis document is CC-BY-SA. It was last updated May 31, 2013.\n" admin_login: success: "Email wysłany" error: "Błąd!" diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml index d3404bc34c..0fe2cf4eff 100644 --- a/config/locales/server.pt.yml +++ b/config/locales/server.pt.yml @@ -69,7 +69,7 @@ pt: min_username_length_exists: "Não pode definir o comprimento mínimo do nome de utilizador acima do nome de utilizador mais curto." min_username_length_range: "Não pode definir o mínimo acima do máximo." max_username_length_exists: "Não pode definir o comprimento máximo do nome de utilizador abaixo do nome de utilizador mais longo." - max_username_length_range: "Não pode definir o máximo acima do mínimo." + max_username_length_range: "Não pode definir o máximo abaixo do mínimo." default_categories_already_selected: "Não pode selecionar uma categoria usada noutra lista." bulk_invite: file_should_be_csv: "O ficheiro a carregar deve estar em formato csv ou txt." @@ -791,6 +791,7 @@ pt: email_token_valid_hours: "Os símbolos para palavra-passe esquecida /conta ativada são válidos por (n) horas." email_token_grace_period_hours: "Os símbolos para palavra-passe esquecida /conta ativada são válidos por um período de carência de (n) horas após serem recuperados" enable_badges: "Ativar o sistema de distintivos" + enable_whispers: "Permitir que os utilizadores susurrem aos moderadores" allow_index_in_robots_txt: "Especificar em robots.txt que este sítio permite ser indexado pelos motores de pesquisa." email_domains_blacklist: "Lista de domínios de email que os utilizadores não podem usar para registo de contas. Exemplo: mailinator.com|trashmail.net" email_domains_whitelist: "Lista de domínios de email que os utilizadores DEVEM usar para registar contas. AVISO: Utilizadores com domínios de email diferentes dos listados não serão permitidos!" @@ -868,6 +869,8 @@ pt: s3_region: "Nome da região Amazon S3 que será usada para carregar imagens." s3_cdn_url: "O URL CDN a ser usado para todos os recursos s3 (por exemplo: https://cdn.somewhere.com). AVISO: após alterar esta configuração deve refazer as últimas mensagens." avatar_sizes: "Lista de tamanhos de avatar gerados automaticamente." + 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}" 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." @@ -1035,8 +1038,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_other_new_topic_duration_minutes: "Por defeito, número global de minutos que um tópico é considerado novo, os utilizadores podem substituir (-1 para sempre, -2 para desde a última visita)" - default_other_auto_track_topics_after_msecs: "Por defeito, milissegundos globais antes de um tópico ser automaticamente acompanhado, os utilizadores podem substituir (0 para sempre, -1 para nunca)" + 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." default_other_enable_quoting: "Por defeito, ativar resposta por citação para texto destacado." default_other_dynamic_favicon: "Mostrar contagem de tópicos novos / atualizados no ícone do browser." @@ -1167,7 +1170,7 @@ pt: 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" + must_end_with_alphanumeric: "tem que terminar com uma letra ou número ou um sublinhado" must_not_contain_two_special_chars_in_seq: "não deve conter uma sequência de 2 ou mais caracteres especiais (.-_)" must_not_contain_confusing_suffix: "não deve conter um sufixo confuso tal como .json ou .png etc." email: @@ -1732,88 +1735,9 @@ pt: \ em qualquer instância, não vai renunciar a tal termo ou condição ou qualquer violação subsequente. Pode atribuir os seus direitos sob este acordo a qualquer parte que consente a, e concorda em ficar vinculado pelos seus termos e condições; %{company_name} pode assignar os seus direitos sob este Acordo sem condição. O presente Acordo será vinculativo e reverterá em benefício das partes, dos seus sucessores e signatários autorizados. \n\nEste documento é CC-BY-SA. Foi atualizado pela última vez em 31 de Maio de 2013. \n\nOriginalmente adaptado de [Termos de Serviço WordPress](http://en.wordpress.com/tos/).\n" privacy_topic: title: "Política de Privacidade" - body: | - - - ## [Que informações reunimos?](#reunião) - - Reunimos informação sobre si assim que se regista no nosso sítio e juntamos dados quando participa no fórum ao ler, escrever e avaliar o conteúdo aí partilhado. - - Ao inscrever-se no nosso sítio, pode ser-lhe pedido para inserir o seu nome e endereço de email. Pode contudo, visitar o nosso sítio sem se registar. O seu endereço de email será verificado por um email contendo uma hiperligação única. Se essa hiperligação for visitada, sabemos que tem controlo do seu endereço de email. - - Ao inscrever-se e publicar, recordamos o endereço IP de onde a publicação é originária. Podemos também reter logs de servidores que incluem endereços IP de todos os pedidos feitos ao servidor. - - - - ## [Para que usamos as suas informações?](#usar) - - Todas as informações que reunimos sobre si podem ser usadas numa das seguintes maneiras: - - * Para personalizar a sua experiência — a sua informação ajuda-nos a responder melhor às suas necessidades individuais. - * Para melhorar o nosso sítio — continuamos a lutar por melhorar as ofertas do nosso sítio com base na informação e feedback que recebemos de si. - * Para melhorar o serviço ao cliente — a sua informação ajuda-nos a responder mais eficazmente aos pedidos de serviço ao cliente e pedidos de suporte. - *Para enviar emails periodicamente — O endereço de email que nos fornece pode ser usado para lhe enviar informação, notificações que peça sobre mudanças em tópicos ou em resposta ao seu nome de utilizador, respostas a inquéritos e/ou outros pedidos ou questões. - - - - ## [Como protegemos a sua informação?](#protect) - - Implementamos uma variedade de medidas de precaução para manter as suas informações pessoais em segurança quando insere, submete ou acede à sua informação pessoal. - - - - ## [Qual é a sua política de retenção de dados?](#retenção-dados) - - Iremos fazer um esforço de boa fé para: - - * Reter logs de servidores contendo o endereço IP de todos os pedidos para este servidor não mais que 90 dias. - * Reter endereços IP associados a utilizadores registados e às suas publicações não mais que 5 anos. - - - - ## [Usamos cookies?](#cookies) - - Sim. Os cookies são pequenos ficheiros que um sítio ou um fornecedor de serviços transfere para o disco do seu computador através do navegador de Internet (se assim o permitir). Estes cookies permitem que o sítio reconheça o seu navegador e, se tiver uma conta registada, associá-lo a essa. - - Usamos cookies para entender e guardar as suas preferências para visitas futuras e compilar dados agregados sobre o tráfego do sítio e a interação com o mesmo para lhe podermos oferecer as melhores experiências e ferramentas no futuro. Podemos contratar fornecedores de serviços para nos ajudarem a entender melhor os visitantes do nosso sítio. Estes fornecedores de serviços não têm permissão para usar a informação reunida em nosso nome excepto para nos ajudar a conduzir e melhorar o nosso negócio. - - - - ## [Divulgamos informação com partes exteriores?](#divulgar) - - Não vendemos, trocamos ou de outra maneira transferimos a sua informação pessoal para partes exteriores. Isto não inclui terceiras partes confiáveis que nos ajudam a operar sítio, conduzir o nosso negócio, ou servi-lo, enquanto estas partes acordarem em manter a informação confidencial. Podemos também partilhar a sua informação quando acreditamos que é apropriado para estar de acordo com a lei, reforçar as políticas do nosso sítio ou proteger os nossos, ou de outros, direitos, propriedades ou segurança. Contudo, informação não-pessoal do visitante pode ser fornecida a outras partes para marketing, publicidade ou outros usos. - - - - ## [Hiperligações de Terceiras Partes](#terceira-parte) - - Ocasionalmente, à nossa descrição, podemos incluir ou oferecer serviços ou produtos de terceiros no nosso sítio. Estes sítios de terceiros têm políticas de privacidade separadas e independentes. Por este motivo, não temos responsabilidade no conteúdo ou atividades destes sítios hiperligados. No entanto, procuramos proteger a integridade do nosso sítio e damos as boas-vindas a qualquer feedback sobre estes sítios. - - - - ## [Cumprimento da Proteção da Privacidade Online Infantil](#coppa) - - O nosso sítio, produtos e serviços são direcionados a pessoas com pelo menos 13 anos de idade. Se este servidor está nos EUA e tem menos de 13 anos de idade, como parte dos requisitos do COPPA ([Proteção da Privacidade Online Infantil](http://en.wikipedia.org/wiki/Children)), não utilize este sítio. - - - - ## [Política de Privacidade Online](#online) - - Estas políticas de privacidade online aplicam-se apenas à informação reunida através do nosso sítio e não à informação reunida offline. - - - - ## [O seu consentimento](#consentimento) - - Ao utilizar o nosso sítio, está a consentir a política de privacidade do nosso sítio. - - - - ## [Mudanças à nossa Política de Privacidade](#mudanças) - - Se decidirmos alterar a nossa política de privacidade, iremos publicar as mudanças nesta página. - - Este documento é CC-BY-SA. Foi atualizado pela última vez em 31 de Maio de 2013. + body: " \n\n## [Que informações reunimos?](#reunião) \n\nReunimos informação sobre si assim que se regista no nosso sítio e juntamos dados quando participa no fórum ao ler, escrever e avaliar o conteúdo aqui partilhado. \n\nAo inscrever-se no nosso sítio, pode ser-lhe pedido para inserir o seu nome e endereço de email. Pode contudo, visitar o nosso sítio sem se registar. O seu endereço de email será verificado por um email contendo uma hiperligação única. Se essa hiperligação for visitada, sabemos que tem controlo do seu endereço de email. \n\nAo inscrever-se e publicar, recordamos o endereço IP de onde a publicação é originária. Podemos também reter logs de servidores que incluem endereços IP de todos os pedidos feitos ao servidor. \n\n \n\n## [Para que usamos as suas informações?](#usar) \n\nTodas as informações que reunimos sobre si podem ser usadas numa das seguintes maneiras: \n\n* Para personalizar a sua experiência — a sua informação ajuda-nos a responder melhor às suas necessidades individuais. \n* Para melhorar o nosso sítio — continuamos a lutar por melhorar as ofertas do nosso sítio com base na informação e feedback que recebemos de si. \n* Para melhorar o serviço ao cliente — a sua informação ajuda-nos a responder mais eficazmente aos pedidos de serviço ao cliente e pedidos de suporte. \n* Para enviar emails periodicamente — O endereço de email que nos fornece pode ser usado para lhe enviar informação, notificações que peça sobre mudanças em tópicos ou em resposta ao seu nome de utilizador, respostas a inquéritos e/ou outros pedidos ou questões. \n\n \n\n## [Como protegemos a sua informação?](#protect)\n\nImplementamos uma variedade de medidas de precaução para manter as suas informações pessoais em segurança quando insere, submete ou acede à sua informação pessoal. \n\n \n\n## [Qual é a sua política de retenção de dados?](#retenção-dados)\n\nIremos fazer um esforço de boa fé para: \n\n* Reter logs de servidores contendo o endereço IP de todos os pedidos para este servidor\ + \ não mais que 90 dias. \n* Reter endereços IP associados a utilizadores registados e às suas publicações por não mais que 5 anos. \n\n \n\n## [Usamos cookies?](#cookies) \n\nSim. Os cookies são pequenos ficheiros que um sítio ou um fornecedor de serviços transfere para o disco do seu computador através do navegador de Internet (se assim o permitir). Estes cookies permitem que o sítio reconheça o seu navegador e, se tiver uma conta registada, associá-lo a essa. \n\nUsamos cookies para entender e guardar as suas preferências para visitas futuras e compilar dados agregados sobre o tráfego do sítio e a interação com o mesmo para lhe podermos oferecer as melhores experiências e ferramentas no futuro. Podemos contratar fornecedores de serviços para nos ajudarem a entender melhor os visitantes do nosso sítio. Estes fornecedores de serviços não têm permissão para usar a informação reunida em nosso nome excepto para nos ajudar a conduzir e melhorar o nosso negócio. \n\n \n\n## [Divulgamos informação com partes exteriores?](#divulgar) \n\nNão vendemos, trocamos ou de outra maneira transferimos a sua informação pessoal para partes exteriores. Isto não inclui terceiras partes confiáveis que nos ajudam a operar sítio, conduzir o nosso negócio, ou servi-lo, enquanto estas partes acordarem em manter a informação confidencial. Podemos também partilhar a sua informação quando acreditamos que é apropriado para estar de acordo com a lei, reforçar as políticas do nosso sítio ou proteger os nossos, ou de outros, direitos, propriedades ou segurança. Contudo, informação não-pessoal do visitante pode ser fornecida a outras partes para marketing, publicidade ou outros usos. \n\n \n\n## [Hiperligações de Terceiras Partes](#terceira-parte) \n\nOcasionalmente, à nossa descrição, podemos incluir ou oferecer serviços ou produtos de terceiros no nosso sítio. Estes sítios de terceiros têm políticas de privacidade separadas e independentes. Por este motivo, não temos responsabilidade no conteúdo ou atividades destes sítios hiperligados. No entanto, procuramos\ + \ proteger a integridade do nosso sítio e damos as boas-vindas a qualquer feedback sobre estes sítios. \n\n \n\n## [Cumprimento da Proteção da Privacidade Online Infantil](#coppa) \n\nO nosso sítio, produtos e serviços são direcionados a pessoas com pelo menos 13 anos de idade. Se este servidor está nos EUA e tem menos de 13 anos de idade, como parte dos requisitos do COPPA ([Proteção da Privacidade Online Infantil]( https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)), não utilize este sítio. \n\n \n\n## [Política de Privacidade Online](#online) \n\nEstas políticas de privacidade online aplicam-se apenas à informação reunida através do nosso sítio e não à informação reunida offline. \n\n \n\n## [O seu consentimento](#consentimento) \n\nAo utilizar o nosso sítio, está a consentir a política de privacidade do nosso sítio. \n\n \n\n## [Mudanças à nossa Política de Privacidade](#mudanças) \n\nSe decidirmos alterar a nossa política de privacidade, iremos publicar as mudanças nesta página. \n\nEste documento é CC-BY-SA. Foi atualizado pela última vez em 31 de Maio de 2013.\n" static: search_help: |

        Dicas

        diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml index fd902d6b8a..27aba097e9 100644 --- a/config/locales/server.pt_BR.yml +++ b/config/locales/server.pt_BR.yml @@ -1613,12 +1613,6 @@ pt_BR: title: "Termos de Serviço" privacy_topic: title: "Política de Privacidade" - body: "\n\n## [Quais as informações que recolhemos?](#coleta)\n\nColetamos informações de você quando você se cadastra em nosso site e coletamos dados quando você participar do fórum, lendo, escrevendo, e avaliar o conteúdo compartilhado aqui. \n\nAo se cadastrar em nosso site, você pode ser solicitado a digitar seu nome e e-mail. Você pode, entretanto, visite nosso site, sem registrar. O seu endereço de e-mail será verificado por um e-mail contendo um link único. Se o link é visitado, sabemos que você controla o endereço de e-mail. \n\nQuando registrado e fazendo postagens, registramos o endereço IP que originou o post. Também podemos manter os logs do servidor, que incluem o endereço IP de todos os pedidos para o nosso servidor.\n\n\n\n## [Em que usamos as suas informações?](#uso)\n\nQualquer uma das informações que coletamos de você pode ser usado em uma das seguintes formas: \n\n* Para personalizar\ - \ a sua experiência — sua informação nos ajuda a responder melhor às suas necessidades individuais. \n* Para melhorar o nosso site — nós nos esforçamos continuamente para melhorar as nossas ofertas de site com base nas informações e feedback que recebemos de você. \n* Para melhorar o serviço ao cliente — sua informação nos ajuda a responder mais eficazmente às suas solicitações de serviço ao cliente e as necessidades de apoio. \n* Para enviar periodicamente e-mails — O endereço de e-mail que você fornece pode ser usado para enviar-lhe informações, as notificações que você quando há mudanças tópicos que solicitou ou em resposta a seu nome de usuário, responder a perguntas, e/ou outras solicitações ou perguntas.\n\n\n\n## [Como vamos proteger a sua informação?](#protecao)\n\nImplementamos uma série de medidas de segurança para manter a segurança de suas informações pessoais quando você\ - \ entra, envia ou acessa suas informações pessoais.\n\n\n\n## [Qual é a sua política de retenção de dados?](#retencao-dados)\n\nNós vamos fazer um esforço de boa fé para: \n\n* Manter registros do servidor contendo o endereço IP de todos os pedidos para este servidor não mais que 90 dias. \n* Manter os endereços de IP associados a usuários registrados e suas mensagens não mais que 5 anos.\n\n\n\n## [Nós usamos cookies?](#cookies)\n\nSim. Cookies são pequenos arquivos que um site ou seu fornecedor de serviços transfere para o disco rígido do seu computador através de seu navegador Web (se você permitir). Estes cookies permitem que o site reconhecer o seu browser e, se você tiver uma conta registrada, associá-lo com a sua conta registrada. \n\nNós usamos cookies para compreender e guardar as suas preferências para futuras visitas e compilar dados agregados sobre o tráfego ea interação\ - \ no site, para que possamos oferecer um site melhor e ferramentas no futuro. Poderemos contratar prestadores de serviços de terceiros para nos ajudar a compreender melhor os nossos visitantes do site. Esses prestadores de serviços não estão autorizados a utilizar as informações coletadas em nosso nome, exceto para nos ajudar a conduzir e melhorar o nosso negócio.\n\n\n\n## [Podemos divulgar qualquer informação a terceiros?](#divulgar)\n\nNós não vendemos, trocamos, ou de outra forma transferrimos a terceiros as suas informações pessoalmente identificáveis. Isso não inclui terceiros de confiança que nos auxiliam no funcionamento do nosso site, conduzindo nosso negócio, ou serviço que a você, desde que as partes concordam em manter esta informação confidencial. Podemos também divulgar as suas informações quando acreditamos que é apropriado para cumprir a lei, fazer cumprir as nossas políticas do site, ou proteger\ - \ nosso ou de outros direitos, propriedade ou segurança. No entanto, informações turísticas não pessoalmente identificáveis ​​podem ser fornecidas a terceiros para marketing, publicidade, ou outros usos.\n\n\n\n## [Links de terceiros](#terceiros)\n\nOcasionalmente, a nosso critério, podemos incluir ou oferecer produtos ou serviços de terceiros no nosso site. Estes sites de terceiros têm políticas de privacidade separadas e independentes. Portanto, não temos responsabilidade ou obrigações pelo conteúdo e atividades desses sites. No entanto, buscamos proteger a integridade do nosso site e agradecemos qualquer feedback sobre esses sites.\n\n\n\n## [Privacidade Online Infantil Protection Act Compliance](#coppa)\n\nNosso site, produtos e serviços são todos dirigidos a pessoas que tem pelo menos 13 anos de idade ou mais. Se o servidor for nos EUA, e você está sob a idade de 13, de acordo com\ - \ as exigências da COPPA ([Lei de Proteção de Privacidade Online de Crianças] (http://en.wikipedia.org/wiki/Children)), não use este site.\n\n\n\n## [Somente Política de Privacidade Online](#online)\n\nEsta política de privacidade online se aplica somente às informações recolhidas pelo nosso site e não a informações coletadas offline.\n\n\n\n## [Seu Consentimento](#consentimento)\n\nAo utilizar nosso site, você concorda com a nossa política de privacidade web site.\n\n\n\n## [Alterações à nossa Política de Privacidade](#mudancas)\n\nSe nós decidirmos mudar nossa política de privacidade, colocaremos essas alterações nesta página. \n\nEste documento é CC-BY-SA. Ele foi atualizado pela última 31 de maio de 2013.\n" badges: long_descriptions: autobiographer: | diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml index b5699e8439..d31190fcdf 100644 --- a/config/locales/server.ro.yml +++ b/config/locales/server.ro.yml @@ -1181,87 +1181,6 @@ ro: title: "Acordul de servicii" privacy_topic: title: "Politica de confidențialitate" - body: | - - - ## [Ce informații colectăm?](#colectăm) - - Colectăm informații de la dvs. când vă înregistrati pe site-ul nostru și colectăm date când participați la forum citind, scriind, și evaluând conținutul distribuit aici. - - Când va înregistrați pe site, vi se va cere numele și adresa e email. Puteți, totuși să vizitați site-ul fără a fi înregistrat. Emailul va fi verificat de un email ce conține o adresă unică. Dacă acea adresa e vizitată, știm că sunteți în controlul adresei de email respective. - - Când postați și sunteți autentificat, îregistrăm adresa IP a originii postării. Tot odată păstrăm și rapoarte de server ce includ adrese IP a orcăror cerințe de pe server. - - - - ## [La ce folosim informația?](#uz) - - Orice informație obținută de la dumneavoastră poate fi folosită în următoarele moduri: - - * Să personalizăm experienta dvs. — informația data de dvs. ne ajută să răspundem cerințelor dvs. individuale. - * Să îmbunătățim site-ul — încercat continuu să îmbunătățim site-ul pe baza informației și feed-back-ului oferit de dvs. - * Să îmbunătățim serviciul de clienți — informația dvs ne ajută să răspundem eficient în oferirea suportului necesar. - * Să trimitem periodic email-uri — Adresa de email data de dvs. poate fi flosita pentru a vă trimite informații,notificări cerute despre schimbări de discuție direct către numele de utiliztor, pentru a răspunde la întrebări, sau alte rugăminți și întrebări. - - - - ## [Cum protejăm informațiile?](#protecție) - - Am implementat o varietate de măsuri de protecție pentru a menține siguranța informațiilor personale când le introduceți, sau accesați. - - - - ## [Care este politica de retenție de date?](#retentie-date) - - Vom face un efort de bună credință să: - - * Păstrăm jurnalele de server care conțin adresa IP a tuturor cererilor de acest pe server nu mai mult de 90 zile. - * Păstrăm adresele IP asociate cu utilizatorii înregistrați și posturile lor, nu mai mult de 5 ani. - - - - ## [Folosim cookie-uri?](#cookie-uri) - - Da. Cookie-urile sunt mici fișiere trimise de site sau provider către hardul dvs. prin intermediul browser-ului de net (dacă este permis). Aceste cookie-uri permite site-ului să recunoască borwserul dvs., iar dacă aveți un cont, sa îl asocieze cu acesta. - - Folosim cookie-urile pentru a înțelege și a salva preferințele dvs. pe viitor și pentru a compila date despre traficul site-ului pentru a oferii o mai bună experiența pe site în viitor. Este posibil să contractăm o parte-terta ce oferă servicii pentru a înțelege mai bine vizitatorii site-ulu. Acestor provideri de servicii nu le este permis să folosească informațiile colectate în contul nostru cu excepția ajutorului oferit nouă pentru a îmbunătății experiență. - - - - ## [Dezvăluim informații partilor-terțe?](#Dezvăluire) - - Nu vindem , schimbăm, sau transferăm oricărei alte terțe-părți informații identificabile ce aparțin utilizatorilor. Aici nu se includ terțe-părți de încredere ce oferă asistentă în funcționarea site-ului nostru, buna funcționare a afacerilor , sau serviciile dedicate dvs., atât timp cât acele terțe-părți și-au asumat responsabilitatea de a menține acele informații confidențiale. Am putea oferii informații doar în cazul în care această acțiune este în limitele legale, în limitele politicii noastre, sau pentru a proteja alte drepturi ce ne aparțin, proprietăți, sau siguranțe. Totuși, informații non-personale identificabile despre vizitatori vor fi oferite părților terțe în scopuri de marketing, reclame, sau alte scopuri. - - - - ## [Adresele părților-terțe](#părți-terțe) - - Occazional, la discreția noastră, vom include sau oferii părților-terțe produse sau servicii pe site-ul nostru. Aceste site-uri ale partilor-terțe au politici de organizare separate și independente. Deci nu ne asumăm responsabilitatea sau vina pentru contextul și activitățile acestor site-uri. În orice caz, intenția noastră este de a proteja integritatea site-ului nostru și orice feed-back despre acestea este bine venit. - - - - ## [Actul de protecție online pentru copii](#coppa) - - Site-ul nostru, produsele și serviciile sunt menite să fie folosite de persoanele ce au depășit vârsta de 13 ani. Dacă serverul nu se află în USA, iar dvs. aveți vârstă sub 13 ani, conform actului COPPA ([Actul de protecție online pentru copii](http://en.wikipedia.org/wiki/Children)), nu folosiți serviciile acestui site. - - - ## [Politica de confidențialitate online](#online) - - Această politică de confidențialitate se aplică doar informațiilor colectate prin intermediul site-ului și nu offline. - - - - ## [Consimțământul dvs.](#Consimțământ) - - Folosind site-ul nosrtu, vă dați consimțământul în ceea ce privește politica de confidențialitate a site-ului. - - - - ## [Schimbări în politica de confidențialitate](#schimbări) - - Dacă decidem să schimbăm politica de confidențialitate, schimbările vor fi postate pe această pagină. - - Acest document este CC-BY-SA. A fost ultima oară actualizat la 31 mai 2013. admin_login: success: "Mesajul a fost trimis" error: "Eroare!" diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml index a85605706c..bc91aeb461 100644 --- a/config/locales/server.ru.yml +++ b/config/locales/server.ru.yml @@ -1778,88 +1778,6 @@ ru: title: "Пользовательское соглашение" privacy_topic: title: "Политика конфиденциальности" - body: | - - - ## [Какую информацию мы собираем?](#collect) - - Мы собираем и обрабатываем данные которые вы передаете на сайт когда регистрируетесь на сайте, а так же когда читаете, пишите и другим спопособом используете материалы сайта. - - Когда вы регистрируетесь на сайте, у вас запрашиваются ваше имя и e-mail адресс. Вы так же можете посещать наш сайт без регистрации. Для проверки e-mail адресса мы направляем пользователю письмо с уникальной ссылкой. Если по ссылке был осуществлен переход мы считаем что именно вы контролируете это e-mail адресс. - - Во время регистрации и публикации материалов на сайте, мы записываем IP адресс с которого была произведена публикация. Мы также храним серверные логи в которых содержится информация об IP адрессе и каждом запросе с этого адреса к нашему серверу. - - - - ## [Как мы используем эту информацию?](#use) - - Любая информация которую мы собираем о вас может быть использованна в следующих случаях: - - * Для улучшения вашего взаимодействия с сервисом — информация о вас помогает нам улучшать сервис для вашего удобства. - * Для улучшения нашего сайта — мы постоянно стараимся улучшить наш сайт руководствуясь информацией полученной от наших пользователей. - * Для улучшения услуг, предоставляемых нашим пользователям — Информация о вас помогает нам более эффективно отвечать на запросы пользователей, сервесной поддержки и для поддержки сайта. - * Для рассылки информационных сообщений — email адрес, которые вы предоставили может быть использован для отправки вам информации, уведомлений об изменениях на которые вы подписались в темах или ответах в темах адрессованые вам, ответов на запросы, и / или другие вопросы. - - - - ## [Как мы защищаем информацию о вас?](#protect) - - Мы реализуем различные меры безопасности для обеспечения безопасности Вашей личной информации на всех стадиях: когда вы входите на сайт, публикуете материалы или просматриваете информацию о вас. - - - - ## [Какова ваша политика хранения данных?](#data-retention) - - Мы стараемся придерживаться следующих правил: - - * Логи содержащие IP адресс для всех ваших запросов хранятся не более 90 дней. - * IP адресс с которого была зарегистрированна учетная запись хранится не более 5 лет. - - - - ## [Используем ли мы cookies?](#cookies) - - Да. Cookies это небольшие файлы, которые сайт или сервис сохраняет на жесткий диск вашего компьютера с помощью веб браузера (если вы разрешили). Эти данные позволяеют сайту определять ваш браузер и если вы зарегистрированны на сайте, позволять вашему браузеру использовать данный аккаунт. - - Мы используем cookies для понимания какие настройки вы сделали на сайте и сохранения этих настроек для будующих визитов, а также для формирования статистики посещений сайта для того чтобы иметь возможность улучшать наш сайт и сервисы. Мы так же оставляем за собой право привлекать для анализа посещений нашего сайта сторонние компании. Сторонние компании могут получить от нас право на анализ собранных нами данных только в целях развития и совершенствования нашего бизнеса. - - - - ## [Какую информацию мы предоставляем третьим лицам?](#disclose) - - Мы не занимаемся торговлей, продаей, или другим распространением ваших персональных данных за пределы нашей компании. Это не относится к доверенным третьим лицам, которые помогают нам управлять нашим сайтом, вести наш бизнес, или предоставлять услуги, до тех пор пока они готовы хранить эти данные конфеденциально. Так же мы оставляем право за собой использовать информацию о вас в случаях когда это необходимо, в случаях предусмотренных действующим законодательством или политикой нашего сайта, а также для защиты наших или чужих прав, прав собственности или безопасности. Обезличенные данные могут быть переданы третьим лицам в использования в рекламных целях, или для других целей. - - - - ## [Third party links](#third-party) - - Occasionally, at our discretion, we may include or offer third party products or services on our site. These third party sites have separate and independent privacy policies. We therefore have no responsibility or liability for the content and activities of these linked sites. Nonetheless, we seek to protect the integrity of our site and welcome any feedback about these sites. - - - - ## [Children's Online Privacy Protection Act Compliance](#coppa) - - Our site, products and services are all directed to people who are at least 13 years old or older. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA ([Children's Online Privacy Protection Act](http://en.wikipedia.org/wiki/Children)), do not use this site. - - - - ## [Online Privacy Policy Only](#online) - - This online privacy policy applies only to information collected through our site and not to information collected offline. - - - - ## [Your Consent](#consent) - - By using our site, you consent to our web site privacy policy. - - - - ## [Changes to our Privacy Policy](#changes) - - If we decide to change our privacy policy, we will post those changes on this page. - - This document is CC-BY-SA. It was last updated May 31, 2013. badges: long_descriptions: autobiographer: | diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml index ecdeeddea6..e83dc17bcd 100644 --- a/config/locales/server.sq.yml +++ b/config/locales/server.sq.yml @@ -2070,88 +2070,6 @@ sq: Originally adapted from the [WordPress Terms of Service](http://en.wordpress.com/tos/). privacy_topic: title: "Politika e Privatësisë" - body: | - - - ## [What information do we collect?](#collect) - - We collect information from you when you register on our site and gather data when you participate in the forum by reading, writing, and evaluating the content shared here. - - When registering on our site, you may be asked to enter your name and e-mail address. You may, however, visit our site without registering. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address. - - When registered and posting, we record the IP address that the post originated from. We also may retain server logs which include the IP address of every request to our server. - - - - ## [What do we use your information for?](#use) - - Any of the information we collect from you may be used in one of the following ways: - - * To personalize your experience — your information helps us to better respond to your individual needs. - * To improve our site — we continually strive to improve our site offerings based on the information and feedback we receive from you. - * To improve customer service — your information helps us to more effectively respond to your customer service requests and support needs. - * To send periodic emails — The email address you provide may be used to send you information, notifications that you request about changes to topics or in response to your user name, respond to inquiries, and/or other requests or questions. - - - - ## [How do we protect your information?](#protect) - - We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. - - - - ## [What is your data retention policy?](#data-retention) - - We will make a good faith effort to: - - * Retain server logs containing the IP address of all requests to this server no more than 90 days. - * Retain the IP addresses associated with registered users and their posts no more than 5 years. - - - - ## [Do we use cookies?](#cookies) - - Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account. - - We use cookies to understand and save your preferences for future visits and compile aggregate data about site traffic and site interaction so that we can offer better site experiences and tools in the future. We may contract with third-party service providers to assist us in better understanding our site visitors. These service providers are not permitted to use the information collected on our behalf except to help us conduct and improve our business. - - - - ## [Do we disclose any information to outside parties?](#disclose) - - We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety. However, non-personally identifiable visitor information may be provided to other parties for marketing, advertising, or other uses. - - - - ## [Third party links](#third-party) - - Occasionally, at our discretion, we may include or offer third party products or services on our site. These third party sites have separate and independent privacy policies. We therefore have no responsibility or liability for the content and activities of these linked sites. Nonetheless, we seek to protect the integrity of our site and welcome any feedback about these sites. - - - - ## [Children's Online Privacy Protection Act Compliance](#coppa) - - Our site, products and services are all directed to people who are at least 13 years old or older. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA ([Children's Online Privacy Protection Act](http://en.wikipedia.org/wiki/Children)), do not use this site. - - - - ## [Online Privacy Policy Only](#online) - - This online privacy policy applies only to information collected through our site and not to information collected offline. - - - - ## [Your Consent](#consent) - - By using our site, you consent to our web site privacy policy. - - - - ## [Changes to our Privacy Policy](#changes) - - If we decide to change our privacy policy, we will post those changes on this page. - - This document is CC-BY-SA. It was last updated May 31, 2013. badges: long_descriptions: autobiographer: | diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml index 6c0c4d7784..13766718a2 100644 --- a/config/locales/server.tr_TR.yml +++ b/config/locales/server.tr_TR.yml @@ -65,7 +65,7 @@ tr_TR: min_username_length_exists: "En kısa kullanıcı adının üstünde en küçük kullanıcı adı uzunluğu ayarlayamazsınız." min_username_length_range: "En büyük değerin üstünde en küçük değer ayarlayamazsınız." max_username_length_exists: "En uzun kullanıcı adının altında en büyük kullanıcı adı uzunluğu ayarlayamazsınız." - max_username_length_range: "En küçük değerin altında en büyük değer ayarlayamazsınız." + max_username_length_range: "En küçük değer altında en büyük değer ayarlayamazsınız." default_categories_already_selected: "Bir başka listede kullanılan bir kategoriyi seçemezsiniz." bulk_invite: file_should_be_csv: "Yüklenen dosya csv veya txt formatında olmalı. " @@ -728,6 +728,7 @@ tr_TR: email_token_valid_hours: "Parolamı unuttum / hesap etkinleştirme jetonları (n) saat geçerlidir." email_token_grace_period_hours: "Parolamı unuttum / hesabı etkinleştir jetonları kullanıldıktan sonra (n) saat boyunca hala geçerlidir." enable_badges: "Rozet sistemini etkinleştir" + enable_whispers: "Kullanıcıların yöneticilere fısıldamasına izin ver" allow_index_in_robots_txt: "robots.txt dosyasında bu sitenin arama motorları tarafından indekslenmesine izin verildiğini belirt." email_domains_blacklist: "Kullanıcıların kayıt olurken kullanamayacağı e-posta alan adlarının, dikey çizgilerle ayrıştırılmış listesi. Örneğin: mailinator.com|trashmail.net" email_domains_whitelist: "Kullanıcıların kayıt olurken kullanmak ZORUNDA olduğu e-posta alan adlarının, dikey çizgilerle ayrıştırılmış listesi. UYARI: Bu listede yer almayan e-posta alan adları kabul edilmeyecektir!" @@ -805,6 +806,8 @@ tr_TR: s3_region: "Resimleri yüklemek için kullanılacak olan Amazon S3 region name." s3_cdn_url: "Tüm s3 öğeleri için CDN URL adresi. (örneğin: https://cdn.somewhere.com). UYARI: bu ayarı değiştirdikten sonra tüm eski gönderileri rebake etmelisiniz." avatar_sizes: "Otomatik üretilen avatar ölçülerinin listesi." + external_system_avatars_enabled: "Dışsal sistem avatarları hizmeti kullan." + external_system_avatars_url: "Dışsal sistem avatarları hizmetinin URL'i. İzin verilen değiştirimler şunlardır: {username} {first_letter} {color} {size}" enable_flash_video_onebox: "Kutularda swf ve flv (Adobe Flash) yerleştirmelerine izin ver. UYARI: güvenlik açıkları doğurabilir" default_invitee_trust_level: "Davet edilen kullanıcılar için varsayılan güven seviyesi (0-4)." default_trust_level: "Tüm yeni kullanıcılar için varsayılan güven seviyesi (0-4). DİKKAT! Bu ayarı değiştirmeniz ciddi spam riski doğurabilir." @@ -972,8 +975,8 @@ tr_TR: default_email_direct: "Öntanımlı olarak birisi bir kullanıcı hakkında alıntı yapma, cevaplama, bahsetme ya da davet etme eylemlerini gerçekleştirdiğinde e-posta gönder." default_email_mailing_list_mode: "Öntanımlı olarak her yeni gönderi için bir e-posta gönder." default_email_always: "Öntanımlı olarak kullanıcı etkin olsa bile e-posta bildirimi gönder." - default_other_new_topic_duration_minutes: "Bir konunun yeni sayıldığı genel öntanımlı dakika sayısı, kullanıcılar geçersiz kılabilir (her zaman için -1, son ziyaret için -2)" - default_other_auto_track_topics_after_msecs: "Bir konu otomatik olarak takip edilmeden önce geçen genel öntanımlı milisaniye sayısı, kullanıcılar geçersiz kılabilir (her zaman için 0, asla için -1)" + default_other_new_topic_duration_minutes: "Konunun yeni olarak düşünülmesi için genel varsayılan koşul." + default_other_auto_track_topics_after_msecs: "Bir konunun otomatik olarak takip edilmesi için geçmesi gereken genel varsayılan zaman." default_other_external_links_in_new_tab: "Harici linkleri, öntanımlı olarak, yeni bir sekmede aç." default_other_enable_quoting: "Vurgulanmış yazılar için alıntı ile cevaplamayı, öntanımlı olarak, etkinleştir." default_other_dynamic_favicon: "Tarayıcı simgesinde, öntanımlı olarak, yeni/güncellenmiş konu sayısını göster." @@ -1096,7 +1099,7 @@ tr_TR: unique: "özgün olmalı" blank: "bulunmalı" must_begin_with_alphanumeric: "bir harf, rakam ya da alt çizgi ile başlamalı" - must_end_with_alphanumeric: "bir harf ya da rakam ile bitmeli" + must_end_with_alphanumeric: "bir harf, sayı yada alt tire ile bitmeli" must_not_contain_two_special_chars_in_seq: "2 ya da daha fazla uzunlukta özel karakter dizisi (.-_) içermemeli" must_not_contain_confusing_suffix: ".json ya da .png gibi kafa karıştırıcı bir son ek içermemeli" email: @@ -1133,8 +1136,9 @@ tr_TR: (Eğer yukarıdaki bağlantının süresi dolmuşsa e-posta adresinizle giriş yaparken "Parolamı unuttum" bağlantısına tıklayınız.) test_mailer: subject_template: "[%{site_name}] E-posta Ulaştırma Testi" - text_body_template: "Bu aşağıdaki adresten gönderilen bir test e-postasıdır.\n\n[**%{base_url}**][0]\n\nE-postaların ulaştırılması karışık bir meseledir. Öncelikle dikkat etmeniz gereken bir kaç önemli nokta:\n\n- Site ayarlarınızda 'bildiri e-postaları' için gönderen adresini doğru ayarladığınıza emin olun. **Yolladığınız e-postalarda \"gönderen\" adresi olarak belirlediğiniz alan adı, e-postalarınızın doğrulanacağı alan adıdır.**\n\n- E-posta başlıklarındaki önemli ipuçlarını yakalayabilmek için e-posta istemcinizde e-postaların kaynak kodunu nasıl görüntüleyebileceğinizi öğrenin. Gmail'da, her e-postanın sağ üstündeki açılır menüden \"show original\" opsiyonuna tıklayabilirsiniz.\n\n- **ÖNEMLİ:** ISP'nizde e-posta yollamak için kullanıdığınız alan adlarıyla IP adreslerinin eşleşmesini sağlayacak bir reverse DNS kaydı var mı? Buradan [reverse PTR kayıtlarınızı test edin][2]. Eğer ISP'niz doğru reverse DNS pointer kaydı girmezse, büyük ihtimal e-postalarınızın hiç biri yerine ulaşmayacaktır.\n\n- Alan adınızın [SPF kaydı][8] doğru mu? Buradan [SPF kaydınızı test edin][1]. SPF için doğru resmi kayıt tipinin TXT olduğunu unutmayın. \n\n- Alan adınızın [DKIM kaydı][3] doğru mu? Bu e-postaların ulaştırılabilirliğini ciddi şekilde artıracaktır. Buradan [DKIM kaydınızı test edin][7].\n\n- Kendi e-posta sunucunuzu kullanıyorsanız, e-posta sunucunuzun IPlerinin [hiç bir e-posta karalistesine][4] alınmadığına emin olun. Sunucunuzun, kesinlikle, HELO mesajında DNS olarak çözümlenen tam tanımlanmış bilgisayar adı da gönderdiğinden emin olun. Göndermemesi, e-postanızın bir çok e-posta servisi tarafından reddedilmesine sebep olacaktır. \n\n(En kolayı, küçük topluluklar için rahat rahat yetecek sayıda bedava email yollama paketleri içeren, [Mandrill][md] veya [Mailgun][mg] veya [Mailjet][mj]'te ücretsiz hesap açmak. Tabi, gene, DNS ayarlarınızda SPF ve DKIM kayıtlarını oluşturmanız gerekecek!) \n\nUmarız bu e-posta ulaştırma testini başarıyla atlatmışsınızdır. \n\nİyi şanslar, \n\n[Discourse](http://www.discourse.org)'tan arkadaşlarınız \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 [md]: http://mandrill.com [mg]: http://www.mailgun.com/ [mj]: https://www.mailjet.com/pricing\n" + text_body_template: "Bu aşağıdaki adresten gönderilen bir test e-postasıdır.\n\n[**%{base_url}**][0]\n\nE-postaların ulaştırılması karışık bir meseledir. Öncelikle dikkat etmeniz gereken bir kaç önemli nokta:\n\n- Site ayarlarınızda 'bildiri e-postaları' için gönderen adresini doğru ayarladığınıza emin olun. **Yolladığınız e-postalarda \"gönderen\" adresi olarak belirlediğiniz alan adı, e-postalarınızın doğrulanacağı alan adıdır.**\n\n- E-posta başlıklarındaki önemli ipuçlarını yakalayabilmek için e-posta istemcinizde e-postaların kaynak kodunu nasıl görüntüleyebileceğinizi öğrenin. Gmail'da, her e-postanın sağ üstündeki açılır menüden \"show original\" opsiyonuna tıklayabilirsiniz.\n\n- **ÖNEMLİ:** ISP'nizde e-posta yollamak için kullanıdığınız alan adlarıyla IP adreslerinin eşleşmesini sağlayacak bir reverse DNS kaydı var mı? Buradan [reverse PTR kayıtlarınızı test edin][2]. Eğer ISP'niz doğru\ + \ reverse DNS pointer kaydı girmezse, büyük ihtimal e-postalarınızın hiç biri yerine ulaşmayacaktır.\n\n- Alan adınızın [SPF kaydı][8] doğru mu? Buradan [SPF kaydınızı test edin][1]. SPF için doğru resmi kayıt tipinin TXT olduğunu unutmayın. \n\n- Alan adınızın [DKIM kaydı][3] doğru mu? Bu e-postaların ulaştırılabilirliğini ciddi şekilde artıracaktır. Buradan [DKIM kaydınızı test edin][7].\n\n- Kendi e-posta sunucunuzu kullanıyorsanız, e-posta sunucunuzun IPlerinin [hiç bir e-posta karalistesine][4] alınmadığına emin olun. Sunucunuzun, kesinlikle, HELO mesajında DNS olarak çözümlenen tam tanımlanmış bilgisayar adı da gönderdiğinden emin olun. Göndermemesi, e-postanızın bir çok e-posta servisi tarafından reddedilmesine sebep olacaktır. \n\n(En kolayı, küçük topluluklar için rahat rahat yetecek sayıda bedava email yollama paketleri içeren, [Mandrill][md] veya [Mailgun][mg] veya [Mailjet][mj]'te\ + \ ücretsiz hesap açmak. Tabi, gene, DNS ayarlarınızda SPF ve DKIM kayıtlarını oluşturmanız gerekecek!) \n\nUmarız bu e-posta ulaştırma testini başarıyla atlatmışsınızdır. \n\nİyi şanslar, \n\n[Discourse](http://www.discourse.org)'tan arkadaşlarınız \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 [md]: http://mandrill.com [mg]: http://www.mailgun.com/ [mj]: https://www.mailjet.com/pricing\n" new_version_mailer: subject_template: "[%{site_name}] Yeni Discourse versiyonu, güncelleme var" text_body_template: | @@ -1187,9 +1191,12 @@ tr_TR: Daha fazla bilgi için, lütfen [topluluk yönergelerine bakın](%{base_url}/guidelines). usage_tips: - text_body_template: "Hemen başlayabilmeniz için bir kaç pratik tavsiye: \n\n## Okuma\n\nDaha fazla okumak için, **sayfayı aşağı kaydırmanız yeterli!** \n\nYeni cevaplar ve konular oluşturuldukça, otomatik olarak görünecekler. \n\n## Gezinme\n\n- Arama, kullanıcı sayfanız veya menü için **sağ üstteki ☰ ikonlu butona** tıklayın. \n\n- Herhangi bir konu başlığı sizi bir sonraki okunmamış gönderiye götürür. En üst veya en alta gitmek için gönderi sayısına veya son cevap tarihini tıklayın.\n\n \n\n- Bir konuyu okurken, tüm navigasyonla ilgili kontroller için sağ alttaki yeşil ilerleme barını seçin. Hızlıca en yukarıya gitmek için konu başlığına tıklayın. Klavye kısayollarını görüntülemek için ? tuşuna basın. \n\n \n\n## Cevaplama \n\n- **Genel olarak konuya** cevap vermek için, sayfanın en altındaki Cevapla butonunu kullanın. \n\n- **Belirli bir kişiye** cevap vermek için, o gönderinin altında bulunan Cevapla butonunu kullanın. \n\n- **Yeni bir konu\" oluşturarak cevaplamak için, gönderinin sağında çıkan ikonuna tıklayın. Eski ve yeni konular birbirleriyle otomatik olarak ilişkilendirilecek.\n\nAlıntı yapmak için, alıntı yapmak istediğiniz metni seçin ve sonrasında herhangi bir Cevapla butonuna tıklayın. Çoklu alıntılar için adımları tekrarlayın! \n\n \n\nBirine cevabınızla ilgili bildiri gitmesini istiyorsanız, o kişinin isminden bahsedin. Kullanıcı adı seçimine başlamak için `@` yazın. \n\n \n\n[Standart Emoji](http://www.emoji.codes/)\ - \ için, `:` yazın ya da gülücük `;)` atın \n\nBir bağlantı için özet oluşturmak istiyorsanız, bağlantıyı kopyalayıp tek başına bir satıra yapıştırın:\n\n\n\n## Aksiyonlar\n\nHer gönderinin altında aksiyon butonları vardır. \n\nBirine gönderisini beğendiğinizi belirtmek istiyorsanız, **beğen** butonunu kullanın. Sevginizi paylaşın!\n\nBirinin gönderisiyle ilgili bir sorun görüyorsanız, özelden bu kişileri veya [görevlileri](%{base_url}/about) uyarmak için **bayrakla** butonunu kullanın. **Paylaş** butonu aracılığıyla gönderiye bir bağlantı paylaşabilir, veya **işaretle** butonu ile gönderiyi işaretleyip sonrasında kullanıcı sayfanızdan kolayca ulaşabilirsiniz. \n\n## Bildiriler \n\nBiri gönderinize cevap verir, gönderinizi alıntılar ya da `@kullanıcıadı` nızdan bahsederse, sayfanızın en sağ üstünde bir sayı hemen beliriverir. Bu sayıya tıklayarak **bildiriler**inize ulaşabilirsiniz. \n\n\n\nBir cevabı kaçıracaksınız diye kaygılanmayın – çevrimiçi olmadığınız zaman gelen bildiriler size e-postalanır.\n\n## Seçenekleriniz\n\nÜzerinden henüz **iki gün geçmemiş** tüm konular yeni sayılır. \n\n**Aktif olarak katıldığınız** (oluşturduğunuz, cevapladığınız, veya uzun bir süre okuduğunuz) tüm sohbetler otomatik olarak takip edilir. \n\nBu konuların yanında, yeni ve okunmamışlar gönderilerin sayılarını gösteren mavi işaretler göreceksiniz: \n\n \n\nHerhangi bir konunun bildiri ayarını o konunun altında bulunan bildiri kontrolü aracılığıyla değiştirebilirsiniz. \n\n \n\nBildiri ayarlarını kategori\ - \ bazında da değiştirebilirsiniz, eğer belirli bir kategorideki her yeni konuyu gözlemek istiyorsanız. Bu ayarların herhangi birini değiştirmek için, [kullanıcı ayarlarınıza](%{base_url}/my/preferences) göz atın. \n\n## Topluluğun Güveni\n\nBurada sohbetlere katıldıkça, topluluğun güvenini kazanırsınız, onun tam bir parçası haline gelirsiniz ve yeni kullanıcılar için konulan limitler kalkar. Yeterli yükseklikteki [güvenlik seviyelerinde](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) ise topluluğumuzu birlikte yönetmemize yardımcı olabilmenizi sağlayacak yetkiler kazanırsınız.\n" + text_body_template: "Hemen başlayabilmeniz için bir kaç pratik tavsiye: \n\n## Okuma\n\nDaha fazla okumak için, **sayfayı aşağı kaydırmanız yeterli!** \n\nYeni cevaplar ve konular oluşturuldukça, otomatik olarak görünecekler. \n\n## Gezinme\n\n- Arama, kullanıcı sayfanız veya menü için **sağ üstteki ☰ ikonlu butona** tıklayın. \n\n- Herhangi bir konu başlığı sizi bir sonraki okunmamış gönderiye götürür. En üst veya en alta gitmek için gönderi sayısına veya son cevap tarihini tıklayın.\n\n \n\n- Bir konuyu okurken, tüm navigasyonla ilgili kontroller için sağ alttaki yeşil ilerleme barını seçin. Hızlıca en yukarıya gitmek için konu başlığına tıklayın. Klavye kısayollarını görüntülemek için ? tuşuna basın. \n\n \n\n## Cevaplama \n\n- **Genel olarak konuya** cevap vermek için, sayfanın en altındaki Cevapla butonunu kullanın. \n\n- **Belirli bir kişiye** cevap vermek için, o gönderinin altında bulunan Cevapla butonunu kullanın. \n\n- **Yeni bir konu\" oluşturarak cevaplamak için, gönderinin sağında çıkan ikonuna tıklayın. Eski ve yeni konular birbirleriyle otomatik olarak ilişkilendirilecek.\n\nAlıntı yapmak için, alıntı yapmak istediğiniz metni seçin ve sonrasında herhangi bir Cevapla butonuna tıklayın. Çoklu alıntılar için adımları tekrarlayın! \n\n \n\nBirine cevabınızla ilgili bildiri gitmesini istiyorsanız, o kişinin isminden bahsedin. Kullanıcı adı seçimine başlamak için `@` yazın. \n\n \n\n[Standart Emoji](http://www.emoji.codes/) için, `:` yazın ya da gülücük `;)` atın \n\nBir bağlantı için özet oluşturmak istiyorsanız, bağlantıyı kopyalayıp tek başına bir satıra yapıştırın:\n\n\n\n## Aksiyonlar\n\nHer gönderinin altında aksiyon butonları vardır. \n\nBirine gönderisini beğendiğinizi belirtmek istiyorsanız, **beğen** butonunu\ + \ kullanın. Sevginizi paylaşın!\n\nBirinin gönderisiyle ilgili bir sorun görüyorsanız, özelden bu kişileri veya [görevlileri](%{base_url}/about) uyarmak için **bayrakla** butonunu kullanın. **Paylaş** butonu aracılığıyla gönderiye bir bağlantı paylaşabilir, veya **işaretle** butonu ile gönderiyi işaretleyip sonrasında kullanıcı sayfanızdan kolayca ulaşabilirsiniz. \n\n## Bildiriler \n\nBiri gönderinize cevap verir, gönderinizi alıntılar ya da `@kullanıcıadı` nızdan bahsederse, sayfanızın en sağ üstünde bir sayı hemen beliriverir. Bu sayıya tıklayarak **bildiriler**inize ulaşabilirsiniz. \n\n\n\nBir cevabı kaçıracaksınız diye kaygılanmayın – çevrimiçi olmadığınız zaman gelen bildiriler size e-postalanır.\n\n## Seçenekleriniz\n\nÜzerinden henüz **iki gün geçmemiş** tüm konular yeni sayılır. \n\n**Aktif\ + \ olarak katıldığınız** (oluşturduğunuz, cevapladığınız, veya uzun bir süre okuduğunuz) tüm sohbetler otomatik olarak takip edilir. \n\nBu konuların yanında, yeni ve okunmamışlar gönderilerin sayılarını gösteren mavi işaretler göreceksiniz: \n\n \n\nHerhangi bir konunun bildiri ayarını o konunun altında bulunan bildiri kontrolü aracılığıyla değiştirebilirsiniz. \n\n \n\nBildiri ayarlarını kategori bazında da değiştirebilirsiniz, eğer belirli bir kategorideki her yeni konuyu gözlemek istiyorsanız. Bu ayarların herhangi birini değiştirmek için, [kullanıcı ayarlarınıza](%{base_url}/my/preferences) göz atın. \n\n## Topluluğun Güveni\n\nBurada sohbetlere katıldıkça, topluluğun güvenini kazanırsınız,\ + \ onun tam bir parçası haline gelirsiniz ve yeni kullanıcılar için konulan limitler kalkar. Yeterli yükseklikteki [güvenlik seviyelerinde](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) ise topluluğumuzu birlikte yönetmemize yardımcı olabilmenizi sağlayacak yetkiler kazanırsınız.\n" welcome_user: subject_template: "%{site_name} sitesine hoşgeldiniz!" text_body_template: "%{site_name} sitesine katıldığınız için teşekkür ederiz, hoşgeldiniz!\n\n%{new_user_tips}\n\nBiz her zaman [medeni topluluk davranışına](%{base_url}/guidelines) inanıyoruz. \n\nZiyaretinizin keyfini çıkarın!\n\n(Eğer yeni bir kullanıcı olarak [görevlilerle](%{base_url}/about) iletişim kurmak isterseniz, bu mesajı cevaplamanız yeterli.)\n" @@ -1584,241 +1591,8 @@ tr_TR: %{page_name} sayfasının içeriğini değiştirmek için bu konuya ait ilk gönderiyi düzenleyin. guidelines_topic: title: "SSS/Yönergeler" - body: | - - - ## [This is a Civilized Place for Public Discussion](#civilized) - - Please treat this discussion forum with the same respect you would a public park. We, too, are a shared community resource — a place to share skills, knowledge and interests through ongoing conversation. - - These are not hard and fast rules, merely aids to the human judgment of our community. Use these guidelines to keep this a clean, well-lighted place for civilized public discourse. - - - - ## [Improve the Discussion](#improve) - - Help us make this a great place for discussion by always working to improve the discussion in some way, however small. If you are not sure your post adds to the conversation, think over what you want to say and try again later. - - The topics discussed here matter to us, and we want you to act as if they matter to you, too. Be respectful of the topics and the people discussing them, even if you disagree with some of what is being said. - - One way to improve the discussion is by discovering ones that are already happening. Please spend some time browsing the topics here before replying or starting your own, and you’ll have a better chance of meeting others who share your interests. - - - - ## [Be Agreeable, Even When You Disagree](#agreeable) - - You may wish to respond to something by disagreeing with it. That’s fine. But, remember to _criticize ideas, not people_. Please avoid: - - * Name-calling. - * Ad hominem attacks. - * Responding to a post’s tone instead of its actual content. - * Knee-jerk contradiction. - - Instead, provide reasoned counter-arguments that improve the conversation. - - - - ## [Your Participation Counts](#participate) - - The conversations we have here set the tone for everyone. Help us influence the future of this community by choosing to engage in discussions that make this forum an interesting place to be — and avoiding those that do not. - - Discourse provides tools that enable the community to collectively identify the best (and worst) contributions: favorites, bookmarks, likes, flags, replies, edits, and so forth. Use these tools to improve your own experience, and everyone else’s, too. - - Let’s try to leave our park better than we found it. - - - - ## [If You See a Problem, Flag It](#flag-problems) - - Moderators have special authority; they are responsible for this forum. But so are you. With your help, moderators can be community facilitators, not just janitors or police. - - When you see bad behavior, don’t reply. It encourages the bad behavior by acknowledging it, consumes your energy, and wastes everyone’s time. _Just flag it_. If enough flags accrue, action will be taken, either automatically or by moderator intervention. - - In order to maintain our community, moderators reserve the right to remove any content and any user account for any reason at any time. Moderators do not preview new posts in any way; the moderators and site operators take no responsibility for any content posted by the community. - - - - ## [Always Be Civil](#be-civil) - - Nothing sabotages a healthy conversation like rudeness: - - * Be civil. Don’t post anything that a reasonable person would consider offensive, abusive, or hate speech. - * Keep it clean. Don’t post anything obscene or sexually explicit. - * Respect each other. Don’t harass or grief anyone, impersonate people, or expose their private information. - * Respect our forum. Don’t post spam or otherwise vandalize the forum. - - These are not concrete terms with precise definitions — avoid even the _appearance_ of any of these things. If you’re unsure, ask yourself how you would feel if your post was featured on the front page of the New York Times. - - This is a public forum, and search engines index these discussions. Keep the language, links, and images safe for family and friends. - - - - ## [Keep It Tidy](#keep-tidy) - - Make the effort to put things in the right place, so that we can spend more time discussing and less cleaning up. So: - - * Don’t start a topic in the wrong category. - * Don’t cross-post the same thing in multiple topics. - * Don’t post no-content replies. - * Don’t divert a topic by changing it midstream. - * Don’t sign your posts — every post has your profile information attached to it. - - Rather than posting “+1” or “Agreed”, use the Like button. Rather than taking an existing topic in a radically different direction, use Reply as a Linked Topic. - - - - ## [Post Only Your Own Stuff](#stealing) - - You may not post anything digital that belongs to someone else without permission. You may not post descriptions of, links to, or methods for stealing someone’s intellectual property (software, video, audio, images), or for breaking any other law. - - - - ## [Powered by You](#power) - - This site is operated by your [friendly local staff](/about) and *you*, the community. If you have any further questions about how things should work here, open a new topic in the [site feedback category](/c/site-feedback) and let's discuss! If there's a critical or urgent issue that can't be handled by a meta topic or flag, contact us via the [staff page](/about). - - - - ## [Terms of Service](#tos) - - Yes, legalese is boring, but we must protect ourselves – and by extension, you and your data – against unfriendly folks. We have a [Terms of Service](/tos) describing your (and our) behavior and rights related to content, privacy, and laws. To use this service, you must agree to abide by our [TOS](/tos). tos_topic: title: "Üyelik Sözleşmesi" - body: | - The following terms and conditions govern all use of the %{company_domain} website and all content, services and products available at or through the website, including, but not limited to, %{company_domain} Forum Software, %{company_domain} Support Forums and the %{company_domain} Hosting service ("Hosting"), (taken together, the Website). The Website is owned and operated by %{company_full_name} ("%{company_name}"). The Website is offered subject to your acceptance without modification of all of the terms and conditions contained herein and all other operating rules, policies (including, without limitation, %{company_domain}’s [Privacy Policy](/privacy) and [Community Guidelines](/faq)) and procedures that may be published from time to time on this Site by %{company_name} (collectively, the "Agreement"). - - Please read this Agreement carefully before accessing or using the Website. By accessing or using any part of the web site, you agree to become bound by the terms and conditions of this agreement. If you do not agree to all the terms and conditions of this agreement, then you may not access the Website or use any services. If these terms and conditions are considered an offer by %{company_name}, acceptance is expressly limited to these terms. The Website is available only to individuals who are at least 13 years old. - - - - ## [1. Your %{company_domain} Account](#1) - - If you create an account on the Website, you are responsible for maintaining the security of your account and you are fully responsible for all activities that occur under the account. You must immediately notify %{company_name} of any unauthorized uses of your account or any other breaches of security. %{company_name} will not be liable for any acts or omissions by you, including any damages of any kind incurred as a result of such acts or omissions. - - - - ## [2. Responsibility of Contributors](#2) - - If you post material to the Website, post links on the Website, or otherwise make (or allow any third party to make) material available by means of the Website (any such material, "Content"), You are entirely responsible for the content of, and any harm resulting from, that Content. That is the case regardless of whether the Content in question constitutes text, graphics, an audio file, or computer software. By making Content available, you represent and warrant that: - - * the downloading, copying and use of the Content will not infringe the proprietary rights, including but not limited to the copyright, patent, trademark or trade secret rights, of any third party; - * if your employer has rights to intellectual property you create, you have either (i) received permission from your employer to post or make available the Content, including but not limited to any software, or (ii) secured from your employer a waiver as to all rights in or to the Content; - * you have fully complied with any third-party licenses relating to the Content, and have done all things necessary to successfully pass through to end users any required terms; - * the Content does not contain or install any viruses, worms, malware, Trojan horses or other harmful or destructive content; - * the Content is not spam, is not machine- or randomly-generated, and does not contain unethical or unwanted commercial content designed to drive traffic to third party sites or boost the search engine rankings of third party sites, or to further unlawful acts (such as phishing) or mislead recipients as to the source of the material (such as spoofing); - * the Content is not pornographic, does not contain threats or incite violence, and does not violate the privacy or publicity rights of any third party; - * your content is not getting advertised via unwanted electronic messages such as spam links on newsgroups, email lists, blogs and web sites, and similar unsolicited promotional methods; - * your content is not named in a manner that misleads your readers into thinking that you are another person or company; and - * you have, in the case of Content that includes computer code, accurately categorized and/or described the type, nature, uses and effects of the materials, whether requested to do so by %{company_name} or otherwise. - - - - ## [3. User Content License](#3) - - User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Without limiting any of those representations or warranties, %{company_name} has the right (though not the obligation) to, in %{company_name}’s sole discretion (i) refuse or remove any content that, in %{company_name}’s reasonable opinion, violates any %{company_name} policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in %{company_name}’s sole discretion. %{company_name} will have no obligation to provide a refund of any amounts previously paid. - - - - - ## [4. Payment and Renewal](#4) - - ### General Terms - - Optional paid services or upgrades may be available on the Website. When utilizing an optional paid service or upgrade, you agree to pay %{company_name} the monthly or annual subscription fees indicated. Payments will be charged on a pre-pay basis on the day you begin utilizing the service or upgrade and will cover the use of that service or upgrade for a monthly or annual subscription period as indicated. These fees are not refundable. - - ### Automatic Renewal - - Unless you notify %{company_name} before the end of the applicable subscription period that you want to cancel a service or upgrade, your subscription will automatically renew and you authorize us to collect the then-applicable annual or monthly subscription fee (as well as any taxes) using any credit card or other payment mechanism we have on record for you. Subscriptions can be canceled at any time. - - - - ## [5. Services](#5) - - ### Hosting, Support Services - - Optional Hosting and Support services may be provided by %{company_name} under the terms and conditions for each such service. By signing up for a Hosting/Support or Support services account, you agree to abide by such terms and conditions. - - - - ## [6. Responsibility of Website Visitors](#6) - - %{company_name} has not reviewed, and cannot review, all of the material, including computer software, posted to the Website, and cannot therefore be responsible for that material’s content, use or effects. By operating the Website, %{company_name} does not represent or imply that it endorses the material there posted, or that it believes such material to be accurate, useful or non-harmful. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. The Website may contain content that is offensive, indecent, or otherwise objectionable, as well as content containing technical inaccuracies, typographical mistakes, and other errors. The Website may also contain material that violates the privacy or publicity rights, or infringes the intellectual property and other proprietary rights, of third parties, or the downloading, copying or use of which is subject to additional terms and conditions, stated or unstated. %{company_name} disclaims any responsibility for any harm resulting from the use by visitors of the Website, or from any downloading by those visitors of content there posted. - - - - ## [7. Content Posted on Other Websites](#7) - - We have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which %{company_domain} links, and that link to %{company_domain}. %{company_name} does not have any control over those non-%{company_domain} websites and webpages, and is not responsible for their contents or their use. By linking to a non-%{company_domain} website or webpage, %{company_name} does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. %{company_name} disclaims any responsibility for any harm resulting from your use of non-%{company_domain} websites and webpages. - - - - ## [8. Copyright Infringement and DMCA Policy](#8) - - As %{company_name} asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by %{company_domain} violates your copyright, and if this website resides in the USA, you are encouraged to notify %{company_name} in accordance with %{company_name}’s [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) ("DMCA") Policy. %{company_name} will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. %{company_name} will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of %{company_name} or others. In the case of such termination, %{company_name} will have no obligation to provide a refund of any amounts previously paid to %{company_name}. - - - - ## [9. Intellectual Property](#9) - - This Agreement does not transfer from %{company_name} to you any %{company_name} or third party intellectual property, and all right, title and interest in and to such property will remain (as between the parties) solely with %{company_name}. %{company_name}, %{company_domain}, the %{company_domain} logo, and all other trademarks, service marks, graphics and logos used in connection with %{company_domain}, or the Website are trademarks or registered trademarks of %{company_name} or %{company_name}’s licensors. Other trademarks, service marks, graphics and logos used in connection with the Website may be the trademarks of other third parties. Your use of the Website grants you no right or license to reproduce or otherwise use any %{company_name} or third-party trademarks. - - - - ## [10. Advertisements](#10) - - %{company_name} reserves the right to display advertisements on your content unless you have purchased an Ad-free Upgrade or a Services account. - - - - ## [11. Attribution](#11) - - %{company_name} reserves the right to display attribution links such as ‘Powered by %{company_domain},’ theme author, and font attribution in your content footer or toolbar. Footer credits and the %{company_domain} toolbar may not be removed regardless of upgrades purchased. - - - - ## [12. Changes](#12) - - %{company_name} reserves the right, at its sole discretion, to modify or replace any part of this Agreement. It is your responsibility to check this Agreement periodically for changes. Your continued use of or access to the Website following the posting of any changes to this Agreement constitutes acceptance of those changes. %{company_name} may also, in the future, offer new services and/or features through the Website (including, the release of new tools and resources). Such new features and/or services shall be subject to the terms and conditions of this Agreement. - - - - ## [13. Termination](#13) - - %{company_name} may terminate your access to all or any part of the Website at any time, with or without cause, with or without notice, effective immediately. If you wish to terminate this Agreement or your %{company_domain} account (if you have one), you may simply discontinue using the Website. All provisions of this Agreement which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability. - - - - ## [14. Disclaimer of Warranties](#14) - - The Website is provided "as is". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that access thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk. - - - - ## [15. Limitation of Liability](#15) - - In no event will %{company_name}, or its suppliers or licensors, be liable with respect to any subject matter of this agreement under any contract, negligence, strict liability or other legal or equitable theory for: (i) any special, incidental or consequential damages; (ii) the cost of procurement for substitute products or services; (iii) for interruption of use or loss or corruption of data; or (iv) for any amounts that exceed the fees paid by you to %{company_name} under this agreement during the twelve (12) month period prior to the cause of action. %{company_name} shall have no liability for any failure or delay due to matters beyond their reasonable control. The foregoing shall not apply to the extent prohibited by applicable law. - - - - ## [16. General Representation and Warranty](#16) - - You represent and warrant that (i) your use of the Website will be in strict accordance with the %{company_name} [Privacy Policy](/privacy), [Community Guidelines](/guidelines), with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the country in which this website resides or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party. - - - - ## [17. Indemnification](#17) - - You agree to indemnify and hold harmless %{company_name}, its contractors, and its licensors, and their respective directors, officers, employees and agents from and against any and all claims and expenses, including attorneys’ fees, arising out of your use of the Website, including but not limited to your violation of this Agreement. - - - - ## [18. Miscellaneous](#18) - - This Agreement constitutes the entire agreement between %{company_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_name}, or by the posting by %{company_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns. - - This document is CC-BY-SA. It was last updated May 31, 2013. - - Originally adapted from the [WordPress Terms of Service](http://en.wordpress.com/tos/). privacy_topic: title: "Gizlilik İlkeleri" static: diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml index 9778d641c0..d84bf396c8 100644 --- a/config/locales/server.zh_CN.yml +++ b/config/locales/server.zh_CN.yml @@ -754,6 +754,7 @@ zh_CN: email_token_valid_hours: "“忘记密码”/“激活账户” token 有效的小时数(n)。" email_token_grace_period_hours: "“忘记密码”/“激活账户” token 在使用后仍旧有效的小时数(n)。" enable_badges: "启用徽章系统" + enable_whispers: "允许用户在主题中给版主发送悄悄话" allow_index_in_robots_txt: "在 robots.txt 中详细指出这个站点允许被网页搜索引擎检索。" email_domains_blacklist: "用管道符“|”分隔的邮箱域名黑名单列表，其中的域名将不能用来注册账户，例如：mailinator.com|trashmail.net" email_domains_whitelist: "用管道符“|”分隔的电子邮箱域名的列表，用户必须使用这些邮箱域名注册。警告：用户使用不包含在这个列表里的邮箱域名，将无法成功注册。" @@ -831,6 +832,8 @@ zh_CN: s3_region: "将用于上传图片的 Amazon S3 区域名。" s3_cdn_url: "用户 S3 资料的 CDN URL（例如：https://cdn.somewhere.com）。警告：在改变该设置后你必须重制所有老帖子。" avatar_sizes: "自动生成的头像大小列表。" + external_system_avatars_enabled: "使用外部系统头像服务。" + external_system_avatars_url: "外部系统头像服务的 URL 地址。可选参数是 {username} {first_letter} {color} {size}" enable_flash_video_onebox: "在 Onebox 启用嵌入 swf 和 flv 链接（Adobe Flash）。警告：可能增加安全风险。" default_invitee_trust_level: "受邀用户的缺省信任等级（0-4）。" default_trust_level: "所有新用户的缺省信任等级（0-4）。警告！改变此项将提高广告泛滥的风险。" @@ -998,8 +1001,8 @@ zh_CN: default_email_direct: "默认在有人引用、回复、提及或者邀请用户时发送一封邮件通知。" default_email_mailing_list_mode: "默认为每一个新帖子发送一封邮件通知。" default_email_always: "即使用户活跃时，仍默认发送邮件通知。" - default_other_new_topic_duration_minutes: "一个主题在多少分钟之内被系统判断为新主题的全局缺省设置，用户可以覆盖此设置（-1为始终，-2为最后一次访问）" - default_other_auto_track_topics_after_msecs: "经过多少毫秒之后一个主题就被自动追踪的全局缺省设置，用户可以覆盖此设置（0 为始终，-1 为从不）" + default_other_new_topic_duration_minutes: "一个主题在多少分钟之内被系统判断为新主题的全局缺省设置" + default_other_auto_track_topics_after_msecs: "经过多少毫秒之后一个主题就被自动追踪的全局缺省设置" default_other_external_links_in_new_tab: "默认在新的标签页打开外部链接" default_other_enable_quoting: "默认在高亮选择文字时启用引用回复" default_other_dynamic_favicon: "默认在浏览器图标上显示新/更新的主题数量" @@ -1122,7 +1125,7 @@ zh_CN: unique: "必须是唯一的" blank: "必须存在" must_begin_with_alphanumeric: "必须以一个字母或数字或下划线开头" - must_end_with_alphanumeric: "必须以一个字母或数字结尾" + must_end_with_alphanumeric: "必须以字母或数字结尾或是下划线" must_not_contain_two_special_chars_in_seq: "必须不包括连续的 2 个或更多的特殊字符（.-_）" must_not_contain_confusing_suffix: "必须不包含奇怪的后缀，例如 .json 或 .png 等等。" email: @@ -1670,7 +1673,7 @@ zh_CN: --- %{respond_instructions} digest: - why: "在你上一次于 %{last_seen_at} 访问后，在 %{site_link} 上的简洁的摘要。" + why: "在你上一次于 %{last_seen_at} 访问后，%{site_link}的简洁摘要。" subject_template: "[%{site_name}] 摘要" new_activity: "在你的主题和帖子里的动态：" top_topics: "热门帖子" diff --git a/public/403.ko.html b/public/403.ko.html index 4e68b597e3..cbf427be1e 100644 --- a/public/403.ko.html +++ b/public/403.ko.html @@ -20,7 +20,7 @@

        403

        해당 내용을 보실 수 없습니다.

        -

        wjdgDiscourse 403 오류 페이지로 대체됩니다.

        +

        Discourse 403 오류 페이지로 대체됩니다.

        diff --git a/public/500.ko.html b/public/500.ko.html index cb175ae32e..32491e904d 100644 --- a/public/500.ko.html +++ b/public/500.ko.html @@ -7,6 +7,6 @@

        죄송합니다

        이 포럼을 서비스하는 소프트웨어에서 예기치 않은 문제가 발생했습니다. 불편을 끼쳐드려 죄송합니다.

        해당 오류에 대한 자세한 정보가 기록되었고 자동으로 시스템 관리자에게 통보되었습니다. 살펴보고 오류를 수정하도록 하겠습니다.

        -

        또다른 조치를 취하실 필요는 없습니다. 하지만 동일한 오류가 지속되면 meta 카테고리 내의 토픽에 자세한 오류 재현 방법을 포함한 글을 올려주세요.

        +

        또다른 조치를 취하실 필요는 없습니다. 하지만 동일한 오류가 지속되면 meta 카테고리 내의 글타래에 자세한 오류 재현 방법을 포함한 글을 올려주세요.

        From f427b6639b8ee9c4c59f7bc3a2f81c9f1f31245d Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 16 Sep 2015 10:43:36 -0400 Subject: [PATCH 156/157] FIX: Error showing `Unread` posts --- .../discourse/pre-initializers/inject-discourse-objects.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ed2577e231..1d47530d5a 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 @@ -34,6 +34,7 @@ export default { app.register('message-bus:main', window.MessageBus, { instantiate: false }); injectAll(app, 'messageBus'); + app.register('current-user:main', Discourse.User.current(), { instantiate: false }); app.register('topic-tracking-state:main', TopicTrackingState.current(), { instantiate: false }); injectAll(app, 'topicTrackingState'); @@ -50,7 +51,6 @@ export default { app.register('session:main', Session.current(), { instantiate: false }); injectAll(app, 'session'); - app.register('current-user:main', Discourse.User.current(), { instantiate: false }); inject(app, 'currentUser', 'component', 'route', 'controller'); app.register('location:discourse-location', DiscourseLocation); From 9b543f65fb2a882fcaa13a420fdd0eea6204c0cf Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Wed, 16 Sep 2015 11:32:31 -0400 Subject: [PATCH 157/157] Version bump to v1.4.0.beta12 --- lib/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/version.rb b/lib/version.rb index f9256e88f2..cf7da889b6 100644 --- a/lib/version.rb +++ b/lib/version.rb @@ -5,7 +5,7 @@ module Discourse MAJOR = 1 MINOR = 4 TINY = 0 - PRE = 'beta11' + PRE = 'beta12' STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end