Browse Source

Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design-i18n into release/10.0

release/10.0
Qinghui.Liu 4 years ago
parent
commit
0da5340510
  1. 5
      .gitignore
  2. 56
      build.gradle
  3. 1
      design-i18n-chart/src/main/resources/com/fr/design/i18n/chart.properties
  4. 1
      design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en.properties
  5. 1
      design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ja_JP.properties
  6. 7
      design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ko_KR.properties
  7. 1
      design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties
  8. 1
      design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_TW.properties
  9. 2
      design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties
  10. 2
      design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties
  11. 29
      globalConfigHook.gradle
  12. BIN
      gradle/wrapper/gradle-wrapper.jar
  13. 6
      gradle/wrapper/gradle-wrapper.properties
  14. 172
      gradlew
  15. 84
      gradlew.bat
  16. 12
      settings.gradle

5
.gitignore vendored

@ -2,4 +2,7 @@
.idea/
.DS_Store
.classpath
.project
.project
.gradle
*/build

56
build.gradle

@ -0,0 +1,56 @@
import org.gradle.plugins.ide.idea.model.IdeaLanguageLevel
plugins {
id 'java'
id 'java-library'
id 'com.fr.common' version '1.0-SNAPSHOT'
}
ext {
frVersion = ""
outputPath = "build"
ignoreTestFailureSetting = true
languageLevelSetting = 1.8
}
applyGlobalConfigPathIfExist()
if (versions.frVersion) {
frVersion = versions.frVersion
}
def frDevVersion = "DEV" + frVersion
dependencies {
compile project(':design-i18n-report')
compile project(':design-i18n-chart')
}
allprojects {
apply plugin: 'java'
apply plugin: 'java-library'
apply plugin: 'idea'
group 'com.fr.design'
version frDevVersion
sourceCompatibility = languageLevelSetting
targetCompatibility = languageLevelSetting
tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
}
repositories {
mavenLocal()
}
idea {
module {
inheritOutputDirs = false
outputDir = file(outputPath +"/classes")
testOutputDir = file(outputPath +"/test-classes")
languageLevel = new IdeaLanguageLevel(sourceCompatibility)
targetBytecodeVersion = targetCompatibility
}
}
}

1
design-i18n-chart/src/main/resources/com/fr/design/i18n/chart.properties

@ -567,6 +567,7 @@ Fine-Design_Chart_Switch=
Fine-Design_Chart_Switch_Chart=
Fine-Design_Chart_TableData=
Fine-Design_Chart_Table_Data=
Fine-Design_Chart_Target_Value=
Fine-Design_Chart_Task_ID=
Fine-Design_Chart_Task_ID_Tooltip=
Fine-Design_Chart_Task_Link=

1
design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en.properties

@ -568,6 +568,7 @@ Fine-Design_Chart_Switch=Switch
Fine-Design_Chart_Switch_Chart=Switch Chart
Fine-Design_Chart_TableData=Dataset Data
Fine-Design_Chart_Table_Data=Dataset
Fine-Design_Chart_Target_Value=
Fine-Design_Chart_Task_ID=Task ID
Fine-Design_Chart_Task_ID_Tooltip=This can be set to none if no task link
Fine-Design_Chart_Task_Link=Task Links

1
design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ja_JP.properties

@ -568,6 +568,7 @@ Fine-Design_Chart_Switch=\u5207\u308A\u66FF\u3048
Fine-Design_Chart_Switch_Chart=\u30B0\u30E9\u30D5\u5207\u308A\u66FF\u3048
Fine-Design_Chart_TableData=\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8\u306E\u30C7\u30FC\u30BF
Fine-Design_Chart_Table_Data=\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8
Fine-Design_Chart_Target_Value=
Fine-Design_Chart_Task_ID=\u30BF\u30B9\u30AFID
Fine-Design_Chart_Task_ID_Tooltip=\u30BF\u30B9\u30AF\u306E\u95A2\u9023\u4ED8\u3051\u3092\u8A2D\u5B9A\u3057\u306A\u3044\u5834\u5408\u3001\u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u201D\u306A\u3057\u201D\u306B\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002
Fine-Design_Chart_Task_Link=\u30BF\u30B9\u30AF\u306E\u95A2\u9023\u4ED8\u3051

7
design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ko_KR.properties

@ -146,7 +146,7 @@ Fine-Design_Chart_DataType=\uB370\uC774\uD130 \uD0C0\uC785
Fine-Design_Chart_Data_Check=\uB370\uC774\uD130 \uAC10\uC2DC
Fine-Design_Chart_Data_CombineOther=\uB098\uBA38\uC9C0 \uD56D\uBAA9\uC744 "\uAE30\uD0C0"\uB85C \uBCD1\uD569
Fine-Design_Chart_Data_Configuration=\uB370\uC774\uD130 \uC124\uC815
Fine-Design_Chart_Data_Field=
Fine-Design_Chart_Data_Field=\uB370\uC774\uD130 \uD544\uB4DC
Fine-Design_Chart_Data_Filter=\uB370\uC774\uD130 \uD544\uD130
Fine-Design_Chart_Data_Function_Percent=\uC810\uC720\uC728
Fine-Design_Chart_Data_Label_Inside=\uB77C\uBCA8 \uC548\uCABD
@ -334,7 +334,7 @@ Fine-Design_Chart_Log_Base_Value=\uB300\uC218 \uAE30\uBCF8
Fine-Design_Chart_Longitude=\uACBD\uB3C4
Fine-Design_Chart_Longitude_First=\uACBD\uB3C4 \uC55E\uCABD\uC5D0
Fine-Design_Chart_Lost_Data=(\uB370\uC774\uD130 \uBD84\uC2E4)
Fine-Design_Chart_M_Popup_Auto_Chart_Type=
Fine-Design_Chart_M_Popup_Auto_Chart_Type=\uCC28\uD2B8 \uC790\uB3D9 \uC720\uD615
Fine-Design_Chart_M_Popup_Chart_Type=\uCC28\uD2B8\uC720\uD615
Fine-Design_Chart_Main_Axis=\uBA54\uC778 \uC88C\uD45C\uCD95
Fine-Design_Chart_Main_Graduation_Line=\uBA54\uC778 \uB208\uAE08\uC120
@ -477,7 +477,7 @@ Fine-Design_Chart_Radius_Set=\uBC18\uACBD \uC124\uC815
Fine-Design_Chart_Range=\uBC94\uC704
Fine-Design_Chart_Range_Chart=\uBC94\uC704\uCC28\uD2B8
Fine-Design_Chart_Range_Num=\uBC94\uC704 \uC218\uCE58
Fine-Design_Chart_Recommend=
Fine-Design_Chart_Recommend=\uCD94\uCC9C
Fine-Design_Chart_Records_Num=\uAE30\uB85D\uC218
Fine-Design_Chart_Rectangular_Coordinate_System=\uB370\uCE74\uB974\uD2B8 \uC88C\uD45C
Fine-Design_Chart_Region=\uAD6C\uC5ED
@ -568,6 +568,7 @@ Fine-Design_Chart_Switch=\uC804\uD658
Fine-Design_Chart_Switch_Chart=\uCC28\uD2B8\uC804\uD658
Fine-Design_Chart_TableData=\uB370\uC774\uD130\uC14B
Fine-Design_Chart_Table_Data=\uB370\uC774\uD130\uC14B
Fine-Design_Chart_Target_Value=
Fine-Design_Chart_Task_ID=\uC5C5\uBB34 \uC544\uC544\uB514
Fine-Design_Chart_Task_ID_Tooltip=\uC5C5\uBB34\uC5F0\uB3D9\uC774 \uD544\uC694\uC5C6\uB294 \uACBD\uC6B0,\uD574\uB2F9 \uC635\uC158\uC744 \uBE48\uAC12\uC73C\uB85C \uC124\uC815\uD574\uC8FC\uC138\uC694.
Fine-Design_Chart_Task_Link=\uD0DC\uC2A4\uD06C \uAD00\uB828

1
design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties

@ -568,6 +568,7 @@ Fine-Design_Chart_Switch=\u5207\u6362
Fine-Design_Chart_Switch_Chart=\u56FE\u8868\u5207\u6362
Fine-Design_Chart_TableData=\u6570\u636E\u96C6\u6570\u636E
Fine-Design_Chart_Table_Data=\u6570\u636E\u96C6
Fine-Design_Chart_Target_Value=\u76EE\u6807\u503C
Fine-Design_Chart_Task_ID=\u4EFB\u52A1ID
Fine-Design_Chart_Task_ID_Tooltip=\u5982\u679C\u4E0D\u8BBE\u7F6E\u4EFB\u52A1\u5173\u8054\uFF0C\u6B64\u9879\u53EF\u4EE5\u8BBE\u7F6E\u6210\u65E0
Fine-Design_Chart_Task_Link=\u4EFB\u52A1\u5173\u8054

1
design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_TW.properties

@ -568,6 +568,7 @@ Fine-Design_Chart_Switch=\u5207\u63DB
Fine-Design_Chart_Switch_Chart=\u5716\u8868\u5207\u63DB
Fine-Design_Chart_TableData=\u8CC7\u6599\u96C6\u8CC7\u6599
Fine-Design_Chart_Table_Data=\u8CC7\u6599\u96C6
Fine-Design_Chart_Target_Value=
Fine-Design_Chart_Task_ID=\u4EFB\u52D9ID
Fine-Design_Chart_Task_ID_Tooltip=\u5982\u679C\u4E0D\u8A2D\u5B9A\u4EFB\u52D9\u95DC\u806F\uFF0C\u6B64\u9805\u53EF\u4EE5\u8A2D\u5B9A\u6210\u7121
Fine-Design_Chart_Task_Link=\u4EFB\u52D9\u95DC\u806F

2
design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties

@ -202,7 +202,7 @@ Fine-Design_Basic_Component_Size=Component Size
Fine-Design_Basic_ConditionB_Add_bracket=Add Brackets
Fine-Design_Basic_ConditionB_Operator=Operators
Fine-Design_Basic_ConditionB_Remove_bracket=Remove Brackets
Fine-Design_Basic_Condition_Attributes=Conditional Attributes
Fine-Design_Basic_Condition_Attributes=Conditional Formatting
Fine-Design_Basic_Conditions_Formula=Condition Formulas
Fine-Design_Basic_Config=Config
Fine-Design_Basic_Configured_Roles=Configured Role

2
design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties

@ -2103,7 +2103,7 @@ Fine-Design_Report_M_Edit_Send_To_Back=\uB9E8 \uC544\uB798\uB85C \uC774\uB3D9(K)
Fine-Design_Report_M_Format_A_Border=\uD14C\uB450\uB9AC(B)
Fine-Design_Report_M_Insert=\uC778\uC11C\uD2B8
Fine-Design_Report_M_Insert-Float=\uD50C\uB85C\uD2B8 \uC694\uC18C
Fine-Design_Report_M_Insert_Auto_Chart=
Fine-Design_Report_M_Insert_Auto_Chart=\uC790\uB3D9 \uCD94\uCC9C \uCC28\uD2B8 \uC0BD\uC785
Fine-Design_Report_M_Insert_Chart=\uCC28\uD2B8
Fine-Design_Report_M_Insert_Formula=\uC218\uC2DD
Fine-Design_Report_M_Insert_Hyperlink=\uD558\uC774\uD37C\uB9C1\uD06C

29
globalConfigHook.gradle

@ -0,0 +1,29 @@
def getRootGradle() {
def currentGradle = gradle
while (currentGradle.parent) {
currentGradle = currentGradle.parent
}
return currentGradle
}
def findHookIncludedBuild() {
def rootGradle = getRootGradle()
def hookProject = rootGradle.getIncludedBuilds()
.find({ build -> build.name == 'hook' })
return hookProject
}
def findGlobalConfig() {
def hookProject = findHookIncludedBuild()
if (hookProject) {
def path = hookProject.projectDir.parent + '/globalConfig.gradle'
if (file(path).exists()) {
return path
}
}
}
def globalConfigPath = findGlobalConfig()
if (globalConfigPath) {
apply from: globalConfigPath
}

BIN
gradle/wrapper/gradle-wrapper.jar vendored

Binary file not shown.

6
gradle/wrapper/gradle-wrapper.properties vendored

@ -0,0 +1,6 @@
#Wed Apr 22 15:17:12 CST 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME

172
gradlew vendored

@ -0,0 +1,172 @@
#!/usr/bin/env sh
##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
warn () {
echo "$*"
}
die () {
echo
echo "$*"
echo
exit 1
}
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=$(save "$@")
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi
exec "$JAVACMD" "$@"

84
gradlew.bat vendored

@ -0,0 +1,84 @@
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto init
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:init
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega

12
settings.gradle

@ -0,0 +1,12 @@
pluginManagement {
repositories {
maven {
url 'http://mvn.finedevelop.com/repository/maven-public/'
}
gradlePluginPortal()
}
}
rootProject.name = 'design-i18n'
include 'design-i18n-report','design-i18n-chart'
Loading…
Cancel
Save