Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-08 05:24:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

include OS version and make/model in email

Browse source
This commit is contained in:
Eric House 2020-08-19 13:24:12 -07:00
parent 4d69366a82
commit 69e3c4b921
10 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
xwords4/android/app/src/main/java/org/eehouse/android/xw4/Utils.java
View file

@ -37,10 +37,9 @@ import android.database.Cursor;
import android.media.Ringtone;
import android.media.RingtoneManager;
import android.net.Uri;
import android.os.Build;
import android.os.Looper;
import android.provider.ContactsContract.PhoneLookup;
import androidx.core.app.NotificationCompat;
import androidx.core.content.FileProvider;
import android.telephony.PhoneNumberUtils;
import android.telephony.TelephonyManager;
import android.text.ClipboardManager;
@ -53,6 +52,8 @@ import android.widget.CheckBox;
import android.widget.EditText;
import android.widget.TextView;
import android.widget.Toast;
import androidx.core.app.NotificationCompat;
import androidx.core.content.FileProvider;
import org.json.JSONObject;
@ -199,7 +200,8 @@ public class Utils {
R.string.email_author_email ) };
intent.putExtra( Intent.EXTRA_EMAIL, addrs );
String body = LocUtils.getString( context, R.string.email_body_rev_fmt,
BuildConfig.GIT_REV );
BuildConfig.GIT_REV, Build.MODEL,
Build.VERSION.RELEASE );
if ( null != msg ) {
body += "\n\n" + msg;
}

6
xwords4/android/app/src/main/res/values/strings.xml
View file

@ -1633,10 +1633,10 @@
<string name="email_author_subject">Comment about CrossWords</string>
<!-- -->
<string name="email_author_chooser">Send comment via</string>
<!-- -->
<!-- Default text for email body generated by "email author" menuitem -->
<string name="email_body_rev_fmt">(If relevant, please include the
version: “%1$s”; and make/model of your phone or
tablet.)</string>
version (“%1$s”) of CrossWords and the make/model (“%2$s”) and OS
version (%3$s) of your phone or tablet.)</string>
<!-- <string name="newgame_enable_bt">Turn Bluetooth on</string> -->
<!-- In invitation dialogs, button to remove checked items -->
<string name="bt_pick_clear_button">Remove</string>

2
xwords4/android/res_src/values-ca/strings.xml
View file

@ -388,7 +388,7 @@ Introduïu el vostre nom aquí. S\'usarà en crear partides noves. (Podreu
<string name="board_menu_file_email">Envia un correu-e a l\'autor</string>
<string name="email_author_subject">Comentari sobre el CrossWords</string>
<string name="email_author_chooser">Envia el comentari via</string>
<string name="email_body_rev_fmt">(Si és rellevant, incloeu la versió: «%1$s»; i el fabricant i model del telèfon o tauleta.)</string>
<string name="email_body_rev_fmt">(Si és rellevant, incloeu la versió: «%1$s»; i el fabricant i model del telèfon o tauleta: %2$s/%3$s.)</string>
<string name="bt_pick_clear_button">Suprimeix</string>
<string name="invite_progress_title">S\'està connectant…</string>
<string name="invite_progress_fmt">S\'està enviant la invitació al CrossWords a %1$s</string>

2
xwords4/android/res_src/values-de/strings.xml
View file

@ -388,7 +388,7 @@
<string name="board_menu_file_email">Email an den Autor</string>
<string name="email_author_subject">Kommentar zu CrossWords</string>
<string name="email_author_chooser">Kommentar senden über</string>
<string name="email_body_rev_fmt">(Falls relevant, geben Sie bitte die Version: „%1$s“; und das Fabrikat/Modell Ihres Smartphones oder Tablets an.)</string>
<string name="email_body_rev_fmt">(Falls relevant, geben Sie bitte die Version: „%1$s“; und das Fabrikat/Modell Ihres Smartphones oder Tablets an: %2$s/%3$s.)</string>
<string name="invite_notice_title">Neue Partie per Einladung</string>
<string name="new_bt_body_fmt">Ein Spieler auf dem Gerät %1$s will eine Partie starten</string>
<string name="new_relay_body">Zum Öffnen der neuen Partie antippen</string>

2
xwords4/android/res_src/values-fr/strings.xml
View file

@ -1928,7 +1928,7 @@ seulement des informations sur les jetons. Il n\'y a pas de mots à parcourir.</
<string name="email_author_chooser">Envoyer un commentaire par</string>
<!-- -->
<!-- Should not be translated -->
<string name="email_body_rev_fmt">(Si c\'est pertinent, merci d\'inclure la version : « %1$s » ; et le modèle de votre téléphone ou votre tablette.)</string>
<string name="email_body_rev_fmt">(Si c\'est pertinent, merci d\'inclure la version : « %1$s » ; et le modèle de votre téléphone ou votre tablette: %2$s/%3$s)</string>
<!-- In the Bluetooth invite device dialog -->
<!--<string name="bt_pick_addall_button">Add all Paired</string>-->
<!-- -->

2
xwords4/android/res_src/values-ja/strings.xml
View file

@ -365,7 +365,7 @@
<string name="board_menu_file_email">作者にメール</string>
<string name="email_author_subject">クロスワードについてのコメント</string>
<string name="email_author_chooser">コメントを次で送信</string>
<string name="email_body_rev_fmt">(該当する場合、バージョン: \"%1$s\" と、お使いの電話またはタブレットのメーカー/モデルを含めるようにしてください)</string>
<string name="email_body_rev_fmt">(該当する場合、バージョン: \"%1$s\" と、お使いの電話またはタブレットのメーカー/モデル[%2$s/%3$s]を含めるようにしてください)</string>
<string name="bt_pick_clear_button">削除</string>
<string name="invite_progress_title">接続しています…</string>
<string name="invite_progress_fmt">%1$s でクロスワードへの招待を送信しています</string>

2
xwords4/android/res_src/values-nb-rNO/strings.xml
View file

@ -576,7 +576,7 @@
<string name="title_lookup_study">Trykk for å slå opp eller studere</string>
<string name="board_menu_file_email">E-postforfatter</string>
<string name="email_author_subject">Kommentar om CrossWords</string>
<string name="email_body_rev_fmt">(Hvis relevant, inkluder versjonen: \"%1$s\", og fabrikatet/modellen av din telefon eller nettbrett.)</string>
<string name="email_body_rev_fmt">(Hvis relevant, inkluder versjonen: \"%1$s\", og fabrikatet/modellen av din telefon eller nettbrett: %2$s/%3$s.)</string>
<string name="bt_pick_clear_button">Fjern valgte</string>
<string name="invite_progress_title">Kobler til…</string>
<string name="invite_progress_fmt">Sender invitasjon til CrossWords på %1$s</string>

2
xwords4/android/res_src/values-nl/strings.xml
View file

@ -366,7 +366,7 @@
<string name="board_menu_file_email">Email ontwikkelaar</string>
<string name="email_author_subject">Geef je mening over CrossWords</string>
<string name="email_author_chooser">Verstuur opmerking via</string>
<string name="email_body_rev_fmt">(Indien relevant, geef alsjeblieft het versienummer mee: \"%1$s\"; en fabrikant/model van je telefoon of tablet.)</string>
<string name="email_body_rev_fmt">(Indien relevant, geef alsjeblieft het versienummer mee: \"%1$s\"; en fabrikant/model van je telefoon of tablet: %2$s/%3$s)</string>
<string name="bt_pick_clear_button">Verwijder geselecteerde[n]</string>
<string name="invite_progress_title">Verbinden...</string>
<string name="invite_progress_fmt">Uitnodiging om CrossWords te spelen versturen op %1$s</string>

2
xwords4/android/res_src/values-pl/strings.xml
View file

@ -471,7 +471,7 @@
<string name="board_menu_file_email">E-mail do autora</string>
<string name="email_author_subject">Komentarz o CrossWords</string>
<string name="email_author_chooser">Wyślij komentarz przez</string>
<string name="email_body_rev_fmt">(Jeśli dotyczy, proszę podać wersję: \"%1$s\"; oraz markę/model telefonu lub tabletu.)</string>
<string name="email_body_rev_fmt">(Jeśli dotyczy, proszę podać wersję: \"%1$s\"; oraz markę/model telefonu lub tabletu: %2$s/%3$s.)</string>
<string name="bt_pick_clear_button">Usuń</string>
<string name="bt_pair_settings">Paruj więcej</string>
<string name="invite_progress_title">Łączenie…</string>

2
xwords4/android/res_src/values-pt/strings.xml
View file

@ -1483,7 +1483,7 @@
<string name="email_author_chooser">Enviar comentário por</string>
<!-- -->
<string name="email_body_rev_fmt">(Se relevante, por favor inclua a
versão: \"%1$s\"; e marca/modelo do seu telefone ou tablet.)"</string>
versão: \"%1$s\"; e marca/modelo do seu telefone ou tablet: %2$s/%3$s)"</string>
<!-- -->
<!-- -->
<string name="bt_pick_clear_button">Remover selecionados</string>