From 03ea54f8c4a7ed3d3f88b091d853d5faeb487aa8 Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Thu, 27 Oct 2022 15:04:55 +0800 Subject: [PATCH 1/6] change(en-us|zh-tw): buyPoints to buyCredits --- src/assets/i18n/en-us.json | 13 +++++++------ src/assets/i18n/zh-tw.json | 17 +++++++++-------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/assets/i18n/en-us.json b/src/assets/i18n/en-us.json index 4113371c5..5dc27fc49 100644 --- a/src/assets/i18n/en-us.json +++ b/src/assets/i18n/en-us.json @@ -309,12 +309,13 @@ "pending": "Pending", "total": "Total", "calculateGasFee": "Calculate Gas", - "buyNum": { - "buyNum": "Buy NUM Points", - "buyPoints": "Buy {{points}} Points", - "pointsAdded": "{{points}} NUM points added", - "failedToAddPoints": "Failed to add points", - "thisPackageIncludesXNumPoints": "This package include {{points}} NUM points.", + "buyCredits": { + "credits": "Credits", + "buyCredits": "Buy Credits", + "buyXCredits": "Buy {{credits}} credits", + "xCreditsAdded": "{{credits}} credits added", + "failedToAddCredits": "Failed to add credits", + "thisPackageIncludeXCredits": "This package include {{credits}} credits", "okIGotIt": "Ok, I got it", "inAppProductsNotAvailableYetPleaseTryAgainLater": "In App Products are not available yet. Try again later." } diff --git a/src/assets/i18n/zh-tw.json b/src/assets/i18n/zh-tw.json index fc97fb2b4..17691a2dc 100644 --- a/src/assets/i18n/zh-tw.json +++ b/src/assets/i18n/zh-tw.json @@ -309,14 +309,15 @@ "pending": "待計算", "total": "總額", "calculateGasFee": "計算油費", - "buyNum": { - "buyNum": "購買 NUM 點數", - "buyPoints": "購買{{points}}點數", - "pointsAdded": "加值 {{points}} NUM 點數", - "failedToAddPoints": "加值失敗", - "thisPackageIncludesXNumPoints": "此方案包括{{points}}個 NUM 點數", - "okIGotIt": "好，我了解", - "inAppProductsNotAvailableYetPleaseTryAgainLater": "App 內購買目前無法使用，請稍後再試" + "buyCredits": { + "credits": "點數", + "buyCredits": "購買點數", + "buyXCredits": "購買 {{credits}} 點", + "xCreditsAdded": "已添加 {{credits}} 點", + "failedToAddCredits": "添加點數失敗", + "thisPackageIncludeXCredits": "此方案包含 {{credits}} 點", + "okIGotIt": "Ok, I got it", + "inAppProductsNotAvailableYetPleaseTryAgainLater": "App 內購買目前無法使用，請稍後再試." } }, "invitation": { From 4c091974f3bc9fbc8bbca041de8ebb75e9886b3d Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Thu, 27 Oct 2022 15:05:39 +0800 Subject: [PATCH 2/6] fix(wallets.page): change translations from points to credits --- src/app/features/wallets/wallets.page.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/features/wallets/wallets.page.html b/src/app/features/wallets/wallets.page.html index fd0e31ff5..360b434da 100644 --- a/src/app/features/wallets/wallets.page.html +++ b/src/app/features/wallets/wallets.page.html @@ -41,7 +41,7 @@

NUM

- Points: + {{ t('wallets.buyCredits.credits') }}: NUM id="buy-num-btn" size="small" class="num-operation-btn" - >{{ t('buy') }} NUM{{ t('wallets.buyCredits.buyCredits') }} Date: Thu, 27 Oct 2022 15:06:13 +0800 Subject: [PATCH 3/6] change(buy-num.page): translations from points to credits --- src/app/features/wallets/buy-num/buy-num.page.html | 10 +++++++--- src/app/features/wallets/buy-num/buy-num.page.ts | 8 +++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/app/features/wallets/buy-num/buy-num.page.html b/src/app/features/wallets/buy-num/buy-num.page.html index 1cdb35665..541fc66e0 100644 --- a/src/app/features/wallets/buy-num/buy-num.page.html +++ b/src/app/features/wallets/buy-num/buy-num.page.html @@ -2,13 +2,15 @@ - {{ t('wallets.buyNum.buyNum') }} + {{ t('wallets.buyCredits.buyCredits') }} - {{ t('wallets.buyNum.inAppProductsNotAvailableYetPleaseTryAgainLater') }} + {{ + t('wallets.buyCredits.inAppProductsNotAvailableYetPleaseTryAgainLater') + }} @@ -37,7 +39,9 @@ fill="outline" color="success" > - {{ t('wallets.buyNum.buyPoints', { points: product.numPoints }) }} + {{ + t('wallets.buyCredits.buyXCredits', { credits: product.numPoints }) + }} diff --git a/src/app/features/wallets/buy-num/buy-num.page.ts b/src/app/features/wallets/buy-num/buy-num.page.ts index b96592c39..8eaae3e31 100644 --- a/src/app/features/wallets/buy-num/buy-num.page.ts +++ b/src/app/features/wallets/buy-num/buy-num.page.ts @@ -51,10 +51,12 @@ export class BuyNumPage implements OnInit { async showNumPointsQuantity(numPoints: number) { const info = this.translocoService.translate( - 'wallets.buyNum.thisPackageIncludesXNumPoints', - { points: numPoints } + 'wallets.buyCredits.thisPackageIncludeXCredits', + { credits: numPoints } + ); + const okText = this.translocoService.translate( + 'wallets.buyCredits.okIGotIt' ); - const okText = this.translocoService.translate('wallets.buyNum.okIGotIt'); const alert = await this.alertController.create({ header: info, buttons: [okText], From 36ec136191a43a4f89a87b389c190e2ed2ed1410 Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Thu, 27 Oct 2022 15:06:38 +0800 Subject: [PATCH 4/6] change(in-app-store.service): translations from points to credits --- src/app/shared/in-app-store/in-app-store.service.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/shared/in-app-store/in-app-store.service.ts b/src/app/shared/in-app-store/in-app-store.service.ts index 4cc33145c..f8e33b64d 100644 --- a/src/app/shared/in-app-store/in-app-store.service.ts +++ b/src/app/shared/in-app-store/in-app-store.service.ts @@ -124,13 +124,13 @@ export class InAppStoreService implements OnDestroy { inAppProduct.finish(); this.notifyUser( - this.translocoService.translate('wallets.buyNum.pointsAdded', { - points: pointsToAdd, + this.translocoService.translate('wallets.buyCredits.xCreditsAdded', { + credits: pointsToAdd, }) ); } catch (error) { const errorMessage = this.translocoService.translate( - 'wallets.buyNum.failedToAddPoints' + 'wallets.buyCredits.failedToAddCredits' ); this.errorService.toastError$(errorMessage).toPromise(); } From 04f1473bc01c0ef28aede22624cfb5081828dc38 Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Mon, 31 Oct 2022 17:18:10 +0800 Subject: [PATCH 5/6] fix(test.yml): generate npmrc before lint and test --- .github/workflows/test.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a82757089..118737525 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,6 +20,11 @@ jobs: - name: Install Ionic CLI run: npm install -g @ionic/cli + - name: Generate .npmrc for pintura package + env: + NUMBERS_PQINA_NPM_KEY: ${{ secrets.NUMBERS_PQINA_NPM_KEY }} + run: npm run preconfig.npmrc + - name: Install dependencies run: npm install @@ -41,6 +46,11 @@ jobs: - name: Install Ionic CLI run: npm install -g @ionic/cli + - name: Generate .npmrc for pintura package + env: + NUMBERS_PQINA_NPM_KEY: ${{ secrets.NUMBERS_PQINA_NPM_KEY }} + run: npm run preconfig.npmrc + - name: Install dependencies run: npm install From 21e89ff01417980b4664b41434baec4c9c12d771 Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Tue, 1 Nov 2022 16:17:07 +0800 Subject: [PATCH 6/6] change ios Provisioning profile to NumbersAppDistributionV4 --- ios/App/App.xcodeproj/project.pbxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index 5cdf7cb2c..f24b4b72a 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -374,8 +374,8 @@ OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; PRODUCT_BUNDLE_IDENTIFIER = io.numbersprotocol.capturelite; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = NumbersAppDistributionV3; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = NumbersAppDistributionV3; + PROVISIONING_PROFILE_SPECIFIER = NumbersAppDistributionV4; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = NumbersAppDistributionV4; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG USE_PUSH"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -400,8 +400,8 @@ MARKETING_VERSION = 0.68.0; PRODUCT_BUNDLE_IDENTIFIER = io.numbersprotocol.capturelite; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = NumbersAppDistributionV3; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = NumbersAppDistributionV3; + PROVISIONING_PROFILE_SPECIFIER = NumbersAppDistributionV4; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = NumbersAppDistributionV4; SWIFT_ACTIVE_COMPILATION_CONDITIONS = USE_PUSH; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2";