Giuseppe Bilotta [Sun, 24 Jul 2011 08:19:31 +0000 (10:19 +0200)]
Bring po update out of cmake again
This solves two issues at once:
* CMake would delete po files during ‘make clean’ because it thought
they were autogenerated and not just managed
* the only gettext tools readily available in Windows are so old they
don't support options like --package-name
The change also moves minetest.pot down one level, so we don't need to
special case ‘en’ anymore.
The downside is of course that you need some sane POSIX shell to update
the po files.
Giuseppe Bilotta [Sat, 23 Jul 2011 14:38:37 +0000 (16:38 +0200)]
Refactor gettext init
Put the gettext init code in a macro and define it appropriately
depending on whether gettext is actually available or not.
Giuseppe Bilotta [Sat, 23 Jul 2011 14:15:29 +0000 (16:15 +0200)]
Do not package en translation, since we don't build it
Giuseppe Bilotta [Sat, 23 Jul 2011 13:49:06 +0000 (15:49 +0200)]
Gettext domain should match the project name
This partially reverts
023cc0d37776976b4b192b7363f73a5d2debdef6, goes
back to using PROJECT_NAME for the filename and also uses PROJECT_NAME
as text domain in the source code.
Giuseppe Bilotta [Sat, 23 Jul 2011 13:47:09 +0000 (15:47 +0200)]
Place project name and gettext use in config
Nils Dagsson Moskopp [Sun, 24 Jul 2011 02:01:51 +0000 (19:01 -0700)]
Merge pull request #34 from SpeedProg/master
Changes to make gettext enabled if it is found
Constantin Wenger [Sat, 23 Jul 2011 20:36:11 +0000 (22:36 +0200)]
updated cmakerules to autodetect if gettext can be used
fixed error if gettext is disabled
Nils Dagsson Moskopp [Fri, 22 Jul 2011 19:56:00 +0000 (21:56 +0200)]
* README updated
Perttu Ahola [Fri, 22 Jul 2011 19:53:50 +0000 (21:53 +0200)]
* key change menu now saving immediately
Nils Dagsson Moskopp [Fri, 22 Jul 2011 19:10:19 +0000 (12:10 -0700)]
Merge pull request #33 from SpeedProg/master
gettext fix of laguagefile names
Constantin Wenger [Fri, 22 Jul 2011 18:55:00 +0000 (20:55 +0200)]
change in readme of a lib
Constantin Wenger [Fri, 22 Jul 2011 18:55:00 +0000 (20:55 +0200)]
change in readme of a lib
Constantin Wenger [Fri, 22 Jul 2011 18:53:29 +0000 (20:53 +0200)]
Merge remote-tracking branch 'upstream/master'
Constantin Wenger [Fri, 22 Jul 2011 18:53:29 +0000 (20:53 +0200)]
Merge remote-tracking branch 'upstream/master'
Constantin Wenger [Fri, 22 Jul 2011 18:19:43 +0000 (20:19 +0200)]
fixed some problems with filenames of the translations
Constantin Wenger [Fri, 22 Jul 2011 18:19:43 +0000 (20:19 +0200)]
fixed some problems with filenames of the translations
Constantin Wenger [Wed, 20 Jul 2011 17:57:44 +0000 (19:57 +0200)]
updated some parts which don't really make a problem but are better this way
Constantin Wenger [Wed, 20 Jul 2011 17:57:44 +0000 (19:57 +0200)]
updated some parts which don't really make a problem but are better this way
Nils Dagsson Moskopp [Fri, 22 Jul 2011 18:16:58 +0000 (20:16 +0200)]
Merge branch 'upstream/master'
Nils Dagsson Moskopp [Fri, 22 Jul 2011 18:16:58 +0000 (20:16 +0200)]
Merge branch 'upstream/master'
Nils Dagsson Moskopp [Fri, 22 Jul 2011 17:30:55 +0000 (10:30 -0700)]
Merge pull request #32 from Oblomov/master
Gettext + misc fixes
Nils Dagsson Moskopp [Fri, 22 Jul 2011 17:30:55 +0000 (10:30 -0700)]
Merge pull request #32 from Oblomov/master
Gettext + misc fixes
Perttu Ahola [Fri, 22 Jul 2011 15:51:49 +0000 (18:51 +0300)]
Fixed the problem of <=r548 clients fucking up maps on >=r549 servers. Also, already fucked up maps are now loaded correctly.
Giuseppe Bilotta [Fri, 22 Jul 2011 12:42:04 +0000 (14:42 +0200)]
Declare USE_GETTEXT option
Giuseppe Bilotta [Fri, 22 Jul 2011 12:42:04 +0000 (14:42 +0200)]
Declare USE_GETTEXT option
Constantin Wenger [Fri, 22 Jul 2011 10:54:07 +0000 (12:54 +0200)]
fixed problem with displaying special chars
Constantin Wenger [Fri, 22 Jul 2011 10:54:07 +0000 (12:54 +0200)]
fixed problem with displaying special chars
Giuseppe Bilotta [Fri, 22 Jul 2011 08:55:05 +0000 (10:55 +0200)]
updatepo cmake rule
Get rid of the system-specific updatelocales.sh and introduce an
updatepo cmake rule. po files are also updated before creating the mo
files, and we now keep the .pot file (in the po/en directory). To
stabilize the po file creation, file contents are sorted by source
filename.
Update po files in the process.
Giuseppe Bilotta [Fri, 22 Jul 2011 08:55:05 +0000 (10:55 +0200)]
updatepo cmake rule
Get rid of the system-specific updatelocales.sh and introduce an
updatepo cmake rule. po files are also updated before creating the mo
files, and we now keep the .pot file (in the po/en directory). To
stabilize the po file creation, file contents are sorted by source
filename.
Update po files in the process.
Perttu Ahola [Fri, 22 Jul 2011 10:10:58 +0000 (13:10 +0300)]
added an unit test for the Settings thingy (the python ConfigParser -like thing)
Giuseppe Bilotta [Fri, 22 Jul 2011 07:58:02 +0000 (09:58 +0200)]
Static naming of po file
The po file should not be named c55 if we're in ∆. But since it is not
exposed at installation time, we don't actually need its name to be
based on the project name at all, so just call it minetest.po
Giuseppe Bilotta [Fri, 22 Jul 2011 07:58:02 +0000 (09:58 +0200)]
Static naming of po file
The po file should not be named c55 if we're in ∆. But since it is not
exposed at installation time, we don't actually need its name to be
based on the project name at all, so just call it minetest.po
Giuseppe Bilotta [Fri, 22 Jul 2011 07:36:17 +0000 (09:36 +0200)]
Refactor mo creation/installation
Giuseppe Bilotta [Fri, 22 Jul 2011 07:36:17 +0000 (09:36 +0200)]
Refactor mo creation/installation
Giuseppe Bilotta [Fri, 22 Jul 2011 06:33:08 +0000 (08:33 +0200)]
Use project name for mo files
Giuseppe Bilotta [Fri, 22 Jul 2011 06:33:08 +0000 (08:33 +0200)]
Use project name for mo files
Giuseppe Bilotta [Fri, 22 Jul 2011 05:48:22 +0000 (07:48 +0200)]
Merge remote-tracking branch 'erlehmann/master'
Conflicts (from the introduction of fr translations):
src/CMakeLists.txt
Giuseppe Bilotta [Fri, 22 Jul 2011 05:48:22 +0000 (07:48 +0200)]
Merge remote-tracking branch 'erlehmann/master'
Conflicts (from the introduction of fr translations):
src/CMakeLists.txt
Constantin Wenger [Thu, 21 Jul 2011 14:44:43 +0000 (16:44 +0200)]
changed some lines to fit the 80chars limit
Constantin Wenger [Thu, 21 Jul 2011 14:44:43 +0000 (16:44 +0200)]
changed some lines to fit the 80chars limit
Perttu Ahola [Thu, 21 Jul 2011 22:37:21 +0000 (01:37 +0300)]
Fixed small error in mapnode.cpp (didn't cause any harm though)
Perttu Ahola [Thu, 21 Jul 2011 22:37:05 +0000 (01:37 +0300)]
Fixed new map generator causing a crash when generating at map limit
Nils Dagsson Moskopp [Thu, 21 Jul 2011 18:13:31 +0000 (20:13 +0200)]
* nicer firefly texture
Nils Dagsson Moskopp [Thu, 21 Jul 2011 18:13:31 +0000 (20:13 +0200)]
* nicer firefly texture
Nils Dagsson Moskopp [Thu, 21 Jul 2011 15:36:23 +0000 (17:36 +0200)]
+ unknown block is sick
Nils Dagsson Moskopp [Thu, 21 Jul 2011 15:36:23 +0000 (17:36 +0200)]
+ unknown block is sick
Nils Dagsson Moskopp [Thu, 21 Jul 2011 14:33:34 +0000 (07:33 -0700)]
Merge pull request #29 from cisoun/master
Add french translation.
Nils Dagsson Moskopp [Thu, 21 Jul 2011 14:33:34 +0000 (07:33 -0700)]
Merge pull request #29 from cisoun/master
Add french translation.
Constantin Wenger [Thu, 21 Jul 2011 14:21:01 +0000 (16:21 +0200)]
fixed not finding dll for gettext in MSVC
Constantin Wenger [Thu, 21 Jul 2011 14:21:01 +0000 (16:21 +0200)]
fixed not finding dll for gettext in MSVC
Cyriaque Skrapits [Thu, 21 Jul 2011 14:14:18 +0000 (16:14 +0200)]
Added missing .po fil.e
Cyriaque Skrapits [Thu, 21 Jul 2011 14:14:18 +0000 (16:14 +0200)]
Added missing .po fil.e
Cyriaque Skrapits [Thu, 21 Jul 2011 14:09:57 +0000 (16:09 +0200)]
Added french translation.
Cyriaque Skrapits [Thu, 21 Jul 2011 14:09:57 +0000 (16:09 +0200)]
Added french translation.
Nils Dagsson Moskopp [Thu, 21 Jul 2011 13:40:00 +0000 (15:40 +0200)]
* different collision box for fireflies so they now hover above the ground
Nils Dagsson Moskopp [Thu, 21 Jul 2011 13:40:00 +0000 (15:40 +0200)]
* different collision box for fireflies so they now hover above the ground
Giuseppe Bilotta [Thu, 21 Jul 2011 13:16:59 +0000 (15:16 +0200)]
Reorganize cmake gettext message output to ease debugging
Giuseppe Bilotta [Thu, 21 Jul 2011 13:16:59 +0000 (15:16 +0200)]
Reorganize cmake gettext message output to ease debugging
Giuseppe Bilotta [Thu, 21 Jul 2011 13:12:58 +0000 (15:12 +0200)]
Restore "Leave address blank" position
Giuseppe Bilotta [Thu, 21 Jul 2011 13:12:58 +0000 (15:12 +0200)]
Restore "Leave address blank" position
Giuseppe Bilotta [Thu, 21 Jul 2011 12:50:15 +0000 (14:50 +0200)]
Find correct library for MSVC vs MingW in Winows
Giuseppe Bilotta [Thu, 21 Jul 2011 12:50:15 +0000 (14:50 +0200)]
Find correct library for MSVC vs MingW in Winows
Giuseppe Bilotta [Thu, 21 Jul 2011 12:46:14 +0000 (14:46 +0200)]
Only install locale files if using gettext
Giuseppe Bilotta [Thu, 21 Jul 2011 12:46:14 +0000 (14:46 +0200)]
Only install locale files if using gettext
Giuseppe Bilotta [Thu, 21 Jul 2011 11:59:50 +0000 (13:59 +0200)]
Uppercase DEFINED or cmake 2.8.4 complains
Giuseppe Bilotta [Thu, 21 Jul 2011 11:59:50 +0000 (13:59 +0200)]
Uppercase DEFINED or cmake 2.8.4 complains
Constantin Wenger [Thu, 21 Jul 2011 11:24:37 +0000 (13:24 +0200)]
updated some path because the dlls are mostly under bin not lib
added explanation why libintl must not belinked under some oses
Constantin Wenger [Thu, 21 Jul 2011 11:24:37 +0000 (13:24 +0200)]
updated some path because the dlls are mostly under bin not lib
added explanation why libintl must not belinked under some oses
Giuseppe Bilotta [Thu, 21 Jul 2011 10:33:29 +0000 (12:33 +0200)]
Refactor and clean up gettext management
Giuseppe Bilotta [Thu, 21 Jul 2011 10:33:29 +0000 (12:33 +0200)]
Refactor and clean up gettext management
Giuseppe Bilotta [Thu, 21 Jul 2011 05:53:13 +0000 (07:53 +0200)]
Make gettext optional
Giuseppe Bilotta [Thu, 21 Jul 2011 05:53:13 +0000 (07:53 +0200)]
Make gettext optional
Weedy [Thu, 21 Jul 2011 06:36:30 +0000 (02:36 -0400)]
Tweak makefiles to add -delta suffix.
Weedy [Thu, 21 Jul 2011 06:36:30 +0000 (02:36 -0400)]
Tweak makefiles to add -delta suffix.
Weedy [Thu, 21 Jul 2011 06:30:21 +0000 (02:30 -0400)]
Fix win32 MSVC compile. (screw gettext)
Weedy [Thu, 21 Jul 2011 06:30:21 +0000 (02:30 -0400)]
Fix win32 MSVC compile. (screw gettext)
Nils Dagsson Moskopp [Wed, 20 Jul 2011 21:29:01 +0000 (14:29 -0700)]
Merge pull request #27 from Oblomov/master
* regression fix for windows build.
Nils Dagsson Moskopp [Wed, 20 Jul 2011 21:29:01 +0000 (14:29 -0700)]
Merge pull request #27 from Oblomov/master
* regression fix for windows build.
Giuseppe Bilotta [Wed, 20 Jul 2011 20:49:48 +0000 (22:49 +0200)]
Move package search out of conditional
This unbreaks the Windows build which would otherwise have problems at
the jthread level.
Giuseppe Bilotta [Wed, 20 Jul 2011 20:49:48 +0000 (22:49 +0200)]
Move package search out of conditional
This unbreaks the Windows build which would otherwise have problems at
the jthread level.
Nils Dagsson Moskopp [Wed, 20 Jul 2011 20:04:24 +0000 (22:04 +0200)]
+ fireflies
Nils Dagsson Moskopp [Wed, 20 Jul 2011 20:04:24 +0000 (22:04 +0200)]
+ fireflies
Nils Dagsson Moskopp [Wed, 20 Jul 2011 17:14:40 +0000 (19:14 +0200)]
* README updated
Nils Dagsson Moskopp [Wed, 20 Jul 2011 17:14:40 +0000 (19:14 +0200)]
* README updated
Nils Dagsson Moskopp [Wed, 20 Jul 2011 16:56:32 +0000 (18:56 +0200)]
Merge branch 'master' of github.com:erlehmann/minetest-delta
Nils Dagsson Moskopp [Wed, 20 Jul 2011 16:56:32 +0000 (18:56 +0200)]
Merge branch 'master' of github.com:erlehmann/minetest-delta
Nils Dagsson Moskopp [Wed, 20 Jul 2011 16:56:23 +0000 (09:56 -0700)]
Merge pull request #24 from SpeedProg/master
gettext paths problem
Nils Dagsson Moskopp [Wed, 20 Jul 2011 16:56:23 +0000 (09:56 -0700)]
Merge pull request #24 from SpeedProg/master
gettext paths problem
Constantin Wenger [Wed, 20 Jul 2011 16:49:18 +0000 (18:49 +0200)]
fixed problem with wront paths in gettext
Constantin Wenger [Wed, 20 Jul 2011 16:49:18 +0000 (18:49 +0200)]
fixed problem with wront paths in gettext
Nils Dagsson Moskopp [Wed, 20 Jul 2011 16:29:48 +0000 (18:29 +0200)]
Merge branch 'master' of github.com:erlehmann/minetest-delta
Nils Dagsson Moskopp [Wed, 20 Jul 2011 16:29:48 +0000 (18:29 +0200)]
Merge branch 'master' of github.com:erlehmann/minetest-delta
Nils Dagsson Moskopp [Wed, 20 Jul 2011 16:29:07 +0000 (09:29 -0700)]
Merge pull request #23 from Oblomov/master
Some misc usability patches
Nils Dagsson Moskopp [Wed, 20 Jul 2011 16:29:07 +0000 (09:29 -0700)]
Merge pull request #23 from Oblomov/master
Some misc usability patches
Giuseppe Bilotta [Thu, 9 Jun 2011 20:31:40 +0000 (22:31 +0200)]
Set the window caption for the initial window too
Giuseppe Bilotta [Thu, 9 Jun 2011 20:31:40 +0000 (22:31 +0200)]
Set the window caption for the initial window too
Giuseppe Bilotta [Wed, 8 Jun 2011 15:27:30 +0000 (17:27 +0200)]
Check the data path before usage
When not running in place, check if the assumed data path in
../share/APPNAME exists. If it doesn't exist, fall back to ../data
instead. This allows the program to run successfully from the checkout
directory even without the run-in-place flag active.
Giuseppe Bilotta [Wed, 8 Jun 2011 15:27:30 +0000 (17:27 +0200)]
Check the data path before usage
When not running in place, check if the assumed data path in
../share/APPNAME exists. If it doesn't exist, fall back to ../data
instead. This allows the program to run successfully from the checkout
directory even without the run-in-place flag active.
Giuseppe Bilotta [Tue, 19 Jul 2011 18:02:31 +0000 (20:02 +0200)]
Use system sqlite3/jthread libs if available
Giuseppe Bilotta [Tue, 19 Jul 2011 18:02:31 +0000 (20:02 +0200)]
Use system sqlite3/jthread libs if available