Commits

nat_linden committed a4167dd

Use [create_account_url] from strings.xml consistently in notifications.xml.
The URL whose simple form is http://join.secondlife.com actually appears in a
number of places in the localized notifications.xml files. It's supposed to be
localized for the current viewer language -- and in strings.xml, it is. But
the same URL is restated a couple times in notifications.xml, sometimes
localized, sometimes not.
Add "create_account_url" to init_default_trans_args(), permitting us to embed
[create_account_url] anywhere in the skin files. Then replace all known
occurrences of that URL in notifications.xml files with [create_account_url].

Comments (0)

Files changed (13)

indra/newview/llappviewer.cpp

 	default_trans_args.insert("CAPITALIZED_APP_NAME");
 	default_trans_args.insert("SECOND_LIFE_GRID");
 	default_trans_args.insert("SUPPORT_SITE");
+	// This URL shows up in a surprising number of places in various skin
+	// files. We really only want to have to maintain a single copy of it.
+	default_trans_args.insert("create_account_url");
 }
 
 //----------------------------------------------------------------------------

indra/newview/skins/default/xui/da/notifications.xml

 		[APP_NAME] installationen er færdig.
 
 Hvis det er første gang du bruger [SECOND_LIFE], skal du først oprette en konto for at logge på.
-Vend tilbage til [http://join.secondlife.com secondlife.com] for at oprette en ny konto?
+Vend tilbage til [[create_account_url] secondlife.com] for at oprette en ny konto?
 	</notification>
 	<notification name="LoginPacketNeverReceived">
 		Der er problemer med at koble på.  Der kan være et problem med din Internet forbindelse eller [SECOND_LIFE_GRID].

indra/newview/skins/default/xui/de/notifications.xml

 
 Sie benötigen ein Konto, um [SECOND_LIFE] betreten zu können. Möchten Sie jetzt ein Konto erstellen?
 		<url name="url">
-			https://join.secondlife.com/index.php?lang=de-DE
+			[create_account_url]
 		</url>
 		<usetemplate name="okcancelbuttons" notext="Erneut versuchen" yestext="Neues Benutzerkonto anlegen"/>
 	</notification>
 		Installation von [APP_NAME] vollständig abgeschlossen.
 
 Falls Sie [SECOND_LIFE] zum ersten Mal verwenden, müssen Sie zuerst ein Konto erstellen, bevor Sie sich anmelden können.
-Zurück zu [http://join.secondlife.com secondlife.com], um ein neues Konto zu erstellen?
+Zurück zu [[create_account_url] secondlife.com], um ein neues Konto zu erstellen?
 		<usetemplate name="okcancelbuttons" notext="Weiter" yestext="Neues Konto..."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">

indra/newview/skins/default/xui/en/notifications.xml

 	option="0"
 	name="url"
 	target = "_external">
-
-			http://join.secondlife.com/
+		[create_account_url]
     </url>
     <usetemplate
      name="okcancelbuttons"
 [APP_NAME] installation is complete.
 
 If this is your first time using [SECOND_LIFE], you will need to create an account before you can log in.
-Return to [http://join.secondlife.com secondlife.com] to create a new account?
+Return to [[create_account_url] secondlife.com] to create a new account?
     <tag>confirm</tag>
     <usetemplate
      name="okcancelbuttons"

indra/newview/skins/default/xui/es/notifications.xml

 
 Necesitas una cuenta para acceder a [SECOND_LIFE]. ¿Te gustaría crear una ahora?
 		<url name="url">
-			https://join.secondlife.com/index.php?lang=es-ES
+			[create_account_url]
 		</url>
 		<usetemplate name="okcancelbuttons" notext="Volver a intentarlo" yestext="Crear una cuenta nueva"/>
 	</notification>
 		Se ha completado la instalación de [SECOND_LIFE].
 
 Si es la primera vez que usas [SECOND_LIFE], debes crear una cuenta antes de poder iniciar una sesión.
-¿Volver a [http://join.secondlife.com secondlife.com] para crear una cuenta nueva?
+¿Volver a [[create_account_url] secondlife.com] para crear una cuenta nueva?
 		<usetemplate name="okcancelbuttons" notext="Continuar" yestext="Cuenta nueva..."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">

indra/newview/skins/default/xui/fr/notifications.xml

 
 Pour entrer dans [SECOND_LIFE], vous devez disposer d&apos;un compte. Voulez-vous en créer un maintenant ?
 		<url name="url">
-			https://join.secondlife.com/index.php?lang=fr-FR
+			[create_account_url]
 		</url>
 		<usetemplate name="okcancelbuttons" notext="Réessayer" yestext="Créer un compte"/>
 	</notification>
 		L&apos;installation de [APP_NAME] est terminée.
 
 Si vous utilisez [SECOND_LIFE] pour la première fois, vous devez ouvrir un compte avant de pouvoir vous connecter.
-Retourner sur [http://join.secondlife.com secondlife.com] pour ouvrir un nouveau compte ?
+Retourner sur [[create_account_url] secondlife.com] pour ouvrir un nouveau compte ?
 		<usetemplate name="okcancelbuttons" notext="Continuer" yestext="Nouveau compte..."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">

indra/newview/skins/default/xui/it/notifications.xml

 
 Devi avere un account per entrare in [SECOND_LIFE]. Vuoi crearne uno adesso?
 		<url name="url">
-			https://join.secondlife.com/index.php?lang=it-IT
+			[create_account_url]
 		</url>
 		<usetemplate name="okcancelbuttons" notext="Riprova" yestext="Crea un nuovo account"/>
 	</notification>
 		L&apos;installazione di [APP_NAME] è terminata.
 
 Se questa è la prima volta che usi [SECOND_LIFE], devi creare un account prima che tu possa effettuare l&apos;accesso.
-Vuoi tornare a [http://join.secondlife.com secondlife.com] per creare un nuovo account?
+Vuoi tornare a [[create_account_url] secondlife.com] per creare un nuovo account?
 		<usetemplate name="okcancelbuttons" notext="Continua" yestext="Nuovo Account..."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">

indra/newview/skins/default/xui/ja/notifications.xml

 
 [SECOND_LIFE] に入るにはアカウントが必要です。今すぐアカウントを作成しますか?
 		<url name="url">
-			https://join.secondlife.com/index.php?lang=ja-JP
+			[create_account_url]
 		</url>
 		<usetemplate name="okcancelbuttons" notext="もう一度試す" yestext="新しいアカウントを作成"/>
 	</notification>
 		[APP_NAME] のインストールが完了しました。
 
 [SECOND_LIFE] を使ったことがない場合は、ログインする前にアカウントの作成を行ってください。
-[http://join.secondlife.com/?lang=ja-JP] で新しいアカウントを作成しますか?
+[[create_account_url] secondlife.com] で新しいアカウントを作成しますか?
 		<usetemplate name="okcancelbuttons" notext="続行" yestext="新規アカウント..."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">

indra/newview/skins/default/xui/pl/notifications.xml

 		Instalacja [APP_NAME] zakończona.
 
 Jeżeli używasz [SECOND_LIFE] po raz pierwszy to musisz stworzyć konto żeby móc się zalogować.
-Czy chcesz przejść na stronę [http://join.secondlife.com secondlife.com] żeby stworzyć nowe konto?
+Czy chcesz przejść na stronę [[create_account_url] secondlife.com] żeby stworzyć nowe konto?
 		<usetemplate name="okcancelbuttons" notext="Kontynuuj" yestext="Nowe konto..."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">

indra/newview/skins/default/xui/pt/notifications.xml

 
 É preciso ter uma conta para entrar no [SECOND_LIFE]. Deseja criar uma conta agora?
 		<url name="url">
-			https://join.secondlife.com/index.php?lang=pt-BR
+			[create_account_url]
 		</url>
 		<usetemplate name="okcancelbuttons" notext="Tentar novamente" yestext="Abrir conta"/>
 	</notification>
 		A instalação do [APP_NAME] está pronta. 
 
 Se você ainda não conhece o [SECOND_LIFE], basta criar uma conta para começar. 
-Voltar para [http://join.secondlife.com secondlife.com] para criar sua conta?
+Voltar para [[create_account_url] secondlife.com] para criar sua conta?
 		<usetemplate name="okcancelbuttons" notext="Continuar" yestext="Nova conta.."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">

indra/newview/skins/default/xui/ru/notifications.xml

 
 Для входа в [SECOND_LIFE] нужен аккаунт. Создать его?
 		<url name="url">
-			http://join.secondlife.com/
+			[create_account_url]
 		</url>
 		<usetemplate name="okcancelbuttons" notext="Повторить попытку" yestext="Создать новый аккаунт"/>
 	</notification>
 		Установка [APP_NAME] завершена.
 
 Если вы используете [SECOND_LIFE] впервые, для входа в программу вам потребуется создать аккаунт.
-Вернуться на [http://join.secondlife.com secondlife.com] для создания аккаунта?
+Вернуться на [[create_account_url] secondlife.com] для создания аккаунта?
 		<usetemplate name="okcancelbuttons" notext="Продолжить" yestext="Создать аккаунт..."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">

indra/newview/skins/default/xui/tr/notifications.xml

 
 [SECOND_LIFE]&apos;a giriş yapmak için bir hesabınız olması gerekir. Şimdi bir hesap oluşturmak ister misiniz?
 		<url name="url">
-			http://join.secondlife.com/
+			[create_account_url]
 		</url>
 		<usetemplate name="okcancelbuttons" notext="Tekrar dene" yestext="Yeni bir hesap oluştur"/>
 	</notification>
 		[APP_NAME] kurulumu tamamlandı.
 
 [SECOND_LIFE]&apos;ı ilk kez kullanıyorsanız, oturum açmadan önce bir hesap oluşturmalısınız.
-Yeni bir hesap oluşturmak için [http://join.secondlife.com secondlife.com] adresine dönülsün mü?
+Yeni bir hesap oluşturmak için [[create_account_url] secondlife.com] adresine dönülsün mü?
 		<usetemplate name="okcancelbuttons" notext="Devam" yestext="Yeni Hesap..."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">

indra/newview/skins/default/xui/zh/notifications.xml

 
 You need an account to enter [SECOND_LIFE]. Would you like to create one now?
 		<url name="url">
-			http://join.secondlife.com/
+			[create_account_url]
 		</url>
 		<usetemplate name="okcancelbuttons" notext="再試一次" yestext="創造新帳戶"/>
 	</notification>
 		[APP_NAME] 安裝完成。
 
 If this is your first time using [SECOND_LIFE], you will need to create an account before you can log in.
-Return to [http://join.secondlife.com secondlife.com] to create a new account?
+Return to [[create_account_url] secondlife.com] to create a new account?
 		<usetemplate name="okcancelbuttons" notext="繼續" yestext="新帳戶..."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">