Merge branch 'pull/5023'
This commit is contained in:
commit
fa9654fe90
2 changed files with 7 additions and 1 deletions
|
@ -138,7 +138,12 @@ class SiteController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def preview
|
def preview
|
||||||
render :html => RichText.new(params[:type], params[:text]).to_html
|
if params[:text].blank?
|
||||||
|
flash.now[:warning] = t("layouts.nothing_to_preview")
|
||||||
|
render :partial => "layouts/flash"
|
||||||
|
else
|
||||||
|
render :html => RichText.new(params[:type], params[:text]).to_html
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def id
|
def id
|
||||||
|
|
|
@ -1586,6 +1586,7 @@ en:
|
||||||
tou: "Terms of Use"
|
tou: "Terms of Use"
|
||||||
osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
|
osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
|
||||||
osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
|
osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
|
||||||
|
nothing_to_preview: "Nothing to preview."
|
||||||
donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."
|
donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."
|
||||||
help: Help
|
help: Help
|
||||||
about: About
|
about: About
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue