From 9bcd4bc238df3abdc4d548da80f389b7aa0d0e87 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Wed, 5 Dec 2012 14:24:43 -0800 Subject: [PATCH] Fixed typo in premium screen, made special exception in translation tests because it uses the % character --- astrid/res/values-de/strings.xml | 2 +- astrid/res/values-es/strings.xml | 2 +- astrid/res/values-fr/strings.xml | 2 +- astrid/res/values-ko/strings.xml | 2 +- astrid/res/values-pt-rBR/strings.xml | 2 +- astrid/res/values-ru/strings.xml | 2 +- astrid/res/values-tr/strings.xml | 2 +- astrid/res/values-zh-rCN/strings.xml | 2 +- astrid/res/values-zh-rTW/strings.xml | 2 +- astrid/res/values/strings-premium.xml | 2 +- tests/src/com/todoroo/andlib/test/TranslationTests.java | 4 ++++ 11 files changed, 14 insertions(+), 10 deletions(-) diff --git a/astrid/res/values-de/strings.xml b/astrid/res/values-de/strings.xml index ce0035e28..396a6c385 100644 --- a/astrid/res/values-de/strings.xml +++ b/astrid/res/values-de/strings.xml @@ -670,7 +670,7 @@ Zukünftige Funktionen ansehen Ünterstütze das Astrid Team! Premium wird deine Produktivität erhöhen! - Bestell für ein Jahr und spare 25%%! + Bestell für ein Jahr und spare 25%! Du hast bereits Astrid Premium! Du brauchst einen Astrid.com Account um dich für Astrid Premium anzumelden. Bitte log dich ein oder registriere dich. Vielen Dank für die Anmeldung bei Astrid Premium! diff --git a/astrid/res/values-es/strings.xml b/astrid/res/values-es/strings.xml index 3443e90ef..e46e71559 100644 --- a/astrid/res/values-es/strings.xml +++ b/astrid/res/values-es/strings.xml @@ -707,7 +707,7 @@ Prueba funciones nuevas ¡Apoya al equipo de Astrid! ¡Premium mejorará tu productividad! - ¡Ordena un año y ahorra un 25%%! + ¡Ordena un año y ahorra un 25%! ¡Ya estás suscrito a Astrid Premium! Necesitas tener una cuenta de Astrid.com para suscribirte a Premium. Por favor inicia sesión o crea una cuenta. ¡Gracias por suscribirte a Astrid Premium! diff --git a/astrid/res/values-fr/strings.xml b/astrid/res/values-fr/strings.xml index a9779969a..7643f8d6b 100644 --- a/astrid/res/values-fr/strings.xml +++ b/astrid/res/values-fr/strings.xml @@ -682,7 +682,7 @@ Bénéficiez des nouvelles fonctionnalités en avant-première Soutenez l\'équipe Astrid ! Premium va booster votre productivité ! - Commandez pour un an et économisez 25%%! + Commandez pour un an et économisez 25%! Vous êtes déjà Astrid Premium ! Vous devez avoir un compte Astrid.com pour passer en premium. Connectez-vous ou inscrivez-vous. Merci pour votre inscription à Astrid Premium ! diff --git a/astrid/res/values-ko/strings.xml b/astrid/res/values-ko/strings.xml index 7efed0e45..8c80a128b 100644 --- a/astrid/res/values-ko/strings.xml +++ b/astrid/res/values-ko/strings.xml @@ -707,7 +707,7 @@ 곧 나올 기능 미리보기 Astrid 팀을 지원해 주세요! 프리미엄은 당신의 생산성을 높여 줄 것입니다! - 1년 사용권 구매시 25%% 할인! + 1년 사용권 구매시 25% 할인! 이미 Astrid 프리미엄 이용권을 구매하였습니다. 프리미엄 이용권을 구매하려면 Astrid.com 계정이 필요합니다. 로그인하거나 가입해 주세요. Astrid 프리미엄 이용권 구매를 감사드립니다! diff --git a/astrid/res/values-pt-rBR/strings.xml b/astrid/res/values-pt-rBR/strings.xml index 584ea0e5c..1622d47fa 100644 --- a/astrid/res/values-pt-rBR/strings.xml +++ b/astrid/res/values-pt-rBR/strings.xml @@ -689,7 +689,7 @@ Visualizar os próximos recursos Apoie a equipe Astrid! Premium vai aumentar sua produtividade! - Contrate um ano e tenha 25%% de desconto + Contrate um ano e tenha 25% de desconto Você já se inscreveu para o Astrid Premium! Você precisa ter uma conta Astrid.com para solicitar a inscrição para o Premium. Por favor, faça o login ou registre-se. Obrigado por se inscrever no Astrid Premium! diff --git a/astrid/res/values-ru/strings.xml b/astrid/res/values-ru/strings.xml index 775a42b56..972535b8d 100644 --- a/astrid/res/values-ru/strings.xml +++ b/astrid/res/values-ru/strings.xml @@ -704,7 +704,7 @@ Знакомиться с ожидаемыми нововведениями Поддержать команду Astrid! Премиум повысит вашу продуктивность! - Подпишитесь на год и сэкономьте 25%%! + Подпишитесь на год и сэкономьте 25%! Вы уже подписаны на Astrid Premium Чтобы оформить премиум подписку, необходима учетная запись на Astrid.com. Пожалуйста, войдите в свою учетную запись или создайте новую. Спасибо за то, что подписались на Astrid Premium! diff --git a/astrid/res/values-tr/strings.xml b/astrid/res/values-tr/strings.xml index 1f339ecfd..d26f5d729 100644 --- a/astrid/res/values-tr/strings.xml +++ b/astrid/res/values-tr/strings.xml @@ -680,7 +680,7 @@ Gelecek özelliklerin önizlemesi Astrid takımını destekle! Premium hesap verimliliğinizi arttırır! - Bir yıllık satın alın ve %%25 kâr yapın! + Bir yıllık satın alın ve %25 kâr yapın! Astrid Premium\'a zaten üyesiniz! Premium üyelik için Astrid.com hesabınız olması gerekiyor. Lütfen üye olun ya da oturum açın. Astrid Premium üyesi olduğunuz için teşekkür ederiz! diff --git a/astrid/res/values-zh-rCN/strings.xml b/astrid/res/values-zh-rCN/strings.xml index a63f56c71..8c47aa188 100644 --- a/astrid/res/values-zh-rCN/strings.xml +++ b/astrid/res/values-zh-rCN/strings.xml @@ -669,7 +669,7 @@ 提前体验亮点 支持清单小助理高级版本团队！ 高级版本能够让您的效率升级！ - 购买一年的服务并且得到25%%的折扣 + 购买一年的服务并且得到25%的折扣 您已经购买了清单小助理高级版本(Astrid Premium)！ 为了成功购买高级版本，您需要一个Astrid.com的账户。 请在我们的网站上登录或者注册。 谢谢购买清单小助理高级版本(Astrid Premium)！ diff --git a/astrid/res/values-zh-rTW/strings.xml b/astrid/res/values-zh-rTW/strings.xml index 39467c18d..cd065354c 100644 --- a/astrid/res/values-zh-rTW/strings.xml +++ b/astrid/res/values-zh-rTW/strings.xml @@ -671,7 +671,7 @@ 提前體驗亮點 支持Astrid團隊！ 高級版本能夠讓您的效率升級！ - 購買一年的服務並且得到25%%的折扣 + 購買一年的服務並且得到25%的折扣 您已經購買了Astrid Premium！ 為了成功購買高級版本，您需要一個Astrid.com的賬戶。 請在我們的網站上登錄或者註冊。 謝謝購買Astrid Premium！ diff --git a/astrid/res/values/strings-premium.xml b/astrid/res/values/strings-premium.xml index 67446016d..4d649ff40 100644 --- a/astrid/res/values/strings-premium.xml +++ b/astrid/res/values/strings-premium.xml @@ -89,7 +89,7 @@ Preview upcoming features Support the Astrid Team! Premium will power up your productivity! - Order one year and save 25%%! + Order one year and save 25%! You are already subscribed to Astrid Premium! You need to have an Astrid.com account in order to subscribe to premium. Please log in or sign up. Thanks for subscribing to Astrid Premium! diff --git a/tests/src/com/todoroo/andlib/test/TranslationTests.java b/tests/src/com/todoroo/andlib/test/TranslationTests.java index 8cba18288..27b0e107d 100644 --- a/tests/src/com/todoroo/andlib/test/TranslationTests.java +++ b/tests/src/com/todoroo/andlib/test/TranslationTests.java @@ -16,6 +16,8 @@ import java.util.Locale; import android.content.res.Resources; +import com.timsu.astrid.R; + /** * Tests translations for consistency with the default values. You must * extend this class and create it with your own values for strings @@ -164,6 +166,8 @@ abstract public class TranslationTests extends TodorooTestCase { Locale locale = r.getConfiguration().locale; for(int i = 0; i < strings.length; i++) { try { + if (strings[i] == R.string.premium_speech_bubble_2) // Special exception--this string contains a % character + continue; String string = r.getString(strings[i]); FormatStringData newFS = new FormatStringData(string); if(!newFS.matches(formatStrings[i])) {