widelands

Merge lp://staging/~widelands-dev/widelands/japanese into lp://staging/widelands

japanese
Merge into trunk

Proposed by GunChleoc on 2015-10-05

Status:

Merged

Merged at revision:

7543

Proposed branch:

lp://staging/~widelands-dev/widelands/japanese

Merge into:

lp://staging/widelands

Diff against target:

253 lines (+191/-3)

3 files modified

src/graphic/text/bidi.cc (+176/-2)
src/graphic/text/bidi.h (+6/-0)
src/graphic/text/rt_render.cc (+9/-1)

To merge this branch:

bzr merge lp://staging/~widelands-dev/widelands/japanese

Medium

Won't Fix

Link a bug report

Reviewer	Review Type	Date Requested	Status
TiborB		2015-10-05	Approve on 2015-10-05
Review via email: mp+273419@code.staging.launchpad.net

This proposal supersedes a proposal from 2015-09-28.

Description of the change

Implemented line wrapping for Japanese.

Some characters block having a new line, so I group them into vector entries.

Testing can be done by removing the \n characters from win_conditions/ja.po and looking at the tooltips - rather than a crash or an endless line, we get properly wrapped lines.

Revision history for this message

TiborB (tiborb95) wrote on 2015-10-05:

I have not tested it in japanesse, I think I dont have proper fonts installed probably anyway. So if there is any potential tester here, you can wait for him.

But the code looks good to me

review: Approve

Revision history for this message

GunChleoc (gunchleoc) wrote on 2015-10-06:

Actually, the fonts come with Widelands, so you can switch anytime if you remember where which button is - I don't read Japanese either *lol

I don't know if your Japanese localizers can compile, so I will merge this and ask them for testing later.