Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-03 23:04:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
7953 commits 21 branches 243 tags 33 MiB
Commit graph

3614 commits

Author SHA1 Message Date
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
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
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
Eric House
e25a0e7dbc changes for translation downloading 2014-04-23 07:39:36 -07:00
Eric House
cb96960446 let's track changes in the fake translations for a bit 2014-04-23 06:28:03 -07:00
Eric House
e643e9d5c0 add debug preference via which Translate menuitems must be enabled 2014-04-22 21:06:05 -07:00
Eric House
0a3371a82f break most of PrefsActivity into PrefsDelegate 2014-04-22 20:59:58 -07:00
Eric House
f410f8bb1a separate local and blessed (server) translations, fix to update or insert correctly and handle keys with embedded quotes, etc. Works to download translations, but a lot of longer keys don't seem to be matching. 2014-04-22 07:43:55 -07:00
Eric House
0e9790ee7c new string 2014-04-22 07:42:26 -07:00
Eric House
66768c7e7d better formatting and key identity checking 2014-04-22 07:30:32 -07:00
Eric House
ec0443b2ce add constraint to loc table 2014-04-22 07:29:35 -07:00
Eric House
94597ee287 record R.java where it won't be used. I want to see how often, and in what ways, it changes. 2014-04-21 19:46:27 -07:00
Eric House
45b1b0bfa8 script to produce the translation array that's downloaded to device 2014-04-21 07:13:41 -07:00
Eric House
0bf8b45157 implement reverse fake-locale 2014-04-20 21:36:41 -07:00
Eric House
5d3beb6404 script to generate fake locales from English strings.xml for use testing downloading translations 2014-04-20 21:26:43 -07:00
Eric House
155dd6f19a snapshot: now receives updates from the server and they show up in 
menus etc. (after a restart.)
 2014-04-20 06:49:26 -07:00
Eric House
f0bd300f1b add setter for new table 2014-04-20 06:45:00 -07:00
Eric House
ed7da84da6 fix compile: add missing param 2014-04-18 19:38:12 -07:00
Eric House
e0404801ba fix clean builds 2014-04-18 19:25:40 -07:00
Eric House
dbc42c3ad2 include xlation info in update request to server. It's not handled yet 
and so the handling of the result is untested.
 2014-04-18 08:03:01 -07:00
Eric House
901e07c0aa getter for new pairs DB 2014-04-18 08:02:25 -07:00
Eric House
b636fe263b new table for generic key/value pairs, and fix crash on new install by 
not requiring localization db to exist during db creation.
 2014-04-18 08:01:26 -07:00
Eric House
96c7f301d0 replace the last of the context.getString(...) calls with LocUtils.getString(context,...) 2014-04-18 07:14:27 -07:00
Eric House
ce59793458 use table to recover from too-new db. (tables are ugly in java) 2014-04-18 07:06:51 -07:00
Eric House
62ecd00971 remove redundant code 2014-04-18 06:26:25 -07:00
Eric House
4d08c7cef9 merge android_branch->android_localize 2014-04-18 06:21:45 -07:00
Eric House
48eb900212 merge -> android_branch 2014-04-18 06:10:25 -07:00
Eric House
c576ec7d7d up client version so relay knows we're cool 2014-04-18 06:05:15 -07:00
Eric House
8ba19184a0 merge from_android_beta_82->android_branch 2014-04-17 08:32:39 -07:00
Eric House
529e6733d0 up strings for new release 2014-04-17 08:27:42 -07:00
Eric House
56ce5761d7 fix malformed utf-8: writeBytes just strips all but the last byte of multi-byte utf8 chars! 2014-04-17 07:42:34 -07:00
Eric House
843518af4d use antcall with params rather than dependency with global properties 2014-04-17 05:34:27 -07:00
Eric House
538cd7b154 disallow duplicate strings in strings.xml, manually appending #<digit>. Will eventually filter that out of displayed strings. 2014-04-16 21:14:53 -07:00
Eric House
f5f7428683 fix debug tree to build again, this time with a paramaterized common 
xml file
 2014-04-16 21:06:41 -07:00
Eric House
79dc66b3a7 add array index as comment 2014-04-16 07:44:10 -07:00
Eric House
be581e762e fix more getString calls -- just keeps going 2014-04-16 07:12:45 -07:00
Eric House
85ffd0cad9 fix getStrings() calls for studylists 2014-04-16 07:02:09 -07:00
Eric House
1eea5bfed5 route more getString() calls through LocUtils 2014-04-16 06:52:20 -07:00
Eric House
1c35bd2a1b call init from outside after constructor completes rather than from inside constructor 2014-04-16 06:46:24 -07:00
Eric House
e2ed445fca complete rename of activity 2014-04-16 06:44:38 -07:00
Eric House
57f9182a4d inval group cache after deleting a game 2014-04-16 06:44:24 -07:00
Eric House
6198992fcd rename file 2014-04-16 06:07:59 -07:00
Eric House
e5151c32be make constructor private 2014-04-15 21:22:56 -07:00
Eric House
9e78d23014 break up more activities into delegates, using all the new methods in 
the base. Crashes a lot, but this is a snapshot to work from.
 2014-04-15 21:02:40 -07:00
Eric House
2e89b95e70 add methods subclasses will be able to use 2014-04-15 20:31:29 -07:00
Eric House
d9a407c9f3 move to superclass 2014-04-15 08:07:04 -07:00
Eric House
3465605481 more moving stuff into superclass 2014-04-15 08:02:57 -07:00
Eric House
548ba63dda more use of overridden AlertBuilder and getString 2014-04-15 07:49:21 -07:00
Eric House
8432500541 override setPositiveButton and friends so ids can be translated 2014-04-15 07:40:27 -07:00
Eric House
e12fbcce8e more use of LocUtils.getString() 2014-04-15 07:34:14 -07:00
Eric House
01c94d91cd I apparently don't understand how varargs works in java 2014-04-15 07:31:57 -07:00
Eric House
3c76de6851 call method on superclass rather than activity 2014-04-15 06:38:51 -07:00
Eric House
dc8b5b073e use superclass's getString() where possible instead of LocUtils's static version 2014-04-15 06:36:18 -07:00
Eric House
9720684ce7 break activity up into delegate 2014-04-15 06:27:17 -07:00
Eric House
1cf7e70091 use superclass's setContentView() 2014-04-15 06:26:55 -07:00
Eric House
0ae63c37ac add convenience methods for subclasses 2014-04-15 06:26:37 -07:00
Eric House
f0b5584e38 translate activity window titles 2014-04-14 08:10:49 -07:00
Eric House
7f48783fb2 get translations working in dicts browser (save title) 2014-04-14 08:05:11 -07:00
Eric House
67ca205774 remove compile command -- which never worked 2014-04-14 08:04:44 -07:00
Eric House
d3c5aeb977 add param 2014-04-14 07:40:35 -07:00
Eric House
a0fd457ad1 add stuff, including ability to list strings missing in english or translated version 2014-04-14 07:40:24 -07:00
Eric House
a04f091d7f more cleanup: copy over comments and manually fix what script couldn't 2014-04-14 07:38:48 -07:00
Eric House
9a4474ac1e ignore .pyc file 2014-04-14 06:28:48 -07:00
Eric House
1249fa5849 call getString on LocUtils instead of context 2014-04-14 06:28:29 -07:00
Eric House
13e900695e call new AlertBuilder only once 2014-04-14 06:28:05 -07:00
Eric House
9abc7b3212 add comment 2014-04-14 06:24:09 -07:00
Eric House
5d5a828dc2 as new printer prints -- no changes but whitespace 2014-04-12 09:33:52 -07:00
Eric House
e227038354 move not-to-be-localized string out of string.xml 2014-04-12 09:22:45 -07:00
Eric House
42ba1baaf7 include preceeding comments with string text 2014-04-12 08:19:48 -07:00
Eric House
6b30248af0 one more _fmt add 2014-04-12 08:17:23 -07:00
Eric House
1b79bcb1c4 add and use ability to remove nodes 2014-04-12 06:37:55 -07:00
Eric House
fe287719eb more fixes 2014-04-12 06:32:50 -07:00
Eric House
b2c6aabd74 start updating: swap %1$[sd] for %[sd] 2014-04-12 06:20:37 -07:00
Eric House
64ebbcfbae mods to export getString 2014-04-12 06:16:32 -07:00
Eric House
539f1205c9 more script-generated changes 2014-04-11 23:34:15 -07:00
Eric House
5434a3c03c more changes by script 2014-04-11 23:17:25 -07:00
Eric House
ac4fc367bb first changes made by script 2014-04-11 23:12:16 -07:00
Eric House
30b861879a first modification made by script 2014-04-11 22:54:13 -07:00
Eric House
77b87c6458 localized files as read in and printed back out, unmodifed but for how 
python prints them differently.  This is a baseline: modifications
will follow.
 2014-04-11 22:43:56 -07:00
Eric House
258b81dfb5 add localized string files exactly as copied from android_branch 2014-04-11 22:19:25 -07:00
Eric House
a22763298a extend AlertDialog.Builder and override setTitle so string ids can be 
translated when passed.
 2014-04-10 21:34:08 -07:00
Eric House
10d6969930 fix release builds: generate empty version of checker function 2014-04-10 07:43:57 -07:00
Eric House
ff03284c5c for debugging (testing what strings aren't yet reachable), uppercase 
all strings without a tranlation.
 2014-04-10 07:31:56 -07:00
Eric House
5c5a353d12 add string array to spinner manually so it can be translated -- sucks 
to have to change code for this, but...  The dropdown views look
crappy though I'm using identical code to what's in DictLangCache
building similar arrays that look fine.  Needs work.
 2014-04-10 06:44:33 -07:00
Eric House
f3b5cbb794 fix NPE 2014-04-09 21:14:30 -07:00
Eric House
67bca0dd4e Because loc: strings can't be supplied for all Views, don't do 
that. Instead use the English strings themselves as keys.  Generate a
java array of all R.string.whatever contants at build time, and use
that at runtime to build a hashmap of localizable strings that may be
found in UI widgets.  When one is found and there's a translation,
substitute.
 2014-04-09 21:09:46 -07:00
Eric House
b4016eaec3 get rid of loc: stuff 2014-04-09 21:05:12 -07:00
Eric House
ce3fab3b15 don't try to write file if not specified 2014-04-09 07:29:56 -07:00
Eric House
7e72cb506d add some more logging/tracking. 2014-04-09 07:28:53 -07:00
Eric House
edf720c58c add EditText's hint. But Spinner's prompt MUST be a reference -- fuck you Android -- so I need another way to do this 2014-04-09 07:28:31 -07:00
Eric House
812c54f598 CheckBoxes get translated too 2014-04-09 07:10:55 -07:00
Eric House
291d4f0217 create table in new DB as well as when upgrading 2014-04-09 06:25:07 -07:00
Eric House
c96e848a05 remove unused method 2014-04-09 05:58:53 -07:00
Eric House
b61f1fbac9 fix crash adding first game to newly installed app by counting games and groups the same way getView determines if they exist. 2014-04-09 05:58:44 -07:00
Eric House
051cc5eb1d call init from outside constructor since constructor can call back into callee 2014-04-09 05:57:33 -07:00
Eric House
0aa2a03760 remove unused method 2014-04-09 05:54:36 -07:00
Eric House
5e03e0cc75 fix crash adding first game to newly installed app by counting games and groups the same way getView determines if they exist. 2014-04-09 05:52:36 -07:00
Eric House
1035c94c3f call init from outside constructor since constructor can call back into callee 2014-04-09 05:38:46 -07:00
Eric House
ccf84135a0 fix NPE on fresh install 2014-04-09 05:08:49 -07:00
Eric House
5d83d2f318 translate GameConfig view -- though it really needs to be broken to have a Delegate.... 2014-04-08 19:12:00 -07:00
Eric House
0ac951c096 remove format() in favor of LocUtils call 2014-04-08 19:00:49 -07:00
Eric House
0b93e77018 combine the xml-manipulation and java-class-generation scripts 2014-04-08 18:57:31 -07:00
Eric House
9e228ab368 use version of getString that translates 2014-04-08 06:54:16 -07:00
Eric House
d27f2d580a (more of prev commit) generate xml layout files from res_src, and run all inflation through LocUtils that tries to substitute strings 2014-04-08 06:48:42 -07:00
Eric House
201e808b4a move layout files into res_src, and modify script to mark their localizable strings with loc:; run all layout inflation through new function that substitutes for loc: 2014-04-08 06:47:33 -07:00
Eric House
848f6ff221 no longer need these custom classes 2014-04-08 06:44:41 -07:00
Eric House
dfb3ea842b get rid of the Loc* classes -- will be transforming xml at buildtime as with menus 2014-04-08 05:20:22 -07:00