[Commits] [wesnoth/wesnoth] c5cf69: reorder gettext.hpp

GitHub noreply at github.com
Sat Oct 25 20:54:22 UTC 2014


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: c5cf6992108a1255405a9289987826f6c7c81d99
      https://github.com/wesnoth/wesnoth/commit/c5cf6992108a1255405a9289987826f6c7c81d99
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-10-25 (Sat, 25 Oct 2014)

  Changed paths:
    M src/about.cpp
    M src/formula_string_utils.cpp
    M src/game_launcher.cpp
    M src/game_preferences_display.cpp
    M src/generators/default_map_generator.cpp
    M src/gettext.cpp
    M src/gettext.hpp
    M src/help.cpp
    M src/hotkey/hotkey_preferences_display.cpp
    M src/loadscreen.cpp
    M src/menu_events.cpp
    M src/reports.cpp
    M src/strftime.cpp
    M src/tests/utils/game_config_manager.cpp
    M src/tstring.cpp
    M src/unit_types.cpp
    M src/unit_types.hpp
    M src/wesnoth.cpp

  Log Message:
  -----------
  reorder gettext.hpp

We want to put all dependencies of linintl.h to getttext.cpp so we can easily replace gettext/libintl with boost locale gettext by replacing that file.


  Commit: 9742c9cb544e3cfaf587761c4e43a4ac9adf8b17
      https://github.com/wesnoth/wesnoth/commit/9742c9cb544e3cfaf587761c4e43a4ac9adf8b17
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-10-25 (Sat, 25 Oct 2014)

  Changed paths:
    M src/addon/manager_ui.cpp
    M src/editor/map/context_manager.cpp
    M src/format_time_summary.cpp
    M src/gettext.cpp
    M src/gettext.hpp
    M src/gui/dialogs/addon/description.cpp
    M src/help.cpp
    M src/save_index.cpp
    M src/strftime.cpp
    M src/strftime.hpp

  Log Message:
  -----------
  make gettext.hpp return std::string.

in 99% of cases the returned value was moved into a std::string anyway. We do this becasue the boost gettext functions also return std::string so it makes replacing them easier.


  Commit: c4e2c4bf5194e6a819ed88a670bef3f487c0452e
      https://github.com/wesnoth/wesnoth/commit/c4e2c4bf5194e6a819ed88a670bef3f487c0452e
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-10-25 (Sat, 25 Oct 2014)

  Changed paths:
    M src/gettext.cpp
    M src/gettext.hpp
    A src/gettext_boost.cpp
    M src/language.cpp

  Log Message:
  -----------
  use boost locale gettext

This includuces an alternative implementation of gettext.cpp. Libintl gettext doesn't seem to support utf8 filenames on windows. Also it causes problems when changign the language on my msvc build. That why i want to use boost locale gettext at least for our windows builds.
This requires boost locale which is introduced in boost 1.48 (That's why i still hesitate to make it the default on all systems).


  Commit: 2fee9e2522cd064259f663e3a8d534406a83c389
      https://github.com/wesnoth/wesnoth/commit/2fee9e2522cd064259f663e3a8d534406a83c389
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-10-25 (Sat, 25 Oct 2014)

  Changed paths:
    M src/gettext.hpp

  Log Message:
  -----------
  fix unused warnings.


  Commit: 9c799b9a47f82a6e5987ceda87647920adc01b33
      https://github.com/wesnoth/wesnoth/commit/9c799b9a47f82a6e5987ceda87647920adc01b33
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-10-25 (Sat, 25 Oct 2014)

  Changed paths:
    M src/gettext.cpp
    M src/gettext.hpp
    M src/gettext_boost.cpp
    M src/language.cpp

  Log Message:
  -----------
  fix compilation

it seems like sometimes libintl.h is needed for LC_MESSAGES so we need
to move that last code that uses LV_MESSAGES out of language.cpp into
gettext.cpp


  Commit: 588c008890ba5a16822814f317152f770f7d48de
      https://github.com/wesnoth/wesnoth/commit/588c008890ba5a16822814f317152f770f7d48de
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-10-25 (Sat, 25 Oct 2014)

  Changed paths:
    M src/gettext.cpp
    M src/gettext.hpp
    M src/gettext_boost.cpp
    M src/tests/utils/game_config_manager.cpp
    M src/wesnoth.cpp

  Log Message:
  -----------
  fix comilation

move LC_MESSAGES out of wesnoth.cpp and game_config_manager.cpp


  Commit: 4fc2368229802783a3861867d3bc50f4bb7f1b29
      https://github.com/wesnoth/wesnoth/commit/4fc2368229802783a3861867d3bc50f4bb7f1b29
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-10-25 (Sat, 25 Oct 2014)

  Changed paths:
    M src/gettext_boost.cpp

  Log Message:
  -----------
  fix gettext_boost.cpp


  Commit: fed433d82994ec94985ba5ea596d7390433c249c
      https://github.com/wesnoth/wesnoth/commit/fed433d82994ec94985ba5ea596d7390433c249c
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-10-25 (Sat, 25 Oct 2014)

  Changed paths:
    M src/image.cpp

  Log Message:
  -----------
  fix image translations


  Commit: e723de7be3ec6a18f8952dfc9e13477bc498200b
      https://github.com/wesnoth/wesnoth/commit/e723de7be3ec6a18f8952dfc9e13477bc498200b
  Author: gfgtdf <tischpapier at gmail.com>
  Date:   2014-10-25 (Sat, 25 Oct 2014)

  Changed paths:
    M src/about.cpp
    M src/addon/manager_ui.cpp
    M src/editor/map/context_manager.cpp
    M src/format_time_summary.cpp
    M src/formula_string_utils.cpp
    M src/game_launcher.cpp
    M src/game_preferences_display.cpp
    M src/generators/default_map_generator.cpp
    M src/gettext.cpp
    M src/gettext.hpp
    A src/gettext_boost.cpp
    M src/gui/dialogs/addon/description.cpp
    M src/help.cpp
    M src/hotkey/hotkey_preferences_display.cpp
    M src/image.cpp
    M src/language.cpp
    M src/loadscreen.cpp
    M src/menu_events.cpp
    M src/reports.cpp
    M src/save_index.cpp
    M src/strftime.cpp
    M src/strftime.hpp
    M src/tests/utils/game_config_manager.cpp
    M src/tstring.cpp
    M src/unit_types.cpp
    M src/unit_types.hpp
    M src/wesnoth.cpp

  Log Message:
  -----------
  Merge pull request #311 from gfgtdf/gettext_reorder

new boost gettext implementation that can handle utf8 paths on windows.


Compare: https://github.com/wesnoth/wesnoth/compare/807f4ead5fd4...e723de7be3ec


More information about the Commits mailing list