This commit is contained in:
jysperm
2014-11-20 06:23:47 +08:00
parent e3032af12f
commit a36bc1c863
2 changed files with 10 additions and 5 deletions

View File

@@ -69,7 +69,12 @@ exports.accountHelpers = (req, res, next) ->
t: app.i18n.getTranslator req
moment: ->
return moment.apply(@, arguments).locale(res.language).tz(res.timezone)
if res.language and res.language != 'auto'
return moment.apply(@, arguments).locale(res.language).tz(res.timezone)
else if res.timezone
return moment.apply(@, arguments).tz(res.timezone)
else
return moment.apply(@, arguments)
_.extend req,
res: res

View File

@@ -1,7 +1,7 @@
extends ../layout
prepend header
title #{t('common.financials')} | #{t(config.web.t_name)}
title #{t('account.financials')} | #{t(config.web.t_name)}
block main
.row
@@ -33,9 +33,9 @@ block main
table.table.table-hover
thead
tr
td= t('common.time')
td= t('common.details')
td= t('common.amount')
th= t('common.time')
th= t('common.details')
th= t('common.amount')
tbody
for item in billing_log
tr