LoW: Fix translation error in conjunct list (fixes #2833) #2834
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@stevecotton points out that this doesn't introduce any new strings and thus might actually be mergeable in 1.14.0 after all. I'll leave it up to @shikadiqueen to decide, but it still needs to be tested first. |
|
Sorry, this one's broken, and LoW is currently broken before this is added. The existing bug can be fixed by PR #2835, but after merging this PR #2833 I get: |
|
Oh, hm. I used the wrong function to get a child array... |
|
I think this PR is now correct, and the remaining issues below are missing translations. The attached savefile starts S09 with 3 elves that will be put in Kalenz' L3 store (Bewóniel, Rosel and Peras), and 1 elf that will be in Landar's L3 store (Tethas). Results with current 1.14 data + this PR (823d37c + 884f88c), running with the Wesnoth binary from 1.13.13:
|
|
This should be squashed when merging, of course. For master, we could consider extending [set_variable][join] rather than cherry-picking this from 1.14 once it's merged. Not quite sure what the syntax would be though. |
stevecotton
added a commit
to stevecotton/wesnoth
that referenced
this pull request
Apr 7, 2018
…e L3 recalls An explanation and a save-file for testing this are in PR wesnoth#2834
stevecotton
added a commit
to stevecotton/wesnoth
that referenced
this pull request
Apr 7, 2018
An explanation and a save-file for testing this are in PR wesnoth#2834
Closed
stevecotton
added a commit
to stevecotton/wesnoth
that referenced
this pull request
Apr 25, 2018
…n Kalenz or Landar have L3 recalls An explanation and a save-file for testing this are in PR wesnoth#2834 This is a rebase of a commit that I tested before rebasing, had merge conflicts in the "conjuct pair^" changes. The disjunct pair changes haven't been tested at all yet.
stevecotton
added a commit
to stevecotton/wesnoth
that referenced
this pull request
Apr 25, 2018
…e L3 recalls An explanation and a save-file for testing this are in PR wesnoth#2834. The "disjunct" strings aren't used anywhere in mainline, but the conjunct ones can be tested with that save-file.
jostephd
pushed a commit
to jostephd/wesnoth
that referenced
this pull request
Oct 18, 2018
…noth#2834) (cherry picked from commit c086f0c)
jostephd
pushed a commit
to jostephd/wesnoth
that referenced
this pull request
Oct 27, 2018
…noth#2834) (cherry picked from commit c086f0c)
jostephd
pushed a commit
to jostephd/wesnoth
that referenced
this pull request
Oct 27, 2018
…noth#2834) (cherry picked from commit c086f0c)
jostephd
pushed a commit
to jostephd/wesnoth
that referenced
this pull request
Oct 28, 2018
…noth#2834) (cherry picked from commit c086f0c)
jostephd
added a commit
that referenced
this pull request
Oct 30, 2018
* josteph/forward-port-some-of-the-174: don't call invalidate_layout() unless needed Convert a bunch more C-style casts I missed in 0dc5656 to static_cast fixup don't show travis notifications from forks (cherry picked from commit 55bc62f) don't show travis notifications from forks (cherry picked from commit d6ab780) fix out of bonunds check Lua: Invalidate layout in set_dialog_value() Fix includes Implement iOS version detection Game Load: Use child_or_empty(). Themes: Fix the observers icon being hidden under the minimap Game Load: Restore the ability to select 1.12.6 savegames in the list Fix CMake build on macOS NR S8: compatibility commit to make the new companions from scratch if we don't have them stored Partially revert "Additional village variations (#3342)" DM: Add last breath dialog for Zorlan DM: Generalize death message so it works when Delfador is young and old gui2/unit_recall: Change Recall button back to its correct label Updated changelog in Xcode Add WML unit test for unupgradable (#3336) gui2/unit_recall: Fix i18n issues DM: add some TODOs iOS: finger scrolling in controls. iOS document directories. Might use these on other platforms as well. .gitignore for CLion German multiplayer translation: fixes German translation: reword era descriptions German translation: fix a string Statistics Dialog: merge unit name and count labels add / remove some comments Tutorial Part2: Give the player a canche to undo his move UtBS 5: changes to scenario locations (#3104) Update changelog in macOS package SotA: transform bats already after the 5th scenario TRoW: revert workaround for #2912 Changelog entry for the #2912 work around TRoW: Increase Rithrandil's workaround portrait height to 700 TRoW: IPF-downscale Rithrandil's portrait, as a workaround to #2912 Add missing deprecation messages for deprecated macros Northern Rebirth S02_01: keep side 8 leader from wandering off too far changelog: remove AToTB AI entry wesnothd: prevent another instance of crash from owner not in player_connections Increased in-game chat size. This makes it render more smoothly Minor tweaks to classic theme (thanks enclave for doing this) Update RELEASE_NOTES (cherry picked from commit e2a2a85) Update changelog for custom AI for AToTB S2 TRoW: revert changes, to avoid a potential OOS Re-apply patches to fix issues #2844 and #2846 in SotA Clear RELEASE_NOTES Repair 66ab35f in the upwards direction Add changelog for 1.14.0 add placeholer links to appdata file Hide Editor help section UtBS: readd do_not_list UtBS: wmlindent pass Fix MP label for #2855 Fixup 601c67d UtBS: Re-added compatibility code to load old saves using the new elves Swap count and name columns in statistics (fixes #2893) Revert string changes in SotA for 1.14 RC 3 - gold AI recruitment: use unit-specific recall cost AI recruitment: fix units on recall list interfering with recruiting Fixup f7ab008 before GCC complains about an unused parameter >_< Help: disabled parsing error popup LoW: Fix translation error in conjunct list (fixes #2833) (#2834) Fix pofix Changelog entry for recent SotA fixes Pofix entry for fc6c3ac Pofix entry for b86a296 Pofix entry for ab9f29a Fix HP label in longer languages Help: removed sort_sections key with invalid value less redraw_everything calls when receiving [change_controller] fix gui2 dialog disappearing after [change_controller] Use a fallback for when the player name is not known in debug notifications
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This uses the new
wesnoth.format_conjunct_listfunction to implement the functionality. Needs to be tested, but there's no hurry since it's destined for 1.14.1.