[Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1-finish_help into lp:widelands
Continuous integration builds have changed state: Travis build 3025. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/325110608. Appveyor build 2833. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fh1_finish_help-2833. -- https://code.launchpad.net/~widelands-dev/widelands/fh1-finish_help/+merge/335708 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fh1-finish_help into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1-finish_help into lp:widelands
Found two things: 1. In 'Workers' and 'Buildings' are some headers called 'Experience levels' and the text of the next line saying 'Miner to Master (19EP)' is right aligned. All other texts are left aligned, so this should also be left aligned. Found for 'Miners' and '*mines' of empire 2. In 'Buildings' -> 'Cumulative cost' the images are mostly in the same line as the string. But starting from 7 Images there is a line break showing some few wares in first row and the other 6 in the next row. E.g. Empire Colloseum shows: One row: '7 x Planks' one image next row: 6 images All other looks good to me :-) -- https://code.launchpad.net/~widelands-dev/widelands/fh1-finish_help/+merge/335708 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fh1-finish_help into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1-scenario-groundwork-emp1 into lp:widelands
Review: Needs Fixing Looks like there was a merge conflict wich is not solved in scenario/richtext.lua. See line number 350 in the div below. The scenario does not even load: Trying to run: map:scripting/init.lua: Fatal exception: lua: [/home/kaputtnik/Quellcode/widelands-repo/fh1-scenario-groundwork-emp1/src/scripting/lua_errors.cc:22] [/home/kaputtnik/Quellcode/widelands-repo/fh1-scenario-groundwork-emp1/src/scripting/lua_errors.cc:22] [/home/kaputtnik/Quellcode/widelands-repo/fh1-scenario-groundwork-emp1/src/scripting/lua_errors.cc:22] [/home/kaputtnik/Quellcode/widelands-repo/fh1-scenario-groundwork-emp1/src/scripting/lua_errors.cc:22] [string "scripting/richtext.lua"]:311: 'end' expected (to close 'function' at line 309) near ' FATAL ERROR - game crashed. Attempting emergency save. -- https://code.launchpad.net/~widelands-dev/widelands/fh1-scenario-groundwork-emp1/+merge/335294 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1-scenario-groundwork-emp1. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1-finish_help into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/fh1-finish_help into lp:widelands has been updated. Commit Message changed to: Converted the Tribal Encyclopedia to the new font renderer and added some tweaks: - Added market building type - Removed markup from some help texts - Pulled out common function help_worker_experience For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fh1-finish_help/+merge/335708 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fh1-finish_help into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1-finish_help into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/fh1-finish_help into
lp:widelands.
Commit message:
Converted the Tribal Encyclopedia to the new font renderer.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/fh1-finish_help/+merge/335708
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/fh1-finish_help into lp:widelands.
=== modified file 'data/scripting/richtext.lua'
--- data/scripting/richtext.lua 2017-12-27 14:25:35 +
+++ data/scripting/richtext.lua 2018-01-04 15:35:20 +
@@ -436,6 +436,7 @@
--
function inline_header(header, text)
return
- div("width=100%", font("size=13 color=D1D1D1", header .. " ") ..
+ div("width=100%", vspace(8)) ..
+ div("width=100%", font("size=13 color=D1D1D1", header .. " ") ..
font("size=12", text))
end
=== modified file 'data/tribes/buildings/productionsites/barbarians/coalmine/helptexts.lua'
--- data/tribes/buildings/productionsites/barbarians/coalmine/helptexts.lua 2016-04-15 16:46:20 +
+++ data/tribes/buildings/productionsites/barbarians/coalmine/helptexts.lua 2018-01-04 15:35:20 +
@@ -1,7 +1,10 @@
function building_helptext_lore()
- -- TRANSLATORS#: Lore helptext for a building
- return pgettext("barbarians_building", [[Ages ago, the Barbarians learned to delve into mountainsides for that black material that feeds their furnaces.
-Wood may serve for a household fire and to keep you warm, but when it comes to working with iron or gold, there is no way around coal.]])
+ return {
+ -- TRANSLATORS: Lore helptext for a coal mine building, part 1
+ pgettext("barbarians_building", "Ages ago, the Barbarians learned to delve into mountainsides for that black material that feeds their furnaces."),
+ -- TRANSLATORS: Lore helptext for a coal mine building, part 2
+ pgettext("barbarians_building", "Wood may serve for a household fire and to keep you warm, but when it comes to working with iron or gold, there is no way around coal.")
+ }
end
function building_helptext_lore_author()
@@ -10,7 +13,7 @@
end
function building_helptext_purpose()
- -- TRANSLATORS#: Purpose helptext for a building
+ -- TRANSLATORS: Purpose helptext for a building
return pgettext("building", "Digs coal out of the ground in mountain terrain.")
end
=== modified file 'data/tribes/buildings/productionsites/barbarians/coalmine_deep/helptexts.lua'
--- data/tribes/buildings/productionsites/barbarians/coalmine_deep/helptexts.lua 2016-04-15 16:46:20 +
+++ data/tribes/buildings/productionsites/barbarians/coalmine_deep/helptexts.lua 2018-01-04 15:35:20 +
@@ -1,7 +1,10 @@
function building_helptext_lore()
- -- TRANSLATORS#: Lore helptext for a building
- return pgettext("barbarians_building", [[Ages ago, the Barbarians learned to delve into mountainsides for that black material that feeds their furnaces.
-Wood may serve for a household fire and to keep you warm, but when it comes to working with iron or gold, there is no way around coal.]])
+ return {
+ -- TRANSLATORS: Lore helptext for a coal mine building, part 1
+ pgettext("barbarians_building", "Ages ago, the Barbarians learned to delve into mountainsides for that black material that feeds their furnaces."),
+ -- TRANSLATORS: Lore helptext for a coal mine building, part 2
+ pgettext("barbarians_building", "Wood may serve for a household fire and to keep you warm, but when it comes to working with iron or gold, there is no way around coal.")
+ }
end
function building_helptext_lore_author()
@@ -10,7 +13,7 @@
end
function building_helptext_purpose()
- -- TRANSLATORS#: Purpose helptext for a building
+ -- TRANSLATORS: Purpose helptext for a building
return pgettext("building", "Digs coal out of the ground in mountain terrain.")
end
=== modified file 'data/tribes/buildings/productionsites/barbarians/coalmine_deeper/helptexts.lua'
--- data/tribes/buildings/productionsites/barbarians/coalmine_deeper/helptexts.lua 2016-04-15 16:46:20 +
+++ data/tribes/buildings/productionsites/barbarians/coalmine_deeper/helptexts.lua 2018-01-04 15:35:20 +
@@ -1,7 +1,10 @@
function building_helptext_lore()
- -- TRANSLATORS#: Lore helptext for a building
- return pgettext("barbarians_building", [[Ages ago, the Barbarians learned to delve into mountainsides for that black material that feeds their furnaces.
-Wood may serve for a household fire and to keep you warm, but when it comes to working with iron or gold, there is no way around coal.]])
+ return {
+ -- TRANSLATORS: Lore helptext for a coal mine building, part 1
+ pgettext("barbarians_building", "Ages ago, the Barbarians learned to delve into mountainsides for that black material that feeds their furnaces."),
+ -- TRANSLATORS: Lore helptext for a coal mine building, part 2
+ pgettext("barbarians_buil
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1-scenario-groundwork-emp1 into lp:widelands
Thanks for the review :) Needs a quick retest before merging. -- https://code.launchpad.net/~widelands-dev/widelands/fh1-scenario-groundwork-emp1/+merge/335294 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fh1-scenario-groundwork-emp1 into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/better_notification_mail into lp:widelands-website
Code LGTM as far as I can tell. I might be available sometime next week to do some testing. -- https://code.launchpad.net/~widelands-dev/widelands-website/better_notification_mail/+merge/335028 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai_seafaring_fix into lp:widelands
Review: Approve Code LGTM. Failure on Travis is transient, so this can go in once it has been tested. -- https://code.launchpad.net/~widelands-dev/widelands/ai_seafaring_fix/+merge/335672 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_seafaring_fix. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai_seafaring_fix into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/ai_seafaring_fix into lp:widelands has been updated. Commit Message changed to: AI is now able to handle ships and shipyards that already exists when a map does no allow seafaring at the moment. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/ai_seafaring_fix/+merge/335672 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ai_seafaring_fix into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/better_notification_mail into lp:widelands-website
Review: Resubmit I had forgotten to update the packages of the virtual environment the last time. Did this now. The content of email send by django-messages are defined by django-messages itself, so the old templates (templates/notification/messages_*.txt) are obsolete and i have removed them in this branch. django messages uses this template: http://bazaar.launchpad.net/~widelands-dev/widelands-website/trunk/view/head:/templates/django_messages/new_message.html -- https://code.launchpad.net/~widelands-dev/widelands-website/better_notification_mail/+merge/335028 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
