jro_apps/redmine Commit - r2001:5166213fd314

Hide Redmine version in atom feeds and pdf properties (#794)....

Jean-Philippe Lang -

r2001:5166213fd314

parent child

Context file:

r2001:5166213fd314

Collapse all files

app/helpers/ifpdf_helper.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'iconv'
             require 'rfpdf/chinese'
             module IfpdfHelper
               class IFPDF < FPDF
                 include GLoc
                 attr_accessor :footer_date
                 def initialize(lang)
                   super()
                   set_language_if_valid lang
                   case current_language.to_s
                   when 'ja'
                     extend(PDF_Japanese)
                     AddSJISFont()
                     @font_for_content = 'SJIS'
                     @font_for_footer = 'SJIS'
                   when 'zh'
                     extend(PDF_Chinese)
                     AddGBFont()
                     @font_for_content = 'GB'
                     @font_for_footer = 'GB'
                   when 'zh-tw'
                     extend(PDF_Chinese)
                     AddBig5Font()
                     @font_for_content = 'Big5'
                     @font_for_footer = 'Big5'
                   else
                     @font_for_content = 'Arial'
                     @font_for_footer = 'Helvetica'
                   end
-                  SetCreator("redMine #{Redmine::VERSION}")
+                  SetCreator(Redmine::Info.app_name)
                   SetFont(@font_for_content)
                 end
                 def SetFontStyle(style, size)
                   SetFont(@font_for_content, style, size)
                 end
                 def Cell(w,h=0,txt='',border=0,ln=0,align='',fill=0,link='')
                   @ic ||= Iconv.new(l(:general_pdf_encoding), 'UTF-8')
                   # these quotation marks are not correctly rendered in the pdf
                   txt = txt.gsub(/[“”]/, '"') if txt
                   txt = begin
                     # 0x5c char handling
                     txtar = txt.split('\\')
                     txtar << '' if txt[-1] == ?\\
                     txtar.collect {|x| @ic.iconv(x)}.join('\\').gsub(/\\/, "\\\\\\\\")
                   rescue
                     txt
                   end || ''
                   super w,h,txt,border,ln,align,fill,link
                 end
                 def Footer
                   SetFont(@font_for_footer, 'I', 8)
                   SetY(-15)
                   SetX(15)
                   Cell(0, 5, @footer_date, 0, 0, 'L')
                   SetY(-15)
                   SetX(-30)
                   Cell(0, 5, PageNo().to_s + '/{nb}', 0, 0, 'C')
                 end
               end
             end

app/views/common/feed.atom.rxml +1 -1

             xml.instruct!
             xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
               xml.title   truncate_single_line(@title, 100)
               xml.link    "rel" => "self", "href" => url_for(params.merge({:format => nil, :only_path => false}))
               xml.link    "rel" => "alternate", "href" => url_for(:controller => 'welcome', :only_path => false)
               xml.id      url_for(:controller => 'welcome', :only_path => false)
               xml.updated((@items.first ? @items.first.event_datetime : Time.now).xmlschema)
               xml.author  { xml.name "#{Setting.app_title}" }
-              xml.generator(:uri => Redmine::Info.url, :version => Redmine::VERSION) { xml.text! Redmine::Info.versioned_name; }
+              xml.generator(:uri => Redmine::Info.url) { xml.text! Redmine::Info.app_name; }
               @items.each do |item|
                 xml.entry do
                   url = url_for(item.event_url(:only_path => false))
                   if @project
                     xml.title truncate_single_line(item.event_title, 100)
                   else
                     xml.title truncate_single_line("#{item.project} - #{item.event_title}", 100)
                   end
                   xml.link "rel" => "alternate", "href" => url
                   xml.id url
                   xml.updated item.event_datetime.xmlschema
                   author = item.event_author if item.respond_to?(:event_author)
                   xml.author do
                     xml.name(author)
                     xml.email(author.mail) if author.respond_to?(:mail) && !author.mail.blank?
                   end if author
                   xml.content "type" => "html" do
                     xml.text! textilizable(item.event_description)
                   end
                 end
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages