Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

minor update just before releasing official 2.2.0

Browse source
This commit is contained in:
tipaul 2005-01-05 14:31:06 +00:00
parent 8b6ddcc968
commit 056c211411
3 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
misc/Install.pm
View file

@ -148,7 +148,7 @@ Are you ready to begin the installation? ([Y]/N): |;
$messages->{'WelcomeToUpgrader'}->{en} =
heading('Welcome to the Koha Upgrader') . qq|
You are attempting to upgrade from Koha %s to %s.
You are attempting to upgrade to Koha %s.
We recommend that you do a complete backup of all your files before upgrading.
This upgrade script will make a backup copy of your files for you.
@ -1818,7 +1818,8 @@ nothing will be added, and you must create them all yourself.
Only choose N if you want to use a MARC format not listed here,
such as DANMARC. We would like to hear from you if you do.
UPGRADE : If you UPGRADE your version from a previous 2.x.x, the right choice here is N (None) to preserve your local MARC setup.
*** UPGRADE ***
If you UPGRADE your version from a previous 2.x.x, the right choice here is N (None) to preserve your local MARC setup.
Choose MARC definition [1]: |;
@ -1826,9 +1827,8 @@ $messages->{'Language'}->{en} = heading('CHOOSE LANGUAGE') . qq|
This version of koha supports a few languages.
en : default language, all pages available
fr : complete translation (except pictures)
es : partial librarian site translation (including pictures)
pl : complete OPAC and partial librarian translation
fr : complete translation
es : partial librarian site translation
zh_TW : partial translation
en is used when a screen is not available in your language

2
misc/buildrelease
View file

@ -218,7 +218,7 @@ You may need to enter your SourceForge password.
Using $kohadir.
|;
chdir($kohadir) || die "$kohadir: $!\n";
system("cvs update -P");
# system("cvs update -P");
if ($cvstag) {
print qq|
Tagging koha with tag R_$tagname

17
misc/koha.upgrade
View file

@ -14,22 +14,21 @@ Install::setetcdir($ENV{etcdir}||'/etc');
my $input;
loadconfigfile();
my $kohaversion=`cat koha.version`;
chomp $kohaversion;
Install::setkohaversion $kohaversion;
$::newversion=`cat koha.version`;
chomp $::newversion;
Install::setkohaversion $::newversion;
if ($kohaversion =~ /RC/) {
if ($::newversion =~ /RC/) {
releasecandidatewarning();
}
my $answer = showmessage(getmessage('WelcomeToUpgrader',[$kohaversion,$::newversion]),'yn');
unless ($answer =~/y/i) {
my $answer = showmessage(getmessage('WelcomeToUpgrader',[$::newversion]),'yn','n');
if ($answer eq "Y" || $answer eq "y") {
print "Great! continuing upgrade... \n";
} else {
showmessage(getmessage('AbortingInstall'),'none');
exit;
} else {
print "Great! continuing upgrade... \n";
};
Install::setkohaversion($::newversion);