diff -r 06dd071a429d -r 4082c41f45e9 www/js/global.js --- a/www/js/global.js Sun Feb 24 21:22:25 2019 +0100 +++ b/www/js/global.js Sun Feb 24 22:29:00 2019 +0100 @@ -114,10 +114,10 @@ var HopTypeAdapter = new $.jqx.dataAdapter(HopTypeSource); var HopFormData = [ - { id: 0, en: 'Pellet', nl: 'pellets' }, - { id: 1, en: 'Plug', nl: 'plugs' }, - { id: 2, en: 'Leaf', nl: 'bellen' } -// { id: 3, en: 'Leaf wet', nl: 'bellen nat' } + { id: 0, en: 'Pellet', nl: 'pellets' }, + { id: 1, en: 'Plug', nl: 'plugs' }, + { id: 2, en: 'Leaf', nl: 'bellen' }, + { id: 3, en: 'Leaf wet', nl: 'hop nat' } ]; var HopFormSource = { localdata: HopFormData, @@ -698,55 +698,6 @@ var mashlist = new $.jqx.dataAdapter(mashProfileSource); -/* -function getLocalization() { - var localizationobj = {}; - localizationobj.pagerGoToPageString = "Gehe zu:"; - localizationobj.pagerShowRowsString = "Zeige Zeile:"; - localizationobj.pagerRangeString = " von "; - localizationobj.pagerNextButtonString = "voriger"; - localizationobj.pagerFirstButtonString = "first"; - localizationobj.pagerLastButtonString = "last"; - localizationobj.pagerPreviousButtonString = "nächster"; - localizationobj.sortAscendingString = "Sortiere aufsteigend"; - localizationobj.sortDescendingString = "Sortiere absteigend"; - localizationobj.sortRemoveString = "Entferne Sortierung"; - localizationobj.firstDay = 1; - localizationobj.percentSymbol = "%"; - localizationobj.currencySymbol = "€"; - localizationobj.currencySymbolPosition = "after"; - localizationobj.decimalSeparator = ","; - localizationobj.thousandsSeparator = "."; - var days = { - // full day names - names: ["Sonntag", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag"], - // abbreviated day names - namesAbbr: ["Sonn", "Mon", "Dien", "Mitt", "Donn", "Fre", "Sams"], - // shortest day names - namesShort: ["So", "Mo", "Di", "Mi", "Do", "Fr", "Sa"] - }; - localizationobj.days = days; - var months = { - // full month names (13 months for lunar calendards -- 13th month should be "" if not lunar) - names: ["Januar", "Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember", ""], - // abbreviated month names - namesAbbr: ["Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dez", ""] - }; - var patterns = { - d: "dd.MM.yyyy", - D: "dddd, d. MMMM yyyy", - t: "HH:mm", - T: "HH:mm:ss", - f: "dddd, d. MMMM yyyy HH:mm", - F: "dddd, d. MMMM yyyy HH:mm:ss", - M: "dd MMMM", - Y: "MMMM yyyy" - } - localizationobj.patterns = patterns; - localizationobj.months = months; - return localizationobj; -} -*/ $(document).ready(function () { @@ -848,9 +799,9 @@ if (Form == 1 ) { // Plug pfactor += my_factor_plug / 100; } -// if (Form == 3) { // Wet leaf -// pfactor += 5.5; // From https://github.com/chrisgilmerproj/brewday/blob/master/brew/constants.py -// } + if (Form == 3) { // Wet leaf + pfactor += my_factor_wethop / 100; // From https://github.com/chrisgilmerproj/brewday/blob/master/brew/constants.py + } if (Method == 0) { // Tinseth /* http://realbeer.com/hops/research.html */