diff --git a/zkdoc/release-note b/zkdoc/release-note index b2ec8922c24..b4429aa5583 100644 --- a/zkdoc/release-note +++ b/zkdoc/release-note @@ -25,6 +25,7 @@ ZK 10.0.0 ZK-5119: Integrate Font Awesome 6 free icons ZK-5541: Move widget restriction check to Client MVVM ZK-5354: Update animation implementation to avoid iframe reloading + ZK-4969: dropupload supports accept file type * Bugs ZK-5089: AfterSizeEvent doesn't return a correct size of a Window component diff --git a/zktest/src/main/webapp/test2/F100-ZK-4969.zul b/zktest/src/main/webapp/test2/F100-ZK-4969.zul new file mode 100644 index 00000000000..c849e6ceb1f --- /dev/null +++ b/zktest/src/main/webapp/test2/F100-ZK-4969.zul @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/zktest/src/main/webapp/test2/config.properties b/zktest/src/main/webapp/test2/config.properties index fdea56359b3..e52053df54a 100644 --- a/zktest/src/main/webapp/test2/config.properties +++ b/zktest/src/main/webapp/test2/config.properties @@ -3781,6 +3781,7 @@ F86-ZK-4235.zul=A,E,datefmt,library-property ##manually##F100-ZK-5119-2.zul=A,E,FontAwesome6,fa6 ##zats##F100-ZK-5354.zul=A,E,Iframe,Animation,reload ##zats##F100-ZK-5354-2.zul=A,E,Ckeditor,Animation,reload +##manually##F100-ZK-4969.zul=A,E,Dropupload,accept,type # Complex Test Case # diff --git a/zul/src/main/java/org/zkoss/zul/impl/Utils.java b/zul/src/main/java/org/zkoss/zul/impl/Utils.java index 9931950cb6e..2a2548b19cf 100644 --- a/zul/src/main/java/org/zkoss/zul/impl/Utils.java +++ b/zul/src/main/java/org/zkoss/zul/impl/Utils.java @@ -276,6 +276,7 @@ public static final String outLocaleJavaScript() { addLocaleJS(sb, "PDFVIEWER_TOGGLE_FULLSCREEN", MZul.PDFVIEWER_TOGGLE_FULLSCREEN); addLocaleJS(sb, "UPLOAD_ERROR_EXCEED_MAXSIZE", MZul.UPLOAD_ERROR_EXCEED_MAXSIZE); + addLocaleJS(sb, "UPLOAD_ERROR_UNACCEPTED_FILE_TYPE", MZul.UPLOAD_ERROR_UNACCEPTED_FILE_TYPE); addLocaleJS(sb, "COLORBOX_PALETTE_BUTTON_LABEL", MZul.COLORBOX_PALETTE_BUTTON_LABEL); addLocaleJS(sb, "COLORBOX_PICKER_BUTTON_LABEL", MZul.COLORBOX_PICKER_BUTTON_LABEL); diff --git a/zul/src/main/java/org/zkoss/zul/mesg/MZul.java b/zul/src/main/java/org/zkoss/zul/mesg/MZul.java index fcc807dd02c..a98fdb5f15e 100644 --- a/zul/src/main/java/org/zkoss/zul/mesg/MZul.java +++ b/zul/src/main/java/org/zkoss/zul/mesg/MZul.java @@ -38,6 +38,7 @@ public interface MZul extends org.zkoss.mesg.MessageConst { static final int UPLOAD_SUBMIT = 0x2103 + MESSAGE_ID; static final int UPLOAD_BROWSE = 0x2104 + MESSAGE_ID; static final int UPLOAD_ERROR_EXCEED_MAXSIZE = 0x2105 + MESSAGE_ID; + static final int UPLOAD_ERROR_UNACCEPTED_FILE_TYPE = 0x2106 + MESSAGE_ID; static final int OK = 0x2200 + MESSAGE_ID; static final int CANCEL = 0x2201 + MESSAGE_ID; static final int YES = 0x2220 + MESSAGE_ID; diff --git a/zul/src/main/resources/metainfo/mesg/msgzul.properties b/zul/src/main/resources/metainfo/mesg/msgzul.properties index a93925a7114..637f4d72413 100644 --- a/zul/src/main/resources/metainfo/mesg/msgzul.properties +++ b/zul/src/main/resources/metainfo/mesg/msgzul.properties @@ -75,6 +75,8 @@ Too many characters are entered. At most {0} characters are allowed. 2104=Browse... #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7} 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1}) +#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE +2106=The request was rejected because the file type is unacceptable # # Messagebox # diff --git a/zul/src/main/resources/metainfo/mesg/msgzul_ar.properties b/zul/src/main/resources/metainfo/mesg/msgzul_ar.properties index a5b890fc571..1e592f9b632 100644 --- a/zul/src/main/resources/metainfo/mesg/msgzul_ar.properties +++ b/zul/src/main/resources/metainfo/mesg/msgzul_ar.properties @@ -74,6 +74,8 @@ 2104=Browse... #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7} 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1}) +#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE +2106=The request was rejected because the file type is unacceptable # # Messagebox # diff --git a/zul/src/main/resources/metainfo/mesg/msgzul_bg.properties b/zul/src/main/resources/metainfo/mesg/msgzul_bg.properties index ffb0f4654a7..f2206981536 100644 --- a/zul/src/main/resources/metainfo/mesg/msgzul_bg.properties +++ b/zul/src/main/resources/metainfo/mesg/msgzul_bg.properties @@ -1,80 +1,82 @@ #"charset=utf-8" #Tranlated by Boril Yonchev (yonchev@gmail.com) 15 June 2010 #Copyright (C) 2005,2006 Potix Corporation - + # # Validation # # #-=EMPTY_NOT_ALLOWED -2000=Трябва да зададете стойност +2000=Трябва да зададете стойност #-=NO_POSITIVE_NEGATIVE_ZERO -2001=Числото може да бъде само положително +2001=Числото може да бъде само положително #-=NO_POSITIVE_NEGATIVE -2002=Може да приема само стойност 0 +2002=Може да приема само стойност 0 #-=NO_POSITIVE_ZERO -2003=Числото може да бъде само отрицателно +2003=Числото може да бъде само отрицателно #-=NO_POSITIVE -2004=Числото може да бъде само отрицателно и нула +2004=Числото може да бъде само отрицателно и нула #-=NO_NEGATIVE_ZERO -2005=Числото може да бъде само положително +2005=Числото може да бъде само положително #-=NO_NEGATIVE -2006=Числото може да бъде само положително и нула +2006=Числото може да бъде само положително и нула #-=NO_ZERO -2007=Числото не може да бъде нула +2007=Числото не може да бъде нула #-=NO_FUTURE_PAST_TODAY -2011=Може да бъде само празно +2011=Може да бъде само празно #-=NO_FUTURE_PAST -2012=Приема само нула +2012=Приема само нула #-=NO_FUTURE_TODAY -2013=Датата може да бъде само от минал период +2013=Датата може да бъде само от минал период #-=NO_FUTURE -2014=Приема само дати, които не са от бъдещ период +2014=Приема само дати, които не са от бъдещ период #-=NO_PAST_TODAY -2015=Датата може да бъде само от бъдещ период +2015=Датата може да бъде само от бъдещ период #-=NO_PAST -2016=Приема само дати, които не са от минал период +2016=Приема само дати, които не са от минал период #-=NO_TODAY -2017=Приема само днешна дата +2017=Приема само днешна дата #-=VALUE_NOT_MATCHED -2018=Трябва да посочите една от стойностите в падащия списък. +2018=Трябва да посочите една от стойностите в падащия списък. #-=INTEGER_REQUIRED -2040=Трябва да бъде цяло число, по-голямо от {0}. +2040=Трябва да бъде цяло число, по-голямо от {0}. #-=NUMBER_REQUIRED -2041=Трябва да бъде число, по-голямо от {0}. +2041=Трябва да бъде число, по-голямо от {0}. #-=DATE_REQUIRED 2042={ -Датата трябва да е след {0}. -Формата е: {1}. +Датата трябва да е след {0}. +Формата е: {1}. } #-=OUT_OF_RANGE 2043={ -Извън обхвата ({0}). +Извън обхвата ({0}). } #-=STRING_TOO_LONG 2044={ -Прекалено много символи. Трябва да бъдат до {0}. +Прекалено много символи. Трябва да бъдат до {0}. } #-=ILLEGAL_VALUE -2050=Неправилна стойност +2050=Неправилна стойност # # Fileupload # # #-=UPLOAD_TITLE -2100=Зареждане на файл +2100=Зареждане на файл #-=UPLOAD_MESSAGE -2101=Изберете файла от вашета система +2101=Изберете файла от вашета система #-=UPLOAD_CANCEL -2102=Прекъсни +2102=Прекъсни #-=UPLOAD_SUBMIT -2103=Зареди +2103=Зареди #-=UPLOAD_BROWSE -2104=Избери... +2104=Избери... #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7} 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1}) +#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE +2106=The request was rejected because the file type is unacceptable # # Messagebox # @@ -82,31 +84,31 @@ #-=OK 2200=OK #-=CANCEL -2201=Прекъсни +2201=Прекъсни #-=YES -2220=Да +2220=Да #-=NO -2221=Не +2221=Не #-=RETRY -2230=Повтори +2230=Повтори #-=ABORT -2231=Откажи +2231=Откажи #-=IGNORE -2232=Игнорирай +2232=Игнорирай #-=RELOAD -2233=Презареди +2233=Презареди # # Paging # # #-=FIRST -2300=Първа +2300=Първа #-=LAST -2301=Последна +2301=Последна #-=PREV -2302=Предишна +2302=Предишна #-=NEXT -2303=Следваща +2303=Следваща #-=CURRENT 2304=Current #-=CURRENT_DESCRIPTION {0}:current, {1}:total @@ -118,21 +120,21 @@ # Common # # #-=PLEASE_WAIT -2400=Зарежда се... +2400=Зарежда се... # # Grid # # #-=GRID_GROUP -2500=Групиране +2500=Групиране #-=GRID_OTHER -2501=Други +2501=Други #-=GRID_ASC -2502=Възходящо сортиране +2502=Възходящо сортиране #-=GRID_DESC -2503=Низходящо сортиране +2503=Низходящо сортиране #-=GRID_COLUMNS -2504=Колони +2504=Колони #-=GRID_UNGROUP 2505=Ungroup @@ -168,7 +170,7 @@ # Calendar # # #-=CALENDAR_TODAY -2801=Днес +2801=Днес # # Pdfviewer # diff --git a/zul/src/main/resources/metainfo/mesg/msgzul_ca.properties b/zul/src/main/resources/metainfo/mesg/msgzul_ca.properties index 1c674045f1e..42f644619c5 100644 --- a/zul/src/main/resources/metainfo/mesg/msgzul_ca.properties +++ b/zul/src/main/resources/metainfo/mesg/msgzul_ca.properties @@ -78,6 +78,8 @@ Heu introduït massa caràcters. El màxim permès és {0}. 2104=Explora... #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7} 2105=La sol·licitud ha estat rebutjada perquè la mida del fitxer ({0}) supera el màxim configurat ({1}) +#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE +2106=The request was rejected because the file type is unacceptable # # Messagebox # diff --git a/zul/src/main/resources/metainfo/mesg/msgzul_cs.properties b/zul/src/main/resources/metainfo/mesg/msgzul_cs.properties index 637445d1d77..ea847d38730 100644 --- a/zul/src/main/resources/metainfo/mesg/msgzul_cs.properties +++ b/zul/src/main/resources/metainfo/mesg/msgzul_cs.properties @@ -74,6 +74,8 @@ Příliš mnoho znakům maximum je {0} znaků 2104=Browse... #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7} 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1}) +#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE +2106=The request was rejected because the file type is unacceptable # # Messagebox # diff --git a/zul/src/main/resources/metainfo/mesg/msgzul_da.properties b/zul/src/main/resources/metainfo/mesg/msgzul_da.properties index 47e52ee2451..0b2e02528d7 100644 --- a/zul/src/main/resources/metainfo/mesg/msgzul_da.properties +++ b/zul/src/main/resources/metainfo/mesg/msgzul_da.properties @@ -75,6 +75,8 @@ For mange tegn er indtastet. Maksimalt {0} tegn er tilladt. 2104=Gennemse... #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7} 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1}) +#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE +2106=The request was rejected because the file type is unacceptable # # Messagebox # diff --git a/zul/src/main/resources/metainfo/mesg/msgzul_de.properties b/zul/src/main/resources/metainfo/mesg/msgzul_de.properties index 67786cc448a..fb64954e1d8 100644 --- a/zul/src/main/resources/metainfo/mesg/msgzul_de.properties +++ b/zul/src/main/resources/metainfo/mesg/msgzul_de.properties @@ -78,6 +78,8 @@ Zu viele Zeichen eingeben. Maximal {0} Zeichen sind zulässig. 2104=Durchsuchen... #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7} 2105=Upload fehlgeschlagen: Dateigröße ({0}) übersteigt das erlaubte Limit ({1}) +#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE +2106=The request was rejected because the file type is unacceptable # # Messagebox # diff --git a/zul/src/main/resources/metainfo/mesg/msgzul_es.properties b/zul/src/main/resources/metainfo/mesg/msgzul_es.properties index dac260743e2..8e4ad7ec60e 100644 --- a/zul/src/main/resources/metainfo/mesg/msgzul_es.properties +++ b/zul/src/main/resources/metainfo/mesg/msgzul_es.properties @@ -78,6 +78,8 @@ Too many characters are entered. At most {0} characters are allowed. 2104=Explorer... #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7} 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1}) +#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE +2106=The request was rejected because the file type is unacceptable # # Messagebox # diff --git a/zul/src/main/resources/metainfo/mesg/msgzul_fr.properties b/zul/src/main/resources/metainfo/mesg/msgzul_fr.properties index e83007309d5..09421681065 100644 --- a/zul/src/main/resources/metainfo/mesg/msgzul_fr.properties +++ b/zul/src/main/resources/metainfo/mesg/msgzul_fr.properties @@ -78,6 +78,8 @@ Trop de caractères sont saisis. {0} caractère(s) sont autorisé(s) au maximum. 2104=Browse... #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7} 2105=la requete à été refusée car sa taille ({0}) dépasse le maximum configuré ({1}) +#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE +2106=The request was rejected because the file type is unacceptable # # Messagebox # diff --git a/zul/src/main/resources/metainfo/mesg/msgzul_hu.properties b/zul/src/main/resources/metainfo/mesg/msgzul_hu.properties index f66e054ba00..b4f078ef9c4 100644 --- a/zul/src/main/resources/metainfo/mesg/msgzul_hu.properties +++ b/zul/src/main/resources/metainfo/mesg/msgzul_hu.properties @@ -76,6 +76,8 @@ Túl hosszú szöveg! Csak {0} vagy kevesebb karakter engedélyezett. 2104=Tallózás... #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7} 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1}) +#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE +2106=The request was rejected because the file type is unacceptable # # Messagebox # diff --git a/zul/src/main/resources/metainfo/mesg/msgzul_id.properties b/zul/src/main/resources/metainfo/mesg/msgzul_id.properties index dcb20465fb4..096fba56801 100644 --- a/zul/src/main/resources/metainfo/mesg/msgzul_id.properties +++ b/zul/src/main/resources/metainfo/mesg/msgzul_id.properties @@ -78,6 +78,8 @@ Terlalu banyak karakter yang dimasukkan. Paling banyak {0} karater yang diijinka 2104=Browse... #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7} 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1}) +#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE +2106=The request was rejected because the file type is unacceptable # # Messagebox # diff --git a/zul/src/main/resources/metainfo/mesg/msgzul_it.properties b/zul/src/main/resources/metainfo/mesg/msgzul_it.properties index bc89a26290c..94b2875789a 100644 --- a/zul/src/main/resources/metainfo/mesg/msgzul_it.properties +++ b/zul/src/main/resources/metainfo/mesg/msgzul_it.properties @@ -75,6 +75,8 @@ Troppi caratteri. Sono consentiti al massimo {0} caratteri. 2104=Browse... #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7} 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1}) +#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE +2106=The request was rejected because the file type is unacceptable # # Messagebox # diff --git a/zul/src/main/resources/metainfo/mesg/msgzul_ja.properties b/zul/src/main/resources/metainfo/mesg/msgzul_ja.properties index bc0fa06b79f..9e530c8ee12 100644 --- a/zul/src/main/resources/metainfo/mesg/msgzul_ja.properties +++ b/zul/src/main/resources/metainfo/mesg/msgzul_ja.properties @@ -77,6 +77,8 @@ 2104=參照... #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7} 2105=このリクエストが拒否されました。ファイルサイズ({0})が最大値({1})を越えています。 +#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE +2106=The request was rejected because the file type is unacceptable # # Messagebox # diff --git a/zul/src/main/resources/metainfo/mesg/msgzul_ko.properties b/zul/src/main/resources/metainfo/mesg/msgzul_ko.properties index 174d71a6ecd..00cbd6690bc 100644 --- a/zul/src/main/resources/metainfo/mesg/msgzul_ko.properties +++ b/zul/src/main/resources/metainfo/mesg/msgzul_ko.properties @@ -7,93 +7,95 @@ # Validation # # #-=EMPTY_NOT_ALLOWED -2000=공백은 피하세요. 필수 사항입니다. 기입해주세요. +2000=공백은 피하세요. 필수 사항입니다. 기입해주세요. #-=NO_POSITIVE_NEGATIVE_ZERO -2001=양수만 허용됩니다. +2001=양수만 허용됩니다. #-=NO_POSITIVE_NEGATIVE -2002='0'만 허용됩니다. +2002='0'만 허용됩니다. #-=NO_POSITIVE_ZERO -2003=음수만 허용됩니다. +2003=음수만 허용됩니다. #-=NO_POSITIVE -2004=양수가 아닌 숫자만 허용됩니다. +2004=양수가 아닌 숫자만 허용됩니다. #-=NO_NEGATIVE_ZERO -2005=양수만 허용됩니다. +2005=양수만 허용됩니다. #-=NO_NEGATIVE -2006=음수가 아닌 숫자만 허용됩니다. +2006=음수가 아닌 숫자만 허용됩니다. #-=NO_ZERO -2007='0'이 아닌 숫자만 허용됩니다. +2007='0'이 아닌 숫자만 허용됩니다. #-=NO_FUTURE_PAST_TODAY -2011=공백으로 남겨주세요. +2011=공백으로 남겨주세요. #-=NO_FUTURE_PAST -2012=오늘날짜만 등록될 수 있습니다. +2012=오늘날짜만 등록될 수 있습니다. #-=NO_FUTURE_TODAY -2013=과거일자만 등록될 수 있습니다. +2013=과거일자만 등록될 수 있습니다. #-=NO_FUTURE -2014=미래일자는 등록될 수 없습니다. +2014=미래일자는 등록될 수 없습니다. #-=NO_PAST_TODAY -2015=미래일자만 등록될 수 있습니다. +2015=미래일자만 등록될 수 있습니다. #-=NO_PAST -2016=과거일자는 등록될 수 없습니다. +2016=과거일자는 등록될 수 없습니다. #-=NO_TODAY -2017=오늘은 등록될 수 없습니다. +2017=오늘은 등록될 수 없습니다. #-=VALUE_NOT_MATCHED -2018=선택박스에서 최소 하나의 값을 명시해야합니다. +2018=선택박스에서 최소 하나의 값을 명시해야합니다. #-=INTEGER_REQUIRED -2040=정수를 선언해야 합니다. {0}. +2040=정수를 선언해야 합니다. {0}. #-=NUMBER_REQUIRED -2041=숫자를 지정해야합니다. {0}. +2041=숫자를 지정해야합니다. {0}. #-=DATE_REQUIRED 2042={ -날짜를 선언해야 합니다. {0}. -형식: {1}. +날짜를 선언해야 합니다. {0}. +형식: {1}. } #-=OUT_OF_RANGE 2043={ -범위를 초과합니다. ({0}) +범위를 초과합니다. ({0}) } #-=STRING_TOO_LONG 2044={ -너무 많은 문자를 입력하셨습니다. 최대 {0}개의 문자가 입력가능합니다. +너무 많은 문자를 입력하셨습니다. 최대 {0}개의 문자가 입력가능합니다. } #-=ILLEGAL_VALUE -2050=옳지 않은 값입니다. +2050=옳지 않은 값입니다. # # Fileupload # # #-=UPLOAD_TITLE -2100=파일 업로드하기 +2100=파일 업로드하기 #-=UPLOAD_MESSAGE -2101=파일이 저장된 위치를 지정하세요 +2101=파일이 저장된 위치를 지정하세요 #-=UPLOAD_CANCEL -2102=업로드 취소 +2102=업로드 취소 #-=UPLOAD_SUBMIT -2103=업로드하기 +2103=업로드하기 #-=UPLOAD_BROWSE 2104=Browse... #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7} 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1}) +#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE +2106=The request was rejected because the file type is unacceptable # # Messagebox # # #-=OK -2200=오케이 +2200=오케이 #-=CANCEL -2201=취소 +2201=취소 #-=YES -2220=네 +2220=네 #-=NO -2221=아니오 +2221=아니오 #-=RETRY -2230=재시도 +2230=재시도 #-=ABORT -2231=중지 +2231=중지 #-=IGNORE -2232=무시하기 +2232=무시하기 #-=RELOAD 2233=Reload @@ -101,13 +103,13 @@ # Paging # # #-=FIRST -2300=처음 +2300=처음 #-=LAST -2301=마지막 +2301=마지막 #-=PREV -2302=이전 +2302=이전 #-=NEXT -2303=다음 +2303=다음 #-=CURRENT 2304=Current #-=CURRENT_DESCRIPTION {0}:current, {1}:total @@ -119,21 +121,21 @@ # Common # # #-=PLEASE_WAIT -2400=처리중... +2400=처리중... # # Grid # # #-=GRID_GROUP -2500=그룹 +2500=그룹 #-=GRID_OTHER -2501=기타 +2501=기타 #-=GRID_ASC -2502=오름차순 정렬 +2502=오름차순 정렬 #-=GRID_DESC -2503=내림차순 정렬 +2503=내림차순 정렬 #-=GRID_COLUMNS -2504=열 +2504=열 #-=GRID_UNGROUP 2505=Ungroup @@ -169,7 +171,7 @@ # Calendar # # #-=CALENDAR_TODAY -2801=오늘 +2801=오늘 # # Pdfviewer # diff --git a/zul/src/main/resources/metainfo/mesg/msgzul_nl.properties b/zul/src/main/resources/metainfo/mesg/msgzul_nl.properties index 20363ae2e8e..a695565e194 100644 --- a/zul/src/main/resources/metainfo/mesg/msgzul_nl.properties +++ b/zul/src/main/resources/metainfo/mesg/msgzul_nl.properties @@ -71,6 +71,8 @@ Alleen spaties zijn ook niet toegestaan 2104=Browse... #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7} 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1}) +#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE +2106=The request was rejected because the file type is unacceptable # # Messagebox # diff --git a/zul/src/main/resources/metainfo/mesg/msgzul_pl.properties b/zul/src/main/resources/metainfo/mesg/msgzul_pl.properties index 42ca9bb2133..a5fae4b74c5 100644 --- a/zul/src/main/resources/metainfo/mesg/msgzul_pl.properties +++ b/zul/src/main/resources/metainfo/mesg/msgzul_pl.properties @@ -75,6 +75,8 @@ Wprowadzono zbyt dużo znaków, dozwolone co najwyżej {0}. 2104=Przeglądaj... #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7} 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1}) +#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE +2106=The request was rejected because the file type is unacceptable # # Messagebox # diff --git a/zul/src/main/resources/metainfo/mesg/msgzul_pt.properties b/zul/src/main/resources/metainfo/mesg/msgzul_pt.properties index c75b3e3f2c6..1e13e608011 100644 --- a/zul/src/main/resources/metainfo/mesg/msgzul_pt.properties +++ b/zul/src/main/resources/metainfo/mesg/msgzul_pt.properties @@ -78,6 +78,8 @@ Muitos caracteres foram inseridos. Permitido no máximo {0} caracteres. 2104=Browse... #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7} 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1}) +#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE +2106=The request was rejected because the file type is unacceptable # # Messagebox # diff --git a/zul/src/main/resources/metainfo/mesg/msgzul_pt_BR.properties b/zul/src/main/resources/metainfo/mesg/msgzul_pt_BR.properties index 65717670bbe..dfa5b5e102c 100644 --- a/zul/src/main/resources/metainfo/mesg/msgzul_pt_BR.properties +++ b/zul/src/main/resources/metainfo/mesg/msgzul_pt_BR.properties @@ -78,6 +78,8 @@ Muitos caracteres foram inseridos. Permitido no máximo {0} caracteres. 2104=Browse... #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7} 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1}) +#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE +2106=The request was rejected because the file type is unacceptable # # Messagebox # diff --git a/zul/src/main/resources/metainfo/mesg/msgzul_ro.properties b/zul/src/main/resources/metainfo/mesg/msgzul_ro.properties index c9ec03ca10b..aabfbf383e9 100644 --- a/zul/src/main/resources/metainfo/mesg/msgzul_ro.properties +++ b/zul/src/main/resources/metainfo/mesg/msgzul_ro.properties @@ -78,6 +78,8 @@ Prea multe caractere sunt introduse. Cel mult {0} caractere sunt permise. 2104=Browse... #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7} 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1}) +#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE +2106=The request was rejected because the file type is unacceptable # # Messagebox # diff --git a/zul/src/main/resources/metainfo/mesg/msgzul_ru.properties b/zul/src/main/resources/metainfo/mesg/msgzul_ru.properties index 361d94ee616..454770cc4c4 100644 --- a/zul/src/main/resources/metainfo/mesg/msgzul_ru.properties +++ b/zul/src/main/resources/metainfo/mesg/msgzul_ru.properties @@ -70,6 +70,8 @@ 2104=Обзор... #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7} 2105=Запрос на загрузку файла отклонен, поскольку его размер ({0}) превышает установленное ограничение ({1}) +#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE +2106=The request was rejected because the file type is unacceptable # # Messagebox # diff --git a/zul/src/main/resources/metainfo/mesg/msgzul_sk.properties b/zul/src/main/resources/metainfo/mesg/msgzul_sk.properties index 37b8249aad9..4ff1bde086f 100644 --- a/zul/src/main/resources/metainfo/mesg/msgzul_sk.properties +++ b/zul/src/main/resources/metainfo/mesg/msgzul_sk.properties @@ -74,6 +74,8 @@ Príliš veľa znakov. Maximum je {0} znakov 2104=Prehliadať... #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7} 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1}) +#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE +2106=The request was rejected because the file type is unacceptable # # Messagebox # diff --git a/zul/src/main/resources/metainfo/mesg/msgzul_sl.properties b/zul/src/main/resources/metainfo/mesg/msgzul_sl.properties index 7b379c121e2..8ab6fa4ff10 100644 --- a/zul/src/main/resources/metainfo/mesg/msgzul_sl.properties +++ b/zul/src/main/resources/metainfo/mesg/msgzul_sl.properties @@ -75,6 +75,8 @@ Too many characters are entered. At most {0} characters are allowed. 2104=Browse... #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7} 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1}) +#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE +2106=The request was rejected because the file type is unacceptable # # Messagebox # diff --git a/zul/src/main/resources/metainfo/mesg/msgzul_sv.properties b/zul/src/main/resources/metainfo/mesg/msgzul_sv.properties index cfe01fd7274..ab611b2c79a 100644 --- a/zul/src/main/resources/metainfo/mesg/msgzul_sv.properties +++ b/zul/src/main/resources/metainfo/mesg/msgzul_sv.properties @@ -78,6 +78,8 @@ För många tecken inmatade. Högst {0} tecken tillåtna. 2104=Bläddra... #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7} 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1}) +#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE +2106=The request was rejected because the file type is unacceptable # # Messagebox # diff --git a/zul/src/main/resources/metainfo/mesg/msgzul_tr.properties b/zul/src/main/resources/metainfo/mesg/msgzul_tr.properties index bd15a31366d..63f5e969240 100644 --- a/zul/src/main/resources/metainfo/mesg/msgzul_tr.properties +++ b/zul/src/main/resources/metainfo/mesg/msgzul_tr.properties @@ -78,6 +78,8 @@ Aralık aşılıyor ({0}). 2104=Browse... #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7} 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1}) +#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE +2106=The request was rejected because the file type is unacceptable # # Messagebox # diff --git a/zul/src/main/resources/metainfo/mesg/msgzul_uk.properties b/zul/src/main/resources/metainfo/mesg/msgzul_uk.properties index 97022b944b5..5c14993888e 100644 --- a/zul/src/main/resources/metainfo/mesg/msgzul_uk.properties +++ b/zul/src/main/resources/metainfo/mesg/msgzul_uk.properties @@ -75,6 +75,8 @@ 2104=Browse... #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7} 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1}) +#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE +2106=The request was rejected because the file type is unacceptable # # Messagebox # diff --git a/zul/src/main/resources/metainfo/mesg/msgzul_vi.properties b/zul/src/main/resources/metainfo/mesg/msgzul_vi.properties index 6edfa54c91e..7f86703c80a 100644 --- a/zul/src/main/resources/metainfo/mesg/msgzul_vi.properties +++ b/zul/src/main/resources/metainfo/mesg/msgzul_vi.properties @@ -75,6 +75,8 @@ Bạn nhập nội dung quá dài, Độ dài cho phép {0} ký tự. 2104=Chọn... #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7} 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1}) +#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE +2106=The request was rejected because the file type is unacceptable # # Messagebox # diff --git a/zul/src/main/resources/metainfo/mesg/msgzul_zh.properties b/zul/src/main/resources/metainfo/mesg/msgzul_zh.properties index 8b788967a18..006120c0f22 100644 --- a/zul/src/main/resources/metainfo/mesg/msgzul_zh.properties +++ b/zul/src/main/resources/metainfo/mesg/msgzul_zh.properties @@ -73,6 +73,8 @@ 2104=瀏覽... #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7} 2105=上傳有誤，檔案大小（{0}）超過配置的最大值（{1}) +#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE +2106=The request was rejected because the file type is unacceptable # # Messagebox # diff --git a/zul/src/main/resources/metainfo/mesg/msgzul_zh_CN.properties b/zul/src/main/resources/metainfo/mesg/msgzul_zh_CN.properties index 2d6006809f5..1984a20e72e 100644 --- a/zul/src/main/resources/metainfo/mesg/msgzul_zh_CN.properties +++ b/zul/src/main/resources/metainfo/mesg/msgzul_zh_CN.properties @@ -71,6 +71,8 @@ 2104=浏览... #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7} 2105=上传有误，档案大小（{0}）超过配置的最大值（{1}) +#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE +2106=The request was rejected because the file type is unacceptable # # Messagebox # diff --git a/zul/src/main/resources/metainfo/mesg/msgzul_zh_SG.properties b/zul/src/main/resources/metainfo/mesg/msgzul_zh_SG.properties index fd9c2716d26..54bac335099 100644 --- a/zul/src/main/resources/metainfo/mesg/msgzul_zh_SG.properties +++ b/zul/src/main/resources/metainfo/mesg/msgzul_zh_SG.properties @@ -72,6 +72,8 @@ 2104=浏览... #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7} 2105=上传有误，档案大小（{0}）超过配置的最大值（{1}) +#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE +2106=The request was rejected because the file type is unacceptable # # Messagebox # diff --git a/zul/src/main/resources/metainfo/mesg/msgzul_zh_TW.properties b/zul/src/main/resources/metainfo/mesg/msgzul_zh_TW.properties index 9c99171e916..23b6ac1afa7 100644 --- a/zul/src/main/resources/metainfo/mesg/msgzul_zh_TW.properties +++ b/zul/src/main/resources/metainfo/mesg/msgzul_zh_TW.properties @@ -73,6 +73,8 @@ 2104=瀏覽... #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7} 2105=上傳有誤，檔案大小（{0}）超過配置的最大值（{1}) +#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE +2106=The request was rejected because the file type is unacceptable # # Messagebox # diff --git a/zul/src/main/resources/metainfo/xml/zul.xsd b/zul/src/main/resources/metainfo/xml/zul.xsd index bdb4258ca09..20c766c4e00 100644 --- a/zul/src/main/resources/metainfo/xml/zul.xsd +++ b/zul/src/main/resources/metainfo/xml/zul.xsd @@ -1756,6 +1756,7 @@ + diff --git a/zul/src/main/resources/web/js/zul/global.d.ts b/zul/src/main/resources/web/js/zul/global.d.ts index 01c2e411e21..50177dbdd79 100644 --- a/zul/src/main/resources/web/js/zul/global.d.ts +++ b/zul/src/main/resources/web/js/zul/global.d.ts @@ -84,6 +84,7 @@ declare global { | 'UNKNOWN_TYPE' | 'UPLOAD_CANCEL' // zul/fud/FileuploadDig | 'UPLOAD_ERROR_EXCEED_MAXSIZE' // zul/Upload + | 'UPLOAD_ERROR_UNACCEPTED_FILE_TYPE' // zul/Upload | 'VALUE_NOT_MATCHED' // zul/inp/Combobox | 'WS_HOME' // zul/WScroll | 'WS_PREV' // zul/WScroll