github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 22:43:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Show date with year in message to banned users who try to log in

Browse Source
This commit is contained in:
Neil Lalonde
2013-06-30 12:49:34 -04:00
parent 023d18cab2
commit c1a39b5a30
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/session_controller.rb
View File

@ -30,7 +30,7 @@ class SessionController < ApplicationController
if @user.confirm_password?(params[:password]) if @user.confirm_password?(params[:password])
if @user.is_banned? if @user.is_banned?
render json: { error: I18n.t("login.banned", {date: I18n.l(@user.banned_till, format: :short_no_year)}) } render json: { error: I18n.t("login.banned", {date: I18n.l(@user.banned_till, format: :date_only)}) }
return return
end end

1
config/locales/server.en.yml
View File

@ -13,6 +13,7 @@ en:
formats: formats:
short: "%m-%d-%Y" short: "%m-%d-%Y"
short_no_year: "%B %-d" short_no_year: "%B %-d"
date_only: "%b %-d, %Y"
title: "Discourse" title: "Discourse"
topics: "Topics" topics: "Topics"