discourse/discourse-subscriptions
1
0
Fork 0
mirror of https://github.com/discourse/discourse-subscriptions.git synced 2025-07-16 19:13:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Bump dependencies and fix linting (#262)

Browse Source
This commit is contained in:
David Taylor 2025-02-06 16:57:53 +00:00 committed by GitHub
parent 721c4f28f1
commit da48acad9a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
30 changed files with 1043 additions and 889 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/javascripts/discourse/components/campaign-banner.js
View File

@ -7,7 +7,7 @@ import { classNameBindings } from "@ember-decorators/component";
import { observes } from "@ember-decorators/object";
import { ajax } from "discourse/lib/ajax";
import { setting } from "discourse/lib/computed";
import discourseComputed from "discourse-common/utils/decorators";
import discourseComputed from "discourse/lib/decorators";
const SIDEBAR_BODY_CLASS = "subscription-campaign-sidebar";

2
assets/javascripts/discourse/components/create-coupon-form.js
View File

@ -1,6 +1,6 @@
import Component from "@ember/component";
import { action } from "@ember/object";
import discourseComputed from "discourse-common/utils/decorators";
import discourseComputed from "discourse/lib/decorators";
export default class CreateCouponForm extends Component {
discountType = "amount";

2
assets/javascripts/discourse/components/modal/admin-cancel-subscription.gjs
View File

@ -4,7 +4,7 @@ import { Input } from "@ember/component";
import { fn, hash } from "@ember/helper";
import DButton from "discourse/components/d-button";
import DModal from "discourse/components/d-modal";
import i18n from "discourse-common/helpers/i18n";
import { i18n } from "discourse-i18n";
export default class AdminCancelSubscription extends Component {
@tracked refund;

2
assets/javascripts/discourse/components/payment-options.js
View File

@ -1,6 +1,6 @@
import Component from "@ember/component";
import { action } from "@ember/object";
import discourseComputed from "discourse-common/utils/decorators";
import discourseComputed from "discourse/lib/decorators";
export default class PaymentOptions extends Component {
@discourseComputed("plans")

2
assets/javascripts/discourse/components/payment-plan.js
View File

@ -1,7 +1,7 @@
import Component from "@ember/component";
import { action } from "@ember/object";
import { tagName } from "@ember-decorators/component";
import discourseComputed from "discourse-common/utils/decorators";
import discourseComputed from "discourse/lib/decorators";
const RECURRING = "recurring";

2
assets/javascripts/discourse/components/product-list.js
View File

@ -1,7 +1,7 @@
import Component from "@ember/component";
import { isEmpty } from "@ember/utils";
import { classNames } from "@ember-decorators/component";
import discourseComputed from "discourse-common/utils/decorators";
import discourseComputed from "discourse/lib/decorators";
@classNames("product-list")
export default class ProductList extends Component {

4
assets/javascripts/discourse/components/subscribe-ca-province-select.js
View File

@ -1,6 +1,6 @@
import { computed } from "@ember/object";
import { classNames } from "@ember-decorators/component";
import I18n from "I18n";
import { i18n } from "discourse-i18n";
import ComboBoxComponent from "select-kit/components/combo-box";
import {
pluginApiIdentifiers,
@ -10,7 +10,7 @@ import {
@selectKitOptions({
filterable: true,
allowAny: false,
translatedNone: I18n.t(
translatedNone: i18n(
"discourse_subscriptions.subscribe.cardholder_address.province"
),
})

502
assets/javascripts/discourse/components/subscribe-country-select.js
View File

@ -1,6 +1,6 @@
import { computed } from "@ember/object";
import { classNames } from "@ember-decorators/component";
import I18n from "I18n";
import { i18n } from "discourse-i18n";
import ComboBoxComponent from "select-kit/components/combo-box";
import {
pluginApiIdentifiers,
@ -11,7 +11,7 @@ import {
@selectKitOptions({
filterable: true,
allowAny: false,
translatedNone: I18n.t(
translatedNone: i18n(
"discourse_subscriptions.subscribe.cardholder_address.country"
),
})
@ -23,255 +23,255 @@ export default class SubscribeCountrySelect extends ComboBoxComponent {
@computed
get content() {
return [
["AF", I18n.t("discourse_subscriptions.subscribe.countries.AF")],
["AX", I18n.t("discourse_subscriptions.subscribe.countries.AX")],
["AL", I18n.t("discourse_subscriptions.subscribe.countries.AL")],
["DZ", I18n.t("discourse_subscriptions.subscribe.countries.DZ")],
["AS", I18n.t("discourse_subscriptions.subscribe.countries.AS")],
["AD", I18n.t("discourse_subscriptions.subscribe.countries.AD")],
["AO", I18n.t("discourse_subscriptions.subscribe.countries.AO")],
["AI", I18n.t("discourse_subscriptions.subscribe.countries.AI")],
["AQ", I18n.t("discourse_subscriptions.subscribe.countries.AQ")],
["AG", I18n.t("discourse_subscriptions.subscribe.countries.AG")],
["AR", I18n.t("discourse_subscriptions.subscribe.countries.AR")],
["AM", I18n.t("discourse_subscriptions.subscribe.countries.AM")],
["AW", I18n.t("discourse_subscriptions.subscribe.countries.AW")],
["AU", I18n.t("discourse_subscriptions.subscribe.countries.AU")],
["AT", I18n.t("discourse_subscriptions.subscribe.countries.AT")],
["AZ", I18n.t("discourse_subscriptions.subscribe.countries.AZ")],
["BS", I18n.t("discourse_subscriptions.subscribe.countries.BS")],
["BH", I18n.t("discourse_subscriptions.subscribe.countries.BH")],
["BD", I18n.t("discourse_subscriptions.subscribe.countries.BD")],
["BB", I18n.t("discourse_subscriptions.subscribe.countries.BB")],
["BY", I18n.t("discourse_subscriptions.subscribe.countries.BY")],
["BE", I18n.t("discourse_subscriptions.subscribe.countries.BE")],
["BZ", I18n.t("discourse_subscriptions.subscribe.countries.BZ")],
["BJ", I18n.t("discourse_subscriptions.subscribe.countries.BJ")],
["BM", I18n.t("discourse_subscriptions.subscribe.countries.BM")],
["BT", I18n.t("discourse_subscriptions.subscribe.countries.BT")],
["BO", I18n.t("discourse_subscriptions.subscribe.countries.BO")],
["BQ", I18n.t("discourse_subscriptions.subscribe.countries.BQ")],
["BA", I18n.t("discourse_subscriptions.subscribe.countries.BA")],
["BW", I18n.t("discourse_subscriptions.subscribe.countries.BW")],
["BV", I18n.t("discourse_subscriptions.subscribe.countries.BV")],
["BR", I18n.t("discourse_subscriptions.subscribe.countries.BR")],
["IO", I18n.t("discourse_subscriptions.subscribe.countries.IO")],
["BN", I18n.t("discourse_subscriptions.subscribe.countries.BN")],
["BG", I18n.t("discourse_subscriptions.subscribe.countries.BG")],
["BF", I18n.t("discourse_subscriptions.subscribe.countries.BF")],
["BI", I18n.t("discourse_subscriptions.subscribe.countries.BI")],
["KH", I18n.t("discourse_subscriptions.subscribe.countries.KH")],
["CM", I18n.t("discourse_subscriptions.subscribe.countries.CM")],
["CA", I18n.t("discourse_subscriptions.subscribe.countries.CA")],
["CV", I18n.t("discourse_subscriptions.subscribe.countries.CV")],
["KY", I18n.t("discourse_subscriptions.subscribe.countries.KY")],
["CF", I18n.t("discourse_subscriptions.subscribe.countries.CF")],
["TD", I18n.t("discourse_subscriptions.subscribe.countries.TD")],
["CL", I18n.t("discourse_subscriptions.subscribe.countries.CL")],
["CN", I18n.t("discourse_subscriptions.subscribe.countries.CN")],
["CX", I18n.t("discourse_subscriptions.subscribe.countries.CX")],
["CC", I18n.t("discourse_subscriptions.subscribe.countries.CC")],
["CO", I18n.t("discourse_subscriptions.subscribe.countries.CO")],
["KM", I18n.t("discourse_subscriptions.subscribe.countries.KM")],
["CG", I18n.t("discourse_subscriptions.subscribe.countries.CG")],
["CD", I18n.t("discourse_subscriptions.subscribe.countries.CD")],
["CK", I18n.t("discourse_subscriptions.subscribe.countries.CK")],
["CR", I18n.t("discourse_subscriptions.subscribe.countries.CR")],
["CI", I18n.t("discourse_subscriptions.subscribe.countries.CI")],
["HR", I18n.t("discourse_subscriptions.subscribe.countries.HR")],
["CU", I18n.t("discourse_subscriptions.subscribe.countries.CU")],
["CW", I18n.t("discourse_subscriptions.subscribe.countries.CW")],
["CY", I18n.t("discourse_subscriptions.subscribe.countries.CY")],
["CZ", I18n.t("discourse_subscriptions.subscribe.countries.CZ")],
["DK", I18n.t("discourse_subscriptions.subscribe.countries.DK")],
["DJ", I18n.t("discourse_subscriptions.subscribe.countries.DJ")],
["DM", I18n.t("discourse_subscriptions.subscribe.countries.DM")],
["DO", I18n.t("discourse_subscriptions.subscribe.countries.DO")],
["EC", I18n.t("discourse_subscriptions.subscribe.countries.EC")],
["EG", I18n.t("discourse_subscriptions.subscribe.countries.EG")],
["SV", I18n.t("discourse_subscriptions.subscribe.countries.SV")],
["GQ", I18n.t("discourse_subscriptions.subscribe.countries.GQ")],
["ER", I18n.t("discourse_subscriptions.subscribe.countries.ER")],
["EE", I18n.t("discourse_subscriptions.subscribe.countries.EE")],
["ET", I18n.t("discourse_subscriptions.subscribe.countries.ET")],
["FK", I18n.t("discourse_subscriptions.subscribe.countries.FK")],
["FO", I18n.t("discourse_subscriptions.subscribe.countries.FO")],
["FJ", I18n.t("discourse_subscriptions.subscribe.countries.FJ")],
["FI", I18n.t("discourse_subscriptions.subscribe.countries.FI")],
["FR", I18n.t("discourse_subscriptions.subscribe.countries.FR")],
["GF", I18n.t("discourse_subscriptions.subscribe.countries.GF")],
["PF", I18n.t("discourse_subscriptions.subscribe.countries.PF")],
["TF", I18n.t("discourse_subscriptions.subscribe.countries.TF")],
["GA", I18n.t("discourse_subscriptions.subscribe.countries.GA")],
["GM", I18n.t("discourse_subscriptions.subscribe.countries.GM")],
["GE", I18n.t("discourse_subscriptions.subscribe.countries.GE")],
["DE", I18n.t("discourse_subscriptions.subscribe.countries.DE")],
["GH", I18n.t("discourse_subscriptions.subscribe.countries.GH")],
["GI", I18n.t("discourse_subscriptions.subscribe.countries.GI")],
["GR", I18n.t("discourse_subscriptions.subscribe.countries.GR")],
["GL", I18n.t("discourse_subscriptions.subscribe.countries.GL")],
["GD", I18n.t("discourse_subscriptions.subscribe.countries.GD")],
["GP", I18n.t("discourse_subscriptions.subscribe.countries.GP")],
["GU", I18n.t("discourse_subscriptions.subscribe.countries.GU")],
["GT", I18n.t("discourse_subscriptions.subscribe.countries.GT")],
["GG", I18n.t("discourse_subscriptions.subscribe.countries.GG")],
["GN", I18n.t("discourse_subscriptions.subscribe.countries.GN")],
["GW", I18n.t("discourse_subscriptions.subscribe.countries.GW")],
["GY", I18n.t("discourse_subscriptions.subscribe.countries.GY")],
["HT", I18n.t("discourse_subscriptions.subscribe.countries.HT")],
["HM", I18n.t("discourse_subscriptions.subscribe.countries.HM")],
["VA", I18n.t("discourse_subscriptions.subscribe.countries.VA")],
["HN", I18n.t("discourse_subscriptions.subscribe.countries.HN")],
["HK", I18n.t("discourse_subscriptions.subscribe.countries.HK")],
["HU", I18n.t("discourse_subscriptions.subscribe.countries.HU")],
["IS", I18n.t("discourse_subscriptions.subscribe.countries.IS")],
["IN", I18n.t("discourse_subscriptions.subscribe.countries.IN")],
["ID", I18n.t("discourse_subscriptions.subscribe.countries.ID")],
["IR", I18n.t("discourse_subscriptions.subscribe.countries.IR")],
["IQ", I18n.t("discourse_subscriptions.subscribe.countries.IQ")],
["IE", I18n.t("discourse_subscriptions.subscribe.countries.IE")],
["IM", I18n.t("discourse_subscriptions.subscribe.countries.IM")],
["IL", I18n.t("discourse_subscriptions.subscribe.countries.IL")],
["IT", I18n.t("discourse_subscriptions.subscribe.countries.IT")],
["JM", I18n.t("discourse_subscriptions.subscribe.countries.JM")],
["JP", I18n.t("discourse_subscriptions.subscribe.countries.JP")],
["JE", I18n.t("discourse_subscriptions.subscribe.countries.JE")],
["JO", I18n.t("discourse_subscriptions.subscribe.countries.JO")],
["KZ", I18n.t("discourse_subscriptions.subscribe.countries.KZ")],
["KE", I18n.t("discourse_subscriptions.subscribe.countries.KE")],
["KI", I18n.t("discourse_subscriptions.subscribe.countries.KI")],
["KP", I18n.t("discourse_subscriptions.subscribe.countries.KP")],
["KR", I18n.t("discourse_subscriptions.subscribe.countries.KR")],
["KW", I18n.t("discourse_subscriptions.subscribe.countries.KW")],
["KG", I18n.t("discourse_subscriptions.subscribe.countries.KG")],
["LA", I18n.t("discourse_subscriptions.subscribe.countries.LA")],
["LV", I18n.t("discourse_subscriptions.subscribe.countries.LV")],
["LB", I18n.t("discourse_subscriptions.subscribe.countries.LB")],
["LS", I18n.t("discourse_subscriptions.subscribe.countries.LS")],
["LR", I18n.t("discourse_subscriptions.subscribe.countries.LR")],
["LY", I18n.t("discourse_subscriptions.subscribe.countries.LY")],
["LI", I18n.t("discourse_subscriptions.subscribe.countries.LI")],
["LT", I18n.t("discourse_subscriptions.subscribe.countries.LT")],
["LU", I18n.t("discourse_subscriptions.subscribe.countries.LU")],
["MO", I18n.t("discourse_subscriptions.subscribe.countries.MO")],
["MK", I18n.t("discourse_subscriptions.subscribe.countries.MK")],
["MG", I18n.t("discourse_subscriptions.subscribe.countries.MG")],
["MW", I18n.t("discourse_subscriptions.subscribe.countries.MW")],
["MY", I18n.t("discourse_subscriptions.subscribe.countries.MY")],
["MV", I18n.t("discourse_subscriptions.subscribe.countries.MV")],
["ML", I18n.t("discourse_subscriptions.subscribe.countries.ML")],
["MT", I18n.t("discourse_subscriptions.subscribe.countries.MT")],
["MH", I18n.t("discourse_subscriptions.subscribe.countries.MH")],
["MQ", I18n.t("discourse_subscriptions.subscribe.countries.MQ")],
["MR", I18n.t("discourse_subscriptions.subscribe.countries.MR")],
["MU", I18n.t("discourse_subscriptions.subscribe.countries.MU")],
["YT", I18n.t("discourse_subscriptions.subscribe.countries.YT")],
["MX", I18n.t("discourse_subscriptions.subscribe.countries.MX")],
["FM", I18n.t("discourse_subscriptions.subscribe.countries.FM")],
["MD", I18n.t("discourse_subscriptions.subscribe.countries.MD")],
["MC", I18n.t("discourse_subscriptions.subscribe.countries.MC")],
["MN", I18n.t("discourse_subscriptions.subscribe.countries.MN")],
["ME", I18n.t("discourse_subscriptions.subscribe.countries.ME")],
["MS", I18n.t("discourse_subscriptions.subscribe.countries.MS")],
["MA", I18n.t("discourse_subscriptions.subscribe.countries.MA")],
["MZ", I18n.t("discourse_subscriptions.subscribe.countries.MZ")],
["MM", I18n.t("discourse_subscriptions.subscribe.countries.MM")],
["NA", I18n.t("discourse_subscriptions.subscribe.countries.NA")],
["NR", I18n.t("discourse_subscriptions.subscribe.countries.NR")],
["NP", I18n.t("discourse_subscriptions.subscribe.countries.NP")],
["NL", I18n.t("discourse_subscriptions.subscribe.countries.NL")],
["NC", I18n.t("discourse_subscriptions.subscribe.countries.NC")],
["NZ", I18n.t("discourse_subscriptions.subscribe.countries.NZ")],
["NI", I18n.t("discourse_subscriptions.subscribe.countries.NI")],
["NE", I18n.t("discourse_subscriptions.subscribe.countries.NE")],
["NG", I18n.t("discourse_subscriptions.subscribe.countries.NG")],
["NU", I18n.t("discourse_subscriptions.subscribe.countries.NU")],
["NF", I18n.t("discourse_subscriptions.subscribe.countries.NF")],
["MP", I18n.t("discourse_subscriptions.subscribe.countries.MP")],
["NO", I18n.t("discourse_subscriptions.subscribe.countries.NO")],
["OM", I18n.t("discourse_subscriptions.subscribe.countries.OM")],
["PK", I18n.t("discourse_subscriptions.subscribe.countries.PK")],
["PW", I18n.t("discourse_subscriptions.subscribe.countries.PW")],
["PS", I18n.t("discourse_subscriptions.subscribe.countries.PS")],
["PA", I18n.t("discourse_subscriptions.subscribe.countries.PA")],
["PG", I18n.t("discourse_subscriptions.subscribe.countries.PG")],
["PY", I18n.t("discourse_subscriptions.subscribe.countries.PY")],
["PE", I18n.t("discourse_subscriptions.subscribe.countries.PE")],
["PH", I18n.t("discourse_subscriptions.subscribe.countries.PH")],
["PN", I18n.t("discourse_subscriptions.subscribe.countries.PN")],
["PL", I18n.t("discourse_subscriptions.subscribe.countries.PL")],
["PT", I18n.t("discourse_subscriptions.subscribe.countries.PT")],
["PR", I18n.t("discourse_subscriptions.subscribe.countries.PR")],
["QA", I18n.t("discourse_subscriptions.subscribe.countries.QA")],
["RE", I18n.t("discourse_subscriptions.subscribe.countries.RE")],
["RO", I18n.t("discourse_subscriptions.subscribe.countries.RO")],
["RU", I18n.t("discourse_subscriptions.subscribe.countries.RU")],
["RW", I18n.t("discourse_subscriptions.subscribe.countries.RW")],
["BL", I18n.t("discourse_subscriptions.subscribe.countries.BL")],
["SH", I18n.t("discourse_subscriptions.subscribe.countries.SH")],
["KN", I18n.t("discourse_subscriptions.subscribe.countries.KN")],
["LC", I18n.t("discourse_subscriptions.subscribe.countries.LC")],
["MF", I18n.t("discourse_subscriptions.subscribe.countries.MF")],
["PM", I18n.t("discourse_subscriptions.subscribe.countries.PM")],
["VC", I18n.t("discourse_subscriptions.subscribe.countries.VC")],
["WS", I18n.t("discourse_subscriptions.subscribe.countries.WS")],
["SM", I18n.t("discourse_subscriptions.subscribe.countries.SM")],
["ST", I18n.t("discourse_subscriptions.subscribe.countries.ST")],
["SA", I18n.t("discourse_subscriptions.subscribe.countries.SA")],
["SN", I18n.t("discourse_subscriptions.subscribe.countries.SN")],
["RS", I18n.t("discourse_subscriptions.subscribe.countries.RS")],
["SC", I18n.t("discourse_subscriptions.subscribe.countries.SC")],
["SL", I18n.t("discourse_subscriptions.subscribe.countries.SL")],
["SG", I18n.t("discourse_subscriptions.subscribe.countries.SG")],
["SX", I18n.t("discourse_subscriptions.subscribe.countries.SX")],
["SK", I18n.t("discourse_subscriptions.subscribe.countries.SK")],
["SI", I18n.t("discourse_subscriptions.subscribe.countries.SI")],
["SB", I18n.t("discourse_subscriptions.subscribe.countries.SB")],
["SO", I18n.t("discourse_subscriptions.subscribe.countries.SO")],
["ZA", I18n.t("discourse_subscriptions.subscribe.countries.ZA")],
["GS", I18n.t("discourse_subscriptions.subscribe.countries.GS")],
["SS", I18n.t("discourse_subscriptions.subscribe.countries.SS")],
["ES", I18n.t("discourse_subscriptions.subscribe.countries.ES")],
["LK", I18n.t("discourse_subscriptions.subscribe.countries.LK")],
["SD", I18n.t("discourse_subscriptions.subscribe.countries.SD")],
["SR", I18n.t("discourse_subscriptions.subscribe.countries.SR")],
["SJ", I18n.t("discourse_subscriptions.subscribe.countries.SJ")],
["SZ", I18n.t("discourse_subscriptions.subscribe.countries.SZ")],
["SE", I18n.t("discourse_subscriptions.subscribe.countries.SE")],
["CH", I18n.t("discourse_subscriptions.subscribe.countries.CH")],
["SY", I18n.t("discourse_subscriptions.subscribe.countries.SY")],
["TW", I18n.t("discourse_subscriptions.subscribe.countries.TW")],
["TJ", I18n.t("discourse_subscriptions.subscribe.countries.TJ")],
["TZ", I18n.t("discourse_subscriptions.subscribe.countries.TZ")],
["TH", I18n.t("discourse_subscriptions.subscribe.countries.TH")],
["TL", I18n.t("discourse_subscriptions.subscribe.countries.TL")],
["TG", I18n.t("discourse_subscriptions.subscribe.countries.TG")],
["TK", I18n.t("discourse_subscriptions.subscribe.countries.TK")],
["TO", I18n.t("discourse_subscriptions.subscribe.countries.TO")],
["TT", I18n.t("discourse_subscriptions.subscribe.countries.TT")],
["TN", I18n.t("discourse_subscriptions.subscribe.countries.TN")],
["TR", I18n.t("discourse_subscriptions.subscribe.countries.TR")],
["TM", I18n.t("discourse_subscriptions.subscribe.countries.TM")],
["TC", I18n.t("discourse_subscriptions.subscribe.countries.TC")],
["TV", I18n.t("discourse_subscriptions.subscribe.countries.TV")],
["UG", I18n.t("discourse_subscriptions.subscribe.countries.UG")],
["UA", I18n.t("discourse_subscriptions.subscribe.countries.UA")],
["AE", I18n.t("discourse_subscriptions.subscribe.countries.AE")],
["GB", I18n.t("discourse_subscriptions.subscribe.countries.GB")],
["US", I18n.t("discourse_subscriptions.subscribe.countries.US")],
["UM", I18n.t("discourse_subscriptions.subscribe.countries.UM")],
["UY", I18n.t("discourse_subscriptions.subscribe.countries.UY")],
["UZ", I18n.t("discourse_subscriptions.subscribe.countries.UZ")],
["VU", I18n.t("discourse_subscriptions.subscribe.countries.VU")],
["VE", I18n.t("discourse_subscriptions.subscribe.countries.VE")],
["VN", I18n.t("discourse_subscriptions.subscribe.countries.VN")],
["VG", I18n.t("discourse_subscriptions.subscribe.countries.VG")],
["VI", I18n.t("discourse_subscriptions.subscribe.countries.VI")],
["WF", I18n.t("discourse_subscriptions.subscribe.countries.WF")],
["EH", I18n.t("discourse_subscriptions.subscribe.countries.EH")],
["YE", I18n.t("discourse_subscriptions.subscribe.countries.YE")],
["ZM", I18n.t("discourse_subscriptions.subscribe.countries.ZM")],
["ZW", I18n.t("discourse_subscriptions.subscribe.countries.ZW")],
["AF", i18n("discourse_subscriptions.subscribe.countries.AF")],
["AX", i18n("discourse_subscriptions.subscribe.countries.AX")],
["AL", i18n("discourse_subscriptions.subscribe.countries.AL")],
["DZ", i18n("discourse_subscriptions.subscribe.countries.DZ")],
["AS", i18n("discourse_subscriptions.subscribe.countries.AS")],
["AD", i18n("discourse_subscriptions.subscribe.countries.AD")],
["AO", i18n("discourse_subscriptions.subscribe.countries.AO")],
["AI", i18n("discourse_subscriptions.subscribe.countries.AI")],
["AQ", i18n("discourse_subscriptions.subscribe.countries.AQ")],
["AG", i18n("discourse_subscriptions.subscribe.countries.AG")],
["AR", i18n("discourse_subscriptions.subscribe.countries.AR")],
["AM", i18n("discourse_subscriptions.subscribe.countries.AM")],
["AW", i18n("discourse_subscriptions.subscribe.countries.AW")],
["AU", i18n("discourse_subscriptions.subscribe.countries.AU")],
["AT", i18n("discourse_subscriptions.subscribe.countries.AT")],
["AZ", i18n("discourse_subscriptions.subscribe.countries.AZ")],
["BS", i18n("discourse_subscriptions.subscribe.countries.BS")],
["BH", i18n("discourse_subscriptions.subscribe.countries.BH")],
["BD", i18n("discourse_subscriptions.subscribe.countries.BD")],
["BB", i18n("discourse_subscriptions.subscribe.countries.BB")],
["BY", i18n("discourse_subscriptions.subscribe.countries.BY")],
["BE", i18n("discourse_subscriptions.subscribe.countries.BE")],
["BZ", i18n("discourse_subscriptions.subscribe.countries.BZ")],
["BJ", i18n("discourse_subscriptions.subscribe.countries.BJ")],
["BM", i18n("discourse_subscriptions.subscribe.countries.BM")],
["BT", i18n("discourse_subscriptions.subscribe.countries.BT")],
["BO", i18n("discourse_subscriptions.subscribe.countries.BO")],
["BQ", i18n("discourse_subscriptions.subscribe.countries.BQ")],
["BA", i18n("discourse_subscriptions.subscribe.countries.BA")],
["BW", i18n("discourse_subscriptions.subscribe.countries.BW")],
["BV", i18n("discourse_subscriptions.subscribe.countries.BV")],
["BR", i18n("discourse_subscriptions.subscribe.countries.BR")],
["IO", i18n("discourse_subscriptions.subscribe.countries.IO")],
["BN", i18n("discourse_subscriptions.subscribe.countries.BN")],
["BG", i18n("discourse_subscriptions.subscribe.countries.BG")],
["BF", i18n("discourse_subscriptions.subscribe.countries.BF")],
["BI", i18n("discourse_subscriptions.subscribe.countries.BI")],
["KH", i18n("discourse_subscriptions.subscribe.countries.KH")],
["CM", i18n("discourse_subscriptions.subscribe.countries.CM")],
["CA", i18n("discourse_subscriptions.subscribe.countries.CA")],
["CV", i18n("discourse_subscriptions.subscribe.countries.CV")],
["KY", i18n("discourse_subscriptions.subscribe.countries.KY")],
["CF", i18n("discourse_subscriptions.subscribe.countries.CF")],
["TD", i18n("discourse_subscriptions.subscribe.countries.TD")],
["CL", i18n("discourse_subscriptions.subscribe.countries.CL")],
["CN", i18n("discourse_subscriptions.subscribe.countries.CN")],
["CX", i18n("discourse_subscriptions.subscribe.countries.CX")],
["CC", i18n("discourse_subscriptions.subscribe.countries.CC")],
["CO", i18n("discourse_subscriptions.subscribe.countries.CO")],
["KM", i18n("discourse_subscriptions.subscribe.countries.KM")],
["CG", i18n("discourse_subscriptions.subscribe.countries.CG")],
["CD", i18n("discourse_subscriptions.subscribe.countries.CD")],
["CK", i18n("discourse_subscriptions.subscribe.countries.CK")],
["CR", i18n("discourse_subscriptions.subscribe.countries.CR")],
["CI", i18n("discourse_subscriptions.subscribe.countries.CI")],
["HR", i18n("discourse_subscriptions.subscribe.countries.HR")],
["CU", i18n("discourse_subscriptions.subscribe.countries.CU")],
["CW", i18n("discourse_subscriptions.subscribe.countries.CW")],
["CY", i18n("discourse_subscriptions.subscribe.countries.CY")],
["CZ", i18n("discourse_subscriptions.subscribe.countries.CZ")],
["DK", i18n("discourse_subscriptions.subscribe.countries.DK")],
["DJ", i18n("discourse_subscriptions.subscribe.countries.DJ")],
["DM", i18n("discourse_subscriptions.subscribe.countries.DM")],
["DO", i18n("discourse_subscriptions.subscribe.countries.DO")],
["EC", i18n("discourse_subscriptions.subscribe.countries.EC")],
["EG", i18n("discourse_subscriptions.subscribe.countries.EG")],
["SV", i18n("discourse_subscriptions.subscribe.countries.SV")],
["GQ", i18n("discourse_subscriptions.subscribe.countries.GQ")],
["ER", i18n("discourse_subscriptions.subscribe.countries.ER")],
["EE", i18n("discourse_subscriptions.subscribe.countries.EE")],
["ET", i18n("discourse_subscriptions.subscribe.countries.ET")],
["FK", i18n("discourse_subscriptions.subscribe.countries.FK")],
["FO", i18n("discourse_subscriptions.subscribe.countries.FO")],
["FJ", i18n("discourse_subscriptions.subscribe.countries.FJ")],
["FI", i18n("discourse_subscriptions.subscribe.countries.FI")],
["FR", i18n("discourse_subscriptions.subscribe.countries.FR")],
["GF", i18n("discourse_subscriptions.subscribe.countries.GF")],
["PF", i18n("discourse_subscriptions.subscribe.countries.PF")],
["TF", i18n("discourse_subscriptions.subscribe.countries.TF")],
["GA", i18n("discourse_subscriptions.subscribe.countries.GA")],
["GM", i18n("discourse_subscriptions.subscribe.countries.GM")],
["GE", i18n("discourse_subscriptions.subscribe.countries.GE")],
["DE", i18n("discourse_subscriptions.subscribe.countries.DE")],
["GH", i18n("discourse_subscriptions.subscribe.countries.GH")],
["GI", i18n("discourse_subscriptions.subscribe.countries.GI")],
["GR", i18n("discourse_subscriptions.subscribe.countries.GR")],
["GL", i18n("discourse_subscriptions.subscribe.countries.GL")],
["GD", i18n("discourse_subscriptions.subscribe.countries.GD")],
["GP", i18n("discourse_subscriptions.subscribe.countries.GP")],
["GU", i18n("discourse_subscriptions.subscribe.countries.GU")],
["GT", i18n("discourse_subscriptions.subscribe.countries.GT")],
["GG", i18n("discourse_subscriptions.subscribe.countries.GG")],
["GN", i18n("discourse_subscriptions.subscribe.countries.GN")],
["GW", i18n("discourse_subscriptions.subscribe.countries.GW")],
["GY", i18n("discourse_subscriptions.subscribe.countries.GY")],
["HT", i18n("discourse_subscriptions.subscribe.countries.HT")],
["HM", i18n("discourse_subscriptions.subscribe.countries.HM")],
["VA", i18n("discourse_subscriptions.subscribe.countries.VA")],
["HN", i18n("discourse_subscriptions.subscribe.countries.HN")],
["HK", i18n("discourse_subscriptions.subscribe.countries.HK")],
["HU", i18n("discourse_subscriptions.subscribe.countries.HU")],
["IS", i18n("discourse_subscriptions.subscribe.countries.IS")],
["IN", i18n("discourse_subscriptions.subscribe.countries.IN")],
["ID", i18n("discourse_subscriptions.subscribe.countries.ID")],
["IR", i18n("discourse_subscriptions.subscribe.countries.IR")],
["IQ", i18n("discourse_subscriptions.subscribe.countries.IQ")],
["IE", i18n("discourse_subscriptions.subscribe.countries.IE")],
["IM", i18n("discourse_subscriptions.subscribe.countries.IM")],
["IL", i18n("discourse_subscriptions.subscribe.countries.IL")],
["IT", i18n("discourse_subscriptions.subscribe.countries.IT")],
["JM", i18n("discourse_subscriptions.subscribe.countries.JM")],
["JP", i18n("discourse_subscriptions.subscribe.countries.JP")],
["JE", i18n("discourse_subscriptions.subscribe.countries.JE")],
["JO", i18n("discourse_subscriptions.subscribe.countries.JO")],
["KZ", i18n("discourse_subscriptions.subscribe.countries.KZ")],
["KE", i18n("discourse_subscriptions.subscribe.countries.KE")],
["KI", i18n("discourse_subscriptions.subscribe.countries.KI")],
["KP", i18n("discourse_subscriptions.subscribe.countries.KP")],
["KR", i18n("discourse_subscriptions.subscribe.countries.KR")],
["KW", i18n("discourse_subscriptions.subscribe.countries.KW")],
["KG", i18n("discourse_subscriptions.subscribe.countries.KG")],
["LA", i18n("discourse_subscriptions.subscribe.countries.LA")],
["LV", i18n("discourse_subscriptions.subscribe.countries.LV")],
["LB", i18n("discourse_subscriptions.subscribe.countries.LB")],
["LS", i18n("discourse_subscriptions.subscribe.countries.LS")],
["LR", i18n("discourse_subscriptions.subscribe.countries.LR")],
["LY", i18n("discourse_subscriptions.subscribe.countries.LY")],
["LI", i18n("discourse_subscriptions.subscribe.countries.LI")],
["LT", i18n("discourse_subscriptions.subscribe.countries.LT")],
["LU", i18n("discourse_subscriptions.subscribe.countries.LU")],
["MO", i18n("discourse_subscriptions.subscribe.countries.MO")],
["MK", i18n("discourse_subscriptions.subscribe.countries.MK")],
["MG", i18n("discourse_subscriptions.subscribe.countries.MG")],
["MW", i18n("discourse_subscriptions.subscribe.countries.MW")],
["MY", i18n("discourse_subscriptions.subscribe.countries.MY")],
["MV", i18n("discourse_subscriptions.subscribe.countries.MV")],
["ML", i18n("discourse_subscriptions.subscribe.countries.ML")],
["MT", i18n("discourse_subscriptions.subscribe.countries.MT")],
["MH", i18n("discourse_subscriptions.subscribe.countries.MH")],
["MQ", i18n("discourse_subscriptions.subscribe.countries.MQ")],
["MR", i18n("discourse_subscriptions.subscribe.countries.MR")],
["MU", i18n("discourse_subscriptions.subscribe.countries.MU")],
["YT", i18n("discourse_subscriptions.subscribe.countries.YT")],
["MX", i18n("discourse_subscriptions.subscribe.countries.MX")],
["FM", i18n("discourse_subscriptions.subscribe.countries.FM")],
["MD", i18n("discourse_subscriptions.subscribe.countries.MD")],
["MC", i18n("discourse_subscriptions.subscribe.countries.MC")],
["MN", i18n("discourse_subscriptions.subscribe.countries.MN")],
["ME", i18n("discourse_subscriptions.subscribe.countries.ME")],
["MS", i18n("discourse_subscriptions.subscribe.countries.MS")],
["MA", i18n("discourse_subscriptions.subscribe.countries.MA")],
["MZ", i18n("discourse_subscriptions.subscribe.countries.MZ")],
["MM", i18n("discourse_subscriptions.subscribe.countries.MM")],
["NA", i18n("discourse_subscriptions.subscribe.countries.NA")],
["NR", i18n("discourse_subscriptions.subscribe.countries.NR")],
["NP", i18n("discourse_subscriptions.subscribe.countries.NP")],
["NL", i18n("discourse_subscriptions.subscribe.countries.NL")],
["NC", i18n("discourse_subscriptions.subscribe.countries.NC")],
["NZ", i18n("discourse_subscriptions.subscribe.countries.NZ")],
["NI", i18n("discourse_subscriptions.subscribe.countries.NI")],
["NE", i18n("discourse_subscriptions.subscribe.countries.NE")],
["NG", i18n("discourse_subscriptions.subscribe.countries.NG")],
["NU", i18n("discourse_subscriptions.subscribe.countries.NU")],
["NF", i18n("discourse_subscriptions.subscribe.countries.NF")],
["MP", i18n("discourse_subscriptions.subscribe.countries.MP")],
["NO", i18n("discourse_subscriptions.subscribe.countries.NO")],
["OM", i18n("discourse_subscriptions.subscribe.countries.OM")],
["PK", i18n("discourse_subscriptions.subscribe.countries.PK")],
["PW", i18n("discourse_subscriptions.subscribe.countries.PW")],
["PS", i18n("discourse_subscriptions.subscribe.countries.PS")],
["PA", i18n("discourse_subscriptions.subscribe.countries.PA")],
["PG", i18n("discourse_subscriptions.subscribe.countries.PG")],
["PY", i18n("discourse_subscriptions.subscribe.countries.PY")],
["PE", i18n("discourse_subscriptions.subscribe.countries.PE")],
["PH", i18n("discourse_subscriptions.subscribe.countries.PH")],
["PN", i18n("discourse_subscriptions.subscribe.countries.PN")],
["PL", i18n("discourse_subscriptions.subscribe.countries.PL")],
["PT", i18n("discourse_subscriptions.subscribe.countries.PT")],
["PR", i18n("discourse_subscriptions.subscribe.countries.PR")],
["QA", i18n("discourse_subscriptions.subscribe.countries.QA")],
["RE", i18n("discourse_subscriptions.subscribe.countries.RE")],
["RO", i18n("discourse_subscriptions.subscribe.countries.RO")],
["RU", i18n("discourse_subscriptions.subscribe.countries.RU")],
["RW", i18n("discourse_subscriptions.subscribe.countries.RW")],
["BL", i18n("discourse_subscriptions.subscribe.countries.BL")],
["SH", i18n("discourse_subscriptions.subscribe.countries.SH")],
["KN", i18n("discourse_subscriptions.subscribe.countries.KN")],
["LC", i18n("discourse_subscriptions.subscribe.countries.LC")],
["MF", i18n("discourse_subscriptions.subscribe.countries.MF")],
["PM", i18n("discourse_subscriptions.subscribe.countries.PM")],
["VC", i18n("discourse_subscriptions.subscribe.countries.VC")],
["WS", i18n("discourse_subscriptions.subscribe.countries.WS")],
["SM", i18n("discourse_subscriptions.subscribe.countries.SM")],
["ST", i18n("discourse_subscriptions.subscribe.countries.ST")],
["SA", i18n("discourse_subscriptions.subscribe.countries.SA")],
["SN", i18n("discourse_subscriptions.subscribe.countries.SN")],
["RS", i18n("discourse_subscriptions.subscribe.countries.RS")],
["SC", i18n("discourse_subscriptions.subscribe.countries.SC")],
["SL", i18n("discourse_subscriptions.subscribe.countries.SL")],
["SG", i18n("discourse_subscriptions.subscribe.countries.SG")],
["SX", i18n("discourse_subscriptions.subscribe.countries.SX")],
["SK", i18n("discourse_subscriptions.subscribe.countries.SK")],
["SI", i18n("discourse_subscriptions.subscribe.countries.SI")],
["SB", i18n("discourse_subscriptions.subscribe.countries.SB")],
["SO", i18n("discourse_subscriptions.subscribe.countries.SO")],
["ZA", i18n("discourse_subscriptions.subscribe.countries.ZA")],
["GS", i18n("discourse_subscriptions.subscribe.countries.GS")],
["SS", i18n("discourse_subscriptions.subscribe.countries.SS")],
["ES", i18n("discourse_subscriptions.subscribe.countries.ES")],
["LK", i18n("discourse_subscriptions.subscribe.countries.LK")],
["SD", i18n("discourse_subscriptions.subscribe.countries.SD")],
["SR", i18n("discourse_subscriptions.subscribe.countries.SR")],
["SJ", i18n("discourse_subscriptions.subscribe.countries.SJ")],
["SZ", i18n("discourse_subscriptions.subscribe.countries.SZ")],
["SE", i18n("discourse_subscriptions.subscribe.countries.SE")],
["CH", i18n("discourse_subscriptions.subscribe.countries.CH")],
["SY", i18n("discourse_subscriptions.subscribe.countries.SY")],
["TW", i18n("discourse_subscriptions.subscribe.countries.TW")],
["TJ", i18n("discourse_subscriptions.subscribe.countries.TJ")],
["TZ", i18n("discourse_subscriptions.subscribe.countries.TZ")],
["TH", i18n("discourse_subscriptions.subscribe.countries.TH")],
["TL", i18n("discourse_subscriptions.subscribe.countries.TL")],
["TG", i18n("discourse_subscriptions.subscribe.countries.TG")],
["TK", i18n("discourse_subscriptions.subscribe.countries.TK")],
["TO", i18n("discourse_subscriptions.subscribe.countries.TO")],
["TT", i18n("discourse_subscriptions.subscribe.countries.TT")],
["TN", i18n("discourse_subscriptions.subscribe.countries.TN")],
["TR", i18n("discourse_subscriptions.subscribe.countries.TR")],
["TM", i18n("discourse_subscriptions.subscribe.countries.TM")],
["TC", i18n("discourse_subscriptions.subscribe.countries.TC")],
["TV", i18n("discourse_subscriptions.subscribe.countries.TV")],
["UG", i18n("discourse_subscriptions.subscribe.countries.UG")],
["UA", i18n("discourse_subscriptions.subscribe.countries.UA")],
["AE", i18n("discourse_subscriptions.subscribe.countries.AE")],
["GB", i18n("discourse_subscriptions.subscribe.countries.GB")],
["US", i18n("discourse_subscriptions.subscribe.countries.US")],
["UM", i18n("discourse_subscriptions.subscribe.countries.UM")],
["UY", i18n("discourse_subscriptions.subscribe.countries.UY")],
["UZ", i18n("discourse_subscriptions.subscribe.countries.UZ")],
["VU", i18n("discourse_subscriptions.subscribe.countries.VU")],
["VE", i18n("discourse_subscriptions.subscribe.countries.VE")],
["VN", i18n("discourse_subscriptions.subscribe.countries.VN")],
["VG", i18n("discourse_subscriptions.subscribe.countries.VG")],
["VI", i18n("discourse_subscriptions.subscribe.countries.VI")],
["WF", i18n("discourse_subscriptions.subscribe.countries.WF")],
["EH", i18n("discourse_subscriptions.subscribe.countries.EH")],
["YE", i18n("discourse_subscriptions.subscribe.countries.YE")],
["ZM", i18n("discourse_subscriptions.subscribe.countries.ZM")],
["ZW", i18n("discourse_subscriptions.subscribe.countries.ZW")],
].map((arr) => {
return { value: arr[0], name: arr[1] };
});

4
assets/javascripts/discourse/components/subscribe-us-state-select.js
View File

@ -1,6 +1,6 @@
import { computed } from "@ember/object";
import { classNames } from "@ember-decorators/component";
import I18n from "I18n";
import { i18n } from "discourse-i18n";
import ComboBoxComponent from "select-kit/components/combo-box";
import {
pluginApiIdentifiers,
@ -11,7 +11,7 @@ import {
@selectKitOptions({
filterable: true,
allowAny: false,
translatedNone: I18n.t(
translatedNone: i18n(
"discourse_subscriptions.subscribe.cardholder_address.state"
),
})

2
assets/javascripts/discourse/controllers/admin-plugins-discourse-subscriptions-products-show-plans-show.js
View File

@ -2,8 +2,8 @@ import Controller from "@ember/controller";
import { action } from "@ember/object";
import { alias } from "@ember/object/computed";
import { popupAjaxError } from "discourse/lib/ajax-error";
import discourseComputed from "discourse/lib/decorators";
import DiscourseURL from "discourse/lib/url";
import discourseComputed from "discourse-common/utils/decorators";
const RECURRING = "recurring";
const ONE_TIME = "one_time";

4
assets/javascripts/discourse/controllers/admin-plugins-discourse-subscriptions-subscriptions.js
View File

@ -1,7 +1,7 @@
import Controller from "@ember/controller";
import { action } from "@ember/object";
import { service } from "@ember/service";
import I18n from "discourse-i18n";
import { i18n } from "discourse-i18n";
import AdminCancelSubscription from "../components/modal/admin-cancel-subscription";
import AdminSubscription from "../models/admin-subscription";
@ -48,7 +48,7 @@ export default class AdminPluginsDiscourseSubscriptionsSubscriptionsController e
.destroy(refund)
.then((result) => {
subscription.set("status", result.status);
this.dialog.alert(I18n.t("discourse_subscriptions.admin.canceled"));
this.dialog.alert(i18n("discourse_subscriptions.admin.canceled"));
})
.catch((data) =>
this.dialog.alert(data.jqXHR.responseJSON.errors.join("\n"))

14
assets/javascripts/discourse/controllers/admin-plugins-discourse-subscriptions.js
View File

@ -4,8 +4,8 @@ import { service } from "@ember/service";
import { htmlSafe } from "@ember/template";
import { ajax } from "discourse/lib/ajax";
import { popupAjaxError } from "discourse/lib/ajax-error";
import discourseComputed from "discourse-common/utils/decorators";
import I18n from "I18n";
import discourseComputed from "discourse/lib/decorators";
import { i18n } from "discourse-i18n";
export default class AdminPluginsDiscourseSubscriptionsController extends Controller {
@service dialog;
@ -31,18 +31,16 @@ export default class AdminPluginsDiscourseSubscriptionsController extends Contro
ajax(`/s/admin/refresh`, {
method: "post",
}).then(() => {
this.dialog.alert(
I18n.t("discourse_subscriptions.campaign.refresh_page")
);
this.dialog.alert(i18n("discourse_subscriptions.campaign.refresh_page"));
});
}
@action
createOneClickCampaign() {
this.dialog.yesNoConfirm({
title: I18n.t("discourse_subscriptions.campaign.confirm_creation_title"),
title: i18n("discourse_subscriptions.campaign.confirm_creation_title"),
message: htmlSafe(
I18n.t("discourse_subscriptions.campaign.confirm_creation")
i18n("discourse_subscriptions.campaign.confirm_creation")
),
didConfirm: () => {
this.set("loading", true);
@ -53,7 +51,7 @@ export default class AdminPluginsDiscourseSubscriptionsController extends Contro
.then(() => {
this.set("loading", false);
this.dialog.confirm({
message: I18n.t("discourse_subscriptions.campaign.created"),
message: i18n("discourse_subscriptions.campaign.created"),
shouldDisplayCancel: false,
didConfirm: () => this.send("showSettings"),
didCancel: () => this.send("showSettings"),

2
assets/javascripts/discourse/controllers/subscribe-index.js
View File

@ -1,6 +1,6 @@
import Controller from "@ember/controller";
import discourseComputed from "discourse/lib/decorators";
import User from "discourse/models/user";
import discourseComputed from "discourse-common/utils/decorators";
export default class SubscribeIndexController extends Controller {
@discourseComputed()

6
assets/javascripts/discourse/controllers/subscribe-show.js
View File

@ -3,8 +3,8 @@ import Controller from "@ember/controller";
import { action } from "@ember/object";
import { not } from "@ember/object/computed";
import { service } from "@ember/service";
import discourseComputed from "discourse-common/utils/decorators";
import I18n from "I18n";
import discourseComputed from "discourse/lib/decorators";
import { i18n } from "discourse-i18n";
import Subscription from "discourse/plugins/discourse-subscriptions/discourse/models/subscription";
import Transaction from "discourse/plugins/discourse-subscriptions/discourse/models/transaction";
@ -43,7 +43,7 @@ export default class SubscribeShowController extends Controller {
}
alert(path) {
this.dialog.alert(I18n.t(`discourse_subscriptions.${path}`));
this.dialog.alert(i18n(`discourse_subscriptions.${path}`));
}
@discourseComputed("model.product.repurchaseable", "model.product.subscribed")

4
assets/javascripts/discourse/controllers/subscriptions.js
View File

@ -1,7 +1,7 @@
import Controller from "@ember/controller";
import { computed } from "@ember/object";
import { htmlSafe } from "@ember/template";
import I18n from "I18n";
import { i18n } from "discourse-i18n";
export default class SubscriptionsController extends Controller {
init() {
@ -39,7 +39,7 @@ export default class SubscriptionsController extends Controller {
></stripe-pricing-table>`);
}
} catch {
return I18n.t("discourse_subscriptions.subscribe.no_products");
return i18n("discourse_subscriptions.subscribe.no_products");
}
}
}

4
assets/javascripts/discourse/controllers/user-billing-subscriptions-card.js
View File

@ -4,7 +4,7 @@ import { action } from "@ember/object";
import { service } from "@ember/service";
import { ajax } from "discourse/lib/ajax";
import { popupAjaxError } from "discourse/lib/ajax-error";
import I18n from "I18n";
import { i18n } from "discourse-i18n";
export default class UserBillingSubscriptionsCardController extends Controller {
@service dialog;
@ -34,7 +34,7 @@ export default class UserBillingSubscriptionsCardController extends Controller {
if (paymentMethodObject.error) {
this.dialog.alert(
paymentMethodObject.error?.message || I18n.t("generic_error")
paymentMethodObject.error?.message || i18n("generic_error")
);
this.set("loading", false);
return;

4
assets/javascripts/discourse/initializers/setup-subscriptions.js
View File

@ -1,5 +1,5 @@
import { withPluginApi } from "discourse/lib/plugin-api";
import I18n from "I18n";
import { i18n } from "discourse-i18n";
export default {
name: "setup-subscriptions",
@ -14,7 +14,7 @@ export default {
if (isNavLinkEnabled) {
api.addNavigationBarItem({
name: "subscribe",
displayName: I18n.t("discourse_subscriptions.navigation.subscribe"),
displayName: i18n("discourse_subscriptions.navigation.subscribe"),
href: subscribeHref,
});
}

2
assets/javascripts/discourse/models/admin-coupon.js
View File

@ -1,6 +1,6 @@
import EmberObject from "@ember/object";
import { ajax } from "discourse/lib/ajax";
import discourseComputed from "discourse-common/utils/decorators";
import discourseComputed from "discourse/lib/decorators";
export default class AdminCoupon extends EmberObject {
static list() {

2
assets/javascripts/discourse/models/admin-plan.js
View File

@ -1,5 +1,5 @@
import { ajax } from "discourse/lib/ajax";
import discourseComputed from "discourse-common/utils/decorators";
import discourseComputed from "discourse/lib/decorators";
import Plan from "discourse/plugins/discourse-subscriptions/discourse/models/plan";
export default class AdminPlan extends Plan {

4
assets/javascripts/discourse/models/admin-subscription.js
View File

@ -1,7 +1,7 @@
import EmberObject from "@ember/object";
import { ajax } from "discourse/lib/ajax";
import getURL from "discourse-common/lib/get-url";
import discourseComputed from "discourse-common/utils/decorators";
import discourseComputed from "discourse/lib/decorators";
import getURL from "discourse/lib/get-url";
export default class AdminSubscription extends EmberObject {
static find() {

2
assets/javascripts/discourse/models/plan.js
View File

@ -1,5 +1,5 @@
import EmberObject, { computed } from "@ember/object";
import discourseComputed from "discourse-common/utils/decorators";
import discourseComputed from "discourse/lib/decorators";
export default class Plan extends EmberObject {
@computed("unit_amount")

2
assets/javascripts/discourse/models/subscription.js
View File

@ -1,6 +1,6 @@
import EmberObject from "@ember/object";
import { ajax } from "discourse/lib/ajax";
import discourseComputed from "discourse-common/utils/decorators";
import discourseComputed from "discourse/lib/decorators";
export default class Subscription extends EmberObject {
static show(id) {

2
assets/javascripts/discourse/models/user-payment.js
View File

@ -1,6 +1,6 @@
import EmberObject from "@ember/object";
import { ajax } from "discourse/lib/ajax";
import discourseComputed from "discourse-common/utils/decorators";
import discourseComputed from "discourse/lib/decorators";
export default class UserPayment extends EmberObject {
static findAll() {

8
assets/javascripts/discourse/models/user-subscription.js
View File

@ -1,7 +1,7 @@
import EmberObject from "@ember/object";
import { ajax } from "discourse/lib/ajax";
import discourseComputed from "discourse-common/utils/decorators";
import I18n from "I18n";
import discourseComputed from "discourse/lib/decorators";
import { i18n } from "discourse-i18n";
import Plan from "discourse/plugins/discourse-subscriptions/discourse/models/plan";
export default class UserSubscription extends EmberObject {
@ -24,7 +24,7 @@ export default class UserSubscription extends EmberObject {
if (!canceled_at) {
return moment.unix(current_period_end).format("LL");
} else {
return I18n.t("discourse_subscriptions.user.subscriptions.cancelled");
return i18n("discourse_subscriptions.user.subscriptions.cancelled");
}
}
@ -40,7 +40,7 @@ export default class UserSubscription extends EmberObject {
return `${percent_off}%`;
}
} else {
return I18n.t("no_value");
return i18n("no_value");
}
}

4
assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-index.js
View File

@ -1,7 +1,7 @@
import { action } from "@ember/object";
import Route from "@ember/routing/route";
import { service } from "@ember/service";
import I18n from "I18n";
import { i18n } from "discourse-i18n";
import AdminProduct from "discourse/plugins/discourse-subscriptions/discourse/models/admin-product";
export default class AdminPluginsDiscourseSubscriptionsProductsIndexRoute extends Route {
@ -14,7 +14,7 @@ export default class AdminPluginsDiscourseSubscriptionsProductsIndexRoute extend
@action
destroyProduct(product) {
this.dialog.yesNoConfirm({
message: I18n.t(
message: i18n(
"discourse_subscriptions.admin.products.operations.destroy.confirm"
),
didConfirm: () => {

4
assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-show.js
View File

@ -2,7 +2,7 @@ import { action } from "@ember/object";
import Route from "@ember/routing/route";
import { service } from "@ember/service";
import { hash } from "rsvp";
import I18n from "I18n";
import { i18n } from "discourse-i18n";
import AdminPlan from "discourse/plugins/discourse-subscriptions/discourse/models/admin-plan";
import AdminProduct from "discourse/plugins/discourse-subscriptions/discourse/models/admin-product";
@ -27,7 +27,7 @@ export default class AdminPluginsDiscourseSubscriptionsProductsShowRoute extends
@action
destroyPlan(plan) {
this.dialog.yesNoConfirm({
message: I18n.t(
message: i18n(
"discourse_subscriptions.admin.plans.operations.destroy.confirm"
),
didConfirm: () => {

4
assets/javascripts/discourse/routes/user-billing-subscriptions-index.js
View File

@ -1,7 +1,7 @@
import { action } from "@ember/object";
import Route from "@ember/routing/route";
import { service } from "@ember/service";
import I18n from "I18n";
import { i18n } from "discourse-i18n";
import UserSubscription from "discourse/plugins/discourse-subscriptions/discourse/models/user-subscription";
export default class UserBillingSubscriptionsIndexRoute extends Route {
@ -20,7 +20,7 @@ export default class UserBillingSubscriptionsIndexRoute extends Route {
@action
cancelSubscription(subscription) {
this.dialog.yesNoConfirm({
message: I18n.t(
message: i18n(
"discourse_subscriptions.user.subscriptions.operations.destroy.confirm"
),
didConfirm: () => {

13
package.json
View File

@ -1,15 +1,16 @@
{
"private": true,
"devDependencies": {
"@discourse/lint-configs": "2.2.2",
"ember-template-lint": "6.0.0",
"eslint": "9.15.0",
"@discourse/lint-configs": "2.4.0",
"ember-template-lint": "6.1.0",
"eslint": "9.19.0",
"prettier": "2.8.8"
},
"engines": {
"node": ">= 18",
"node": ">= 22",
"npm": "please-use-pnpm",
"yarn": "please-use-pnpm",
"pnpm": ">= 9"
}
"pnpm": "9.x"
},
"packageManager": "pnpm@9.15.5"
}

1317
pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff

6
test/javascripts/acceptance/subscribe-test.js
View File

@ -2,7 +2,7 @@ import { click, visit } from "@ember/test-helpers";
import { test } from "qunit";
import pretender, { response } from "discourse/tests/helpers/create-pretender";
import { acceptance, count } from "discourse/tests/helpers/qunit-helpers";
import I18n from "discourse-i18n";
import { i18n } from "discourse-i18n";
import { stubStripe } from "discourse/plugins/discourse-subscriptions/helpers/stripe";
function singleProductPretender() {
@ -54,12 +54,12 @@ acceptance("Subscriptions", function (needs) {
// In YAML `NO:` is a boolean, so we need quotes around `"NO":`.
test("Norway is translated correctly", async function (assert) {
assert.equal(
I18n.t("discourse_subscriptions.subscribe.countries.NO"),
i18n("discourse_subscriptions.subscribe.countries.NO"),
"Norway"
);
assert.equal(
I18n.t("discourse_subscriptions.subscribe.countries.NG"),
i18n("discourse_subscriptions.subscribe.countries.NG"),
"Nigeria"
);
});