Merge branch 'master' into stable

README.md

@@ -140,7 +140,7 @@ You can use the ```ad_platform_through_trust_level``` dropdown to disable ads fo
 * 0 shows ads to users that are not logged in.
 * 1 shows ads to users that are not logged in, and to new and basic users.
 * 2 shows ads to members as well, but not to regulars and leaders.
-* 3 shows ads to everyone but leaders.
+* 3 shows ads to everyone, but not to leaders.
 * 4 shows ads to everyone including leaders.
 
 To find more about trust levels in Discourse, refer to [Discourse's posts on trust levels](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924)

assets/javascripts/discourse/components/amazon-product-links.js.es6

@@ -1,98 +1,167 @@
 var currentUser = Discourse.User.current();
 
 var data = {
-  "topic-list-top" : {},
-  "topic-above-post-stream" : {},
-  "topic-above-suggested" : {},
-  "post-bottom" : {}
+  "topic-list-top": {},
+  "topic-above-post-stream": {},
+  "topic-above-suggested": {},
+  "post-bottom": {}
 };
 
-
-if (!Discourse.Mobile.mobileView && Discourse.SiteSettings.amazon_topic_list_top_src_code) {
-  data["topic-list-top"]["user_input"] = Discourse.SiteSettings.amazon_topic_list_top_src_code;
-  data["topic-list-top"]["amazon_width"] = parseInt(Discourse.SiteSettings.amazon_topic_list_top_ad_width_code);
-  data["topic-list-top"]["amazon_height"] = parseInt(Discourse.SiteSettings.amazon_topic_list_top_ad_height_code);
+if (
+  !Discourse.Mobile.mobileView &&
+  Discourse.SiteSettings.amazon_topic_list_top_src_code
+) {
+  data["topic-list-top"]["user_input"] =
+    Discourse.SiteSettings.amazon_topic_list_top_src_code;
+  data["topic-list-top"]["amazon_width"] = parseInt(
+    Discourse.SiteSettings.amazon_topic_list_top_ad_width_code
+  );
+  data["topic-list-top"]["amazon_height"] = parseInt(
+    Discourse.SiteSettings.amazon_topic_list_top_ad_height_code
+  );
 }
 
-if (Discourse.Mobile.mobileView && Discourse.SiteSettings.amazon_mobile_topic_list_top_src_code) {
-  data["topic-list-top"]["user_input_mobile"] = Discourse.SiteSettings.amazon_mobile_topic_list_top_src_code;
-  data["topic-list-top"]["mobile_amazon_width"] = parseInt(Discourse.SiteSettings.amazon_mobile_topic_list_top_ad_width_code);
-  data["topic-list-top"]["mobile_amazon_height"] = parseInt(Discourse.SiteSettings.amazon_mobile_topic_list_top_ad_height_code);
+if (
+  Discourse.Mobile.mobileView &&
+  Discourse.SiteSettings.amazon_mobile_topic_list_top_src_code
+) {
+  data["topic-list-top"]["user_input_mobile"] =
+    Discourse.SiteSettings.amazon_mobile_topic_list_top_src_code;
+  data["topic-list-top"]["mobile_amazon_width"] = parseInt(
+    Discourse.SiteSettings.amazon_mobile_topic_list_top_ad_width_code
+  );
+  data["topic-list-top"]["mobile_amazon_height"] = parseInt(
+    Discourse.SiteSettings.amazon_mobile_topic_list_top_ad_height_code
+  );
 }
 
-if (!Discourse.Mobile.mobileView && Discourse.SiteSettings.amazon_topic_above_post_stream_src_code) {
-  data["topic-above-post-stream"]["user_input"] = Discourse.SiteSettings.amazon_topic_above_post_stream_src_code;
-  data["topic-above-post-stream"]["amazon_width"] = parseInt(Discourse.SiteSettings.amazon_topic_above_post_stream_ad_width_code);
-  data["topic-above-post-stream"]["amazon_height"] = parseInt(Discourse.SiteSettings.amazon_topic_above_post_stream_ad_height_code);
+if (
+  !Discourse.Mobile.mobileView &&
+  Discourse.SiteSettings.amazon_topic_above_post_stream_src_code
+) {
+  data["topic-above-post-stream"]["user_input"] =
+    Discourse.SiteSettings.amazon_topic_above_post_stream_src_code;
+  data["topic-above-post-stream"]["amazon_width"] = parseInt(
+    Discourse.SiteSettings.amazon_topic_above_post_stream_ad_width_code
+  );
+  data["topic-above-post-stream"]["amazon_height"] = parseInt(
+    Discourse.SiteSettings.amazon_topic_above_post_stream_ad_height_code
+  );
 }
 
-if (Discourse.Mobile.mobileView && Discourse.SiteSettings.amazon_mobile_topic_above_post_stream_src_code) {
-  data["topic-above-post-stream"]["user_input_mobile"] = Discourse.SiteSettings.amazon_mobile_topic_above_post_stream_src_code;
-  data["topic-above-post-stream"]["mobile_amazon_width"] = parseInt(Discourse.SiteSettings.amazon_mobile_topic_above_post_stream_ad_width_code);
-  data["topic-above-post-stream"]["mobile_amazon_height"] = parseInt(Discourse.SiteSettings.amazon_mobile_topic_above_post_stream_ad_height_code);
+if (
+  Discourse.Mobile.mobileView &&
+  Discourse.SiteSettings.amazon_mobile_topic_above_post_stream_src_code
+) {
+  data["topic-above-post-stream"]["user_input_mobile"] =
+    Discourse.SiteSettings.amazon_mobile_topic_above_post_stream_src_code;
+  data["topic-above-post-stream"]["mobile_amazon_width"] = parseInt(
+    Discourse.SiteSettings.amazon_mobile_topic_above_post_stream_ad_width_code
+  );
+  data["topic-above-post-stream"]["mobile_amazon_height"] = parseInt(
+    Discourse.SiteSettings.amazon_mobile_topic_above_post_stream_ad_height_code
+  );
 }
 
-if (!Discourse.Mobile.mobileView && Discourse.SiteSettings.amazon_topic_above_suggested_src_code) {
-  data["topic-above-suggested"]["user_input"] = Discourse.SiteSettings.amazon_topic_above_suggested_src_code;
-  data["topic-above-suggested"]["amazon_width"] = parseInt(Discourse.SiteSettings.amazon_topic_above_suggested_ad_width_code);
-  data["topic-above-suggested"]["amazon_height"] = parseInt(Discourse.SiteSettings.amazon_topic_above_suggested_ad_height_code);
+if (
+  !Discourse.Mobile.mobileView &&
+  Discourse.SiteSettings.amazon_topic_above_suggested_src_code
+) {
+  data["topic-above-suggested"]["user_input"] =
+    Discourse.SiteSettings.amazon_topic_above_suggested_src_code;
+  data["topic-above-suggested"]["amazon_width"] = parseInt(
+    Discourse.SiteSettings.amazon_topic_above_suggested_ad_width_code
+  );
+  data["topic-above-suggested"]["amazon_height"] = parseInt(
+    Discourse.SiteSettings.amazon_topic_above_suggested_ad_height_code
+  );
 }
 
-if (Discourse.Mobile.mobileView && Discourse.SiteSettings.amazon_mobile_topic_above_suggested_src_code) {
-  data["topic-above-suggested"]["user_input_mobile"] = Discourse.SiteSettings.amazon_mobile_topic_above_suggested_src_code;
-  data["topic-above-suggested"]["mobile_amazon_width"] = parseInt(Discourse.SiteSettings.amazon_mobile_topic_above_suggested_ad_width_code);
-  data["topic-above-suggested"]["mobile_amazon_height"] = parseInt(Discourse.SiteSettings.amazon_mobile_topic_above_suggested_ad_height_code);
+if (
+  Discourse.Mobile.mobileView &&
+  Discourse.SiteSettings.amazon_mobile_topic_above_suggested_src_code
+) {
+  data["topic-above-suggested"]["user_input_mobile"] =
+    Discourse.SiteSettings.amazon_mobile_topic_above_suggested_src_code;
+  data["topic-above-suggested"]["mobile_amazon_width"] = parseInt(
+    Discourse.SiteSettings.amazon_mobile_topic_above_suggested_ad_width_code
+  );
+  data["topic-above-suggested"]["mobile_amazon_height"] = parseInt(
+    Discourse.SiteSettings.amazon_mobile_topic_above_suggested_ad_height_code
+  );
 }
 
-if (!Discourse.Mobile.mobileView && Discourse.SiteSettings.amazon_post_bottom_src_code) {
-  data["post-bottom"]["user_input"] = Discourse.SiteSettings.amazon_post_bottom_src_code;
-  data["post-bottom"]["amazon_width"] = parseInt(Discourse.SiteSettings.amazon_post_bottom_ad_width_code);
-  data["post-bottom"]["amazon_height"] = parseInt(Discourse.SiteSettings.amazon_post_bottom_ad_height_code);
+if (
+  !Discourse.Mobile.mobileView &&
+  Discourse.SiteSettings.amazon_post_bottom_src_code
+) {
+  data["post-bottom"]["user_input"] =
+    Discourse.SiteSettings.amazon_post_bottom_src_code;
+  data["post-bottom"]["amazon_width"] = parseInt(
+    Discourse.SiteSettings.amazon_post_bottom_ad_width_code
+  );
+  data["post-bottom"]["amazon_height"] = parseInt(
+    Discourse.SiteSettings.amazon_post_bottom_ad_height_code
+  );
 }
 
-if (Discourse.Mobile.mobileView && Discourse.SiteSettings.amazon_mobile_post_bottom_src_code) {
-  data["post-bottom"]["user_input_mobile"] = Discourse.SiteSettings.amazon_mobile_post_bottom_src_code;
-  data["post-bottom"]["mobile_amazon_width"] = parseInt(Discourse.SiteSettings.amazon_mobile_post_bottom_ad_width_code);
-  data["post-bottom"]["mobile_amazon_height"] = parseInt(Discourse.SiteSettings.amazon_mobile_post_bottom_ad_height_code);
+if (
+  Discourse.Mobile.mobileView &&
+  Discourse.SiteSettings.amazon_mobile_post_bottom_src_code
+) {
+  data["post-bottom"]["user_input_mobile"] =
+    Discourse.SiteSettings.amazon_mobile_post_bottom_src_code;
+  data["post-bottom"]["mobile_amazon_width"] = parseInt(
+    Discourse.SiteSettings.amazon_mobile_post_bottom_ad_width_code
+  );
+  data["post-bottom"]["mobile_amazon_height"] = parseInt(
+    Discourse.SiteSettings.amazon_mobile_post_bottom_ad_height_code
+  );
 }
 
-
 export default Ember.Component.extend({
-  classNames: ['amazon-product-links'],
+  classNames: ["amazon-product-links"],
 
   init: function() {
-    let placement = this.get('placement');
-    this.set('user_input', data[placement]["user_input"] );
-    this.set('amazon_width', data[placement]["amazon_width"] );
-    this.set('amazon_height', data[placement]["amazon_height"] );
-    this.set('user_input_mobile', data[placement]["user_input_mobile"] );
-    this.set('mobile_amazon_height', data[placement]["mobile_amazon_height"] );
-    this.set('mobile_amazon_width', data[placement]["mobile_amazon_width"] );
+    let placement = this.get("placement");
+    this.set("user_input", data[placement]["user_input"]);
+    this.set("amazon_width", data[placement]["amazon_width"]);
+    this.set("amazon_height", data[placement]["amazon_height"]);
+    this.set("user_input_mobile", data[placement]["user_input_mobile"]);
+    this.set("mobile_amazon_height", data[placement]["mobile_amazon_height"]);
+    this.set("mobile_amazon_width", data[placement]["mobile_amazon_width"]);
     this._super();
   },
 
   adWrapperStyle: function() {
-    return `width: ${this.get('amazon_width')}px; height: ${this.get('amazon_height')}px;`.htmlSafe();
-  }.property('amazon_width', 'amazon_height'),
+    return `width: ${this.get("amazon_width")}px; height: ${this.get(
+      "amazon_height"
+    )}px;`.htmlSafe();
+  }.property("amazon_width", "amazon_height"),
 
   adWrapperStyleMobile: function() {
-    return `width: ${this.get('mobile_amazon_width')}px; height: ${this.get('mobile_amazon_height')}px;`.htmlSafe();
-  }.property('mobile_amazon_width', 'mobile_amazon_height'),
+    return `width: ${this.get("mobile_amazon_width")}px; height: ${this.get(
+      "mobile_amazon_height"
+    )}px;`.htmlSafe();
+  }.property("mobile_amazon_width", "mobile_amazon_height"),
 
   adTitleStyleMobile: function() {
-    return `width: ${this.get('mobile_amazon_width')}px;`.htmlSafe();
-  }.property('mobile_amazon_width'),
+    return `width: ${this.get("mobile_amazon_width")}px;`.htmlSafe();
+  }.property("mobile_amazon_width"),
 
   userInput: function() {
-    return `${this.get('user_input')}`.htmlSafe();
-  }.property('user_input'),
+    return `${this.get("user_input")}`.htmlSafe();
+  }.property("user_input"),
 
   userInputMobile: function() {
-    return `${this.get('user_input_mobile')}`.htmlSafe();
-  }.property('user_input_mobile'),
+    return `${this.get("user_input_mobile")}`.htmlSafe();
+  }.property("user_input_mobile"),
 
   checkTrustLevels: function() {
-    return !((currentUser) && (currentUser.get('trust_level') > Discourse.SiteSettings.amazon_through_trust_level));
-  }.property('trust_level'),
-
+    return !(
+      currentUser &&
+      currentUser.get("trust_level") >
+        Discourse.SiteSettings.amazon_through_trust_level
+    );
+  }.property("trust_level")
 });

assets/javascripts/discourse/components/codefund-ad.js.es6

@@ -1,9 +1,12 @@
-import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
+import {
+  default as computed,
+  observes
+} from "ember-addons/ember-computed-decorators";
 
 var _loaded = false,
-    _promise = null,
-    currentUser = Discourse.User.current(),
-    propertyId = Discourse.SiteSettings.codefund_property_id;
+  _promise = null,
+  currentUser = Discourse.User.current(),
+  propertyId = Discourse.SiteSettings.codefund_property_id;
 
 function loadCodeFund() {
   if (_loaded) {
@@ -14,15 +17,15 @@ function loadCodeFund() {
     return _promise;
   }
 
-  const url = 'https://codefund.io/t/s/' + propertyId + '/details.json';
+  const url = "https://codefund.io/t/s/" + propertyId + "/details.json";
 
   _promise = new Promise(function(resolve, reject) {
     let xhr = new XMLHttpRequest();
 
-    xhr.open('GET', url);
+    xhr.open("GET", url);
     xhr.onreadystatechange = handler;
-    xhr.responseType = 'json';
-    xhr.setRequestHeader('Accept', 'application/json');
+    xhr.responseType = "json";
+    xhr.setRequestHeader("Accept", "application/json");
     xhr.send();
 
     function handler() {
@@ -32,79 +35,97 @@ function loadCodeFund() {
         if (this.status === 200) {
           resolve(this.response);
         } else {
-          reject(new Error('getJSON: `' + url + '` failed with status: [' + this.status + ']'));
+          reject(
+            new Error(
+              "getJSON: `" + url + "` failed with status: [" + this.status + "]"
+            )
+          );
         }
       }
-    };
+    }
   });
 
   return _promise;
 }
 
-
 export default Ember.Component.extend({
-  classNameBindings: [':codefund-ad', 'classForSlot', 'isResponsive:codefund-responsive'],
+  classNameBindings: [
+    ":codefund-ad",
+    "classForSlot",
+    "isResponsive:codefund-responsive"
+  ],
   propertyId: propertyId,
   adRequested: false,
   adDetails: {},
 
   _triggerAds() {
     if (!propertyId) return;
-    
-    this.set('adRequested', true);
-    loadCodeFund().then((data) => {
-      _loaded = false;
-      _promise = null;
-      this.set('adDetails', data);
-      this.set('adRequested', false);
-    }).catch(error => console.log(error));
+
+    this.set("adRequested", true);
+    loadCodeFund()
+      .then(data => {
+        _loaded = false;
+        _promise = null;
+        this.set("adDetails", data);
+        this.set("adRequested", false);
+      })
+      .catch(error => console.log(error));
   },
 
   didInsertElement() {
     this._super();
 
-    if (!this.get('showAd')) { return; }
+    if (!this.get("showAd")) {
+      return;
+    }
 
-    if (this.get('listLoading')) { return; }
+    if (this.get("listLoading")) {
+      return;
+    }
 
-    Ember.run.scheduleOnce('afterRender', this, this._triggerAds);
+    Ember.run.scheduleOnce("afterRender", this, this._triggerAds);
   },
 
-  @observes('listLoading')
+  @observes("listLoading")
   waitForLoad: function() {
-    if (this.get('adRequested')) { return; } // already requested that this ad unit be populated
-    if (!this.get('listLoading')) {
-      Ember.run.scheduleOnce('afterRender', this, this._triggerAds);
+    if (this.get("adRequested")) {
+      return;
+    } // already requested that this ad unit be populated
+    if (!this.get("listLoading")) {
+      Ember.run.scheduleOnce("afterRender", this, this._triggerAds);
     }
   },
 
   checkTrustLevels: function() {
-    return !((currentUser) && (currentUser.get('trust_level') > Discourse.SiteSettings.codefund_through_trust_level));
-  }.property('trust_level'),
+    return !(
+      currentUser &&
+      currentUser.get("trust_level") >
+        Discourse.SiteSettings.codefund_through_trust_level
+    );
+  }.property("trust_level"),
 
-  @computed('checkTrustLevels')
+  @computed("checkTrustLevels")
   showAd: function(checkTrustLevels) {
     return Discourse.SiteSettings.codefund_property_id && checkTrustLevels;
   },
 
-  @computed('placement')
+  @computed("placement")
   displayPostBottom: function(placement) {
-    return placement === 'post-bottom';
+    return placement === "post-bottom";
   },
 
-  @computed('placement')
+  @computed("placement")
   displayTopicAbovePostStream: function() {
-    return this.get('placement') === 'topic-above-post-stream';
+    return this.get("placement") === "topic-above-post-stream";
   },
 
-  @computed('placement')
+  @computed("placement")
   displayTopicAboveSuggested: function() {
-    return this.get('placement') === 'topic-above-suggested';
+    return this.get("placement") === "topic-above-suggested";
   },
 
-  @computed('placement')
+  @computed("placement")
   displayTopicListTop: function() {
-    return this.get('placement') === 'topic-list-top';
+    return this.get("placement") === "topic-list-top";
   }
-
 });

assets/javascripts/discourse/components/google-adsense.js.es6

@@ -1,20 +1,24 @@
-import loadScript from 'discourse/lib/load-script';
+import loadScript from "discourse/lib/load-script";
 
 var _loaded = false,
-    _promise = null,
-    currentUser = Discourse.User.current(),
-    publisher_id = Discourse.SiteSettings.adsense_publisher_code;
+  _promise = null,
+  currentUser = Discourse.User.current(),
+  publisher_id = Discourse.SiteSettings.adsense_publisher_code;
 
-const mobileView = Discourse.Site.currentProp('mobileView');
+const mobileView = Discourse.Site.currentProp("mobileView");
 
 function parseAdWidth(value) {
-  if (value === 'responsive') { return 'auto'; }
-  return `${parseInt( value.substring(0, 3).trim() )}px`;
+  if (value === "responsive") {
+    return "auto";
+  }
+  return `${parseInt(value.substring(0, 3).trim())}px`;
 }
 
 function parseAdHeight(value) {
-  if (value === 'responsive') { return 'auto'; }
-  return `${parseInt( value.substring(4, 7).trim() )}px`;
+  if (value === "responsive") {
+    return "auto";
+  }
+  return `${parseInt(value.substring(4, 7).trim())}px`;
 }
 
 function loadAdsense() {
@@ -26,7 +30,9 @@ function loadAdsense() {
     return _promise;
   }
 
-  var adsenseSrc = (('https:' === document.location.protocol) ? 'https:' : 'http:') + '//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js';
+  var adsenseSrc =
+    ("https:" === document.location.protocol ? "https:" : "http:") +
+    "//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js";
   _promise = loadScript(adsenseSrc, { scriptTag: true }).then(function() {
     _loaded = true;
   });
@@ -35,57 +41,113 @@ function loadAdsense() {
 }
 
 var data = {
-  "topic-list-top" : {},
-  "topic-above-post-stream" : {},
-  "topic-above-suggested" : {},
-  "post-bottom" : {}
+  "topic-list-top": {},
+  "topic-above-post-stream": {},
+  "topic-above-suggested": {},
+  "post-bottom": {}
 };
 
 if (Discourse.SiteSettings.adsense_publisher_code) {
   if (!mobileView && Discourse.SiteSettings.adsense_topic_list_top_code) {
-    data["topic-list-top"]["ad_code"] = Discourse.SiteSettings.adsense_topic_list_top_code;
-    data["topic-list-top"]["ad_width"] = parseAdWidth(Discourse.SiteSettings.adsense_topic_list_top_ad_sizes);
-    data["topic-list-top"]["ad_height"] = parseAdHeight(Discourse.SiteSettings.adsense_topic_list_top_ad_sizes);
+    data["topic-list-top"]["ad_code"] =
+      Discourse.SiteSettings.adsense_topic_list_top_code;
+    data["topic-list-top"]["ad_width"] = parseAdWidth(
+      Discourse.SiteSettings.adsense_topic_list_top_ad_sizes
+    );
+    data["topic-list-top"]["ad_height"] = parseAdHeight(
+      Discourse.SiteSettings.adsense_topic_list_top_ad_sizes
+    );
   }
   if (mobileView && Discourse.SiteSettings.adsense_mobile_topic_list_top_code) {
-    data["topic-list-top"]["ad_code"] = Discourse.SiteSettings.adsense_mobile_topic_list_top_code;
-    data["topic-list-top"]["ad_width"] = parseAdWidth(Discourse.SiteSettings.adsense_mobile_topic_list_top_ad_size);
-    data["topic-list-top"]["ad_height"] = parseAdHeight(Discourse.SiteSettings.adsense_mobile_topic_list_top_ad_size);
+    data["topic-list-top"]["ad_code"] =
+      Discourse.SiteSettings.adsense_mobile_topic_list_top_code;
+    data["topic-list-top"]["ad_width"] = parseAdWidth(
+      Discourse.SiteSettings.adsense_mobile_topic_list_top_ad_size
+    );
+    data["topic-list-top"]["ad_height"] = parseAdHeight(
+      Discourse.SiteSettings.adsense_mobile_topic_list_top_ad_size
+    );
   }
-  if (!mobileView && Discourse.SiteSettings.adsense_topic_above_post_stream_code) {
-    data["topic-above-post-stream"]["ad_code"] = Discourse.SiteSettings.adsense_topic_above_post_stream_code;
-    data["topic-above-post-stream"]["ad_width"] = parseAdWidth(Discourse.SiteSettings.adsense_topic_above_post_stream_ad_sizes);
-    data["topic-above-post-stream"]["ad_height"] = parseAdHeight(Discourse.SiteSettings.adsense_topic_above_post_stream_ad_sizes);
+  if (
+    !mobileView &&
+    Discourse.SiteSettings.adsense_topic_above_post_stream_code
+  ) {
+    data["topic-above-post-stream"]["ad_code"] =
+      Discourse.SiteSettings.adsense_topic_above_post_stream_code;
+    data["topic-above-post-stream"]["ad_width"] = parseAdWidth(
+      Discourse.SiteSettings.adsense_topic_above_post_stream_ad_sizes
+    );
+    data["topic-above-post-stream"]["ad_height"] = parseAdHeight(
+      Discourse.SiteSettings.adsense_topic_above_post_stream_ad_sizes
+    );
   }
-  if (mobileView && Discourse.SiteSettings.adsense_mobile_topic_above_post_stream_code) {
-    data["topic-above-post-stream"]["ad_code"] = Discourse.SiteSettings.adsense_mobile_topic_above_post_stream_code;
-    data["topic-above-post-stream"]["ad_width"] = parseAdWidth(Discourse.SiteSettings.adsense_mobile_topic_above_post_stream_ad_size);
-    data["topic-above-post-stream"]["ad_height"] = parseAdHeight(Discourse.SiteSettings.adsense_mobile_topic_above_post_stream_ad_size);
+  if (
+    mobileView &&
+    Discourse.SiteSettings.adsense_mobile_topic_above_post_stream_code
+  ) {
+    data["topic-above-post-stream"]["ad_code"] =
+      Discourse.SiteSettings.adsense_mobile_topic_above_post_stream_code;
+    data["topic-above-post-stream"]["ad_width"] = parseAdWidth(
+      Discourse.SiteSettings.adsense_mobile_topic_above_post_stream_ad_size
+    );
+    data["topic-above-post-stream"]["ad_height"] = parseAdHeight(
+      Discourse.SiteSettings.adsense_mobile_topic_above_post_stream_ad_size
+    );
   }
-  if (!mobileView && Discourse.SiteSettings.adsense_topic_above_suggested_code) {
-    data["topic-above-suggested"]["ad_code"] = Discourse.SiteSettings.adsense_topic_above_suggested_code;
-    data["topic-above-suggested"]["ad_width"] = parseAdWidth(Discourse.SiteSettings.adsense_topic_above_suggested_ad_sizes);
-    data["topic-above-suggested"]["ad_height"] = parseAdHeight(Discourse.SiteSettings.adsense_topic_above_suggested_ad_sizes);
+  if (
+    !mobileView &&
+    Discourse.SiteSettings.adsense_topic_above_suggested_code
+  ) {
+    data["topic-above-suggested"]["ad_code"] =
+      Discourse.SiteSettings.adsense_topic_above_suggested_code;
+    data["topic-above-suggested"]["ad_width"] = parseAdWidth(
+      Discourse.SiteSettings.adsense_topic_above_suggested_ad_sizes
+    );
+    data["topic-above-suggested"]["ad_height"] = parseAdHeight(
+      Discourse.SiteSettings.adsense_topic_above_suggested_ad_sizes
+    );
   }
-  if (mobileView && Discourse.SiteSettings.adsense_mobile_topic_above_suggested_code) {
-    data["topic-above-suggested"]["ad_code"] = Discourse.SiteSettings.adsense_mobile_topic_above_suggested_code;
-    data["topic-above-suggested"]["ad_width"] = parseAdWidth(Discourse.SiteSettings.adsense_mobile_topic_above_suggested_ad_size);
-    data["topic-above-suggested"]["ad_height"] = parseAdHeight(Discourse.SiteSettings.adsense_mobile_topic_above_suggested_ad_size);
+  if (
+    mobileView &&
+    Discourse.SiteSettings.adsense_mobile_topic_above_suggested_code
+  ) {
+    data["topic-above-suggested"]["ad_code"] =
+      Discourse.SiteSettings.adsense_mobile_topic_above_suggested_code;
+    data["topic-above-suggested"]["ad_width"] = parseAdWidth(
+      Discourse.SiteSettings.adsense_mobile_topic_above_suggested_ad_size
+    );
+    data["topic-above-suggested"]["ad_height"] = parseAdHeight(
+      Discourse.SiteSettings.adsense_mobile_topic_above_suggested_ad_size
+    );
   }
   if (!mobileView && Discourse.SiteSettings.adsense_post_bottom_code) {
-    data["post-bottom"]["ad_code"] = Discourse.SiteSettings.adsense_post_bottom_code;
-    data["post-bottom"]["ad_width"] = parseAdWidth(Discourse.SiteSettings.adsense_post_bottom_ad_sizes);
-    data["post-bottom"]["ad_height"] = parseAdHeight(Discourse.SiteSettings.adsense_post_bottom_ad_sizes);
+    data["post-bottom"]["ad_code"] =
+      Discourse.SiteSettings.adsense_post_bottom_code;
+    data["post-bottom"]["ad_width"] = parseAdWidth(
+      Discourse.SiteSettings.adsense_post_bottom_ad_sizes
+    );
+    data["post-bottom"]["ad_height"] = parseAdHeight(
+      Discourse.SiteSettings.adsense_post_bottom_ad_sizes
+    );
   }
   if (mobileView && Discourse.SiteSettings.adsense_mobile_post_bottom_code) {
-    data["post-bottom"]["ad_code"] = Discourse.SiteSettings.adsense_mobile_post_bottom_code;
-    data["post-bottom"]["ad_width"] = parseAdWidth(Discourse.SiteSettings.adsense_mobile_post_bottom_ad_size);
-    data["post-bottom"]["ad_height"] = parseAdHeight(Discourse.SiteSettings.adsense_mobile_post_bottom_ad_size);
+    data["post-bottom"]["ad_code"] =
+      Discourse.SiteSettings.adsense_mobile_post_bottom_code;
+    data["post-bottom"]["ad_width"] = parseAdWidth(
+      Discourse.SiteSettings.adsense_mobile_post_bottom_ad_size
+    );
+    data["post-bottom"]["ad_height"] = parseAdHeight(
+      Discourse.SiteSettings.adsense_mobile_post_bottom_ad_size
+    );
   }
 }
 
 export default Ember.Component.extend({
-  classNameBindings: [':google-adsense', 'classForSlot', 'isResponsive:adsense-responsive'],
+  classNameBindings: [
+    ":google-adsense",
+    "classForSlot",
+    "isResponsive:adsense-responsive"
+  ],
   loadedGoogletag: false,
 
   publisher_id: publisher_id,
@@ -95,14 +157,14 @@ export default Ember.Component.extend({
   adRequested: false,
 
   init() {
-    this.set('ad_width', data[this.placement]["ad_width"] );
-    this.set('ad_height', data[this.placement]["ad_height"] );
-    this.set('ad_code', data[this.placement]["ad_code"] );
+    this.set("ad_width", data[this.placement]["ad_width"]);
+    this.set("ad_height", data[this.placement]["ad_height"]);
+    this.set("ad_code", data[this.placement]["ad_code"]);
     this._super();
   },
 
   _triggerAds() {
-    this.set('adRequested', true);
+    this.set("adRequested", true);
     loadAdsense().then(function() {
       const adsbygoogle = window.adsbygoogle || [];
 
@@ -115,45 +177,63 @@ export default Ember.Component.extend({
   didInsertElement() {
     this._super();
 
-    if (!this.get('showAd')) { return; }
+    if (!this.get("showAd")) {
+      return;
+    }
 
-    if (this.get('listLoading')) { return; }
+    if (this.get("listLoading")) {
+      return;
+    }
 
-    Ember.run.scheduleOnce('afterRender', this, this._triggerAds);
+    Ember.run.scheduleOnce("afterRender", this, this._triggerAds);
   },
 
   waitForLoad: function() {
-    if (this.get('adRequested')) { return; } // already requested that this ad unit be populated
-    if (!this.get('listLoading')) {
-      Ember.run.scheduleOnce('afterRender', this, this._triggerAds);
+    if (this.get("adRequested")) {
+      return;
+    } // already requested that this ad unit be populated
+    if (!this.get("listLoading")) {
+      Ember.run.scheduleOnce("afterRender", this, this._triggerAds);
     }
-  }.observes('listLoading'),
+  }.observes("listLoading"),
 
   isResponsive: function() {
-    return this.get('ad_width') === 'auto';
-  }.property('ad_width'),
+    return this.get("ad_width") === "auto";
+  }.property("ad_width"),
 
   classForSlot: function() {
-    return `adsense-${this.get('placement')}`.htmlSafe();
-  }.property('placement'),
+    return `adsense-${this.get("placement")}`.htmlSafe();
+  }.property("placement"),
 
   autoAdFormat: function() {
-    return this.get('isResponsive') ? 'auto'.htmlSafe() : false;
-  }.property('isResponsive'),
+    return this.get("isResponsive") ? "auto".htmlSafe() : false;
+  }.property("isResponsive"),
 
   adWrapperStyle: function() {
-    return (this.get('isResponsive') ? '' : `width: ${this.get('ad_width')}; height: ${this.get('ad_height')};`).htmlSafe();
-  }.property('ad_width', 'ad_height'),
+    return (this.get("isResponsive")
+      ? ""
+      : `width: ${this.get("ad_width")}; height: ${this.get("ad_height")};`
+    ).htmlSafe();
+  }.property("ad_width", "ad_height"),
 
   adInsStyle: function() {
-    return `display: ${this.get('isResponsive') ? 'block' : 'inline-block'}; ${this.get('adWrapperStyle')}`.htmlSafe();
-  }.property('adWrapperStyle', 'isResponsive'),
+    return `display: ${
+      this.get("isResponsive") ? "block" : "inline-block"
+    }; ${this.get("adWrapperStyle")}`.htmlSafe();
+  }.property("adWrapperStyle", "isResponsive"),
 
   checkTrustLevels: function() {
-    return !((currentUser) && (currentUser.get('trust_level') > Discourse.SiteSettings.adsense_through_trust_level));
-  }.property('trust_level'),
+    return !(
+      currentUser &&
+      currentUser.get("trust_level") >
+        Discourse.SiteSettings.adsense_through_trust_level
+    );
+  }.property("trust_level"),
 
   showAd: function() {
-    return Discourse.SiteSettings.adsense_publisher_code && this.get('checkTrustLevels');
-  }.property('checkTrustLevels')
+    return (
+      Discourse.SiteSettings.adsense_publisher_code &&
+      this.get("checkTrustLevels")
+    );
+  }.property("checkTrustLevels")
 });

assets/javascripts/initializers/initialize-ad-plugin.js.es6

@@ -1,53 +1,50 @@
-import PostModel from 'discourse/models/post';
-import {
-  withPluginApi
-} from 'discourse/lib/plugin-api';
+import PostModel from "discourse/models/post";
+import { withPluginApi } from "discourse/lib/plugin-api";
 
 export default {
-  name: 'initialize-ad-plugin',
+  name: "initialize-ad-plugin",
   initialize(container) {
-    const siteSettings = container.lookup('site-settings:main');
+    const siteSettings = container.lookup("site-settings:main");
 
     PostModel.reopen({
       postSpecificCountDFP: function() {
         return this.isNthPost(parseInt(siteSettings.dfp_nth_post_code));
-      }.property('post_number'),
+      }.property("post_number"),
 
       postSpecificCountAdsense: function() {
         return this.isNthPost(parseInt(siteSettings.adsense_nth_post_code));
-      }.property('post_number'),
+      }.property("post_number"),
 
       postSpecificCountAmazon: function() {
         return this.isNthPost(parseInt(siteSettings.amazon_nth_post_code));
-      }.property('post_number'),
+      }.property("post_number"),
 
       postSpecificCountCodeFund: function() {
         return this.isNthPost(parseInt(siteSettings.codefund_nth_post));
-      }.property('post_number'),
+      }.property("post_number"),
 
       isNthPost: function(n) {
         if (n && n > 0) {
-          return (this.get('post_number') % n) === 0;
+          return this.get("post_number") % n === 0;
         } else {
           return false;
         }
       }
     });
 
-    withPluginApi('0.1', api => {
-      api.decorateWidget('post:after', dec => {
-
+    withPluginApi("0.1", api => {
+      api.decorateWidget("post:after", dec => {
         if (dec.canConnectComponent) {
           return dec.connect({
-            component: 'adplugin-container',
-            context: 'model'
+            component: "adplugin-container",
+            context: "model"
           });
         }
 
         // Old way for backwards compatibility
         return dec.connect({
-          templateName: 'connectors/post-bottom/discourse-adplugin',
-          context: 'model'
+          templateName: "connectors/post-bottom/discourse-adplugin",
+          context: "model"
         });
       });
     });

config/locales/client.ar.yml

@@ -10,6 +10,4 @@ ar:
     admin:
       site_settings:
         categories:
-          dfp_plugin: 'DFP'
-          adsense_plugin: 'جوجل ادسنس'
           amazon_plugin: 'اعلانات امازون'

config/locales/client.bs_BA.yml

@@ -13,6 +13,4 @@ bs_BA:
     admin:
       site_settings:
         categories:
-          dfp_plugin: 'DFP'
-          adsense_plugin: 'Adsense'
           amazon_plugin: 'Amazon'

config/locales/client.cs.yml

@@ -13,6 +13,4 @@ cs:
     admin:
       site_settings:
         categories:
-          dfp_plugin: 'DFP'
-          adsense_plugin: 'Adsense'
           amazon_plugin: 'Amazon'

config/locales/client.da.yml

@@ -13,6 +13,4 @@ da:
     admin:
       site_settings:
         categories:
-          dfp_plugin: 'DFP'
-          adsense_plugin: 'Adsense'
           amazon_plugin: 'Amazon'

config/locales/client.de.yml

@@ -14,6 +14,6 @@ de:
       site_settings:
         categories:
           dfp_plugin: 'DFP/Ad Manager'
-          adsense_plugin: 'Adsense'
+          adsense_plugin: 'AdSense'
           amazon_plugin: 'Amazon'
           codefund_plugin: 'CodeFund'

config/locales/client.el.yml

@@ -10,6 +10,4 @@ el:
     admin:
       site_settings:
         categories:
-          dfp_plugin: 'DFP'
-          adsense_plugin: 'Adsense'
           amazon_plugin: 'Amazon'

config/locales/client.en.yml

@@ -7,6 +7,6 @@ en:
       site_settings:
         categories:
           dfp_plugin: 'DFP/Ad Manager'
-          adsense_plugin: 'Adsense'
+          adsense_plugin: 'AdSense'
           amazon_plugin: 'Amazon'
-          codefund_plugin: 'CodeFund'
+          codefund_plugin: 'CodeFund'

config/locales/client.es.yml

@@ -14,6 +14,6 @@ es:
       site_settings:
         categories:
           dfp_plugin: 'DFP/Ad Manager'
-          adsense_plugin: 'Adsense'
+          adsense_plugin: 'AdSense'
           amazon_plugin: 'Amazon'
           codefund_plugin: 'CodeFund'

config/locales/client.et.yml

@@ -13,6 +13,4 @@ et:
     admin:
       site_settings:
         categories:
-          dfp_plugin: 'DFP'
-          adsense_plugin: 'Adsense'
           amazon_plugin: 'Amazon'

config/locales/client.fa_IR.yml

@@ -10,6 +10,4 @@ fa_IR:
     admin:
       site_settings:
         categories:
-          dfp_plugin: 'DFP'
-          adsense_plugin: 'ادسنس'
           amazon_plugin: 'آمازون'

config/locales/client.fi.yml

@@ -13,6 +13,4 @@ fi:
     admin:
       site_settings:
         categories:
-          dfp_plugin: 'DFP'
-          adsense_plugin: 'Adsense'
           amazon_plugin: 'Amazon'

config/locales/client.fr.yml

@@ -14,6 +14,6 @@ fr:
       site_settings:
         categories:
           dfp_plugin: 'Gestionnaire DFP/Ad'
-          adsense_plugin: 'Adsense'
+          adsense_plugin: 'AdSense'
           amazon_plugin: 'Amazon'
           codefund_plugin: 'CodeFund'

config/locales/client.gl.yml

@@ -10,6 +10,4 @@ gl:
     admin:
       site_settings:
         categories:
-          dfp_plugin: 'DFP'
-          adsense_plugin: 'Adsense'
           amazon_plugin: 'Amazon'

config/locales/client.he.yml

@@ -13,6 +13,4 @@ he:
     admin:
       site_settings:
         categories:
-          dfp_plugin: 'DFP'
-          adsense_plugin: 'אדסנס'
           amazon_plugin: 'אמזון'

config/locales/client.hu.yml

@@ -13,7 +13,5 @@ hu:
     admin:
       site_settings:
         categories:
-          dfp_plugin: 'DFP'
-          adsense_plugin: 'Adsense'
           amazon_plugin: 'Amazon'
           codefund_plugin: 'CodeFund'

config/locales/client.id.yml

@@ -5,9 +5,4 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-id:
-  admin_js:
-    admin:
-      site_settings:
-        categories:
-          adsense_plugin: 'Adsense'
+id: {}

config/locales/client.it.yml

@@ -13,7 +13,5 @@ it:
     admin:
       site_settings:
         categories:
-          dfp_plugin: 'DFP'
-          adsense_plugin: 'Adsense'
           amazon_plugin: 'Amazon'
           codefund_plugin: 'CodeFund'

config/locales/client.ko.yml

@@ -10,6 +10,4 @@ ko:
     admin:
       site_settings:
         categories:
-          dfp_plugin: 'DFP'
-          adsense_plugin: 'Adsense'
           amazon_plugin: 'Amazon'

config/locales/client.lt.yml

@@ -0,0 +1,17 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+lt:
+  js:
+    adplugin:
+      advertisement_label: 'REKLAMA'
+  admin_js:
+    admin:
+      site_settings:
+        categories:
+          dfp_plugin: 'DFP/Ad Redaktorius'
+          amazon_plugin: 'Amazon'

config/locales/client.nb_NO.yml

@@ -13,6 +13,4 @@ nb_NO:
     admin:
       site_settings:
         categories:
-          dfp_plugin: 'DFP'
-          adsense_plugin: 'Adsense'
           amazon_plugin: 'Amazon'

config/locales/client.nl.yml

@@ -10,6 +10,4 @@ nl:
     admin:
       site_settings:
         categories:
-          dfp_plugin: 'DFP'
-          adsense_plugin: 'Adsense'
           amazon_plugin: 'Amazon'

config/locales/client.pl_PL.yml

@@ -10,6 +10,4 @@ pl_PL:
     admin:
       site_settings:
         categories:
-          dfp_plugin: 'DFP'
-          adsense_plugin: 'Adsense'
           amazon_plugin: 'Amazon'

config/locales/client.pt.yml

@@ -13,6 +13,4 @@ pt:
     admin:
       site_settings:
         categories:
-          dfp_plugin: 'DFP'
-          adsense_plugin: 'Adsense'
           amazon_plugin: 'Amazon'

config/locales/client.pt_BR.yml

@@ -13,7 +13,6 @@ pt_BR:
     admin:
       site_settings:
         categories:
-          dfp_plugin: 'DFP'
-          adsense_plugin: 'Adsense'
+          dfp_plugin: 'Gerenciador de Anúncios'
           amazon_plugin: 'Amazon'
           codefund_plugin: 'CodeFund'