Development

Changeset 1203

You must first sign up to be able to contribute.

Changeset 1203

Show
Ignore:
Timestamp:
04/13/06 23:46:15 (3 years ago)
Author:
rovert
Message:

RoVeRT: updating to trunk r1202

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/rovert-0.6/CHANGELOG

    r953 r1203  
    11SVN 
    22--- 
     3 
     4Version 0.6.2 
     5------------- 
     6 
     7* lot of bugs fixes 
     8* new output escaping system (to automatically prevent XSS) 
     9* better form repopulation system 
     10* fixed sfMailView 
     11* cache system tweaks 
     12* better exception page in debug mode and internal server error page in production mode 
     13* added some more information in the debug toolbar 
    314 
    415Version 0.6.1 

  • branches/rovert-0.6/data/skeleton/app/app/templates/layout.php

    r1157 r1203  
    1313<body> 
    1414 
    15 <?php echo $content ?> 
     15<?php echo $sf_data->getRaw('sf_content') ?> 
    1616 
    1717</body> 

  • branches/rovert-0.6/data/web/sf/css/sf_debug_stats/main.css

    r829 r1203  
    11#sfStatsBase 
    22{ 
    3   z-index: 999; 
    43  padding: 0; 
    54  margin: 0; 
    …… 
    1312.sfStats 
    1413{ 
     14  z-index: 999; 
    1515  width: 110px; 
    1616  position: absolute; 

  • branches/rovert-0.6/data/web/sf/js/calendar/calendar-setup.js

    r500 r1203  
    6363  function param_default(pname, def) { if (typeof params[pname] == "undefined") { params[pname] = def; } }; 
    6464 
    65   param_default("inputField",     null); 
    66   param_default("displayArea",    null); 
    67   param_default("button",         null); 
    68   param_default("eventName",      "click"); 
    69   param_default("ifFormat",       "%Y/%m/%d"); 
    70   param_default("daFormat",       "%Y/%m/%d"); 
    71   param_default("singleClick",    true); 
    72   param_default("disableFunc",    null); 
    73   param_default("dateStatusFunc", params["disableFunc"]); // takes precedence if both are defined 
    74   param_default("dateText",       null); 
    75   param_default("firstDay",       null); 
    76   param_default("align",          "Br"); 
    77   param_default("range",          [1900, 2999]); 
    78   param_default("weekNumbers",    true); 
    79   param_default("flat",           null); 
    80   param_default("flatCallback",   null); 
    81   param_default("onSelect",       null); 
    82   param_default("onClose",        null); 
    83   param_default("onUpdate",       null); 
    84   param_default("date",           null); 
    85   param_default("showsTime",      false); 
    86   param_default("timeFormat",     "24"); 
    87   param_default("electric",       true); 
    88   param_default("step",           2); 
    89   param_default("position",       null); 
    90   param_default("cache",          false); 
    91   param_default("showOthers",     false); 
    92   param_default("multiple",       null); 
     65  param_default("inputField",      null); 
     66  param_default("displayArea",     null); 
     67  param_default("button",          null); 
     68  param_default("eventName",       "click"); 
     69  param_default("ifFormat",        "%Y/%m/%d"); 
     70  param_default("daFormat",        "%Y/%m/%d"); 
     71  param_default("singleClick",     true); 
     72  param_default("disableFunc",     null); 
     73  param_default("dateStatusFunc",  params["disableFunc"]);  // takes precedence if both are defined 
     74  param_default("dateTooltipFunc", null); 
     75  param_default("dateText",        null); 
     76  param_default("firstDay",        null); 
     77  param_default("align",           "Br"); 
     78  param_default("range",           [1900, 2999]); 
     79  param_default("weekNumbers",     true); 
     80  param_default("flat",            null); 
     81  param_default("flatCallback",    null); 
     82  param_default("onSelect",        null); 
     83  param_default("onClose",         null); 
     84  param_default("onUpdate",        null); 
     85  param_default("date",            null); 
     86  param_default("showsTime",       false); 
     87  param_default("timeFormat",      "24"); 
     88  param_default("electric",        true); 
     89  param_default("step",            2); 
     90  param_default("position",        null); 
     91  param_default("cache",           false); 
     92  param_default("showOthers",      false); 
     93  param_default("multiple",        null); 
    9394 
    9495  var tmp = ["inputField", "displayArea", "button"]; 
    …… 
    131132    } 
    132133    var cal = new Calendar(params.firstDay, params.date, params.onSelect || onSelect); 
     134    cal.setDateToolTipHandler(params.dateTooltipFunc); 
    133135    cal.showsOtherMonths = params.showOthers; 
    134136    cal.showsTime = params.showsTime; 
    …… 
    163165                   params.onSelect || onSelect, 
    164166                   params.onClose || function(cal) { cal.hide(); }); 
     167      cal.setDateToolTipHandler(params.dateTooltipFunc); 
    165168      cal.showsTime = params.showsTime; 
    166169      cal.time24 = (params.timeFormat == "24"); 

  • branches/rovert-0.6/data/web/sf/js/calendar/calendar.js

    r500 r1203  
    553553    if (el.caldate) { 
    554554      Calendar.addClass(el.parentNode, "rowhilite"); 
     555      var cal = el.calendar; 
     556      if (cal && cal.getDateToolTip) { 
     557        var d = el.caldate; 
     558        window.status = d; 
     559        el.title = cal.getDateToolTip(d, d.getFullYear(), d.getMonth(), d.getDate()); 
     560      } 
    555561    } 
    556562  } 
    …… 
    568574    if (el.calendar) 
    569575      el.calendar.tooltips.innerHTML = _TT["SEL_DATE"]; 
    570     return stopEvent(ev); 
     576    // return stopEvent(ev); 
    571577  } 
    572578}; 
    …… 
    593599    date = cal.date; 
    594600    var other_month = !(cal.dateClicked = !el.otherMonth); 
    595     if (!other_month && !cal.currentDateEl) 
     601    if (!other_month && !cal.currentDateEl && cal.multiple) 
    596602      cal._toggleMultipleDate(new Date(date)); 
    597603    else 
    …… 
    11501156      if (this.getDateStatus) { 
    11511157        var status = this.getDateStatus(date, year, month, iday); 
    1152         if (this.getDateToolTip) { 
    1153           var toolTip = this.getDateToolTip(date, year, month, iday); 
    1154           if (toolTip) 
    1155             cell.title = toolTip; 
    1156         } 
    11571158        if (status === true) { 
    11581159          cell.className += " disabled"; 

  • branches/rovert-0.6/data/web/sf/js/calendar/lang/calendar-cs-utf8.js

    r500 r1203  
    1212Calendar._MN  = new Array('Leden','Únor','Březen','Duben','Květen','Červen','Červenec','Srpen','Září','Říjen','Listopad','Prosinec'); 
    1313Calendar._SMN = new Array('Led','Úno','Bře','Dub','Kvě','Črv','Čvc','Srp','Zář','Říj','Lis','Pro'); 
     14 
     15// First day of the week. "0" means display Sunday first, "1" means display 
     16// Monday first, etc. 
     17Calendar._FD = 0; 
    1418 
    1519// tooltips 
    …… 
    2933 
    3034Calendar._TT["ABOUT"] = 
    31 "DHTML Date/Time Selector\n" + 
    32 "(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-) 
    33 "For latest version visit: http://www.dynarch.com/projects/calendar/\n" + 
    34 "Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." + 
     35"DHTML Kalendář\n" + 
     36"(c) dynarch.com 2002-2005 / Autor: Mihai Bazon\n" + // don't translate this this ;-) 
     37"Aktuální verzi najdete na: http://www.dynarch.com/projects/calendar/\n" + 
     38"Distribuováno pod licencí GNU LGPL.  Viz. http://gnu.org/licenses/lgpl.html" + 
    3539"\n\n" + 
    3640"Výběr datumu:\n" + 
    37 "- Use the \xab, \xbb buttons to select year\n" + 
     41"- Použijte \xab, \xbb tlačítka k výběru roku\n" + 
    3842"- Použijte tlačítka " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " k výběru měsíce\n" + 
    3943"- Podržte tlačítko myši na jakémkoliv z těch tlačítek pro rychlejší výběr."; 
    …… 
    6468Calendar._TT["WK"] = "wk"; 
    6569Calendar._TT["TIME"] = "Čas:"; 
     70 

  • branches/rovert-0.6/data/web/sf/js/calendar/lang/calendar-cs-win.js

    r500 r1203  
    1212Calendar._MN  = new Array('Leden','�or','B�','Duben','Kv�n','�rven','�rvenec','Srpen','Z�','�jen','Listopad','Prosinec'); 
    1313Calendar._SMN = new Array('Led','�o','B�Dub','Kv�'�v','�c','Srp','Z�,'�j','Lis','Pro'); 
     14 
     15// First day of the week. "0" means display Sunday first, "1" means display 
     16// Monday first, etc. 
     17Calendar._FD = 0; 
    1418 
    1519// tooltips 
    …… 
    2933 
    3034Calendar._TT["ABOUT"] = 
    31 "DHTML Date/Time Selector\n" + 
    32 "(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-) 
    33 "For latest version visit: http://www.dynarch.com/projects/calendar/\n" + 
    34 "Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." + 
     35"DHTML Kalend�n" + 
     36"(c) dynarch.com 2002-2005 / Autor: Mihai Bazon\n" + // don't translate this this ;-) 
     37"Aktu��erzi najdete na: http://www.dynarch.com/projects/calendar/\n" + 
     38"Distribuov� pod licenc�NU LGPL.  Viz. http://gnu.org/licenses/lgpl.html" + 
    3539"\n\n" + 
    3640"V�atumu:\n" + 
    37 "- Use the \xab, \xbb buttons to select year\n" + 
     41"- Pou�ijte \xab, \xbb tla�ka k v�roku\n" + 
    3842"- Pou�ijte tla�ka " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " k v�m�ce\n" + 
    3943"- Podr�te tla�ko my�i na jak�oliv z t� tla�ek pro rychlej���; 
    …… 
    6468Calendar._TT["WK"] = "wk"; 
    6569Calendar._TT["TIME"] = "�s:"; 
     70 

  • branches/rovert-0.6/data/web/sf/js/calendar/lang/calendar-de.js

    r500 r1203  
    11// ** I18N 
    22 
    3 // Calendar DE language 
    4 // Author: Jack (tR), <jack@jtr.de> 
     3// Calendar EN language 
     4// Author: Mihai Bazon, <mihai_bazon@yahoo.com> 
    55// Encoding: any 
    66// Distributed under the same terms as the calendar itself. 
    …… 
    4444 "So"); 
    4545 
     46// First day of the week. "0" means display Sunday first, "1" means display 
     47// Monday first, etc. 
     48Calendar._FD = 1; 
     49 
    4650// full month names 
    4751Calendar._MN = new Array 
    …… 
    6569 "M\u00e4r", 
    6670 "Apr", 
    67  "May", 
     71 "Mai", 
    6872 "Jun", 
    6973 "Jul", 
    …… 
    9498"- oder klicken und festhalten f\u00fcr Schnellauswahl."; 
    9599 
    96 Calendar._TT["TOGGLE"] = "Ersten Tag der Woche w\u00e4hlen"; 
    97 Calendar._TT["PREV_YEAR"] = "Voriges Jahr (Festhalten f\u00fcr Schnellauswahl)"; 
    98 Calendar._TT["PREV_MONTH"] = "Voriger Monat (Festhalten f\u00fcr Schnellauswahl)"; 
     100Calendar._TT["PREV_YEAR"] = "Voriges Jahr (Schnellauswahl: festhalten)"; 
     101Calendar._TT["PREV_MONTH"] = "Voriger Monat (Schnellauswahl: festhalten)"; 
    99102Calendar._TT["GO_TODAY"] = "Heute ausw\u00e4hlen"; 
    100 Calendar._TT["NEXT_MONTH"] = "N\u00e4chst. Monat (Festhalten f\u00fcr Schnellauswahl)"; 
    101 Calendar._TT["NEXT_YEAR"] = "N\u00e4chst. Jahr (Festhalten f\u00fcr Schnellauswahl)"; 
     103Calendar._TT["NEXT_MONTH"] = "N\u00e4chst. Monat (Schnellauswahl: festhalten)"; 
     104Calendar._TT["NEXT_YEAR"] = "N\u00e4chst. Jahr (Schnellauswahl: festhalten)"; 
    102105Calendar._TT["SEL_DATE"] = "Datum ausw\u00e4hlen"; 
    103106Calendar._TT["DRAG_TO_MOVE"] = "Zum Bewegen festhalten"; 

  • branches/rovert-0.6/data/web/sf/js/calendar/lang/calendar-fr.js

    r500 r1203  
    33// Calendar EN language 
    44// Author: Mihai Bazon, <mihai_bazon@yahoo.com> 
    5 // Encoding: any 
     5// Encoding: UTF-8 
    66// Distributed under the same terms as the calendar itself. 
    77 
    …… 
    1010// include your contact information in the header, as can be seen above. 
    1111 
    12 // Translator: David Duret, <pilgrim@mala-template.net> from previous french version 
     12// Translator: André Liechti, <developer@sysco.ch> (2006-01-04) from scratch for version 1.x 
    1313 
    1414// full day names 
    …… 
    4040 "Lun", 
    4141 "Mar", 
    42  "Mar", 
     42 "Mer", 
    4343 "Jeu", 
    4444 "Ven", 
    …… 
    4646 "Dim"); 
    4747 
     48// First day of the week. "0" means display Sunday first, "1" means display 
     49// Monday first, etc. 
     50Calendar._FD = 1; 
     51 
    4852// full month names 
    4953Calendar._MN = new Array 
    5054("Janvier", 
    51  "F�ier", 
     55 "Février", 
    5256 "Mars", 
    5357 "Avril", 
    …… 
    5559 "Juin", 
    5660 "Juillet", 
    57  "Ao� "Septembre", 
     61 "Août", 
     62 "Septembre", 
    5863 "Octobre", 
    5964 "Novembre", 
    60  "D�mbre"); 
     65 "Décembre"); 
    6166 
    6267// short month names 
    6368Calendar._SMN = new Array 
    6469("Jan", 
    65  "Fev", 
     70 "Fév", 
    6671 "Mar", 
    6772 "Avr", 
    …… 
    6974 "Juin", 
    7075 "Juil", 
    71  "Aout", 
     76 "Aou", 
    7277 "Sep", 
    7378 "Oct", 
    7479 "Nov", 
    75  "Dec"); 
     80 "Déc"); 
    7681 
    7782// tooltips 
    7883Calendar._TT = {}; 
    79 Calendar._TT["INFO"] = "A propos du calendrier"; 
     84Calendar._TT["INFO"] = "À propos du calendrier"; 
    8085 
    8186Calendar._TT["ABOUT"] = 
    82 "DHTML Date/Heure Selecteur\n" + 
     87"Sélecteur DHTML de date/heure\n" + 
    8388"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-) 
    84 "Pour la derniere version visitez : http://www.dynarch.com/projects/calendar/\n" + 
    85 "Distribu�ar GNU LGPL.  Voir http://gnu.org/licenses/lgpl.html pour les details." + 
     89"Pour la version actuelle, visitez: http://www.dynarch.com/projects/calendar/\n" + 
     90"Distribué sous licence GNU LGPL.  Voir http://gnu.org/licenses/lgpl.html pour les détails." + "\n(licence traduite en français: http://www.rodage.org/lgpl.fr.html)" + 
    8691"\n\n" + 
    87 "Selection de la date :\n" + 
    88 "- Utiliser les bouttons \xab, \xbb  pour selectionner l\'annee\n" + 
    89 "- Utiliser les bouttons " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " pour selectionner les mois\n" + 
    90 "- Garder la souris sur n'importe quels boutons pour une selection plus rapide"; 
     92"Sélection de la date:\n" + 
     93"- Utiliser les boutons \xab, \xbb pour sélectionner l'année\n" + 
     94"- Utiliser les boutons " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " pour sélectionner le mois\n" + 
     95"- En conservant pressé le bouton de la souris sur l'un de ces boutons, la sélection devient plus rapide."; 
    9196Calendar._TT["ABOUT_TIME"] = "\n\n" + 
    92 "Selection de l\'heure :\n" + 
    93 "- Cliquer sur heures ou minutes pour incrementer\n" + 
    94 "- ou Maj-clic pour decrementer\n" + 
    95 "- ou clic et glisser-deplacer pour une selection plus rapide"; 
     97"Sélection de l\'heure:\n" + 
     98"- Cliquer sur l'une des parties du temps pour l'augmenter\n" + 
     99"- ou Maj-clic pour le diminuer\n" + 
     100"- ou faire un cliquer-déplacer horizontal pour une modification plus rapide."; 
    96101 
    97 Calendar._TT["PREV_YEAR"] = "Ann�pr� (maintenir pour menu)"; 
    98 Calendar._TT["PREV_MONTH"] = "Mois pr� (maintenir pour menu)"; 
     102Calendar._TT["PREV_YEAR"] = "Année préc. (maintenir pour afficher menu)"; 
     103Calendar._TT["PREV_MONTH"] = "Mois préc. (maintenir pour afficher menu)"; 
    99104Calendar._TT["GO_TODAY"] = "Atteindre la date du jour"; 
    100 Calendar._TT["NEXT_MONTH"] = "Mois suiv. (maintenir pour menu)"; 
    101 Calendar._TT["NEXT_YEAR"] = "Ann�suiv. (maintenir pour menu)"; 
    102 Calendar._TT["SEL_DATE"] = "S�ctionner une date"; 
    103 Calendar._TT["DRAG_TO_MOVE"] = "D�acer"; 
    104 Calendar._TT["PART_TODAY"] = " (Aujourd'hui)"; 
     105Calendar._TT["NEXT_MONTH"] = "Mois suiv. (maintenir pour afficher menu)"; 
     106Calendar._TT["NEXT_YEAR"] = "Année suiv. (maintenir pour afficher menu)"; 
     107Calendar._TT["SEL_DATE"] = "Sélectionner une date"; 
     108Calendar._TT["DRAG_TO_MOVE"] = "Glisser pour déplacer"; 
     109Calendar._TT["PART_TODAY"] = " (aujourd'hui)"; 
    105110 
    106111// the following is to inform that "%s" is to be the first day of week 
    …… 
    115120Calendar._TT["CLOSE"] = "Fermer"; 
    116121Calendar._TT["TODAY"] = "Aujourd'hui"; 
    117 Calendar._TT["TIME_PART"] = "(Maj-)Clic ou glisser pour modifier la valeur"; 
     122Calendar._TT["TIME_PART"] = "(Maj-)Clic ou glisser pour changer la valeur"; 
    118123 
    119124// date formats 
    120 Calendar._TT["DEF_DATE_FORMAT"] = "%d/%m/%Y"; 
    121 Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e"; 
     125Calendar._TT["DEF_DATE_FORMAT"] = "%d.%m.%Y"; 
     126Calendar._TT["TT_DATE_FORMAT"] = "%A, %e %B"; 
    122127 
    123 Calendar._TT["WK"] = "Sem."; 
    124 Calendar._TT["TIME"] = "Heure :"; 
     128Calendar._TT["WK"] = "sem."; 
     129Calendar._TT["TIME"] = "Heure:"; 

  • branches/rovert-0.6/data/web/sf/js/calendar/lang/calendar-sk.js

    r500 r1203  
    11// ** I18N 
    22 
    3 // Calendar SK language 
    4 // Author: Peter Valach (pvalach@gmx.net) 
    5 // Encoding: utf-8 
    6 // Last update: 2003/10/29 
     3// Calendar EN language 
     4// Author: Mihai Bazon, <mihai_bazon@yahoo.com> 
     5// Encoding: any 
    76// Distributed under the same terms as the calendar itself. 
     7 
     8// For translators: please use UTF-8 if possible.  We strongly believe that 
     9// Unicode is the answer to a real internationalized world.  Also please 
     10// include your contact information in the header, as can be seen above. 
    811 
    912// full day names 
    1013Calendar._DN = new Array 
    11 ("NedeÄľa", 
     14("Nedeľa", 
    1215 "Pondelok", 
    1316 "Utorok", 
    1417 "Streda", 
    15  "Ĺ tvrtok", 
     18 "Štvrtok", 
    1619 "Piatok", 
    1720 "Sobota", 
    18  "NedeÄľa"); 
     21 "Nedeľa"); 
     22 
     23// Please note that the following array of short day names (and the same goes 
     24// for short month names, _SMN) isn't absolutely necessary.  We give it here 
     25// for exemplification on how one can customize the short day names, but if 
     26// they are simply the first N letters of the full name you can simply say: 
     27// 
     28//   Calendar._SDN_len = N; // short day name length 
     29//   Calendar._SMN_len = N; // short month name length 
     30// 
     31// If N = 3 then this is not needed either since we assume a value of 3 if not 
     32// present, to be compatible with translation files that were written before 
     33// this feature. 
    1934 
    2035// short day names 
    2136Calendar._SDN = new Array 
    22 ("Ned", 
    23  "Pon", 
    24  "Uto", 
    25  "Str", 
    26  "Ĺ tv", 
    27  "Pia", 
    28  "Sob", 
    29  "Ned"); 
     37("Ne", 
     38 "Po", 
     39 "Ut", 
     40 "St", 
     41 "Št", 
     42 "Pi", 
     43 "So", 
     44 "Ne"); 
     45 
     46// First day of the week. "0" means display Sunday first, "1" means display 
     47// Monday first, etc. 
     48Calendar._FD = 1; 
    3049 
    3150// full month names 
    3251Calendar._MN = new Array 
    33 ("Január", 
    34  "Február", 
     52("Január", 
     53 "Február", 
    3554 "Marec", 
    36  "AprĂ­l", 
    37  "Máj", 
    38  "JĂşn", 
    39  "JĂşl", 
     55 "Apríl", 
     56 "Máj", 
     57 "Jún", 
     58 "Júl", 
    4059 "August", 
    4160 "September", 
    42  "OktĂłber", 
     61 "Október", 
    4362 "November", 
    4463 "December"); 
    …… 
    5069 "Mar", 
    5170 "Apr", 
    52  "Máj", 
    53  "JĂşn", 
    54  "JĂşl", 
     71 "Máj", 
     72 "Jún", 
     73 "Júl", 
    5574 "Aug", 
    5675 "Sep", 
    …… 
    6180// tooltips 
    6281Calendar._TT = {}; 
    63 Calendar._TT["INFO"] = "O kalendári"; 
     82Calendar._TT["INFO"] = "O kalendári"; 
    6483 
    6584Calendar._TT["ABOUT"] = 
    6685"DHTML Date/Time Selector\n" + 
    67 "(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + 
    68 "PoslednĂş verziu nájdete na: http://www.dynarch.com/projects/calendar/\n" + 
    69 "DistribuovanĂ© pod GNU LGPL.  ViÄŹ http://gnu.org/licenses/lgpl.html pre detaily." + 
     86"(c) dynarch.com 2002-2005 / Autor: Mihai Bazon\n" + // don't translate this this ;-) 
     87"Poslednú verziu nájdete na: http://www.dynarch.com/projects/calendar/\n" + 
     88"Distribuované pod licenciou GNU LGPL /http://gnu.org/licenses/lgpl.html/" + 
    7089"\n\n" + 
    71 "VĂ˝ber dátumu:\n" + 
    72 "- PouĹľite tlaÄŤidlá \xab, \xbb pre vĂ˝ber roku\n" + 
    73 "- PouĹľite tlaÄŤidlá " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " pre vĂ˝ber mesiaca\n" + 
    74 "- Ak ktorĂ©koÄľvek z tĂ˝chto tlaÄŤidiel podržíte dlhšie, zobrazĂ­ sa rĂ˝chly vĂ˝ber."; 
     90"Výber dátumu:\n" + 
     91"- Použite tlačidlá \xab, \xbb pre výber roku\n" + 
     92"- Použite tlačidlá " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " pre výber mesiaca\n" + 
     93"- Podrž tlačidlo myši nad akýmkoľvek tlačidlom pre rýchlejší výber."; 
    7594Calendar._TT["ABOUT_TIME"] = "\n\n" + 
    76 "VĂ˝ber ÄŤasu:\n" + 
    77 "- Kliknutie na niektorĂş poloĹľku ÄŤasu ju zvýši\n" + 
    78 "- Shift-klik ju znĂ­Ĺľi\n" + 
    79 "- Ak podržíte tlaÄŤĂ­tko stlaÄŤenĂ©, posĂşvanĂ­m menĂ­te hodnotu."; 
     95"Výber času:\n" + 
     96"- Kliknutie na niektorú položku času ju zväčší\n" + 
     97"- Shift-kliknutie ju zmenší\n" + 
     98"- ak necháte tlačítko myši stlačené, posúvaním meníte hodnotu."; 
    8099 
    81 Calendar._TT["PREV_YEAR"] = "PredošlĂ˝ rok (podrĹľte pre menu)"; 
    82 Calendar._TT["PREV_MONTH"] = "PredošlĂ˝ mesiac (podrĹľte pre menu)"; 
    83 Calendar._TT["GO_TODAY"] = "PrejsĹĄ na dnešok"; 
    84 Calendar._TT["NEXT_MONTH"] = "Nasl. mesiac (podrĹľte pre menu)"; 
    85 Calendar._TT["NEXT_YEAR"] = "Nasl. rok (podrĹľte pre menu)"; 
    86 Calendar._TT["SEL_DATE"] = "ZvoÄľte dátum"; 
    87 Calendar._TT["DRAG_TO_MOVE"] = "PodrĹľanĂ­m tlaÄŤĂ­tka zmenĂ­te polohu"; 
     100Calendar._TT["PREV_YEAR"] = "Predošlý rok (podržte pre menu)"; 
     101Calendar._TT["PREV_MONTH"] = "Predošlý mesiac (podržte pre menu)"; 
     102Calendar._TT["GO_TODAY"] = "Prejsť na dnešok"; 
     103Calendar._TT["NEXT_MONTH"] = "Nasled. mesiac (podržte pre menu)"; 
     104Calendar._TT["NEXT_YEAR"] = "Nasled. rok (podržte pre menu)"; 
     105Calendar._TT["SEL_DATE"] = "Vyberte dátum"; 
     106Calendar._TT["DRAG_TO_MOVE"] = "Podržaním tlačítka zmeňte polohu"; 
    88107Calendar._TT["PART_TODAY"] = " (dnes)"; 
    89 Calendar._TT["MON_FIRST"] = "ZobraziĹĄ pondelok ako prvĂ˝"; 
    90 Calendar._TT["SUN_FIRST"] = "ZobraziĹĄ nedeÄľu ako prvĂş"; 
    91 Calendar._TT["CLOSE"] = "ZavrieĹĄ"; 
     108 
     109// the following is to inform that "%s" is to be the first day of week 
     110// %s will be replaced with the day name. 
     111Calendar._TT["DAY_FIRST"] = "Zobraz %s first"; 
     112 
     113// This may be locale-dependent.  It specifies the week-end days, as an array 
     114// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1 
     115// means Monday, etc. 
     116Calendar._TT["WEEKEND"] = "0,6"; 
     117 
     118Calendar._TT["CLOSE"] = "Zavrieť"; 
    92119Calendar._TT["TODAY"] = "Dnes"; 
    93 Calendar._TT["TIME_PART"] = "(Shift-)klik/ĹĄahanie zmenĂ­ hodnotu"; 
     120Calendar._TT["TIME_PART"] = "(Shift-)klik/ťahanie zmení hodnotu"; 
    94121 
    95122// date formats 
    96 Calendar._TT["DEF_DATE_FORMAT"] = "$d. %m. %Y"; 
    97 Calendar._TT["TT_DATE_FORMAT"] = "%a, %e. %b"; 
     123Calendar._TT["DEF_DATE_FORMAT"] = "%d.%m.%Y"; 
     124Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e"; 
    98125 
    99 Calendar._TT["WK"] = "týž"; 
     126Calendar._TT["WK"] = "týž"; 
     127Calendar._TT["TIME"] = "Čas:"; 

  • branches/rovert-0.6/data/web/sf/js/calendar/lang/calendar-sv.js

    r500 r1203  
    44// Author: Mihai Bazon, <mihai_bazon@yahoo.com> 
    55// Translation team: <sv@li.org> 
    6 // Translator: Leonard Norrg� <leonard.norrgard@refactor.fi> 
    7 // Last translator: Leonard Norrg� <leonard.norrgard@refactor.fi> 
    8 // Encoding: iso-latin-1 
     6// Translator: Leonard Norrgård <leonard.norrgard@refactor.fi> 
     7// Last translator: Emil Ljungdahl <emil@kratern.se> 
     8// Encoding: UTF-8 
    99// Distributed under the same terms as the calendar itself. 
    1010 
    …… 
    1515// full day names 
    1616Calendar._DN = new Array 
    17 ("s�g", 
    18  "m�ag", 
     17("söndag", 
     18 "måndag", 
    1919 "tisdag", 
    2020 "onsdag", 
    2121 "torsdag", 
    2222 "fredag", 
    23  "l�g", 
    24  "s�g"); 
     23 "lördag", 
     24 "söndag"); 
    2525 
    2626// Please note that the following array of short day names (and the same goes 
    …… 
    3535// present, to be compatible with translation files that were written before 
    3636// this feature. 
    37 Calendar._SDN_len = 2; 
    38 Calendar._SMN_len = 3; 
     37 
     38// short day names 
     39Calendar._SDN = new Array 
     40("sön", 
     41 "mån", 
     42 "tis", 
     43 "ons", 
     44 "tor", 
     45 "fre", 
     46 "lör", 
     47 "sön"); 
     48 
     49// First day of the week. "0" means display Sunday first, "1" means display 
     50// Monday first, etc. 
     51Calendar._FD = 0; 
    3952 
    4053// full month names 
    …… 
    5366 "december"); 
    5467 
     68// short month names 
     69Calendar._SMN = new Array 
     70("jan", 
     71 "feb", 
     72 "mar", 
     73 "apr", 
     74 "maj", 
     75 "jun", 
     76 "jul", 
     77 "aug", 
     78 "sep", 
     79 "okt", 
     80 "nov", 
     81 "dec"); 
     82 
    5583// tooltips 
    5684Calendar._TT = {}; 
    …… 
    5886 
    5987Calendar._TT["ABOUT"] = 
    60 "DHTML Datum/tid-v�are\n" + 
     88"DHTML Datum/tid-väljare\n" + 
    6189"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-) 
    62 "F�enaste version g�ill: http://www.dynarch.com/projects/calendar/\n" + 
    63 "Distribueras under GNU LGPL.  Se http://gnu.org/licenses/lgpl.html f�etaljer." + 
     90"För senaste version gå till: http://www.dynarch.com/projects/calendar/\n" + 
     91"Distribueras under GNU LGPL.  Se http://gnu.org/licenses/lgpl.html för detaljer." + 
    6492"\n\n" + 
    6593"Val av datum:\n" + 
    66 "- Anv� knapparna \xab, \xbb f�tt v�a �n" + 
    67 "- Anv� knapparna " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " f�tt v�a m�d\n" + 
    68 "- H� musknappen nedtryckt p��n av ovanst�de knappar f�nabbare val."; 
     94"- Använd knapparna \xab, \xbb för att välja år\n" + 
     95"- Använd knapparna " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " för att välja månad\n" + 
     96"- Håll musknappen nedtryckt på någon av ovanstående knappar för snabbare val."; 
    6997Calendar._TT["ABOUT_TIME"] = "\n\n" + 
    7098"Val av tid:\n" + 
    71 "- Klicka p�n del av tiden f�tt �den delen\n" + 
    72 "- eller skift-klicka f�tt minska den\n" + 
    73 "- eller klicka och drag f�nabbare val."; 
     99"- Klicka på en del av tiden för att öka den delen\n" + 
     100"- eller skift-klicka för att minska den\n" + 
     101"- eller klicka och drag för snabbare val."; 
    74102 
    75 Calendar._TT["PREV_YEAR"] = "F��de �(h� f�enu)"; 
    76 Calendar._TT["PREV_MONTH"] = "F��de m�d (h� f�enu)"; 
    77 Calendar._TT["GO_TODAY"] = "G�ill dagens datum"; 
    78 Calendar._TT["NEXT_MONTH"] = "F�nde m�d (h� f�enu)"; 
    79 Calendar._TT["NEXT_YEAR"] = "F�nde �(h� f�enu)"; 
    80 Calendar._TT["SEL_DATE"] = "V� datum"; 
    81 Calendar._TT["DRAG_TO_MOVE"] = "Drag f�tt flytta"; 
     103Calendar._TT["PREV_YEAR"] = "Föregående år (håll för menu)"; 
     104Calendar._TT["PREV_MONTH"] = "Föregående månad (håll för menu)"; 
     105Calendar._TT["GO_TODAY"] = "Gå till dagens datum"; 
     106Calendar._TT["NEXT_MONTH"] = "Följande månad (håll för menu)"; 
     107Calendar._TT["NEXT_YEAR"] = "Följande år (håll för menu)"; 
     108Calendar._TT["SEL_DATE"] = "Välj datum"; 
     109Calendar._TT["DRAG_TO_MOVE"] = "Drag för att flytta"; 
    82110Calendar._TT["PART_TODAY"] = " (idag)"; 
    83 Calendar._TT["MON_FIRST"] = "Visa m�ag f�"; 
    84 Calendar._TT["SUN_FIRST"] = "Visa s�g f�"; 
    85 Calendar._TT["CLOSE"] = "St�"; 
     111Calendar._TT["MON_FIRST"] = "Visa måndag först"; 
     112Calendar._TT["SUN_FIRST"] = "Visa söndag först"; 
     113 
     114// the following is to inform that "%s" is to be the first day of week 
     115// %s will be replaced with the day name. 
     116Calendar._TT["DAY_FIRST"] = "Visa %s först"; 
     117 
     118// This may be locale-dependent.  It specifies the week-end days, as an array 
     119// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1 
     120// means Monday, etc. 
     121Calendar._TT["WEEKEND"] = "0"; 
     122 
     123Calendar._TT["CLOSE"] = "Stäng"; 
    86124Calendar._TT["TODAY"] = "Idag"; 
    87 Calendar._TT["TIME_PART"] = "(Skift-)klicka eller drag f�tt �ra tid"; 
     125Calendar._TT["TIME_PART"] = "(Skift-)klicka eller drag för att ändra tid"; 
    88126 
    89127// date formats 
    …… 
    92130 
    93131Calendar._TT["WK"] = "vecka"; 
     132Calendar._TT["TIME"] = "Tid:"; 

  • branches/rovert-0.6/lib/action/sfComponent.class.php

    r983 r1203  
    9393  public function logMessage($message, $priority = 'info') 
    9494  { 
    95     return $this->context->getLogger()->log($message, constant('SF_PEAR_LOG_'.strtoupper($priority))); 
     95    if (sfConfig::get('sf_logging_active')) 
     96    { 
     97      return $this->context->getLogger()->log($message, constant('SF_PEAR_LOG_'.strtoupper($priority))); 
     98    } 
    9699  } 
    97100 

  • branches/rovert-0.6/lib/config/sfConfigHandler.class.php

    r983 r1203  
    118118 
    119119  /** 
    120    * Replace constant identifiers in a string. 
     120   * Replace constant identifiers in a value. 
    121121   * 
    122    * @param string The value on which to run the replacement procedure. 
     122   * If the value is an array replacements are made recursively. 
     123   *  
     124   * @param mixed The value on which to run the replacement procedure. 
    123125   * 
    124126   * @return string The new value. 
    125127   */ 
    126128  public static function replaceConstants($value) 
     129  { 
     130    if (is_array($value)) 
     131    { 
     132      array_walk_recursive($value, array('self', 'replaceConstantsCallback')); 
     133    } 
     134    else 
     135    { 
     136      $value = self::replaceConstantsCallback($value); 
     137    } 
     138 
     139    return $value; 
     140  } 
     141 
     142  /** 
     143   * Replaces constant identifiers in a scalar value. 
     144   * 
     145   * This is used by the {@link replaceConstants}. 
     146   * 
     147   * @param string the value to perform the replacement on 
     148   * @return string the value with substitutions made 
     149   */ 
     150  private static function replaceConstantsCallback($value) 
    127151  { 
    128152    return preg_replace('/%(.+?)%/e', 'sfConfig::get(strtolower("\\1"))', $value); 

  • branches/rovert-0.6/lib/config/sfViewConfigHandler.class.php

    r1157 r1203  
    4545 
    4646    // merge javascripts and stylesheets 
    47     $myConfig['all']['stylesheets'] = array_merge(isset($myConfig['default']['stylesheets']) ? $myConfig['default']['javascripts'] : array(), isset($myConfig['all']['stylesheets']) ? $myConfig['all']['stylesheets'] : array()); 
    48     $myConfig['all']['javascripts'] = array_merge(isset($myConfig['default']['javascripts']) ? $myConfig['default']['javascripts'] : array(), isset($myConfig['all']['javascripts']) ? $myConfig['all']['javascripts'] : array()); 
     47    $myConfig['all']['stylesheets'] = array_merge(isset($myConfig['default']['stylesheets']) && is_array($myConfig['default']['stylesheets']) ? $myConfig['default']['stylesheets'] : array(), isset($myConfig['all']['stylesheets']) && is_array($myConfig['all']['stylesheets']) ? $myConfig['all']['stylesheets'] : array()); 
     48    $myConfig['all']['javascripts'] = array_merge(isset($myConfig['default']['javascripts']) && is_array($myConfig['default']['javascripts']) ? $myConfig['default']['javascripts'] : array(), isset($myConfig['all']['javascripts']) && is_array($myConfig['all']['javascripts']) ? $myConfig['all']['javascripts'] : array()); 
    4949 
    5050    unset($myConfig['default']); 
    …… 
    5656 
    5757    $data[] = "\$sf_safe_slot = sfConfig::get('sf_safe_slot');\n"; 
     58    $data[] = "\$response = \$action->getResponse();\n"; 
    5859 
    5960    // iterate through all view names 
    …… 
    8788      $data[] = $this->addComponentSlots($viewName); 
    8889      $data[] = $this->addHtmlHead($viewName); 
     90      $data[] = $this->addEscaping($viewName); 
    8991 
    9092      $data[] = "  }\n"; 
    …… 
    116118    $data[] = $this->addComponentSlots(); 
    117119    $data[] = $this->addHtmlHead(); 
     120    $data[] = $this->addEscaping(); 
    118121 
    119122    $data[] = "  }\n"; 
    …… 
    223226    foreach ($this->mergeConfigValue('http_metas', $viewName) as $httpequiv => $content) 
    224227    { 
    225       $data[] = sprintf("    \$action->getResponse()->addHttpMeta('%s', '%s', false);", $httpequiv, $content); 
     228      $data[] = sprintf("    \$response->addHttpMeta('%s', '%s', false);", $httpequiv, $content); 
    226229    } 
    227230 
    228231    foreach ($this->mergeConfigValue('metas', $viewName) as $name => $content) 
    229232    { 
    230       $data[] = sprintf("    \$action->getResponse()->addMeta('%s', '%s', false);", $name, $content); 
     233      $data[] = sprintf("    \$response->addMeta('%s', '%s', false);", $name, $content); 
    231234    } 
    232235 
    …… 
    260263          $key = key($css); 
    261264          $options = $css[$key]; 
    262           $data[] = sprintf("  \$action->getResponse()->addStylesheet('%s', '', %s);", $key, var_export($options, true)); 
    263265        } 
    264266        else 
    265267        { 
    266           $data[] = sprintf("  \$action->getResponse()->addStylesheet('%s');", $css); 
     268          $key = $css; 
     269          $options = array(); 
     270        } 
     271 
     272        if ($key) 
     273        { 
     274          $data[] = sprintf("  \$response->addStylesheet('%s', '', %s);", $key, var_export($options, true)); 
    267275        } 
    268276      } 
    …… 
    286294      foreach ($javascripts as $js) 
    287295      { 
    288         $data[] = sprintf("  \$action->getResponse()->addJavascript('%s');", $js); 
     296        if ($js) 
     297        { 
     298          $data[] = sprintf("  \$response->addJavascript('%s');", $js); 
     299        } 
    289300      } 
    290301    } 
    …… 
    292303    return implode("\n", $data)."\n"; 
    293304  } 
     305 
     306  private function addEscaping($viewName = '') 
     307  { 
     308    $data = array(); 
     309 
     310    $escaping = $this->getConfigValue('escaping', $viewName); 
     311 
     312    if(isset($escaping['strategy'])) 
     313    { 
     314      $data[] = sprintf("  \$this->setEscaping(%s);", var_export($escaping['strategy'], true)); 
     315    } 
     316 
     317    if(isset($escaping['method'])) 
     318    { 
     319      $data[] = sprintf("  \$this->setEscapingMethod(%s);", var_export($escaping['method'], true)); 
     320    } 
     321 
     322    return implode("\n", $data)."\n"; 
     323  } 
    294324} 
    295325 

  • branches/rovert-0.6/lib/helper/FormHelper.php

    r1157 r1203  
    356356  else 
    357357  { 
    358     return content_tag('textarea', htmlspecialchars((is_object($content)) ? $content->__toString() : $content), array_merge(array('name' => $name, 'id' => $id), _convert_options($options))); 
     358    return content_tag('textarea', (is_object($content)) ? $content->__toString() : $content, array_merge(array('name' => $name, 'id' => $id), _convert_options($options))); 
    359359  } 
    360360} 
    …… 
    436436 
    437437  // register our javascripts and stylesheets 
     438  $langFile = '/sf/js/calendar/lang/calendar-'.strtolower(substr($culture, 0, 2)); 
    438439  $jss = array( 
    439440    '/sf/js/calendar/calendar', 
    440 //  '/sf/js/calendar/lang/calendar-'.substr($culture, 0, 2), 
    441     '/sf/js/calendar/lang/calendar-en', 
     441    is_readable(sfConfig::get('sf_symfony_data_dir').'/web/'.$langFile.'.js') ? $langFile : '/sf/js/calendar/lang/calendar-en', 
    442442    '/sf/js/calendar/calendar-setup', 
    443443  ); 

  • branches/rovert-0.6/lib/i18n/sfNumberFormat.class.php

    r1157 r1203  
    131131 
    132132    // get the suffix 
    133     if ($number > 0) 
     133