widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

Hans Joachim Desserud has proposed merging lp:~widelands-dev/widelands/move-two-fonts into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/move-two-fonts/+merge/245380

Spin-off from https://code.launchpad.net/~widelands-dev/widelands/copyright-file/+merge/245297.

Moved the two fonts into their own directories, updated the paths in i18n/fonts.lua.
Anything else I need to update?


-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/move-two-fonts into lp:widelands.

=== modified file 'i18n/fonts.lua'
--- i18n/fonts.lua	2014-12-02 07:19:33 +0000
+++ i18n/fonts.lua	2014-12-26 16:09:15 +0000
@@ -41,7 +41,7 @@
 	},
 
 	devanagari = {
-		serif = "nakula.ttf",
+		serif = "Nakula/nakula.ttf",
 		direction = "rtl"
 	},
 
@@ -56,7 +56,7 @@
 	},
 
 	myanmar = {
-		serif = "mmrCensus.ttf",
+		serif = "mmrCensus/mmrCensus.ttf",
 	},
 
 	sinhala = {

=== added directory 'i18n/fonts/Nakula'
=== renamed file 'i18n/fonts/COPYING' => 'i18n/fonts/Nakula/COPYING'
=== renamed file 'i18n/fonts/README.nakula' => 'i18n/fonts/Nakula/README.nakula'
=== renamed file 'i18n/fonts/nakula.ttf' => 'i18n/fonts/Nakula/nakula.ttf'
=== added directory 'i18n/fonts/mmrCensus'
=== renamed file 'i18n/fonts/OFL.txt' => 'i18n/fonts/mmrCensus/OFL.txt'
=== renamed file 'i18n/fonts/README.mmrCensus' => 'i18n/fonts/mmrCensus/README.mmrCensus'
=== renamed file 'i18n/fonts/mmrCensus.ttf' => 'i18n/fonts/mmrCensus/mmrCensus.ttf'