Commit graph

7954 commits

Author SHA1 Message Date
Eric House
6d60e45eb9 tweak fake translation generation (and include new strings) 2014-05-02 22:08:44 -07:00
Eric House
43f90cb3b0 use -1 as array index 2014-05-02 22:03:02 -07:00
Eric House
ad65b93ef2 changes necessary to actually return a translation based on revision
hash of R.java passed by client, or none if it already has it.  Rough,
but works.
2014-05-02 22:00:25 -07:00
Eric House
56a057f06c when translations get out of sync with R.java values, there's often a
format exception.  Catch that, and strip out the locale's translations
so the app at least doesn't crash.  This should not happen once I have
the server side right, but it'll help now and provide a safety net
later.
2014-05-01 22:05:57 -07:00
Eric House
8d6f46fa22 snapshot. Should work for current case where the newest R.java is older than the app connecting 2014-05-01 08:15:42 -07:00
Eric House
7b40abfa2f more features and some refactoring 2014-05-01 08:14:40 -07:00
Eric House
5a22e08664 no need for package name in app info as it's in the top-level obj 2014-04-30 07:28:42 -07:00
Eric House
164387b37d update to use mygit 2014-04-30 07:25:23 -07:00
Eric House
6d194e5362 don't chdir (which isn't cool when a cgi); use subprocess's cwd param instead 2014-04-30 07:08:59 -07:00
Eric House
d91c307792 include hash of current R.java in xlation update json, not of the entire app 2014-04-30 03:29:47 -07:00
Eric House
a3bcef18f0 add more functionality 2014-04-29 21:15:50 -07:00
Eric House
a7c4730eb5 start of a file to interact with git for getting xlations 2014-04-29 06:53:02 -07:00
Eric House
d463ea3f30 commented-out line to copy xwdb into /sdcard from which it can be retrieved 2014-04-29 06:43:11 -07:00
Eric House
4279457471 name change to remind what script is doing 2014-04-29 06:43:11 -07:00
Eric House
b4d5130588 Merge remote branch 'origin/android_localize' into android_localize 2014-04-29 06:39:35 -07:00
Eric House
7ea037d56a work with arrays of locales 2014-04-29 06:33:14 -07:00
Eric House
6c46ce2297 send and receive array of locales for translation info, one of which
is the device's current default.  Plan's to include a fake as well if
set, but currently that replaces the default.
2014-04-28 07:58:23 -07:00
Eric House
b42c372c79 send git version code, app package name, and git hash with all messages 2014-04-27 20:03:40 -07:00
Eric House
be817feb55 add git rev hash as constant (and usage()) 2014-04-27 20:03:08 -07:00
Eric House
19badff420 tweak text 2014-04-27 19:21:21 -07:00
Eric House
b87a7e808c don't fail building if scp fails 2014-04-27 19:08:04 -07:00
Eric House
33a83b0e2f toward use of data text messages for games: don't let CDMA phone users
turn data messages on, and when checking if SMS is supported say yes
for KitKat users if they've successfully turned data on.
2014-04-27 13:34:09 -07:00
Eric House
f386cd5c1b for consistency, createDialog -> onCreateDialog 2014-04-27 13:17:48 -07:00
Eric House
716109e979 Merge branch 'android_branch' into android_localize
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsActivity.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java
2014-04-26 22:04:57 -07:00
Eric House
c82c59d985 experimental: enable SMS on KitKat if debug setting to use Data SMS is on 2014-04-26 20:04:55 -07:00
Eric House
fbb042ffee merge android_branch -> android_sms_kitkat 2014-04-26 18:31:05 -07:00
Eric House
ae4c6e98f2 replace escaped carraige returns and unicode from resources to get
closer to what getString returns.  If I can't find an Android API to
do this it should be done on the server, but this is an improvement
until I do.
2014-04-25 20:58:14 -07:00
Eric House
540eb73aec merge android_branch 2014-04-25 20:33:57 -07:00
Eric House
ead0fdf668 merge from_android_beta_82-> 2014-04-25 20:29:54 -07:00
Eric House
f954b09391 merge android_branch-> 2014-04-25 18:47:24 -07:00
Eric House
19573af533 a more elegant way of building up params to pass to PQexecParams 2014-04-25 18:45:51 -07:00
Eric House
a7c1724bb8 another change 2014-04-25 07:46:33 -07:00
Eric House
2f3a7f4bd2 allow board screen to be "upside down" on OS version new enough to
support it (and make SMS Invite Activity go any way, just like
everything else)

Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
2014-04-25 07:46:22 -07:00
Eric House
6eaf7a57b5 fix crash when there's a "'" in model name 2014-04-25 07:41:58 -07:00
Eric House
7818cd002b merge android_branch->android_localize 2014-04-24 20:00:38 -07:00
Eric House
6e011ab36f allow board screen to be "upside down" on OS version new enough to
support it (and make SMS Invite Activity go any way, just like
everything else)
2014-04-24 19:59:20 -07:00
Eric House
808e342cd4 clean up 2014-04-24 19:58:18 -07:00
Eric House
28e81e3a74 translate preferences -- finally. 2014-04-24 07:56:27 -07:00
Eric House
3b4c672492 toward substituting what getString (or the resource compiler) normally does. 2014-04-24 07:08:57 -07:00
Eric House
ed3370133f use lowercase \u instead; \U isn't acceptable in java 2014-04-24 07:01:53 -07:00
Eric House
00ecf0d9d0 be consistent using capital-U \U to indicate unicode 2014-04-24 06:53:13 -07:00
Eric House
28c0862604 translations come in with ids rather than English strings as keys 2014-04-24 06:31:27 -07:00
Eric House
8612a5f624 use IDs rather than english strings as keys in passing
translations. Requires parallel change on client, and currently
doesn't quite work because e.g. \n is not replaced before the
translation is rendered.
2014-04-24 06:24:38 -07:00
Eric House
1e5a474692 remove unneeded param 2014-04-24 06:21:10 -07:00
Eric House
7434c6a3a7 cleanup 2014-04-23 19:41:44 -07:00
Eric House
6d7d4955a0 more informative log message 2014-04-23 19:38:16 -07:00
Eric House
780b22678e add param caller expects 2014-04-23 19:35:35 -07:00
Eric House
36f839f8d1 more stuff to not reverse/capitalize (e.g. "\n"); print to stdout by default 2014-04-23 19:35:10 -07:00
Eric House
19c32b0444 Merge branch 'android_branch' into android_localize
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2014-04-23 07:44:51 -07:00
Eric House
6a4c599da5 Merge remote branch 'origin/android_branch' into android_branch 2014-04-23 07:40:46 -07:00