mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-20 22:26:54 +01:00
remove unused format spec (SMS number no longer known)
This commit is contained in:
Eric House
parent
3d1cefe00b
commit
0888167db5
12 changed files with 14 additions and 189 deletions
|
|
@ -591,11 +591,13 @@ public class DBUtils {
|
|||
|
||||
switch ( means ) {
|
||||
case SMS_DATA:
|
||||
case SMS_USER:
|
||||
int fmt = means == InviteMeans.SMS_DATA
|
||||
? R.string.invit_expl_sms_fmt : R.string.invit_expl_usrsms_fmt;
|
||||
int fmt = R.string.invit_expl_sms_fmt;
|
||||
msg = LocUtils.getString( context, fmt, target, timestamp );
|
||||
break;
|
||||
case SMS_USER:
|
||||
fmt = R.string.invit_expl_usrsms_fmt;
|
||||
msg = LocUtils.getString( context, fmt, timestamp );
|
||||
break;
|
||||
case BLUETOOTH:
|
||||
String devName = BTUtils.nameForAddr( target );
|
||||
msg = LocUtils.getString( context, R.string.invit_expl_bt_fmt,
|
||||
|
|
|
|||
|
|
@ -500,7 +500,7 @@
|
|||
and all invitations have been accepted.)</string>
|
||||
<string name="invit_expl_sms_fmt">Invite sent via Data SMS to phone
|
||||
number %1$s on %2$s</string>
|
||||
<string name="invit_expl_usrsms_fmt">Invite sent via SMS to %1$s on %2$s</string>
|
||||
<string name="invit_expl_usrsms_fmt">Invite sent via SMS on %1$s</string>
|
||||
<!-- shown when user chooses to invite via the default SMS app -->
|
||||
<string name="sms_invite_flakey">This option launches your
|
||||
default SMS app with an invitation ready to send—when it
|
||||
|
|
|
|||
|
|
@ -880,7 +880,7 @@ de %2$d destinataris. Useu el botó de tornar a
|
|||
\n(Només podeu tornar a afegir els aparells que són accessibles via Bluetooth.)"</string>
|
||||
<string name="button_close">Tanca</string>
|
||||
<string name="gameevent_channel_expl">Esdeveniments durant la partida</string>
|
||||
<string name="invit_expl_usrsms_fmt">S\'ha enviat la invitació via SMS al telèfon %1$s a %2$s</string>
|
||||
<string name="invit_expl_usrsms_fmt">S\'ha enviat la invitació via SMS a %1$s</string>
|
||||
<string name="invite_choice_user_sms">SMS (missatges de text)</string>
|
||||
<string name="ok_with_robots">D\'acord (robots)</string>
|
||||
<string name="sms_invite_flakey">Aquesta opció nova executa l\'aplicació de missatgeria SMS amb una invitació llesta per a enviar, si funciona. Cada aplicació de missatgeria SMS és diferent i algunes no cooperen.</string>
|
||||
|
|
|
|||
|
|
@ -915,7 +915,7 @@
|
|||
\n • Starten Sie CrossWords auf dem anderen Gerät
|
||||
\n • Wenn alles nichts hilft, booten Sie dieses Gerät
|
||||
\n</string>
|
||||
<string name="invit_expl_usrsms_fmt">"Einladung per SMS an %1$s an %2$s gesendet"</string>
|
||||
<string name="invit_expl_usrsms_fmt">"Einladung per SMS an %1$s gesendet"</string>
|
||||
<string name="sms_invite_flakey">Diese neue Option startet Ihre Standard-SMS-App mit einer versandfertigen Einladung - wenn es funktioniert. Jede SMS-App ist anders, und mit einigen funktioniert es nicht.</string>
|
||||
<string name="sms_invite_fail">SMS-App konnte nicht gestartet werden</string>
|
||||
<string name="msg_dev_deleted_fmt">Das Spiel mit dem Namen „%1$s” wurde auf einem anderen Gerät gelöscht. Sie werden es nicht mehr spielen können.</string>
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@
|
|||
<string name="invite_if_nfc">O simplemente pulsa para invitar -- si el otro dispositivo tiene también Android Beaming y está cerca.</string>
|
||||
<string name="invite_multiple">" (Estás esperando a varios jugadores remotos. No tienes que invitarlos a todos a la vez, pero esta alerta no será descartada hasta que todos hayan sido invitados y las invitaciones aceptadas.)"</string>
|
||||
<string name="invit_expl_sms_fmt">Invitación enviada por SMS al número de teléfono %1$s a %2$s</string>
|
||||
<string name="invit_expl_usrsms_fmt">Invitación enviada por SMS a %1$s en %2$s</string>
|
||||
<string name="invit_expl_usrsms_fmt">Invitación enviada por SMS en %1$s</string>
|
||||
<string name="sms_invite_flakey">Esta nueva opción ejecuta tu aplicación SMS por defecto con una invitación preparada para invitar -- cuando funciona. Cada aplicación SMS es diferente, y algunas no funcionarán.</string>
|
||||
<string name="sms_invite_fail">No se puede ejecutar la aplicación SMS</string>
|
||||
<string name="invit_expl_bt_fmt">Invitación enviada vía Bluetooth al dispositivo conectado \"%1$s\" en %2$s</string>
|
||||
|
|
|
|||
|
|
@ -3079,7 +3079,7 @@ pour la langue</string>
|
|||
\n • Lancez CrossWords sur l\'autre périphérique
|
||||
\n • Si tout cela échoue, redémarrez le périphérique
|
||||
\n</string>
|
||||
<string name="invit_expl_usrsms_fmt">Invitation envoyée par SMS à %1$s sur %2$s</string>
|
||||
<string name="invit_expl_usrsms_fmt">Invitation envoyée par SMS sur %1$s</string>
|
||||
<string name="msg_dev_deleted_fmt">La partie nommée \"%1$s\" a été effacée sur un autre périphérique. Vous ne pourrez plus y jouer.</string>
|
||||
<string name="invite_choice_user_sms">SMS</string>
|
||||
<string name="invite_choice_data_sms">MMS</string>
|
||||
|
|
|
|||
|
|
@ -864,7 +864,7 @@ WiFi ダイレクト経由で接続可能なデバイスはありません。</s
|
|||
\n • 他のデバイスでクロスワードを起動してみます
|
||||
\n • それでも失敗する場合は、このデバイスを再起動します
|
||||
\n</string>
|
||||
<string name="invit_expl_usrsms_fmt">%2$s の %1$s に SMS で招待を送信しました</string>
|
||||
<string name="invit_expl_usrsms_fmt">%1$s の SMS で招待を送信しました</string>
|
||||
<string name="sms_invite_flakey">この新しいオプションを使用すると、デフォルトのSMSアプリが起動し、招待状が送信可能になります（機能する場合）。各SMSアプリは異なり、一部は連携しません。</string>
|
||||
<string name="sms_invite_fail">SMS アプリを起動できません</string>
|
||||
<string name="msg_dev_deleted_fmt">\"%1$s\" という名前のゲームが別のデバイスで削除されました。これ以上プレイすることはできません。</string>
|
||||
|
|
|
|||
|
|
@ -912,7 +912,7 @@
|
|||
<string name="sms_invite_fail">Kunne ikke starte SMS-program</string>
|
||||
<string name="checkbox_archive">Flytt til arkiv</string>
|
||||
<string name="button_more_info">Les mer</string>
|
||||
<string name="invit_expl_usrsms_fmt">Invitasjon sendt via SMS-melding til telefonnummer %1$s på %2$s</string>
|
||||
<string name="invit_expl_usrsms_fmt">Invitasjon sendt via SMS-melding på %1$s</string>
|
||||
<string name="msg_dev_deleted_fmt">Spillet ved navn \"%1$s\" har blitt slettet på en annen enhet. Du vil ikke kunne spille videre.</string>
|
||||
<string name="invite_choice_data_sms">Data-SMS</string>
|
||||
<string name="empty_bt_inviter">Ingen parrede enheter oppdaget enda.</string>
|
||||
|
|
|
|||
|
|
@ -930,7 +930,7 @@
|
|||
\n
|
||||
\n(%1$d gier zostanie również usuniętych.)"</item>
|
||||
</plurals>
|
||||
<string name="invit_expl_usrsms_fmt">Zaproszenie wysłane przez SMS do %1$s na %2$s</string>
|
||||
<string name="invit_expl_usrsms_fmt">Zaproszenie wysłane przez SMS na %1$s</string>
|
||||
<string name="sms_invite_flakey">Ta opcja uruchamia domyślną aplikację SMS z zaproszeniem gotowym do wysłania -- gdy działa. Każda aplikacja SMS jest inna, a niektóre nie współpracują.</string>
|
||||
<string name="sms_invite_fail">Nie można uruchomić aplikacji SMS</string>
|
||||
<string name="msg_dev_deleted_fmt">Gra o nazwie \"%1$s\" została usunięta na innym urządzeniu. Nie będziesz mógł grać dalej.</string>
|
||||
|
|
|
|||
|
|
@ -1712,7 +1712,7 @@
|
|||
<string name="invit_expl_bt_fmt">Convite enviado via Bluetooth para o dispositivo pareado \"%1$s\" em %2$s</string>
|
||||
<string name="sms_invite_fail">Não foi possível iniciar o aplicativo de SMS</string>
|
||||
<string name="sms_invite_flakey">Essa nova opção inicia seu aplicativo padrão de SMS com um convite pronto para ser enviado -- quando funciona. Cada aplicativo de SMS é diferente e alguns não cooperam.</string>
|
||||
<string name="invit_expl_usrsms_fmt">Convite enviado via SMS para %1$s em %2$s</string>
|
||||
<string name="invit_expl_usrsms_fmt">Convite enviado via SMS em %1$s</string>
|
||||
<string name="invit_expl_sms_fmt">Convite enviado via Data SMS para o número de telefone %1$s em %2$s</string>
|
||||
<string name="invite_if_nfc">Ou apenas toque no Convite -- se o outro dispositivo também possuir Android Beaming e estiver perto.</string>
|
||||
<string name="invited_msg">Esse jogo foi criado a partir de um convite que você recebeu. Assim que for possível conectar com o remetente e todos os outros convidados chegarem o jogo será iniciado.</string>
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
<?php
|
||||
|
||||
print <<<EOF
|
||||
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
|
||||
<html>
|
||||
<head>
|
||||
<title>Crosswords install redirect</title>
|
||||
<meta http-equiv="REFRESH"
|
||||
content="0;url=market://search?q=pname:org.eehouse.android.xw4">
|
||||
</head>
|
||||
<body>
|
||||
<p>Redirecting to the market...</p>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
||||
EOF;
|
||||
|
||||
?>
|
||||
|
|
@ -1,157 +0,0 @@
|
|||
<!-- -*- mode: sgml; -*- -->
|
||||
<?php
|
||||
|
||||
function langToString( $code ) {
|
||||
switch ( $code ) {
|
||||
case 1: return "English";
|
||||
case 2: return "French";
|
||||
case 3: return "German";
|
||||
case 4: return "Turkish";
|
||||
case 5: return "Arabic";
|
||||
case 6: return "Spanish";
|
||||
case 7: return "Swedish";
|
||||
case 8: return "Polish";
|
||||
case 9: return "Danish";
|
||||
case 0xA: return "Italian";
|
||||
case 0xB: return "Dutch";
|
||||
case 0xC: return "Catalan";
|
||||
case 0xD: return "Portuguese";
|
||||
|
||||
case 0XF: return "Russian";
|
||||
case 0x11: return "Czech";
|
||||
case 0x12: return "Greek";
|
||||
case 0x13: return "Slovak";
|
||||
default:
|
||||
return "<unknown>";
|
||||
}
|
||||
}
|
||||
|
||||
$g_androidStrings = array( "android", );
|
||||
|
||||
$scheme = "newxwgame";
|
||||
$host = "10.0.2.2";
|
||||
$lang = $_REQUEST["lang"];
|
||||
$room = $_REQUEST["room"];
|
||||
$np = $_REQUEST["np"];
|
||||
$id = $_REQUEST["id"];
|
||||
$wl = $_REQUEST["wl"];
|
||||
|
||||
$agent = $_SERVER['HTTP_USER_AGENT'];
|
||||
$onAndroid = false;
|
||||
for ( $ii = 0; $ii < count($g_androidStrings) && !$onAndroid; ++$ii ) {
|
||||
$needle = $g_androidStrings[$ii];
|
||||
$onAndroid = 0 != stripos( $agent, $needle );
|
||||
}
|
||||
$onFire = 0 != stripos( $agent, 'silk' );
|
||||
|
||||
$localurl = "$scheme://$host?room=$room&lang=$lang&np=$np";
|
||||
if ( $id != "" ) {
|
||||
$localurl .= "&id=$id";
|
||||
}
|
||||
if ( $wl != "" ) {
|
||||
$localurl .= "&wl=$wl";
|
||||
}
|
||||
|
||||
if ( $onAndroid || $onFire ) {
|
||||
print <<<EOF
|
||||
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
|
||||
<html>
|
||||
<head>
|
||||
<link rel="stylesheet" type="text/css" href="/xw4mobile.css" />
|
||||
<title>Crosswords Invite redirect</title>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<div align="center">
|
||||
<img src="./icon48x48.png"/>
|
||||
|
||||
<h1><a href="$localurl">Tap this link to launch Crosswords with
|
||||
your new game.</a>
|
||||
</h1>
|
||||
<p>If this fails it's probably because you don't have a new enough
|
||||
version of Crosswords installed.
|
||||
</p>
|
||||
|
||||
<img src="./icon48x48.png"/>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
||||
EOF;
|
||||
|
||||
} else if ( $onFire ) {
|
||||
$langString = langToString($lang);
|
||||
$langText = "Make sure the language chosen is $langString";
|
||||
if ( '' != $wl ) {
|
||||
$langText .= " and the wordlist is $wl.";
|
||||
}
|
||||
$langText .= " If you don't have a[n] $langString wordlist installed you'll need to do that first.";
|
||||
print <<<EOF
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
|
||||
<html>
|
||||
<head>
|
||||
<title>Crosswords Invite redirect</title>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<p>It appears you're running on a Kindle Fire, whose non-standard (from
|
||||
an Android perspective) OS doesn't support the custom schemes on which
|
||||
Crosswords invitations depend. If you want to accept this invitation
|
||||
you'll need to do it the manual way:
|
||||
|
||||
<ol>
|
||||
<li>Open Crosswords, and navigate to the main Games List screen</li>
|
||||
<li>Choose "Add game", either from the menu or the button at the bottom.</li>
|
||||
<li>Under "New Networked game", choose "Configure first".</li>
|
||||
<li>$langText</li>
|
||||
<li>As the room name, enter "$room".</li>
|
||||
<li>Make sure the total number of players shown is $np and that only one of them is not an "Off-device player".</li>
|
||||
<li>Now tap the "Play game" button at the bottom (above the keyboard). Your new game should open and connect.</li>
|
||||
</ol></p>
|
||||
<p>I'm sorry this is so complicated. I'm trying to find a
|
||||
workaround for this limitation in the Kindle Fire's operating system
|
||||
but for now this is all I can offer.</p>
|
||||
|
||||
<p>(Just in case Amazon's fixed the
|
||||
problem, <a href="$localurl">here is the link</a> that should open
|
||||
your new game.)</p>
|
||||
</body>
|
||||
</html>
|
||||
EOF;
|
||||
} else {
|
||||
$subject = "Android device not identified";
|
||||
|
||||
$body = htmlentities("My browser is running on an android device but"
|
||||
. " says its user agent is: \"$agent\". Please fix your script to recognize"
|
||||
. " this as an Android browser.");
|
||||
|
||||
print <<<EOF
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
|
||||
<html>
|
||||
<head>
|
||||
<title>Crosswords Invite redirect</title>
|
||||
</head>
|
||||
<body>
|
||||
<div align="center">
|
||||
<img src="./icon48x48.png"/>
|
||||
</div>
|
||||
<p>This page is meant to be viewed on a browser on your Android
|
||||
device. Please open the email that sent you here on that device and
|
||||
revisit this link to complete the invitation process.
|
||||
</p>
|
||||
|
||||
<p>(If you <em>are</em> viewing this on an Android device, you've
|
||||
found a bug! Please <a href="mailto:
|
||||
xwords@eehouse.org?subject=$subject&body=$body">email me</a> (and be
|
||||
sure to leave the user agent string in the email body.)
|
||||
</p>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
EOF;
|
||||
}
|
||||
|
||||
?>
|
||||
Loading…
Reference in a new issue