Skip to content

Recovering translation submit to po after 0.9 #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Recovering translation submit to po after 0.9 #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9831340
Merge tag 'v0.7.2' into develop
aherranz Feb 20, 2016
a75934f
Merge remote-tracking branch 'upstream/master' into develop
aherranz May 19, 2016
5d5eca4
Version bumped.
aherranz May 19, 2016
7d40767
Merge branch 'release/0.7.3'
aherranz May 19, 2016
36ca5c4
Version bumped.
aherranz Jun 10, 2016
9e7d959
Boss dependency updated to 0.9.
aherranz Jun 10, 2016
758b470
Simple bridge now returns request parameter values as binaries. This …
aherranz Jun 10, 2016
e198c52
rebar updated:
aherranz Jun 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified rebar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion rebar.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{deps, [
{boss, ".*", {git, "https://github.com/ChicagoBoss/ChicagoBoss.git", {tag, "v0.8.13"}}}
{boss, "0\.9.*", {git, "git://github.com/ChicagoBoss/ChicagoBoss", {tag, "932e33a017d3abb3b55b08dced05835260a093f3"}}}
]}.
{plugin_dir, ["priv/rebar"]}.
{plugins, [boss_plugin]}.
Expand Down
2 changes: 1 addition & 1 deletion src/cb_admin.app.src
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{application, cb_admin, [
{description, "Chicago Boss Admin Interface"},
{vsn, "0.7.2"},
{vsn, "0.8.0"},
{modules, []},
{registered, []},
{applications, [kernel, stdlib, crypto, boss]},
Expand Down
4 changes: 2 additions & 2 deletions src/controller/cb_admin_lang_controller.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ edit('POST', [App, Lang|Fmt], Auth) ->
LangFile = boss_files_util:lang_path(AppAtom, Lang),
{ok, IODevice} = file:open(LangFile, [write, append]),
lists:map(fun(Message) ->
Original = proplists:get_value("orig", Message),
Translation = proplists:get_value("trans", Message),
Original = binary_to_list(proplists:get_value("orig", Message)),
Translation = binary_to_list(proplists:get_value("trans", Message)),
case Translation of
"" ->
case WithBlanks of
Expand Down