From 1469a4c8df574d066c49b55f9fd9096638740272 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Fri, 16 Nov 2007 21:24:22 +0000 Subject: [PATCH] Fixed (CVS adapter): changes not recorded when using :pserver string. Updated Russian js calendar (iGor kMeta). git-svn-id: http://redmine.rubyforge.org/svn/trunk@907 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/scm/adapters/cvs_adapter.rb | 3 ++- public/javascripts/calendar/lang/calendar-ru.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/redmine/scm/adapters/cvs_adapter.rb b/lib/redmine/scm/adapters/cvs_adapter.rb index c5f85f1c..e84c1eea 100644 --- a/lib/redmine/scm/adapters/cvs_adapter.rb +++ b/lib/redmine/scm/adapters/cvs_adapter.rb @@ -142,7 +142,8 @@ module Redmine if state=="entry_start" branch_map=Hash.new - if /^RCS file: #{Regexp.escape(root_url)}\/#{Regexp.escape(path_with_project)}(.+),v$/ =~ line + # gsub(/^:.*@[^:]+:/, '') is here to remove :pserver:anonymous@foo.bar: string if present in the url + if /^RCS file: #{Regexp.escape(root_url.gsub(/^:.*@[^:]+:/, ''))}\/#{Regexp.escape(path_with_project)}(.+),v$/ =~ line entry_path = normalize_cvs_path($1) entry_name = normalize_path(File.basename($1)) logger.debug("Path #{entry_path} <=> Name #{entry_name}") diff --git a/public/javascripts/calendar/lang/calendar-ru.js b/public/javascripts/calendar/lang/calendar-ru.js index 775bfc42..6274cc89 100644 --- a/public/javascripts/calendar/lang/calendar-ru.js +++ b/public/javascripts/calendar/lang/calendar-ru.js @@ -45,7 +45,7 @@ Calendar._SDN = new Array // First day of the week. "0" means display Sunday first, "1" means display // Monday first, etc. -Calendar._FD = 0; +Calendar._FD = 1; // full month names Calendar._MN = new Array