]> git.koha-community.org Git - koha.git/commit
Bug 6537 - squashed version of the previous 5 commits, signed-off
authorMagnus Enger <magnus@enger.priv.no>
Wed, 15 Jun 2011 06:38:40 +0000 (08:38 +0200)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 6 Sep 2011 21:19:07 +0000 (09:19 +1200)
commit6bd38d3eabc79c68cb90193378c69825ddac2a43
tree40c579b0911f472848205b8a3ac9b007a9b1ff37
parent34b553d03b96cb3c84ec978f6eea542f38f60de3
Bug 6537 - squashed version of the previous 5 commits, signed-off

Bug 6537 - Move installer/data/mysql/en/mandatory/sysprefs.sql to installer/data/mysql/sysprefs.sql

Bug 6537 - Make the web installer use installer/data/mysql/sysprefs.sql

Bug 6537 - New syspref files with only the prefs that differ from the default

I have mostly deleted old syspref files and created new ones, with a new name,
mainly in order to reduce the risk of merge conflicts if the old syspref files
are changed before this patch is pushed, if it is pushed.

See http://wiki.koha-community.org/wiki/Simplified_syspref_handling_RFC for
a description of how the new files were created to reflect sysprefs that
differ from the global default.

.txt files have been moved to reflect the new names of the SQL files they are
associated with.

Bug 6537 - Remove syspref-related tests in xt/

As far as I can see, the previous patches for this bug makes the syspref tests
obsolete, and this patch removes them:

xt/syspref.t
xt/check_sysprefs.t

Bug 6537 - Fix a problem in French syspref file

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
35 files changed:
C4/Installer.pm
installer/data/mysql/de-DE/mandatory/sysprefs.sql [deleted file]
installer/data/mysql/de-DE/mandatory/sysprefs.txt [deleted file]
installer/data/mysql/de-DE/mandatory/system_preferences.sql [new file with mode: 0644]
installer/data/mysql/de-DE/mandatory/system_preferences.txt [new file with mode: 0644]
installer/data/mysql/en/mandatory/sysprefs.sql [deleted file]
installer/data/mysql/en/mandatory/sysprefs.txt [deleted file]
installer/data/mysql/es-ES/mandatory/sysprefs.sql [deleted file]
installer/data/mysql/es-ES/mandatory/sysprefs.txt [deleted file]
installer/data/mysql/es-ES/mandatory/system_preferences.sql [new file with mode: 0644]
installer/data/mysql/es-ES/mandatory/system_preferences.txt [new file with mode: 0644]
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_system_preferences.sql [new file with mode: 0644]
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_system_preferences.txt [new file with mode: 0644]
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql [deleted file]
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.txt [deleted file]
installer/data/mysql/it-IT/necessari/sysprefs.sql [deleted file]
installer/data/mysql/it-IT/necessari/system_preferences.sql [new file with mode: 0644]
installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql [deleted file]
installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.txt [deleted file]
installer/data/mysql/nb-NO/1-Obligatorisk/system_preferences.sql [new file with mode: 0644]
installer/data/mysql/nb-NO/1-Obligatorisk/system_preferences.txt [new file with mode: 0644]
installer/data/mysql/pl-PL/mandatory/sysprefs.sql [deleted file]
installer/data/mysql/pl-PL/mandatory/sysprefs.txt [deleted file]
installer/data/mysql/pl-PL/mandatory/system_preferences.sql [new file with mode: 0644]
installer/data/mysql/pl-PL/mandatory/system_preferences.txt [new file with mode: 0644]
installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
installer/data/mysql/ru-RU/mandatory/system_preferences_only_translation_updating.sql [deleted file]
installer/data/mysql/ru-RU/mandatory/system_preferences_only_translation_updating.txt [deleted file]
installer/data/mysql/sysprefs.sql [new file with mode: 0755]
installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql
installer/data/mysql/uk-UA/mandatory/system_preferences_only_translation_updating.sql [deleted file]
installer/data/mysql/uk-UA/mandatory/system_preferences_only_translation_updating.txt [deleted file]
installer/data/mysql/uk-UA/mandatory/system_preferences_optimal_values_insert_only.sql
xt/check_sysprefs.t [deleted file]
xt/syspref.t [deleted file]