From 78b46fa61946fde4d0004b4c263633e794bb6b41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Mon, 16 Oct 2017 20:41:13 +0800
Subject: [PATCH] Scroll add local loading-text

---
 examples/routers/scroll.vue      |  2 +-
 src/components/scroll/scroll.vue | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/examples/routers/scroll.vue b/examples/routers/scroll.vue
index fbfaccdc..489d959b 100644
--- a/examples/routers/scroll.vue
+++ b/examples/routers/scroll.vue
@@ -1,5 +1,5 @@
 <template>
-    <Scroll :on-reach-top="loadData" loading-text="L-o-a-d-i-n-g...">
+    <Scroll :on-reach-edge="loadData">
         <section v-for="item in list">
             <div class="city">
                 <p>{{ item }}</p>
diff --git a/src/components/scroll/scroll.vue b/src/components/scroll/scroll.vue
index 2a754583..65897b2e 100644
--- a/src/components/scroll/scroll.vue
+++ b/src/components/scroll/scroll.vue
@@ -9,13 +9,13 @@
             ref="scrollContainer"
         >
             <div :class="loaderClasses" :style="{paddingTop: wrapperPadding.paddingTop}" ref="toploader">
-                <loader :text="loadingText" :active="showTopLoader"></loader>
+                <loader :text="localeLoadingText" :active="showTopLoader"></loader>
             </div>
             <div :class="slotContainerClasses" ref="scrollContent">
                 <slot></slot>
             </div>
             <div :class="loaderClasses" :style="{paddingBottom: wrapperPadding.paddingBottom}" ref="bottomLoader">
-                <loader :text="loadingText" :active="showBottomLoader"></loader>
+                <loader :text="localeLoadingText" :active="showBottomLoader"></loader>
             </div>
         </div>
     </div>
@@ -24,6 +24,7 @@
     import throttle from 'lodash.throttle';
     import loader from './loading-component.vue';
     import { on, off } from '../../utils/dom';
+    import Locale from '../../mixins/locale';
 
     const prefixCls = 'ivu-scroll';
     const dragConfig = {
@@ -35,7 +36,7 @@
 
     export default {
         name: 'Scroll',
-        mixins: [],
+        mixins: [ Locale ],
         components: {loader},
         props: {
             height: {
@@ -52,8 +53,7 @@
                 type: Function
             },
             loadingText: {
-                type: String,
-                default: ''
+                type: String
             }
         },
         data() {
@@ -98,7 +98,14 @@
                     paddingTop: this.topRubberPadding + 'px',
                     paddingBottom: this.bottomRubberPadding + 'px'
                 };
-            }
+            },
+            localeLoadingText () {
+                if (this.loadingText === undefined) {
+                    return this.t('i.select.loading');
+                } else {
+                    return this.loadingText;
+                }
+            },
         },
         methods: {
             // just to improve feeling of loading and avoid scroll trailing events fired by the browser