Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1-documentation into lp:widelands
Ah forgotten: Not directly related to this branch but a question about the translation makro '_' and the use of brackets for strings instead of double quotation marks: Does the _ only work with '_[[some text]]' and not with _"some text"? The doc for _ (https://wl.widelands.org/docs/wl/autogen_globals/#_) says _"some text" can also be used. Why are then all strings in the campaign files enclosed with brackets? Is there a benefit of using [[ ]] in comparison with using ""? -- https://code.launchpad.net/~widelands-dev/widelands/fh1-documentation/+merge/337545 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1-documentation. ___ 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-documentation into lp:widelands
Changed the code example and the resulting image. I have tried also to explain in short what the '..' are used for. While a first reader may does not know what my explanation means exactly, one can search the web for the keyword. Feel free to rephrase :-) -- https://code.launchpad.net/~widelands-dev/widelands/fh1-documentation/+merge/337545 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1-documentation. ___ 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/string-fixes into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/string-fixes into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/337849 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/bug-1750102_map_admin_page into lp:widelands-website
Review: Approve LGTM :) -- https://code.launchpad.net/~widelands-dev/widelands-website/bug-1750102_map_admin_page/+merge/338767 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/fh1-documentation into lp:widelands
Thanks! Maybe it would indeed be best if you created the examples - I am too close to this, so you know better what is needed here. -- https://code.launchpad.net/~widelands-dev/widelands/fh1-documentation/+merge/337545 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1-documentation. ___ 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/string-fixes into lp:widelands
Thanks for the review :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/337849 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Continuous integration builds have changed state: Travis build 3228. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/345141547. Appveyor build 3037. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-3037. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/337849 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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-website/bug-1750102_map_admin_page into lp:widelands-website
kaputtnik has proposed merging
lp:~widelands-dev/widelands-website/bug-1750102_map_admin_page into
lp:widelands-website.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1750102 in Widelands Website: "Allow map editing without world name"
https://bugs.launchpad.net/widelands-website/+bug/1750102
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/bug-1750102_map_admin_page/+merge/338767
Allow some columns of table wlmaps_map to be empty. This makes renaming a map
possible.
Also reworked the admin page of wlmaps and split into some sections.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands-website/bug-1750102_map_admin_page into
lp:widelands-website.
=== modified file 'wlmaps/admin.py'
--- wlmaps/admin.py 2016-02-09 18:05:18 +
+++ wlmaps/admin.py 2018-02-23 09:36:54 +
@@ -7,9 +7,24 @@
class MapAdmin(admin.ModelAdmin):
+list_display = ['name', 'author', 'pub_date']
prepopulated_fields = {'slug': ('name',)}
search_fields = ['name', 'author']
-list_display = ['name', 'author', 'pub_date']
list_filter = ['pub_date']
-
+readonly_fields = ('uploader', 'nr_players', 'w', 'h', 'minimap', 'file', 'world_name')
+fieldsets = (
+(None, {
+'fields': (('name', 'author'), 'uploader', 'uploader_comment')
+}),
+('Map properties', {
+'classes': ('collapse',),
+'fields': ('descr', 'hint', 'world_name',
+ ('nr_players', 'w', 'h')
+ )
+}),
+('Upload information', {
+'classes': ('collapse',),
+'fields': ('minimap', 'file', 'pub_date', 'nr_downloads', 'slug')
+}),
+)
admin.site.register(Map, MapAdmin)
=== modified file 'wlmaps/models.py'
--- wlmaps/models.py 2018-01-14 10:37:20 +
+++ wlmaps/models.py 2018-02-23 09:36:54 +
@@ -22,13 +22,13 @@
nr_players = models.PositiveIntegerField(verbose_name='Max Players')
descr = models.TextField(verbose_name='Description')
-hint = models.TextField(verbose_name='Hint')
+hint = models.TextField(verbose_name='Hint', blank=True)
minimap = models.ImageField(
verbose_name='Minimap', upload_to='wlmaps/minimaps')
file = models.FileField(verbose_name='Mapfile',
upload_to='wlmaps/maps')
-world_name = models.CharField(max_length=50)
+world_name = models.CharField(max_length=50, blank=True)
pub_date = models.DateTimeField(default=datetime.datetime.now)
uploader_comment = models.TextField(
___
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/string-fixes into lp:widelands
Review: Approve LGTM Thanks for doing the empire 4 string. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/337849 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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-documentation into lp:widelands
I think this is better :-)
Maybe i have not explained enough about the code example for the attributes.
The reason why i am so stubborn for a related code example is that it took me
some time to fiddle out how to use them. E.g. it was unclear how to use values
for an attribute.
I would suggest to change the code example in richtext.lua to something like:
--h1(_[[Header]]) ..
--p(_[[A Paragraph]]) ..
--p(_[[A Paragraph with ]] .. font("color=ff", _[[red text ]]) ..
_[[and ]] .. font("italic=1", _[[italic formatted text.]])) ..
-- and so on
No idea if this code will ever work :-D But hopefully it shows what kind of
code example i miss. I could add such an example with a related image, if you
don't want to do the additional work to create such an image. May i could test
then also if i have understand all the things ;)
I have found some misspelling, will do a complete proof reading this weekend.
--
https://code.launchpad.net/~widelands-dev/widelands/fh1-documentation/+merge/337545
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/fh1-documentation.
___
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/frisians into lp:widelands
I'm on the wrong computer right now, so some string fixes as diff comments in-line. I'd still like to look at the Lua code and the scenario texts. Scenario texts can be done later though, because I can control when I add them to Transifex. The introductions need to be ready though. At first glance, I noticed that you used CamelCase for variable and function names. We use under_scores instead, so it's important that we fix those for code style consistency. It will make the code easier to read. Diff comments: > === modified file 'data/campaigns/campaigns.conf' > --- data/campaigns/campaigns.conf 2018-01-21 10:14:16 + > +++ data/campaigns/campaigns.conf 2018-02-23 07:19:41 + > @@ -48,6 +48,15 @@ > campdesc2=_"When their God lost faith in the Atlanteans and drowned their > island, one woman’s struggle for justice and a second chance for her people > would become the stuff of legends. Leading the remaining Atlanteans into a > new future in a new part of the World, Jundlina became the most powerful > human of her time, but at a high cost: her humanity and soul." > campvisi2=0 > cnewvisi2=empiretut01 > +# Frisian Introduction > +campname3=_"From Water to Ice" > +campsect3=frisians > +camptribe3=_"Frisians" > +campdiff3=3 > +campdiffdescr3=_"For advanced players. Introduces the Frisians" > +campdesc3=_"Living from the ocean is a constant struggle, and even more so > for the inhabitants of the Frisian North Sea shore. Was the last stormflood, > the most devastating one in human memory, really nothing more than yet > another example for the hardships all Frisians have to face – or a sign from > the gods that a tribe that only just settled here must seek out an entirely > new home?" Living off the ocean is a constant struggle, and even more so for the inhabitants of the Frisian North Sea shore. Was the last storm flood, the most devastating one in human memory, really nothing more than yet another example for the hardships all Frisians have to face – or a sign from the gods that a tribe that only just settled here must seek out an entirely new home? > +campvisi3=0 > +cnewvisi3=atlanteans01 > > > > === added file 'data/campaigns/fri01.wmf/elemental' > --- data/campaigns/fri01.wmf/elemental1970-01-01 00:00:00 + > +++ data/campaigns/fri01.wmf/elemental2018-02-23 07:19:41 + > @@ -0,0 +1,13 @@ > +# Automatically created by Widelands bzr8485[frisians] (Release) > + > +[global] > +packet_version="1" > +map_w="224" > +map_h="128" > +nr_players="2" > +name="De Grote Mandrenke" Please reserve this title for the German translation and think up an English name. https://en.wikipedia.org/wiki/Saint_Marcellus%27_flood Also, we need localization markers for name, descr and hint. > +author="Nordfriese" > +descr="In 1362, the quiet, peaceful life of the inhabitants of the Northern > Frisian Islands was disrupted by one of the greatest stormfloods in human > memory: Saint Marcellus´ Flood. Is it really nothing more than yet another > storm, or a sign from the Gods that the Frisian community on the island of > Langeneß is not wanted here?" In 1362, the quiet, peaceful life of the inhabitants of the Northern Frisian Islands was disrupted by one of the greatest storm floods in human memory: Saint Marcellus’ Flood. Is it really nothing more than yet another storm, or a sign from the Gods that the Frisian community on the island of Langeness is not wanted here? > +hint="This scenario is set in a historical context, but most of the > storyline is fiction." This scenario is set in a historical context, but most of the story line is fiction. > +background="campaigns/fri01.wmf/pics/background.jpg" > +tags="seafaring" > === added file 'data/campaigns/fri02.wmf/elemental' > --- data/campaigns/fri02.wmf/elemental1970-01-01 00:00:00 + > +++ data/campaigns/fri02.wmf/elemental2018-02-23 07:19:41 + > @@ -0,0 +1,13 @@ > +# Automatically created by Widelands bzr8439[frisians] (Release) > + > +[global] > +packet_version="1" > +map_w="208" > +map_h="208" > +nr_players="3" > +name="An Icy Welcome" Add localization markers name=_"An Icy Welcome" > +author="Nordfriese" > +descr="Reebaud and his tribe have arrived in the North. But their arrival > between the frozen steppes and the snow-covered mountains is less than > welcome…" > +hint= > +background="campaigns/fri02.wmf/pics/background.jpg" > +tags="unbalanced" -- https://code.launchpad.net/~widelands-dev/widelands/frisians/+merge/336910 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/frisians. ___ 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/bug-1750561 into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1750561 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1750561/+merge/338352 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1750561. ___ 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
