Tasks.org account strings

app/src/main/java/org/tasks/billing/PurchaseDialog.kt

@@ -67,7 +67,7 @@ class PurchaseDialog : DialogFragment(), OnPurchasesUpdated {
         ButterKnife.bind(this, binding.root)
 
         if (savedInstanceState == null) {
-            nameYourPrice = !isTasksPayment
+            nameYourPrice = !isTasksPayment && !inventory.hasTasksSubscription
         } else {
             binding.slider.value = savedInstanceState.getFloat(EXTRA_PRICE)
             priceChanged = savedInstanceState.getBoolean(EXTRA_PRICE_CHANGED)
@@ -129,14 +129,14 @@ class PurchaseDialog : DialogFragment(), OnPurchasesUpdated {
         benefits += if (nameYourPrice) {
             """
 ---
-#### ~~${getString(R.string.upgrade_tasks_account)}~~
+#### ~~${getString(R.string.tasks_org_account)}~~
 
-_${getString(R.string.upgrade_tasks_no_account)}_
+_${getString(R.string.account_not_included)}_
 """
         } else {
             """
 ---                
-#### ${getString(R.string.upgrade_tasks_account)}
+#### ${getString(R.string.tasks_org_account)}
 * ${getString(R.string.tasks_org_description)}
 * [${getString(R.string.upgrade_third_party_apps)}](${getString(R.string.url_app_passwords)})
 * [${getString(R.string.upgrade_coming_soon)}](${getString(R.string.help_url_sync)})
@@ -221,8 +221,8 @@ _${getString(R.string.upgrade_tasks_no_account)}_
         binding.payOther.isVisible = !isWaitScreen
         binding.payOther.setText(when {
             isTasksPayment -> R.string.cancel
-            nameYourPrice -> R.string.upgrade_tasks_account
+            nameYourPrice -> R.string.get_tasks_org_account
-            else -> R.string.back
+            else -> R.string.name_your_price
         })
         binding.tasksOrgButtonPanel.isVisible = !isWaitScreen && !generic
         binding.screenWait.isVisible = isWaitScreen && !generic

app/src/main/res/values/keys.xml

@@ -31,8 +31,6 @@
   <string name="url_app_passwords">https://tasks.org/passwords</string>
 
   <!-- Eventually these should be moved to strings.xml for translation -->
-  <string name="upgrade_tasks_account">Tasks.org account</string>
-  <string name="upgrade_tasks_no_account">Not included with \'Name your price\' subscriptions</string>
   <string name="upgrade_sync_self_hosted">Sync with third-party apps and services</string>
   <string name="upgrade_third_party_apps">Compatible with Outlook, Thunderbird, Apple Reminders, and more</string>
   <string name="upgrade_coming_soon">Many new features coming soon!</string>

app/src/main/res/values/strings.xml

@@ -694,4 +694,7 @@ File %1$s contained %2$s.\n\n
   <string name="app_password_delete_confirmation">Any app using this password will be signed out</string>
   <string name="app_password_save">Use these credentials to configure a third-party app. They grant complete access to your Tasks.org account, don\'t write them down or share them with anyone!</string>
   <string name="copied_to_clipboard">%s copied to clipboard</string>
+  <string name="tasks_org_account">Tasks.org account</string>
+  <string name="get_tasks_org_account">Get Tasks.org account</string>
+  <string name="account_not_included">Not included with \'Name your price\' subscriptions</string>
 </resources>