Commit graph

4009 commits

Author SHA1 Message Date
Eric House
9b785e230c Merge branch 'android_branch' into android_translate
Conflicts:
	xwords4/android/XWords4/res_src/values-ca/strings.xml
2015-07-29 05:49:11 -07:00
Eric House
cb7b8660dc bring in Catalan changes from android_translate branch, and fix a
couple of typos
2015-07-29 05:47:08 -07:00
Eric House
d94f7bbf49 Merge remote-tracking branch 'weblate/android_translate' into android_translate
Conflicts:
	xwords4/android/XWords4/res_src/values-nl/strings.xml
2015-07-29 05:28:07 -07:00
Eric House
5bf674ca76 Merge branch 'android_branch' into android_translate 2015-07-28 20:35:30 -07:00
Joan Montané
0e797e2679 Translated using Weblate (Catalan)
Currently translated at 100.0% (682 of 682 strings)
2015-07-28 20:53:21 +02:00
Eric House
2ec2972b9b invalidate menubar when minimizing group. (Thanks Aidan.) 2015-07-28 06:26:25 -07:00
Joan Montané
0cb49e7379 Translated using Weblate (Catalan)
Currently translated at 90.9% (620 of 682 strings)
2015-07-27 01:04:01 +02:00
Eric House
3c58267d4e goes with cherrypick 2015-07-26 12:09:51 -07:00
Eric House
0bb51e8b93 show a toast when hint can't find anything, on the principle that user
should see some response to every action.

Conflicts:
	xwords4/android/XWords4/archive/R.java
2015-07-26 12:09:15 -07:00
Eric House
a40ee96439 first set of Dutch strings 2015-07-23 19:37:31 -07:00
Weblate
c58fdd0273 Merge remote-tracking branch 'origin/android_translate' into android_translate 2015-07-23 18:45:26 +02:00
Sylvie
235d4d232c Translated using Weblate (Dutch)
Currently translated at 19.3% (132 of 682 strings)
2015-07-23 18:45:25 +02:00
Eric House
fa00eef151 convert string to plurals and add some "one" items to others to allow
removing [s]. There's more to do still.
2015-07-23 06:57:37 -07:00
Eric House
a48468eca1 convert string to plurals and add some "one" items to others to allow
removing [s]. There's more to do still.
2015-07-23 06:56:12 -07:00
Eric House
2a009e620b empty file for Dutch strings 2015-07-22 20:59:13 -07:00
Eric House
f626d6ca4c remove redundant constant 2015-07-21 06:55:15 -07:00
Eric House
c796e7d4cc clear the net status rect for standalone games' boards to avoid ghost
button effect when they're opened after a networked game.
2015-07-17 06:10:08 -07:00
Eric House
6851fd9746 include teaser from server, and launch an alert in-game instead of
having the notification display everything. I've committed this
before; not sure where it went.
2015-07-11 08:25:10 -07:00
Eric House
5e63d03e76 apparently I forgot to check this in 2015-07-11 08:23:22 -07:00
Eric House
ec393bc0c8 don't crash if intent is null 2015-07-11 07:53:22 -07:00
Eric House
fe25060255 fix assertion failure, probably due to some freak accident of missaved
timestamp. Whatever.
2015-07-01 05:52:02 -07:00
Eric House
d426db7a49 move httppost stuff into NetUtils 2015-06-26 06:37:34 -07:00
Eric House
8a575bc789 fill in help text for communication means 2015-06-26 06:18:42 -07:00
Eric House
e60a16be1e add onPrepareDialog, without which we crash turning on SMS from
prefs. Note: I've committed this before and somehow lost it, so there
may be some git anomolies here.
2015-06-26 06:13:11 -07:00
Eric House
63aae3d4e8 add newbie hints to checkboxes enabling communication types (bt, sms,
etc.)
2015-06-25 06:38:40 -07:00
Eric House
4f53ccd5db cleanup; log dropped messages on DEBUG builds 2015-06-24 07:48:25 -07:00
Eric House
fd765c6cb0 turn invite-by-sms on 2015-06-24 07:46:48 -07:00
Eric House
b8193d635d SMS-enable alert: Add cancel button, and disable OK button until user
selects an enabling option
2015-06-23 08:11:18 -07:00
Eric House
54b18c898d more, and hopefully last, French strings 2015-06-19 20:52:40 -07:00
Eric House
8354f45548 deal with case where invitation includes only conntypes not supported
on device, e.g. sms-only sent to a tablet. Strip the unsupported types
when creating the game, and then on game open suggest to user he
delete (with explanation)
2015-06-19 07:51:51 -07:00
Eric House
d27fdbd748 It's now possible for a game to have no address modes, so don't assert
otherwise.
2015-06-19 07:45:47 -07:00
Eric House
d89c0d2847 on receipt of invitation, remove address modes the device doesn't
support.
2015-06-18 08:48:03 -07:00
Eric House
f93f0cd926 Yet another attempt to deal with bad connectivity: when can't connect
to relay but other address modes are present, offer to remove the
relay from the game, and if that choice is taken confirm with an
explanation of the limits of what remains.
2015-06-18 08:14:33 -07:00
Eric House
9d25b0cb65 test for language, not full locale, in deciding to show English-only
release note
2015-06-16 07:27:01 -07:00
Eric House
13f4e66f84 More French strings, and fix typo in English 2015-06-16 06:45:23 -07:00
Eric House
568e3fdfe8 wrap email in changes log in a mailto url 2015-06-15 07:49:59 -07:00
Eric House
d4bfaca127 cleanup: mostly removing logging and wrapping rematch code in an
if(false) so it goes away.
2015-06-14 22:39:47 -07:00
Eric House
4b6ea57e70 revert earlier change not running update check timer on DEBUG builds
since they're now upgradable too.
2015-06-14 22:34:58 -07:00
Eric House
6a36c1252d fix assert that wasn't asserting anything 2015-06-14 19:39:51 -07:00
Eric House
9a46d0713a don't post notifications for "moves" about which there's nothing to be
said. I think these are admin messages, e.g. "The move you reported is
legal", that are not of interest to users.
2015-06-14 07:39:10 -07:00
Eric House
4251d08248 generated strings 2015-06-13 07:39:29 -07:00
Eric House
7190706eaf when game doesn't have connection to relay but has another way to
connect, give user the option of inviting "anyway", but warn that
there will be no relay connection used in that game. And then remove
the relay addressing from the invitation info.
2015-06-13 07:35:02 -07:00
Eric House
82e0de6c40 test for BT being on, not airplane mode, to fix showing as disabled in
airplane mode when BT's been enabled manually.
2015-06-12 07:52:27 -07:00
Eric House
b000564278 show connection status as green/connected if ANY of the connection
types has succeeded more recently than it's failed.
2015-06-11 07:26:36 -07:00
Eric House
f353a70c89 catch up with recent changes 2015-06-10 07:29:28 -07:00
Eric House
a20797aab1 more translated French strings 2015-06-09 06:40:13 -07:00
Eric House
9e92af7c1f put dbg field in app object, not its parent 2015-06-09 06:39:46 -07:00
Eric House
f296ab4dc3 add additional warning about failure to connect when user's on WiFi,
since paranoid WiFi settings are probably a leading cause of my not
being able to connect.
2015-06-08 07:36:47 -07:00
Eric House
7eb6c17623 Restart service on socket exception. This gives the service a chance
to reconnect when the network connection changes (e.g. user switches
from wifi connection to cellular). The packet is still dropped, so a
lower level will need to send it again. Eventually the relay needs to
keep a queue of un-acked packets, or track stuff needing resending the
way BTService does.
2015-06-08 06:46:51 -07:00
Eric House
faba6c856f enable check-for-updated menu even on DEBUG builds (though the server
doesn't respond with anything yet)
2015-06-08 06:31:36 -07:00