Commit graph

3614 commits

Author SHA1 Message Date
Eric House
9a9a4e2991 add option to replace %s with %1$d etc. 2014-05-20 20:53:48 -07:00
Eric House
0b6549d829 as formatted by python scripts, but without any non-whitespace changes 2014-05-20 20:52:18 -07:00
Eric House
dbaa28de5e don't refuse to delete local translation 2014-05-20 07:00:03 -07:00
Eric House
9bf92257b9 ignore more stuff 2014-05-19 07:54:08 -07:00
Eric House
af5cbe5325 need to call super when don't handle an id locally 2014-05-19 07:53:41 -07:00
Eric House
4452adf33d no blank Translate menu titles 2014-05-19 07:26:10 -07:00
Eric House
1ebf51d3ab when building from modified tree, still use latest commit number for
about box for easier debugging. Shouldn't matter for releases.
2014-05-19 07:15:21 -07:00
Eric House
f8dbc91cb0 don't set constant if R.java has uncommitted changes 2014-05-19 07:10:29 -07:00
Eric House
8f15f76fed label xlations with the language name 2014-05-17 16:57:24 -07:00
Eric House
018424e6e8 modify item text after the db backing it is modified by covering edit
activity.
2014-05-16 22:11:18 -07:00
Eric House
dfbb1bae71 derive context from menu that's triggered from it rather than trying
to set it from onResume() calls.
2014-05-16 22:05:48 -07:00
Eric House
3c4ed7de46 associate strings with the contexts in which they're looked up and
implement that filter.  I'm tracking by the name of the class rather
than a WeakReference, which means that the hashsets of keys will never
be freed.  Will need to see how much memory that means I'm using.
2014-05-16 06:40:01 -07:00
Eric House
c44a676808 derive from XWListActivity 2014-05-15 21:47:46 -07:00
Eric House
750393a5e6 oops: get the translation activity translated! 2014-05-15 06:53:03 -07:00
Eric House
891af6a84d use iter.remove to avoid ConcurrentModificationException 2014-05-15 06:43:59 -07:00
Eric House
6ce47f8208 use WeakReference rather than hashCode to associate menu with its strings 2014-05-15 06:37:03 -07:00
Eric House
5364f31da0 add filter and state-tracking for most recent menu. Used hashCode to
identify menu (since keeping a reference to it would cause it to
leak.) Will try WeakReference instead, or just dumping when another
comes along.
2014-05-15 05:41:15 -07:00
Eric House
e8efd70bdc tweak strings 2014-05-15 05:39:29 -07:00
Eric House
cbb10f6994 remove logging 2014-05-15 05:31:40 -07:00
Eric House
5e70d28ea1 first cut at filtering: all and modified work, but the other two
require that I track strings by the contexts in which they appear.
2014-05-14 21:24:29 -07:00
Eric House
6426e41d30 show locally-translated strings in red 2014-05-14 19:04:58 -07:00
Eric House
d00e49f843 save edited translations 2014-05-14 06:46:08 -07:00
Eric House
3040003126 oops -- include auto-modified files 2014-05-13 21:23:53 -07:00
Eric House
c4598f2bf9 tweak main translations strings layout 2014-05-13 21:22:50 -07:00
Eric House
4d42768f83 add separate activity/delegate for editing translations, launched by
tapping on a line in the list-o-strings.
2014-05-13 21:07:56 -07:00
Eric House
47eaca3d71 add filter spinner to translate dialog (though there's not yet data to filter on) 2014-05-13 06:30:38 -07:00
Eric House
049c55e2d2 toward adding default menu to all activities and eventually tracking
translations by where they're used so most relevant can be shown: put
back common superclasses XWActivity and XWListActivity with default
implemenations of activity lifecycle methods that call through to
delegates (and that later can help LocUtils track what's been seen
when.) Not thoroughly tested, but seems to work for the main screens
anyway.
2014-05-12 21:26:31 -07:00
Eric House
19204d5720 remove unused/commented-out file 2014-05-12 21:23:27 -07:00
Eric House
c42e5f2c0f keep elipses char where it belongs when reversing rest of strings 2014-05-11 20:15:10 -07:00
Eric House
49001c6893 various changes so dbg and bt versions build again -- and may work, but
that's not tested yet.
2014-05-11 19:55:05 -07:00
Eric House
2a3b8c7a74 when reversing words, preserve capitalization (i.e. start don't end with a cap) 2014-05-10 06:52:26 -07:00
Eric House
c06f0e157d first cut at file to clean up variant trees by removing anything not
under version control
2014-05-10 06:50:55 -07:00
Eric House
b085aeeb46 translate DialogPreference title, message and buttons 2014-05-06 21:13:10 -07:00
Eric House
30b966b902 generate fake translations automatically 2014-05-06 07:47:29 -07:00
Eric House
c0afd40337 update test section to work again 2014-05-06 07:25:00 -07:00
Eric House
806851057c update translations, late. This needs to be automated!! 2014-05-06 07:24:17 -07:00
Eric House
0ff09868cb Query user before removing build dir 2014-05-06 06:58:57 -07:00
Eric House
a4cd137cef get rid of #1 used to make strings unique: remove duplicates where
possible, and where not replace it with a non-printing zero-width
unicode char.
2014-05-06 06:27:33 -07:00
Eric House
d566bd63ae break the last Activities out into Delegates, and move a bunch of
stuff info the delegate base class so fewer calls required on
m_activity and LocUtils.
2014-05-06 05:56:43 -07:00
Eric House
5d9e846316 make constructor protected 2014-05-06 05:55:33 -07:00
Eric House
ce77f09588 the new spinner adapter override works much better for game config's
spinners
2014-05-05 07:38:37 -07:00
Eric House
96ca4f9946 fix NPE: not all spinners have adapters 2014-05-05 07:27:06 -07:00
Eric House
1170a31385 translate spinners by replacing their adapters with new class that
delegates to old then translates any views returned
2014-05-05 07:19:35 -07:00
Eric House
6165fc2201 translate list summary 2014-05-05 06:45:37 -07:00
Eric House
22a9fbdb3e translate color setting pref dialog 2014-05-05 06:37:05 -07:00
Eric House
3a7111c098 translate ListPreference lists 2014-05-05 06:03:33 -07:00
Eric House
477019757e make getopt flags match what usage says is there 2014-05-04 16:39:56 -07:00
Eric House
1fcf9027cb when looking for a translation for locale xx_YY, if there is none try
again for just xx. And silently drop strings in the translation file
with names that don't exist in English, though eventually that
shouldn't happen.  With this change a newly installed app on a
claiming-to-be-Czech emulator picks up the Czech translation within
moments.
2014-05-04 16:26:35 -07:00
Eric House
edcd29c88d in order that non-English versions not go long after installation
without translations, try immediately after any install or upgrade to
get translations from server.  (Triggered from the Application rather
than an Activity, so initializing the preferences DB had to be moved
there too.) Should probably post a notification after installing
localizations, ideally with a message in the language, offering to
restart with all new strings.
2014-05-04 15:41:02 -07:00
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
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