Index: openacs-4/packages/acs-lang/acs-lang.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/acs-lang.info,v diff -u -r1.64.2.3 -r1.64.2.4 --- openacs-4/packages/acs-lang/acs-lang.info 11 Apr 2019 18:36:41 -0000 1.64.2.3 +++ openacs-4/packages/acs-lang/acs-lang.info 1 Jul 2019 14:47:06 -0000 1.64.2.4 @@ -9,7 +9,7 @@ f t - + Peter Marklund OpenACS Internationalization Support. 2017-08-06 @@ -20,7 +20,7 @@ GPL 3 - + Index: openacs-4/packages/acs-lang/catalog/acs-lang.ar_LB.utf-8.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.ar_LB.utf-8.xml,v diff -u -r1.7 -r1.7.14.1 --- openacs-4/packages/acs-lang/catalog/acs-lang.ar_LB.utf-8.xml 10 Dec 2007 09:12:25 -0000 1.7 +++ openacs-4/packages/acs-lang/catalog/acs-lang.ar_LB.utf-8.xml 1 Jul 2019 14:47:06 -0000 1.7.14.1 @@ -9,6 +9,7 @@ {أح} {إث} {ثل} {أر} {خم} {جم} {سب} {ك2} {شبا} {آذا} {نيس} {أيا} {حزي} {تمو} {آب} {أيل} {ت1} {ت2} {ك1} ص + بايت ل.ل. %d/%m/%y %a %d %B %Y %H:%M %Z Index: openacs-4/packages/acs-lang/catalog/acs-lang.ca_ES.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.ca_ES.ISO-8859-1.xml,v diff -u -r1.6 -r1.6.14.1 --- openacs-4/packages/acs-lang/catalog/acs-lang.ca_ES.ISO-8859-1.xml 10 Dec 2007 09:12:25 -0000 1.6 +++ openacs-4/packages/acs-lang/catalog/acs-lang.ca_ES.ISO-8859-1.xml 1 Jul 2019 14:47:06 -0000 1.6.14.1 @@ -11,6 +11,7 @@ {dg.} {dl.} {dt.} {dc.} {dj.} {dv.} {ds.} {gen.} {febr.} {mar�} {abr.} {maig} {juny} {jul.} {ag.} {set.} {oct.} {nov.} {des.} AM + bytes ? %m/%d/%y %a %d %B %Y %H:%M %Z Index: openacs-4/packages/acs-lang/catalog/acs-lang.ch_zh.utf-8.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.ch_zh.utf-8.xml,v diff -u -r1.6 -r1.6.12.1 --- openacs-4/packages/acs-lang/catalog/acs-lang.ch_zh.utf-8.xml 26 Aug 2008 23:37:36 -0000 1.6 +++ openacs-4/packages/acs-lang/catalog/acs-lang.ch_zh.utf-8.xml 1 Jul 2019 14:47:06 -0000 1.6.12.1 @@ -8,6 +8,7 @@ 周日 周一 周二 周三 周四 周五 周六 1月 2月 3月 4月 5月 6月 7月 8月 9月 10月 11月 12月 上午 + 字节 ¥ %y年%m月%d日 %a %B %d, %Y %r %Z Index: openacs-4/packages/acs-lang/catalog/acs-lang.da_DK.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.da_DK.ISO-8859-1.xml,v diff -u -r1.21 -r1.21.14.1 --- openacs-4/packages/acs-lang/catalog/acs-lang.da_DK.ISO-8859-1.xml 10 Dec 2007 09:12:25 -0000 1.21 +++ openacs-4/packages/acs-lang/catalog/acs-lang.da_DK.ISO-8859-1.xml 1 Jul 2019 14:47:06 -0000 1.21.14.1 @@ -9,6 +9,7 @@ {s�n} {man} {tir} {ons} {tor} {fre} {l�r} {jan} {feb} {mar} {apr} {maj} {jun} {jul} {aug} {sep} {okt} {nov} {dec} AM + bytes kr %d/%m-%y %a %e. %B %Y %r %Z Index: openacs-4/packages/acs-lang/catalog/acs-lang.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.de_DE.ISO-8859-1.xml,v diff -u -r1.24 -r1.24.2.1 --- openacs-4/packages/acs-lang/catalog/acs-lang.de_DE.ISO-8859-1.xml 7 Aug 2017 23:47:56 -0000 1.24 +++ openacs-4/packages/acs-lang/catalog/acs-lang.de_DE.ISO-8859-1.xml 1 Jul 2019 14:47:06 -0000 1.24.2.1 @@ -47,6 +47,7 @@ {So} {Mo} {Di} {Mi} {Do} {Fr} {Sa} {Jan} {Feb} {Mrz} {Apr} {Mai} {Jun} {Jul} {Aug} {Sep} {Okt} {Nov} {Dez} A.M. + Bytes ? %d.%m.%Y %a, %d. %B %Y %H:%M %Z Index: openacs-4/packages/acs-lang/catalog/acs-lang.el_GR.utf-8.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.el_GR.utf-8.xml,v diff -u -r1.11 -r1.11.14.1 --- openacs-4/packages/acs-lang/catalog/acs-lang.el_GR.utf-8.xml 19 Nov 2007 22:09:25 -0000 1.11 +++ openacs-4/packages/acs-lang/catalog/acs-lang.el_GR.utf-8.xml 1 Jul 2019 14:47:06 -0000 1.11.14.1 @@ -11,6 +11,7 @@ {Κ} {Δ} {Τ} {Τ} {Π} {Π} {Σ} {Ιαν} {Φεβ} {Μαρ} {Απρ} {Μαι} {Ιουν} {Ιουλ} {Αυγ} {Σεπ} {Οκτ} {Νοε} {Δεκ} πμ + bytes Euro %d%m%y %d %a %B, %Y %r %Z Index: openacs-4/packages/acs-lang/catalog/acs-lang.en_AU.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.en_AU.ISO-8859-1.xml,v diff -u -r1.4 -r1.4.12.1 --- openacs-4/packages/acs-lang/catalog/acs-lang.en_AU.ISO-8859-1.xml 26 Aug 2008 23:37:36 -0000 1.4 +++ openacs-4/packages/acs-lang/catalog/acs-lang.en_AU.ISO-8859-1.xml 1 Jul 2019 14:47:06 -0000 1.4.12.1 @@ -9,6 +9,7 @@ {Sun} {Mon} {Tue} {Wed} {Thu} {Fri} {Sat} {Jan} {Feb} {Mar} {Apr} {May} {Jun} {Jul} {Aug} {Sep} {Oct} {Nov} {Dec} AM + bytes $ %m/%d/%y %a %B %d, %Y %r %Z Index: openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml,v diff -u -r1.31.2.2 -r1.31.2.3 --- openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml 11 Apr 2019 18:36:41 -0000 1.31.2.2 +++ openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml 1 Jul 2019 14:47:06 -0000 1.31.2.3 @@ -52,6 +52,7 @@ {Sun} {Mon} {Tue} {Wed} {Thu} {Fri} {Sat} {Jan} {Feb} {Mar} {Apr} {May} {Jun} {Jul} {Aug} {Sep} {Oct} {Nov} {Dec} AM + bytes $ %m/%d/%y %a %B %d, %Y %r %Z Index: openacs-4/packages/acs-lang/catalog/acs-lang.es_CO.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.es_CO.ISO-8859-1.xml,v diff -u -r1.5 -r1.5.14.1 --- openacs-4/packages/acs-lang/catalog/acs-lang.es_CO.ISO-8859-1.xml 10 Dec 2007 09:12:25 -0000 1.5 +++ openacs-4/packages/acs-lang/catalog/acs-lang.es_CO.ISO-8859-1.xml 1 Jul 2019 14:47:06 -0000 1.5.14.1 @@ -9,6 +9,7 @@ {Dom} {Lun} {Mar} {Mi�} {Jue} {Vie} {S�b} {Ene} {Feb} {Mar} {Abr} {May} {Jun} {Jul} {Ago} {Sep} {Oct} {Nov} {Dic} AM + bytes � %d/%m/%y %a %d %B %Y %H:%M %Z Index: openacs-4/packages/acs-lang/catalog/acs-lang.es_ES.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.es_ES.ISO-8859-1.xml,v diff -u -r1.27.2.1 -r1.27.2.2 --- openacs-4/packages/acs-lang/catalog/acs-lang.es_ES.ISO-8859-1.xml 11 Apr 2019 18:36:41 -0000 1.27.2.1 +++ openacs-4/packages/acs-lang/catalog/acs-lang.es_ES.ISO-8859-1.xml 1 Jul 2019 14:47:06 -0000 1.27.2.2 @@ -49,6 +49,7 @@ {Dom} {Lun} {Mar} {Mi�} {Jue} {Vie} {S�b} {Ene} {Feb} {Mar} {Abr} {May} {Jun} {Jul} {Ago} {Sep} {Oct} {Nov} {Dic} AM + bytes ? %d/%m/%y %a %d %B %Y %H:%M %Z Index: openacs-4/packages/acs-lang/catalog/acs-lang.es_GT.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.es_GT.ISO-8859-1.xml,v diff -u -r1.7 -r1.7.14.1 --- openacs-4/packages/acs-lang/catalog/acs-lang.es_GT.ISO-8859-1.xml 10 Dec 2007 09:12:25 -0000 1.7 +++ openacs-4/packages/acs-lang/catalog/acs-lang.es_GT.ISO-8859-1.xml 1 Jul 2019 14:47:06 -0000 1.7.14.1 @@ -9,6 +9,7 @@ {Dom} {Lun} {Mar} {Mi�} {Jue} {Vie} {S�b} {Ene} {Feb} {Mar} {Abr} {May} {Jun} {Jul} {Ago} {Sep} {Oct} {Nov} {Dic} AM + bytes � %d/%m/%y %a %d %B %Y %H:%M %Z Index: openacs-4/packages/acs-lang/catalog/acs-lang.eu_ES.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.eu_ES.ISO-8859-1.xml,v diff -u -r1.6 -r1.6.14.1 --- openacs-4/packages/acs-lang/catalog/acs-lang.eu_ES.ISO-8859-1.xml 10 Dec 2007 09:12:25 -0000 1.6 +++ openacs-4/packages/acs-lang/catalog/acs-lang.eu_ES.ISO-8859-1.xml 1 Jul 2019 14:47:06 -0000 1.6.14.1 @@ -9,6 +9,7 @@ {Iga} {Ast} {Ast} {Ast} {Ost} {Ost} {Lar} {Urt} {Ots} {Mar} {Api} {Mai} {Eka} {Uzt} {Abu} {Ira} {Urr} {Aza} {Abe} AM + bytes ? %y-%m-%d %a, %Y(e)ko %Bren %d, %T %Z Index: openacs-4/packages/acs-lang/catalog/acs-lang.hi_IN.utf-8.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.hi_IN.utf-8.xml,v diff -u -r1.5 -r1.5.14.1 --- openacs-4/packages/acs-lang/catalog/acs-lang.hi_IN.utf-8.xml 10 Dec 2007 09:12:25 -0000 1.5 +++ openacs-4/packages/acs-lang/catalog/acs-lang.hi_IN.utf-8.xml 1 Jul 2019 14:47:06 -0000 1.5.14.1 @@ -10,6 +10,7 @@ {रवि} {सोम} {मन्गल} {बुध} {गुरु} {शुर्क} {शनि} {जनवरी} {फ़रवरी} {मार्च} {अप्रैल} {मई} {जून} {जुलाई} {अगस्त} {सितम्बर} {अकतूबर} {नवम्बर} {दिसम्बर} एम + बाईट $ %म/%ड/%य %अ %ब %ड, %य %र %ज़ी Index: openacs-4/packages/acs-lang/catalog/acs-lang.it_IT.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.it_IT.ISO-8859-1.xml,v diff -u -r1.22.2.2 -r1.22.2.3 --- openacs-4/packages/acs-lang/catalog/acs-lang.it_IT.ISO-8859-1.xml 17 Apr 2019 09:57:17 -0000 1.22.2.2 +++ openacs-4/packages/acs-lang/catalog/acs-lang.it_IT.ISO-8859-1.xml 1 Jul 2019 14:47:06 -0000 1.22.2.3 @@ -50,6 +50,7 @@ {Dom} {Lun} {Mar} {Mer} {Gio} {Ven} {Sab} {Gen} {Feb} {Mar} {Apr} {Mag} {Giu} {Lug} {Ago} {Set} {Ott} {Nov} {Dic} AM + byte �? %d/%m/%y %a %d %B %Y %H:%M %Z Index: openacs-4/packages/acs-lang/catalog/acs-lang.ko_KR.utf-8.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.ko_KR.utf-8.xml,v diff -u -r1.10 -r1.10.14.1 --- openacs-4/packages/acs-lang/catalog/acs-lang.ko_KR.utf-8.xml 10 Dec 2007 09:12:25 -0000 1.10 +++ openacs-4/packages/acs-lang/catalog/acs-lang.ko_KR.utf-8.xml 1 Jul 2019 14:47:06 -0000 1.10.14.1 @@ -8,6 +8,7 @@ {일} {월} {화} {수} {목} {금} {토} {1¿?} {2¿?} {3¿?} {4¿?} {5¿?} {6¿?} {7¿?} {8¿?} {9¿?} {10¿?} {11¿?} {12¿?} 오전 + 바이트 ₩ %m/%d/%y %a %B %d, %Y %r %Z Index: openacs-4/packages/acs-lang/catalog/acs-lang.ms_MY.utf-8.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.ms_MY.utf-8.xml,v diff -u -r1.6 -r1.6.14.1 --- openacs-4/packages/acs-lang/catalog/acs-lang.ms_MY.utf-8.xml 10 Dec 2007 09:12:25 -0000 1.6 +++ openacs-4/packages/acs-lang/catalog/acs-lang.ms_MY.utf-8.xml 1 Jul 2019 14:47:06 -0000 1.6.14.1 @@ -9,6 +9,7 @@ {Aha} {Isn} {Sel} {Rab} {Kha} {Jum} {Sab} {Jan} {Feb} {Mac} {Apr} {Mei} {Jun} {Jul} {Ogo} {Sep} {Okt} {Nov} {Dis} AM + bait $ %m/%d/%y %a %B %d %Y %r %Z Index: openacs-4/packages/acs-lang/catalog/acs-lang.nl_NL.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.nl_NL.ISO-8859-1.xml,v diff -u -r1.22 -r1.22.14.1 --- openacs-4/packages/acs-lang/catalog/acs-lang.nl_NL.ISO-8859-1.xml 10 Dec 2007 09:12:25 -0000 1.22 +++ openacs-4/packages/acs-lang/catalog/acs-lang.nl_NL.ISO-8859-1.xml 1 Jul 2019 14:47:06 -0000 1.22.14.1 @@ -11,6 +11,7 @@ {zon} {maa} {din} {woe} {don} {vr?} {zat} {jan} {feb} {mrt} {apr} {mei} {jun} {jul} {aug} {sep} {okt} {nov} {dec} Voormiddag + bytes ? %d.%m.%Y Index: openacs-4/packages/acs-lang/catalog/acs-lang.nn_NO.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.nn_NO.ISO-8859-1.xml,v diff -u -r1.8 -r1.8.14.1 --- openacs-4/packages/acs-lang/catalog/acs-lang.nn_NO.ISO-8859-1.xml 10 Dec 2007 09:12:25 -0000 1.8 +++ openacs-4/packages/acs-lang/catalog/acs-lang.nn_NO.ISO-8859-1.xml 1 Jul 2019 14:47:06 -0000 1.8.14.1 @@ -9,6 +9,7 @@ {sun} {m�n} {tys} {ons} {tor} {fre} {lau} {jan} {feb} {mar} {apr} {mai} {jun} {jul} {aug} {sep} {okt} {nov} {des} Formiddag + bytes kr %e%m-%y %a %e. %B %Y %r %Z Index: openacs-4/packages/acs-lang/catalog/acs-lang.no_NO.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.no_NO.ISO-8859-1.xml,v diff -u -r1.18 -r1.18.14.1 --- openacs-4/packages/acs-lang/catalog/acs-lang.no_NO.ISO-8859-1.xml 10 Dec 2007 09:12:25 -0000 1.18 +++ openacs-4/packages/acs-lang/catalog/acs-lang.no_NO.ISO-8859-1.xml 1 Jul 2019 14:47:06 -0000 1.18.14.1 @@ -9,6 +9,7 @@ {s�n} {man} {tir} {ons} {tor} {fre} {l�r} {jan} {feb} {mar} {apr} {mai} {jun} {jul} {aug} {sep} {okt} {nov} {des} Formiddag + bytes kr %e/%m-%y %a %e. %B %Y %r %Z Index: openacs-4/packages/acs-lang/catalog/acs-lang.pl_PL.utf-8.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.pl_PL.utf-8.xml,v diff -u -r1.11 -r1.11.14.1 --- openacs-4/packages/acs-lang/catalog/acs-lang.pl_PL.utf-8.xml 10 Dec 2007 09:12:25 -0000 1.11 +++ openacs-4/packages/acs-lang/catalog/acs-lang.pl_PL.utf-8.xml 1 Jul 2019 14:47:06 -0000 1.11.14.1 @@ -11,6 +11,7 @@ {Nd} {Pn} {Wt} {Śr} {Czw} {Pt} {So} {Sty} {Lut} {Mar} {Kwi} {Maj} {Cze} {Lip} {Sie} {Wrz} {Paź} {Lis} {Gru} PP + bajtów zł %d-%m-%y %d %B %Y %T %Z Index: openacs-4/packages/acs-lang/catalog/acs-lang.pt_BR.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.pt_BR.ISO-8859-1.xml,v diff -u -r1.18 -r1.18.14.1 --- openacs-4/packages/acs-lang/catalog/acs-lang.pt_BR.ISO-8859-1.xml 10 Dec 2007 09:12:25 -0000 1.18 +++ openacs-4/packages/acs-lang/catalog/acs-lang.pt_BR.ISO-8859-1.xml 1 Jul 2019 14:47:06 -0000 1.18.14.1 @@ -11,6 +11,7 @@ {Dom} {Seg} {Ter} {Qua} {Qui} {Sex} {S�b} {Jan} {Fev} {Mar} {Abr} {Mai} {Jun} {Jul} {Ago} {Set} {Out} {Nov} {Dez} AM + bytes R$ %d/%m/%y %a, %d de %B de %Y, %r %Z Index: openacs-4/packages/acs-lang/catalog/acs-lang.pt_PT.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.pt_PT.ISO-8859-1.xml,v diff -u -r1.13 -r1.13.14.1 --- openacs-4/packages/acs-lang/catalog/acs-lang.pt_PT.ISO-8859-1.xml 10 Dec 2007 09:12:25 -0000 1.13 +++ openacs-4/packages/acs-lang/catalog/acs-lang.pt_PT.ISO-8859-1.xml 1 Jul 2019 14:47:06 -0000 1.13.14.1 @@ -7,6 +7,7 @@ {Dom} {Seg} {Ter} {Qua} {Qui} {Sex} {S�b} {Jan} {Fev} {Mar} {Abr} {Mai} {Jun} {Jul} {Ago} {Set} {Out} {Nov} {Dez} AM + bytes ? %d-%m-%Y %a %d %B %Y %R %Z Index: openacs-4/packages/acs-lang/catalog/acs-lang.ro_RO.utf-8.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.ro_RO.utf-8.xml,v diff -u -r1.8 -r1.8.14.1 --- openacs-4/packages/acs-lang/catalog/acs-lang.ro_RO.utf-8.xml 10 Dec 2007 09:12:25 -0000 1.8 +++ openacs-4/packages/acs-lang/catalog/acs-lang.ro_RO.utf-8.xml 1 Jul 2019 14:47:06 -0000 1.8.14.1 @@ -9,6 +9,7 @@ Dum Lun Mar Mie Joi Vin Sam Ian Feb Mar Apr Mai Iun Iul Aug Sep Oct Nov Dec AM + bytes $ %d/%m/%y %a %B %d, %Y %r %Z Index: openacs-4/packages/acs-lang/catalog/acs-lang.ru_RU.utf-8.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.ru_RU.utf-8.xml,v diff -u -r1.12 -r1.12.4.1 --- openacs-4/packages/acs-lang/catalog/acs-lang.ru_RU.utf-8.xml 6 Jul 2015 22:48:37 -0000 1.12 +++ openacs-4/packages/acs-lang/catalog/acs-lang.ru_RU.utf-8.xml 1 Jul 2019 14:47:06 -0000 1.12.4.1 @@ -47,6 +47,7 @@ {Вс} {Пн} {Вт} {Ср} {Чт} {Пт} {Сб} {янв} {фев} {мар} {апр} {май} {июн} {июл} {авг} {сен} {окт} {ноя} {дек} + байт руб. %d.%m.%y %a %d %B %Y ?., %H:%M %Z Index: openacs-4/packages/acs-lang/catalog/acs-lang.sv_SE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.sv_SE.ISO-8859-1.xml,v diff -u -r1.18 -r1.18.14.1 --- openacs-4/packages/acs-lang/catalog/acs-lang.sv_SE.ISO-8859-1.xml 10 Dec 2007 09:12:25 -0000 1.18 +++ openacs-4/packages/acs-lang/catalog/acs-lang.sv_SE.ISO-8859-1.xml 1 Jul 2019 14:47:06 -0000 1.18.14.1 @@ -8,6 +8,7 @@ {S�n} {M�n} {Tis} {Ons} {Tor} {Fre} {L�r} {Jan} {Feb} {Mar} {Apr} {Maj} {Jun} {Jul} {Aug} {Sep} {Okt} {Nov} {Dec} FM + bytes kr %Y-%m-%d %a %e. %B %Y %r %Z Index: openacs-4/packages/acs-lang/catalog/acs-lang.zh_CN.utf-8.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.zh_CN.utf-8.xml,v diff -u -r1.7 -r1.7.14.1 --- openacs-4/packages/acs-lang/catalog/acs-lang.zh_CN.utf-8.xml 10 Dec 2007 09:12:25 -0000 1.7 +++ openacs-4/packages/acs-lang/catalog/acs-lang.zh_CN.utf-8.xml 1 Jul 2019 14:47:06 -0000 1.7.14.1 @@ -9,6 +9,7 @@ {周日} {周一} {周二} {周三} {周四} {周五} {周六} {1月} {2月} {3月} {4月} {5月} {6月} {7月} {8月} {9月} {10月} {11月} {12月} 上午 + 字节 ¥ %y年%m月%d日 %a %Y年 %B月 %d日 %r %Z Index: openacs-4/packages/acs-lang/tcl/localization-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/localization-procs.tcl,v diff -u -r1.29.2.1 -r1.29.2.2 --- openacs-4/packages/acs-lang/tcl/localization-procs.tcl 14 Feb 2019 10:02:36 -0000 1.29.2.1 +++ openacs-4/packages/acs-lang/tcl/localization-procs.tcl 1 Jul 2019 14:47:06 -0000 1.29.2.2 @@ -590,6 +590,79 @@ return [format "%0${n_desired_digits}d" $the_integer] } + +ad_proc -public lc_content_size_pretty { + {-size "0"} + {-precision "1"} + {-standard "decimal"} +} { + + Transforms data size, provided in non-negative bytes, to KB, MB... up to YB. + + @param size Size in bytes + @param precision Numbers in the fractional part + @param standard Standard to use for binary prefix. Three standards are + supported currently by this proc: + - decimal (default): SI (base-10, 1000 bytes = 1kB) + - binary: IEC (base-2, 1024 bytes = 1KiB) + - legacy: JEDEC (base-2, 1024 bytes = 1KB) + + @return Size in given standard units (e.g. '5.2 MB') + + @author Héctor Romojaro + @creation-date 2019-06-25 + +} { + # Localized bytes + set bytes [lc_get "bytes"] + + switch $standard { + decimal { + # + # SI (base-10, 1000 bytes = 1KB) + # + set div 1000 + set units [list $bytes kB MB GB TB PB EB ZB YB] + } + binary { + # + # IEC (base-2, 1024 bytes = 1KiB) + # + set div 1024 + set units [list $bytes KiB MiB GiB TiB PiB EiB ZiB YiB] + } + legacy { + # + # JEDEC (base-2, 1024 bytes = 1KB) + # + set div 1024 + set units [list $bytes KB MB GB TB PB EB ZB YB] + } + default { + return "Unknown value $standard for -standard option" + } + } + + if {$size eq ""} { + set size 0 + } + + set len [string length $size] + + if {$size < $div} { + set size_pretty [format "%s $bytes" $size] + } else { + set unit [expr {($len - 1) / 3}] + set size_pretty [format "%.${precision}f %s" [expr {$size / pow($div,$unit)}] [lindex $units $unit]] + } + # + # Localize dot/comma just before return + # + set size_pretty "[lc_numeric [lindex $size_pretty 0]] [lindex $size_pretty 1]" + + return $size_pretty +} + # Local variables: # mode: tcl # tcl-indent-level: 4 Index: openacs-4/packages/acs-lang/tcl/test/acs-lang-localization-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/test/acs-lang-localization-procs.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/acs-lang/tcl/test/acs-lang-localization-procs.tcl 22 Jul 2018 09:46:48 -0000 1.4 +++ openacs-4/packages/acs-lang/tcl/test/acs-lang-localization-procs.tcl 1 Jul 2019 14:47:06 -0000 1.4.2.1 @@ -60,7 +60,67 @@ } } +aa_register_case \ + -cats {api smoke production_safe} \ + -procs lc_content_size_pretty \ + lang_test__lc_content_size_pretty { + Test lc_content_size_pretty proc + + @author Héctor Romojaro + @creation-date 2019-06-25 + +} { + # Localized bytes + set bytes [lc_get "bytes"] + + aa_equals "No arguments binary" [lc_content_size_pretty -standard "binary"] "[lc_numeric 0] $bytes" + aa_equals "No arguments legacy" [lc_content_size_pretty -standard "legacy"] "[lc_numeric 0] $bytes" + aa_equals "No arguments decimal" [lc_content_size_pretty] "[lc_numeric 0] $bytes" + aa_equals "Empty value binary" [lc_content_size_pretty -size "" -standard "binary"] "[lc_numeric 0] $bytes" + aa_equals "Empty value legacy" [lc_content_size_pretty -size "" -standard "legacy"] "[lc_numeric 0] $bytes" + aa_equals "Empty value decimal" [lc_content_size_pretty -size ""] "[lc_numeric 0] $bytes" + aa_equals "1.0 KiB" [lc_content_size_pretty -size 1024 -standard "binary"] "[lc_numeric 1.0] KiB" + aa_equals "1.0 KB" [lc_content_size_pretty -size 1024 -standard "legacy"] "[lc_numeric 1.0] KB" + aa_equals "1.0 KB" [lc_content_size_pretty -size 1000] "[lc_numeric 1.0] kB" + aa_equals "1.0 MiB" [lc_content_size_pretty -size 1048576 -standard "binary"] "[lc_numeric 1.0] MiB" + aa_equals "1.0 MB" [lc_content_size_pretty -size 1048576 -standard "legacy"] "[lc_numeric 1.0] MB" + aa_equals "1.0 MB" [lc_content_size_pretty -size 1000000] "[lc_numeric 1.0] MB" + aa_equals "1.0 GiB" [lc_content_size_pretty -size 1073741824 -standard "binary"] "[lc_numeric 1.0] GiB" + aa_equals "1.0 GB" [lc_content_size_pretty -size 1073741824 -standard "legacy"] "[lc_numeric 1.0] GB" + aa_equals "1.0 GB" [lc_content_size_pretty -size 1000000000] "[lc_numeric 1.0] GB" + aa_equals "1.0 TiB" [lc_content_size_pretty -size 1099511627800 -standard "binary"] "[lc_numeric 1.0] TiB" + aa_equals "1.0 TB" [lc_content_size_pretty -size 1099511627800 -standard "legacy"] "[lc_numeric 1.0] TB" + aa_equals "1.0 TB" [lc_content_size_pretty -size 1000000000000] "[lc_numeric 1.0] TB" + aa_equals "1.0 PiB" [lc_content_size_pretty -size 1125899906842620 -standard "binary"] "[lc_numeric 1.0] PiB" + aa_equals "1.0 PB" [lc_content_size_pretty -size 1125899906842620 -standard "legacy"] "[lc_numeric 1.0] PB" + aa_equals "1.0 PB" [lc_content_size_pretty -size 1000000000000000] "[lc_numeric 1.0] PB" + aa_equals "1.0 EiB" [lc_content_size_pretty -size 1152921504606850000 -standard "binary"] "[lc_numeric 1.0] EiB" + aa_equals "1.0 EB" [lc_content_size_pretty -size 1152921504606850000 -standard "legacy"] "[lc_numeric 1.0] EB" + aa_equals "1.0 EB" [lc_content_size_pretty -size 1000000000000000000] "[lc_numeric 1.0] EB" + aa_equals "1.0 ZiB" [lc_content_size_pretty -size 1180591620717410000000 -standard "binary"] "[lc_numeric 1.0] ZiB" + aa_equals "1.0 ZB" [lc_content_size_pretty -size 1180591620717410000000 -standard "legacy"] "[lc_numeric 1.0] ZB" + aa_equals "1.0 ZB" [lc_content_size_pretty -size 1000000000000000000000] "[lc_numeric 1.0] ZB" + aa_equals "1.0 YiB" [lc_content_size_pretty -size 1208925819614630000000000 -standard "binary"] "[lc_numeric 1.0] YiB" + aa_equals "1.0 YB" [lc_content_size_pretty -size 1208925819614630000000000 -standard "legacy"] "[lc_numeric 1.0] YB" + aa_equals "1.0 YB" [lc_content_size_pretty -size 1000000000000000000000000] "[lc_numeric 1.0] YB" + aa_equals "1.3 YiB" [lc_content_size_pretty -size 1571603565499020000000000 -standard "binary"] "[lc_numeric 1.3] YiB" + aa_equals "1.3 YB" [lc_content_size_pretty -size 1571603565499020000000000 -standard "legacy"] "[lc_numeric 1.3] YB" + aa_equals "1.3 YB" [lc_content_size_pretty -size 1300000000000000000000000] "[lc_numeric 1.3] YB" + aa_equals "1.000 KiB" [lc_content_size_pretty -size 1024 -precision 3 -standard "binary"] "[lc_numeric 1.000] KiB" + aa_equals "1.000 KB" [lc_content_size_pretty -size 1024 -precision 3 -standard "legacy"] "[lc_numeric 1.000] KB" + aa_equals "1.000 kB" [lc_content_size_pretty -size 1000 -precision 3] "[lc_numeric 1.000] kB" + aa_equals "1 KiB" [lc_content_size_pretty -size 1024 -precision 0 -standard "binary"] "[lc_numeric 1] KiB" + aa_equals "1 KB" [lc_content_size_pretty -size 1024 -precision 0 -standard "legacy"] "[lc_numeric 1] KB" + aa_equals "1 kB" [lc_content_size_pretty -size 1000 -precision 0] "[lc_numeric 1] kB" + aa_equals "1 KiB" [lc_content_size_pretty -size 1044 -precision 0 -standard "binary"] "[lc_numeric 1] KiB" + aa_equals "1 KB" [lc_content_size_pretty -size 1044 -precision 0 -standard "legacy"] "[lc_numeric 1] KB" + aa_equals "1 kB" [lc_content_size_pretty -size 1080 -precision 0] "[lc_numeric 1] kB" + aa_equals "1.01953 -> 1.020 KiB" [lc_content_size_pretty -size 1044 -precision 3 -standard "binary"] "[lc_numeric 1.020] KiB" + aa_equals "1.01953 -> 1.020 KB" [lc_content_size_pretty -size 1044 -precision 3 -standard "legacy"] "[lc_numeric 1.020] KB" + aa_equals "1.080 kB" [lc_content_size_pretty -size 1080 -precision 3] "[lc_numeric 1.080] kB" +} + # Local variables: # mode: tcl # tcl-indent-level: 4 Index: openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl,v diff -u -r1.22.2.2 -r1.22.2.3 --- openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl 25 Jun 2019 16:35:41 -0000 1.22.2.2 +++ openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl 1 Jul 2019 14:47:06 -0000 1.22.2.3 @@ -110,7 +110,7 @@ {upload_file { $max_bytes eq "" || [file size [ns_queryget upload_file.tmpfile]] <= $max_bytes } - {Your file is too large. The publisher of [ad_system_name] has chosen to limit portraits to [util::content_size_pretty -size $max_bytes]. You can use PhotoShop or the GIMP (free) to shrink your image} + {Your file is too large. The publisher of [ad_system_name] has chosen to limit portraits to [lc_content_size_pretty -size $max_bytes]. You can use PhotoShop or the GIMP (free) to shrink your image} } } -on_submit { Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v diff -u -r1.189.2.19 -r1.189.2.20 --- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 27 Jun 2019 17:36:53 -0000 1.189.2.19 +++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 1 Jul 2019 14:47:06 -0000 1.189.2.20 @@ -3416,73 +3416,6 @@ return [lindex $list $idx] } -ad_proc -public util::content_size_pretty { - {-size "0"} - {-precision "1"} - {-standard "decimal"} -} { - Transforms data size, provided in non-negative bytes, to KB, MB... up to YB. - - @param size Size in bytes - @param precision Numbers in the fractional part - @param standard Standard to use for binary prefix. Three standards are - supported currently by this proc: - - decimal (default): SI (base-10, 1000 B = 1kB) - - binary: IEC (base-2, 1024 B = 1KiB) - - legacy: JEDEC (base-2, 1024 B = 1KB) - - @return Size in given standard units (e.g. '5.2 MB') - - @author Héctor Romojaro - @creation-date 2019-06-25 -} { - switch $standard { - decimal { - # - # SI (base-10, 1000 B = 1KB) - # - set div 1000 - set units [list B kB MB GB TB PB EB ZB YB] - } - binary { - # - # IEC (base-2, 1024 B = 1KiB) - # - set div 1024 - set units [list B KiB MiB GiB TiB PiB EiB ZiB YiB] - } - legacy { - # - # JEDEC (base-2, 1024 B = 1KB) - # - set div 1024 - set units [list B KB MB GB TB PB EB ZB YB] - } - default { - return "Unknown value $standard for -standard option" - } - } - - if {$size eq ""} { - set size 0 - } - - set len [string length $size] - - if {$size < $div} { - set size_pretty [format "%s B" $size] - } else { - set unit [expr {($len - 1) / 3}] - set size_pretty [format "%.${precision}f %s" [expr {$size / pow($div,$unit)}] [lindex $units $unit]] - } - # - # Localize dot/comma just before return - # - set size_pretty "[lc_numeric [lindex $size_pretty 0]] [lindex $size_pretty 1]" - - return $size_pretty -} - ad_proc -public util::age_pretty { -timestamp_ansi:required -sysdate_ansi:required Index: openacs-4/packages/acs-tcl/tcl/test/acs-tcl-test-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/acs-tcl-test-procs.tcl,v diff -u -r1.71.2.10 -r1.71.2.11 --- openacs-4/packages/acs-tcl/tcl/test/acs-tcl-test-procs.tcl 26 Jun 2019 16:21:20 -0000 1.71.2.10 +++ openacs-4/packages/acs-tcl/tcl/test/acs-tcl-test-procs.tcl 1 Jul 2019 14:47:06 -0000 1.71.2.11 @@ -1404,63 +1404,6 @@ } } -aa_register_case \ - -cats {api smoke production_safe} \ - -procs util::content_size_pretty \ - util__content_size_pretty { - - Test util::content_size_pretty proc - - @author Héctor Romojaro - @creation-date 2019-06-25 -} { - aa_equals "No arguments binary" [util::content_size_pretty -standard "binary"] "[lc_numeric 0] B" - aa_equals "No arguments legacy" [util::content_size_pretty -standard "legacy"] "[lc_numeric 0] B" - aa_equals "No arguments decimal" [util::content_size_pretty] "[lc_numeric 0] B" - aa_equals "Empty value binary" [util::content_size_pretty -size "" -standard "binary"] "[lc_numeric 0] B" - aa_equals "Empty value legacy" [util::content_size_pretty -size "" -standard "legacy"] "[lc_numeric 0] B" - aa_equals "Empty value decimal" [util::content_size_pretty -size ""] "[lc_numeric 0] B" - aa_equals "1.0 KiB" [util::content_size_pretty -size 1024 -standard "binary"] "[lc_numeric 1.0] KiB" - aa_equals "1.0 KB" [util::content_size_pretty -size 1024 -standard "legacy"] "[lc_numeric 1.0] KB" - aa_equals "1.0 KB" [util::content_size_pretty -size 1000] "[lc_numeric 1.0] kB" - aa_equals "1.0 MiB" [util::content_size_pretty -size 1048576 -standard "binary"] "[lc_numeric 1.0] MiB" - aa_equals "1.0 MB" [util::content_size_pretty -size 1048576 -standard "legacy"] "[lc_numeric 1.0] MB" - aa_equals "1.0 MB" [util::content_size_pretty -size 1000000] "[lc_numeric 1.0] MB" - aa_equals "1.0 GiB" [util::content_size_pretty -size 1073741824 -standard "binary"] "[lc_numeric 1.0] GiB" - aa_equals "1.0 GB" [util::content_size_pretty -size 1073741824 -standard "legacy"] "[lc_numeric 1.0] GB" - aa_equals "1.0 GB" [util::content_size_pretty -size 1000000000] "[lc_numeric 1.0] GB" - aa_equals "1.0 TiB" [util::content_size_pretty -size 1099511627800 -standard "binary"] "[lc_numeric 1.0] TiB" - aa_equals "1.0 TB" [util::content_size_pretty -size 1099511627800 -standard "legacy"] "[lc_numeric 1.0] TB" - aa_equals "1.0 TB" [util::content_size_pretty -size 1000000000000] "[lc_numeric 1.0] TB" - aa_equals "1.0 PiB" [util::content_size_pretty -size 1125899906842620 -standard "binary"] "[lc_numeric 1.0] PiB" - aa_equals "1.0 PB" [util::content_size_pretty -size 1125899906842620 -standard "legacy"] "[lc_numeric 1.0] PB" - aa_equals "1.0 PB" [util::content_size_pretty -size 1000000000000000] "[lc_numeric 1.0] PB" - aa_equals "1.0 EiB" [util::content_size_pretty -size 1152921504606850000 -standard "binary"] "[lc_numeric 1.0] EiB" - aa_equals "1.0 EB" [util::content_size_pretty -size 1152921504606850000 -standard "legacy"] "[lc_numeric 1.0] EB" - aa_equals "1.0 EB" [util::content_size_pretty -size 1000000000000000000] "[lc_numeric 1.0] EB" - aa_equals "1.0 ZiB" [util::content_size_pretty -size 1180591620717410000000 -standard "binary"] "[lc_numeric 1.0] ZiB" - aa_equals "1.0 ZB" [util::content_size_pretty -size 1180591620717410000000 -standard "legacy"] "[lc_numeric 1.0] ZB" - aa_equals "1.0 ZB" [util::content_size_pretty -size 1000000000000000000000] "[lc_numeric 1.0] ZB" - aa_equals "1.0 YiB" [util::content_size_pretty -size 1208925819614630000000000 -standard "binary"] "[lc_numeric 1.0] YiB" - aa_equals "1.0 YB" [util::content_size_pretty -size 1208925819614630000000000 -standard "legacy"] "[lc_numeric 1.0] YB" - aa_equals "1.0 YB" [util::content_size_pretty -size 1000000000000000000000000] "[lc_numeric 1.0] YB" - aa_equals "1.3 YiB" [util::content_size_pretty -size 1571603565499020000000000 -standard "binary"] "[lc_numeric 1.3] YiB" - aa_equals "1.3 YB" [util::content_size_pretty -size 1571603565499020000000000 -standard "legacy"] "[lc_numeric 1.3] YB" - aa_equals "1.3 YB" [util::content_size_pretty -size 1300000000000000000000000] "[lc_numeric 1.3] YB" - aa_equals "1.000 KiB" [util::content_size_pretty -size 1024 -precision 3 -standard "binary"] "[lc_numeric 1.000] KiB" - aa_equals "1.000 KB" [util::content_size_pretty -size 1024 -precision 3 -standard "legacy"] "[lc_numeric 1.000] KB" - aa_equals "1.000 kB" [util::content_size_pretty -size 1000 -precision 3] "[lc_numeric 1.000] kB" - aa_equals "1 KiB" [util::content_size_pretty -size 1024 -precision 0 -standard "binary"] "[lc_numeric 1] KiB" - aa_equals "1 KB" [util::content_size_pretty -size 1024 -precision 0 -standard "legacy"] "[lc_numeric 1] KB" - aa_equals "1 kB" [util::content_size_pretty -size 1000 -precision 0] "[lc_numeric 1] kB" - aa_equals "1 KiB" [util::content_size_pretty -size 1044 -precision 0 -standard "binary"] "[lc_numeric 1] KiB" - aa_equals "1 KB" [util::content_size_pretty -size 1044 -precision 0 -standard "legacy"] "[lc_numeric 1] KB" - aa_equals "1 kB" [util::content_size_pretty -size 1080 -precision 0] "[lc_numeric 1] kB" - aa_equals "1.01953 -> 1.020 KiB" [util::content_size_pretty -size 1044 -precision 3 -standard "binary"] "[lc_numeric 1.020] KiB" - aa_equals "1.01953 -> 1.020 KB" [util::content_size_pretty -size 1044 -precision 3 -standard "legacy"] "[lc_numeric 1.020] KB" - aa_equals "1.080 kB" [util::content_size_pretty -size 1080 -precision 3] "[lc_numeric 1.080] kB" -} - # Local variables: # mode: tcl # tcl-indent-level: 4 Index: openacs-4/packages/attachments/www/attach.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/attach.tcl,v diff -u -r1.14.2.2 -r1.14.2.3 --- openacs-4/packages/attachments/www/attach.tcl 25 Jun 2019 15:59:12 -0000 1.14.2.2 +++ openacs-4/packages/attachments/www/attach.tcl 1 Jul 2019 14:47:06 -0000 1.14.2.3 @@ -59,7 +59,7 @@ set name_url [export_vars -base "attach" { {folder_id $object_id} {object_id $to_object_id} return_url pretty_object_name}] } else { if {$content_size ne ""} { - set content_size [util::content_size_pretty -size $content_size] + set content_size [lc_content_size_pretty -size $content_size] } set action_url [export_vars -base "attach-2" {{item_id $object_id} {object_id $to_object_id} return_url pretty_object_name}] } Index: openacs-4/packages/file-storage/lib/folder-links.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/lib/folder-links.tcl,v diff -u -r1.5.2.4 -r1.5.2.5 --- openacs-4/packages/file-storage/lib/folder-links.tcl 25 Jun 2019 13:03:30 -0000 1.5.2.4 +++ openacs-4/packages/file-storage/lib/folder-links.tcl 1 Jul 2019 14:47:07 -0000 1.5.2.5 @@ -66,7 +66,7 @@ append content_size_pretty " [_ file-storage.items]" set pretty_type "Folder" } else { - set content_size_pretty [util::content_size_pretty -size $content_size] + set content_size_pretty [lc_content_size_pretty -size $content_size] } set name [lang::util::localize $name] Index: openacs-4/packages/file-storage/www/file.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file.tcl,v diff -u -r1.39.2.3 -r1.39.2.4 --- openacs-4/packages/file-storage/www/file.tcl 25 Jun 2019 13:03:30 -0000 1.39.2.3 +++ openacs-4/packages/file-storage/www/file.tcl 1 Jul 2019 14:47:07 -0000 1.39.2.4 @@ -178,7 +178,7 @@ # set file_url [ad_urlencode $file_url] set last_modified_ansi [lc_time_system_to_conn $last_modified_ansi] set last_modified_pretty [lc_time_fmt $last_modified_ansi "%x %X"] - set content_size_pretty [util::content_size_pretty -size $content_size] + set content_size_pretty [lc_content_size_pretty -size $content_size] if {$title eq ""} { set title "[_ file-storage.untitled]" } Index: openacs-4/packages/file-storage/www/folder-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk.tcl,v diff -u -r1.61.2.4 -r1.61.2.5 --- openacs-4/packages/file-storage/www/folder-chunk.tcl 25 Jun 2019 12:45:23 -0000 1.61.2.4 +++ openacs-4/packages/file-storage/www/folder-chunk.tcl 1 Jul 2019 14:47:07 -0000 1.61.2.5 @@ -338,7 +338,7 @@ set content_size_pretty "[lc_numeric $content_size] [_ file-storage.items]" set pretty_type "#file-storage.Folder#" } else { - set content_size_pretty [util::content_size_pretty -size $content_size] + set content_size_pretty [lc_content_size_pretty -size $content_size] } if { $content_size ne "" } { @@ -405,7 +405,7 @@ append content_size_pretty " [_ file-storage.items]" set pretty_type "#file-storage.Folder#" } else { - set content_size_pretty [util::content_size_pretty -size $content_size] + set content_size_pretty [lc_content_size_pretty -size $content_size] } set properties_url [export_vars -base ${fs_url}file {{file_id $object_id}}] set new_version_link [_ acs-kernel.common_New] Index: openacs-4/packages/file-storage/www/folder-zip-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-zip-add.tcl,v diff -u -r1.11.2.2 -r1.11.2.3 --- openacs-4/packages/file-storage/www/folder-zip-add.tcl 25 Jun 2019 16:47:49 -0000 1.11.2.2 +++ openacs-4/packages/file-storage/www/folder-zip-add.tcl 1 Jul 2019 14:47:07 -0000 1.11.2.3 @@ -47,7 +47,7 @@ set n_bytes [file size ${upload_file.tmpfile}] set max_bytes [fs::max_upload_size] if { $n_bytes > $max_bytes } { - ad_complain "Your file is larger than the maximum file size allowed on this system ([util::content_size_pretty -size $max_bytes])" + ad_complain "Your file is larger than the maximum file size allowed on this system ([lc_content_size_pretty -size $max_bytes])" } } } Index: openacs-4/packages/forums/lib/message/attachment-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/attachment-list.tcl,v diff -u -r1.8.2.3 -r1.8.2.4 --- openacs-4/packages/forums/lib/message/attachment-list.tcl 25 Jun 2019 14:33:00 -0000 1.8.2.3 +++ openacs-4/packages/forums/lib/message/attachment-list.tcl 1 Jul 2019 14:47:07 -0000 1.8.2.4 @@ -29,7 +29,7 @@ # File # set content_size [db_string size {select content_length from cr_revisions where item_id = :id} -default ""] - set content_size_pretty "([util::content_size_pretty -size $content_size])" + set content_size_pretty "([lc_content_size_pretty -size $content_size])" set icon "/resources/acs-subsite/attach.png" } else { # Index: openacs-4/packages/general-comments/www/file-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/file-add-2.tcl,v diff -u -r1.10.2.1 -r1.10.2.2 --- openacs-4/packages/general-comments/www/file-add-2.tcl 25 Jun 2019 16:47:49 -0000 1.10.2.1 +++ openacs-4/packages/general-comments/www/file-add-2.tcl 1 Jul 2019 14:47:07 -0000 1.10.2.2 @@ -30,7 +30,7 @@ set tmp_size [file size ${upload_file.tmpfile}] set max_file_size [parameter::get -parameter MaxFileSize -default {0}] if { $tmp_size > $max_file_size && $max_file_size > 0 } { - ad_complain "[_ general-comments.lt_Your_file_is_too_larg] [_ general-comments.The_publisher_of] [ad_system_name] [_ general-comments.lt_has_chosen_to_limit_a] [util::content_size_pretty -size $max_file_size].\n" + ad_complain "[_ general-comments.lt_Your_file_is_too_larg] [_ general-comments.The_publisher_of] [ad_system_name] [_ general-comments.lt_has_chosen_to_limit_a] [lc_content_size_pretty -size $max_file_size].\n" } if { $tmp_size == 0 } { ad_complain "[_ general-comments.lt_Your_file_is_zero-len]\n" Index: openacs-4/packages/xotcl-core/lib/revisions.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/lib/revisions.tcl,v diff -u -r1.8.2.1 -r1.8.2.2 --- openacs-4/packages/xotcl-core/lib/revisions.tcl 25 Jun 2019 12:53:27 -0000 1.8.2.1 +++ openacs-4/packages/xotcl-core/lib/revisions.tcl 1 Jul 2019 14:47:07 -0000 1.8.2.2 @@ -74,7 +74,7 @@ set version_number $version_number: set last_modified_ansi [lc_time_system_to_conn $last_modified_ansi] set last_modified_pretty [lc_time_fmt $last_modified_ansi "%x %X"] - set content_size_pretty [util::content_size_pretty -size $content_size] + set content_size_pretty [lc_content_size_pretty -size $content_size] if {$name eq ""} {set name [_ file-storage.untitled]} set live_revision_link [export_vars -base make-live-revision \ Index: openacs-4/packages/xotcl-core/tcl/cr-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/cr-procs.tcl,v diff -u -r1.76.2.17 -r1.76.2.18 --- openacs-4/packages/xotcl-core/tcl/cr-procs.tcl 25 Jun 2019 12:53:27 -0000 1.76.2.17 +++ openacs-4/packages/xotcl-core/tcl/cr-procs.tcl 1 Jul 2019 14:47:07 -0000 1.76.2.18 @@ -1263,7 +1263,7 @@ -orderby "r.revision_id desc"] ::xo::dc foreach revisions_select $sql { - set content_size_pretty [util::content_size_pretty -size $content_length] + set content_size_pretty [lc_content_size_pretty -size $content_length] set last_modified_ansi [lc_time_system_to_conn $last_modified_ansi] Index: openacs-4/packages/xowiki/www/xinha/file-selector.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/xinha/file-selector.tcl,v diff -u -r1.21.2.3 -r1.21.2.4 --- openacs-4/packages/xowiki/www/xinha/file-selector.tcl 25 Jun 2019 13:15:20 -0000 1.21.2.3 +++ openacs-4/packages/xowiki/www/xinha/file-selector.tcl 1 Jul 2019 14:47:07 -0000 1.21.2.4 @@ -292,7 +292,7 @@ set last_modified_pretty [lc_time_fmt $last_modified_ansi "%x %X"] if {$type ne "folder"} { - set content_size_pretty [util::content_size_pretty -size $content_size] + set content_size_pretty [lc_content_size_pretty -size $content_size] } else { set content_size_pretty "" }