Merge remote-tracking branch 'upstream/master'

natee · natee · commit 41ddc963dd44 · 2015-07-31T16:58:33.000+08:00
diff --git a/README.md b/README.md
@@ -1322,7 +1322,7 @@ While this guide explains the *what*, *why* and *how*, I find it helpful to see
 
     *Why?*: The controller `activate` makes it convenient to re-use the logic for a refresh for the controller/View, keeps the logic together, gets the user to the View faster, makes animations easy on the `ng-view` or `ui-view`, and feels snappier to the user.
 
-    Note: If you need to conditionally cancel the route before you start use the controller, use a [route resolve](#style-y081) instead.
+    Note: If you need to conditionally cancel the route before you start using the controller, use a [route resolve](#style-y081) instead.
 
   ```javascript
   /* avoid */
@@ -2902,6 +2902,8 @@ Use file templates or snippets to help follow consistent styles and patterns. He
     ngservice    // creates an Angular service
     ngfilter     // creates an Angular filter
     ```
+
+
 **[Back to top](#table-of-contents)**
 
 ## Yeoman Generator
diff --git a/assets/sublime-angular-snippets/angular.controller.sublime-snippet b/assets/sublime-angular-snippets/angular.controller.sublime-snippet
@@ -23,5 +23,5 @@
 })();
 ]]></content>
     <tabTrigger>ngcontroller</tabTrigger>
-    <scope>source.js</scope>
+    <scope>text.plain, source.js</scope>
 </snippet>
diff --git a/assets/sublime-angular-snippets/angular.directive.sublime-snippet b/assets/sublime-angular-snippets/angular.directive.sublime-snippet
@@ -36,5 +36,5 @@
 })();
 ]]></content>
     <tabTrigger>ngdirective</tabTrigger>
-    <scope>source.js</scope>
+    <scope>text.plain, source.js</scope>
 </snippet>
diff --git a/assets/sublime-angular-snippets/angular.factory.sublime-snippet b/assets/sublime-angular-snippets/angular.factory.sublime-snippet
@@ -23,5 +23,5 @@
 })();
 ]]></content>
     <tabTrigger>ngfactory</tabTrigger>
-    <scope>source.js</scope>
+    <scope>text.plain, source.js</scope>
 </snippet>
diff --git a/assets/sublime-angular-snippets/angular.filter.sublime-snippet b/assets/sublime-angular-snippets/angular.filter.sublime-snippet
@@ -19,5 +19,5 @@
 })();
 ]]></content>
     <tabTrigger>ngfilter</tabTrigger>
-    <scope>source.js</scope>
+    <scope>text.plain, source.js</scope>
 </snippet>
diff --git a/assets/sublime-angular-snippets/angular.module.sublime-snippet b/assets/sublime-angular-snippets/angular.module.sublime-snippet
@@ -9,5 +9,5 @@
 })();
 ]]></content>
     <tabTrigger>ngmodule</tabTrigger>
-    <scope>source.js</scope>
+    <scope>text.plain, source.js</scope>
 </snippet>
diff --git a/assets/sublime-angular-snippets/angular.service.sublime-snippet b/assets/sublime-angular-snippets/angular.service.sublime-snippet
@@ -20,5 +20,5 @@
 })();
 ]]></content>
     <tabTrigger>ngservice</tabTrigger>
-    <scope>source.js</scope>
+    <scope>text.plain, source.js</scope>
 </snippet>
diff --git a/i18n/PT-BR.md b/i18n/PT-BR.md
@@ -317,7 +317,7 @@ ou *Controladores*
 
 ### controllerAs Controller Syntax
 
-  - Utilize a sintaxe `controllerAs` ao invés invés da sintaxe `clássica controller com $scope`. 
+  - Utilize a sintaxe `controllerAs` ao invés da sintaxe `clássica controller com $scope`. 
 
   - A sintaxe `controllerAs` usa o `this` dentro dos controllers que fica ligado ao `$scope`.
 
@@ -434,7 +434,7 @@ ou *Controladores*
 
     ![Controller Using "Above the Fold"](https://raw.githubusercontent.com/johnpapa/angularjs-styleguide/master/assets/above-the-fold-1.png)
 
-   Nota: Se a função possuir apenas 1 linha considere matê-la no topo, desde que a legibilidade não seja afetada.
+   Nota: Se a função possuir apenas 1 linha considere mantê-la no topo, desde que a legibilidade não seja afetada.
 
   ```javascript
   /* evite */
@@ -1683,7 +1683,7 @@ ou *Nomenclatura*
   * o nome do arquivo (`avengers.controllers.js`)
   * o nome de componente registrado pelo Angular (`AvengersController`)
 
-	*Por que?*: As convenções de nomenclatura ajudam a fornecer uma maneira consistente de encontrar algo à primeira vista. Consistência dentro do projeto e vital. Consistência dentro de um time é importante. Consistência em toda a empresa proporciona uma enorme eficiência.
+	*Por que?*: As convenções de nomenclatura ajudam a fornecer uma maneira consistente de encontrar algo à primeira vista. Consistência dentro do projeto é vital. Consistência dentro de um time é importante. Consistência em toda a empresa proporciona uma enorme eficiência.
 
     *Por que?*: As convenções de nomenclatura deveriam simplesmente te ajudar a encontrar trechos do seu código mais rápido e torná-lo mais fácil de se entender.
     
diff --git a/i18n/README.md b/i18n/README.md
@@ -15,7 +15,7 @@ The [original English version](http://jpapa.me/ngstyles) is the source of truth,
 9. [Spanish](es-ES.md)
 
 ## Contributing
-Language translations are welcomed and encouraged. The succcess of these translations depends on the community. I highly encourage new translation contributions and help to keep them up to date. 
+Language translations are welcomed and encouraged. The success of these translations depends on the community. I highly encourage new translation contributions and help to keep them up to date. 
 
 All translations must preserve the intention of the original document.
 
diff --git a/i18n/de-DE.md b/i18n/de-DE.md
diff --git a/i18n/fr-FR.md b/i18n/fr-FR.md
@@ -2093,7 +2093,7 @@ Alors que ce guide explique le *quoi*, le *pourquoi* et le *comment*, il m'a ét
 ### Layout
 ###### [Style [Y151](#style-y151)]
 
-  - Placez les composants qui définissent le layout principal de l'application dans un répertoire nommé `layout`. Il devrait inclure une vue noyau et le controlleur devrait agir comme conteneur pour l'appli, la nivigation, les menus, les zones de contenu, et les autres régions.
+  - Placez les composants qui définissent le layout principal de l'application dans un répertoire nommé `layout`. Il devrait inclure une vue noyau et le controlleur devrait agir comme conteneur pour l'appli, la navigation, les menus, les zones de contenu, et les autres régions.
 
     *Pourquoi ?* : Organise tout le layout à un seul endroit réutilisé dans l'application.
 
diff --git a/i18n/ru-RU.md b/i18n/ru-RU.md
@@ -789,7 +789,7 @@
 ### Определения Функций для Скрытия Деталей Реализации
 ###### [Style [Y053](#style-y053)]
 
-  - Используйте определения функций, чтобы скрыть детали реализации. Держите вызываемые члены фабрики в верхней части. Свяжите их с определениями функций, которые распололжены ниже в файле. Подробную информацию смотрите [здесь](http://www.johnpapa.net/angular-function-declarations-function-expressions-and-readable-code).
+  - Используйте определения функций, чтобы скрыть детали реализации. Держите вызываемые члены фабрики в верхней части. Свяжите их с определениями функций, которые расположены ниже в файле. Подробную информацию смотрите [здесь](http://www.johnpapa.net/angular-function-declarations-function-expressions-and-readable-code).
 
     *Почему?*: Размещение вызываемых членов в верхней части улучшает читабельность и помогает быстро определить, какие функции фабрики могут быть вызваны извне. 
 
@@ -1192,7 +1192,7 @@
 
     Замечание: Что касается внедренной зависимости, смотрите [Определение зависимостей вручную](#manual-annotating-for-dependency-injection).
 
-    Замечание: Заметьте, что контроллер директивы находится снаружи самой директивы. Такой подход исключает проблемы, когда инжектор создается в недосягаемом код после, например, 'return'.
+    Замечание: Заметьте, что контроллер директивы находится снаружи самой директивы. Такой подход исключает проблемы, когда инжектор создается в недосягаемом кодe после, например, 'return'.
 
   ```html
   <div my-example max="77"></div>
diff --git a/i18n/zh-CN.md b/i18n/zh-CN.md
@@ -293,7 +293,7 @@ Angular社区是一个热衷于分享经验的令人难以置信的社区，尽
 
   - 使用[`controllerAs`](http://www.johnpapa.net/do-you-like-your-angular-controllers-with-or-without-sugar/) 语法代替直接用经典的$scope定义的controller的方式。 
 
-	*为什么？*：congtroller被构建的时候，就会有一个新的实例，`controllerAs` 的语法比`经典的$scope语法`更接近JavaScript构造函数。
+	*为什么？*：controller被构建的时候，就会有一个新的实例，`controllerAs` 的语法比`经典的$scope语法`更接近JavaScript构造函数。
 
 	*为什么？*：这促进在View中对绑定到“有修饰”的对象的使用（例如用`customer.name` 代替`name`），这将更有语境、更容易阅读，也避免了任何没有“修饰”而产生的引用问题。
 
@@ -1247,8 +1247,8 @@ Angular社区是一个热衷于分享经验的令人难以置信的社区，尽
   ```html
   <!-- example.directive.html -->
   <div>hello world</div>
-  <div>max={{vm.max}}<input ng-model={vm.max"/></div>
-  <div>min={{vm.min}}<input ng-model={vm.min"/></div>
+  <div>max={{vm.max}}<input ng-model={{vm.max}}"/></div>
+  <div>min={{vm.min}}<input ng-model={{vm.min}}"/></div>
   ```
 
     注意：当你把controller注入到link的函数或可访问的directive的attributes时，你可以把它命名为控制器的属性。
