summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-05-01 11:25:57 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-05-01 11:25:57 +0000
commit6054b8a4300101652fec4b27c7b2ce1383ba24cc (patch)
treede963a411a836740aee018968a0025bdf007b019
parentde27a602458b00f9ff004e2f008d0aa2233bae0d (diff)
downloadredmine-6054b8a4300101652fec4b27c7b2ce1383ba24cc.tar.gz
redmine-6054b8a4300101652fec4b27c7b2ce1383ba24cc.zip
Do not use GLoc's l_date.
git-svn-id: http://redmine.rubyforge.org/svn/branches/work@1397 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--gloc-1.2.0/app/helpers/timelog_helper.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/gloc-1.2.0/app/helpers/timelog_helper.rb b/gloc-1.2.0/app/helpers/timelog_helper.rb
index db13556a1..78e2c7374 100644
--- a/gloc-1.2.0/app/helpers/timelog_helper.rb
+++ b/gloc-1.2.0/app/helpers/timelog_helper.rb
@@ -16,6 +16,8 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
module TimelogHelper
+ include ApplicationHelper
+
def select_hours(data, criteria, value)
data.select {|row| row[criteria] == value}
end
@@ -60,7 +62,7 @@ module TimelogHelper
csv << headers.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
# csv lines
entries.each do |entry|
- fields = [l_date(entry.spent_on),
+ fields = [format_date(entry.spent_on),
entry.user,
entry.activity,
entry.project,