Skip to content

Commit bddc366

Browse files
committed
Should push up same against dev-branch
1 parent 60885b4 commit bddc366

File tree

2 files changed

+20
-1
lines changed

2 files changed

+20
-1
lines changed

.githooks/pre-commit

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,25 @@
66
# it wants to stop the commit.
77
#
88
# To enable this hook, rename this file to "pre-commit".
9+
#
10+
# Exit on error
11+
set -e
12+
13+
project_dir=$(git rev-parse --show-toplevel)
14+
15+
updateLanguage() {
16+
command -v xgettext || return
17+
command -v msgcat || return
18+
command -v msgmerge || return
19+
xgettext --language=PHP --from-code=UTF-8 --output="$project_dir/packages/web/management/languages/messages.pot" --omit-header --no-location $(find $project_dir/packages/web/ -name "*.php")
20+
msgcat --sort-output -o "$project_dir/packages/web/management/languages/messages.pot" "$project_dir/packages/web/management/languages/messages.pot"
21+
for PO_FILE in $(find $project_dir/packages/web/management/languages/ -type f -name *.po); do
22+
msgmerge --update --backup=none $PO_FILE $project_dir/packages/web/management/languages/messages.pot 2>/dev/null >/dev/null
23+
msgcat --sort-output -o $PO_FILE $PO_FILE
24+
done
25+
}
26+
27+
updateLanguage
928

1029
# Get the current branch name
1130
gitbranch=$(git branch --show-current)

packages/web/lib/fog/system.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ private static function _versionCompare()
5353
public function __construct()
5454
{
5555
self::_versionCompare();
56-
define('FOG_VERSION', '1.5.10.79');
56+
define('FOG_VERSION', '1.5.10.80');
5757
define('FOG_SCHEMA', 271);
5858
define('FOG_BCACHE_VER', 141);
5959
define('FOG_CLIENT_VERSION', '0.13.0');

0 commit comments

Comments
 (0)