summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@digital-scurf.org>2016-11-05 13:32:40 +0000
committerDaniel Silverstone <dsilvers@digital-scurf.org>2016-11-05 13:32:40 +0000
commit3f8491dc00fb9ec758cef1e3a1fe6529a6df5bac (patch)
tree641840204b9bc67029d6448ded97eb562372b72e /lib
parent23b90d4409e7baea3837389a3e0061658d933c59 (diff)
downloadgitano-3f8491dc00fb9ec758cef1e3a1fe6529a6df5bac.tar.gz
Messages from actions.lua
Diffstat (limited to 'lib')
-rw-r--r--lib/gitano/actions.lua9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/gitano/actions.lua b/lib/gitano/actions.lua
index 264fa48..95be9d0 100644
--- a/lib/gitano/actions.lua
+++ b/lib/gitano/actions.lua
@@ -8,6 +8,7 @@ local util = require "gitano.util"
local log = require "gitano.log"
local gall = require "gall"
local config = require "gitano.config"
+local i18n = require 'gitano.i18n'
local sio = require 'luxio.simple'
local supple = require 'gitano.supple'
local subprocess = require 'luxio.subprocess'
@@ -19,22 +20,22 @@ local function update_actions(conf, repo, tags)
tags["ref"] == "refs/heads/master" then
-- Update to the master branch of the gitano-admin repo, perform a conf
-- check based on the target sha
- log.chat("Verifying new gitano-admin master")
+ log.chat(i18n.expand(VERIFY_NEW_GITANO_ADMIN))
local conf, msg = config.parse(repo.git:get(tags["newsha"]))
if not conf then
return false, msg
end
- log.chat("Looks okay")
+ log.chat(i18n.expand("LOOKS_OKAY"))
end
if tags["ref"] == "refs/gitano/admin" then
-- Update to the admin branch, see if we can cause the repo to
-- parse the new admin branch safely.
- log.chat("Verifying new admin sha:", tags["newsha"])
+ log.chat(i18n.expand("VERIFY_NEW_ADMIN_SHA", {sha=tags["newsha"]}))
local ok, msg = repo:validate_admin_sha(tags["newsha"])
if not ok then
return false, msg
end
- log.chat("Looks okay")
+ log.chat(i18n.expand("LOOKS_OKAY"))
end