[Widelands-dev] [Merge] lp:~widelands-dev/widelands/nethost-split into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/nethost-split into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/nethost-split/+merge/332385 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/nethost-split. ___ 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/nethost-split into lp:widelands
Continuous integration builds have changed state: Travis build 2721. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/295046033. Appveyor build 2533. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_nethost_split-2533. -- https://code.launchpad.net/~widelands-dev/widelands/nethost-split/+merge/332385 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/nethost-split. ___ 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_small_requests into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/ai_small_requests into lp:widelands has been updated. Commit Message changed to: Prohibits seafaring buildings for AI on non-seafaring maps, fixes 1724073 when AI crashed when some AI slots were empty, allows reseting of teams via LUA during game For more details, see: https://code.launchpad.net/~widelands-dev/widelands/ai_small_requests/+merge/332519 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_small_requests. ___ 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_small_requests into lp:widelands
Review: Approve testing This fixes https://bugs.launchpad.net/widelands/+bug/1724073 :-) So for this bug approval. -- https://code.launchpad.net/~widelands-dev/widelands/ai_small_requests/+merge/332519 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_small_requests. ___ 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/net-relay into lp:widelands
This merge request tripped up bunnybot because the number of comments went down when it was reopened. The bug is fixed now, so other branches should now get merged as normal again. -- https://code.launchpad.net/~widelands-dev/widelands/net-relay/+merge/332386 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/net-relay 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-website/read_changelog_utf8 into lp:widelands-website
kaputtnik has proposed merging
lp:~widelands-dev/widelands-website/read_changelog_utf8 into
lp:widelands-website.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1242354 in Widelands Website: "Changelog page is empty; use unicode for
input"
https://bugs.launchpad.net/widelands-website/+bug/1242354
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/read_changelog_utf8/+merge/332990
Use utf-8 encoding when reading the ChangeLog.
I have tested also other places where files are read:
- Uploading maps
- Developers
Something else?
Except the ChangeLog all are working fine without using the codecs module.
For the Developers list i've added a TOC, because this list is very long.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands-website/read_changelog_utf8 into
lp:widelands-website.
=== modified file 'mainpage/views.py'
--- mainpage/views.py 2016-12-13 18:28:51 +
+++ mainpage/views.py 2017-10-30 13:51:18 +
@@ -13,6 +13,7 @@
import os
import os.path
import locale
+import codecs
def mainpage(request):
@@ -67,7 +68,7 @@
# Get locale and translator names from each .json file and
# store them in one list.
-txt = ''
+txt = '[TOC]\n\n'
transl_files = []
transl_list = []
path = os.path.normpath(WIDELANDS_SVN_DIR + 'data/i18n/locales/')
@@ -144,7 +145,7 @@
This replaces the wiki changelog
"""
-data = open(WIDELANDS_SVN_DIR + 'ChangeLog', 'r').read()
+data = codecs.open(WIDELANDS_SVN_DIR + 'ChangeLog', encoding='utf-8', mode='r').read()
return render_to_response('mainpage/changelog.html',
{'changelog': data},
context_instance=RequestContext(request)
=== modified file 'templates/mainpage/developers.html'
--- templates/mainpage/developers.html 2012-05-04 16:52:39 +
+++ templates/mainpage/developers.html 2017-10-30 13:51:18 +
@@ -1,9 +1,9 @@
{% extends "base.html" %}
-{% load wl_markdown %}
{% block title %}Widelands Development Team - {{ block.super }}{% endblock %}
{% block extra_head %}
+
{{ block.super}}
{% endblock %}
___
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/fix_code_in_blockquotes into lp:widelands-website
The proposal to merge
lp:~widelands-dev/widelands-website/fix_code_in_blockquotes into
lp:widelands-website has been updated.
Description changed to:
Something that annoys me a long time: When quoting a post which contains a code
block, the codeblock is not rendered correct. This branch will fix this.
The approach is to exchange the syntax for quoted code and use the normal
markdown syntax for this. E.g. a quoted codeblock looks like this:
>
> code line 1
> code line 2
>
This will be changed into:
> code line 1
> code line 2
The line with tildes ('~') get removed and all lines between get additionally 4
spaces at the beginning (Edit: launchpad does not show the spaces). After
markdown runs over this, the code block will be rendered correctly.
I am not happy with my code, but right now i don't know how to do it better. I
tried also using regular expressions, but i didn't get it to work. Suggestions
welcome :-)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/fix_code_in_blockquotes/+merge/332966
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands-website/fix_code_in_blockquotes into
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/nethost-split into lp:widelands
Is bunnybot ill? Another try: @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/nethost-split/+merge/332385 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/nethost-split. ___ 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/translation_stats into lp:widelands
I have run the update_translation_stats.py: Looks like this could be run only with python2. Maybe add a comment? I got a list out of range error: $ > python2 utils/update_translation_stats.py Fetching translation stats ... Locale Total Translated -- - -- Something went wrong: Traceback (most recent call last): File "utils/update_translation_stats.py", line 118, in main result = generate_translation_stats(po_dir, output_file) File "utils/update_translation_stats.py", line 97, in generate_translation_stats result = result + 'total=' + str(locale_stats[locale_stats.keys()[0]].total) + '\n\n' IndexError: list index out of range Do i miss something? -- https://code.launchpad.net/~widelands-dev/widelands/translation_stats/+merge/332029 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/translation_stats. ___ 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
