}
}
diff --git a/source/bilingual_guides/components/defining-a-component.md b/source/bilingual_guides/components/defining-a-component.md
index d07e8e3..1f32e9b 100644
--- a/source/bilingual_guides/components/defining-a-component.md
+++ b/source/bilingual_guides/components/defining-a-component.md
@@ -3,11 +3,19 @@
中英对照:[http://emberjs.cn/bilingual_guides/components/defining-a-component/](http://emberjs.cn/bilingual_guides/components/defining-a-component/)
To define a component, create a template whose name starts with
-`components/`. To define a new component `{{blog-post}}`, for example,
+`components/`. To define a new component, `{{blog-post}}` for example,
create a `components/blog-post` template.
为了定义一个组件,需要先创建一个名字以`components/`开始的模板。例如:如果需要定义一个新组建`{{blog-post}}`,需要创建`components/blog-post`模板。
+
+
If you are including your Handlebars templates inside an HTML file via
`
-Each component, under the hood, is backed by an element. By default,
+Each component, under the hood, is backed by an element. By default
Ember will use a `
` element to contain your component's template.
To learn how to change the element Ember uses for your component, see
[Customizing a Component's Element](/guides/components/customizing-a-components-element).
@@ -59,7 +67,7 @@ created.
通常情况下,组件只封装一些会被不停的重复使用的Handlebars模板片段。在这些情况下,不需要编写任何Javascript代码,只需要像之前所述,定义好Handlebars模板,就能使用组件了。
-If you need to customize the behavior of the component, however, you'll
+If you need to customize the behavior of the component you'll
need to define a subclass of `Ember.Component`. For example, you would
need a custom subclass if you wanted to change a component's element,
respond to actions from the component's template, or manually make
diff --git a/source/bilingual_guides/components/passing-properties-to-a-component.md b/source/bilingual_guides/components/passing-properties-to-a-component.md
index baac804..70a452b 100644
--- a/source/bilingual_guides/components/passing-properties-to-a-component.md
+++ b/source/bilingual_guides/components/passing-properties-to-a-component.md
@@ -2,7 +2,7 @@
中英对照:[http://emberjs.cn/bilingual_guides/components/passing-properties-to-a-component/](http://emberjs.cn/bilingual_guides/components/passing-properties-to-a-component/)
-By default, a component does not have access to properties in the
+By default a component does not have access to properties in the
template scope in which it is used.
默认情况下,组件不能访问模板作用域下的属性。
diff --git a/source/bilingual_guides/concepts/naming-conventions.md b/source/bilingual_guides/concepts/naming-conventions.md
index 1b6fb9b..ec09a9b 100644
--- a/source/bilingual_guides/concepts/naming-conventions.md
+++ b/source/bilingual_guides/concepts/naming-conventions.md
@@ -133,7 +133,7 @@ Here's an example:
App.FavoritesRoute = Ember.Route.extend({
model: function() {
// the model is an Array of all of the posts
- return App.Post.find();
+ return this.get('store').find('post');
}
});
```
@@ -211,7 +211,7 @@ generating a link for a model object).
```javascript
App.PostRoute = Ember.Route.extend({
model: function(params) {
- return App.Post.find(params.post_id);
+ return this.get('store').find('post', params.post_id);
},
serialize: function(post) {
diff --git a/source/bilingual_guides/getting-started/accepting-edits.md b/source/bilingual_guides/getting-started/accepting-edits.md
index f527c85..ccff257 100644
--- a/source/bilingual_guides/getting-started/accepting-edits.md
+++ b/source/bilingual_guides/getting-started/accepting-edits.md
@@ -8,7 +8,7 @@ In the previous step we updated TodoMVC to allow a user to toggle the display of
在上一步中我们修改了TodoMVC使其可以支持用户能够切换到一个文本输入框``来编辑一个待办事项的标题。接下来,我们将实现在``显示时立即当前焦点移至其上,开始接收用户的输入,并在用户按下``键时或把焦点从编辑的``元素中移出时,将用户的修改持久化,并显示待办事项修改后的标题。
-To accomplish this, we'll create a new custom component and register it with Handelbars to make it available to our templates.
+To accomplish this, we'll create a new custom component and register it with Handlebars to make it available to our templates.
为了实现这一步,可以创建一个自定义的组件并且通过Handlebars来注册它,使得其在模板中可用。
@@ -59,7 +59,7 @@ In `index.html` replace the static `` element with our custom `{{edit-tod
```
-Pressing the `` key will trigger the `acceptChanges` event on the instance of `TodoController`. Moving focus away from from the `` will trigger the `focus-out` event, calling a method `acceptChanges` on this view's instance of `TodoController`.
+Pressing the `` key will trigger the `acceptChanges` event on the instance of `TodoController`. Moving focus away from the `` will trigger the `focus-out` event, calling a method `acceptChanges` on this view's instance of `TodoController`.
点击``键会触发`TodoController`实例的`acceptChanges`事件。焦点离开``时会出发`focus-out`事件,并调用视图的`TodoController`实例的`acceptChanges`方法。
diff --git a/source/bilingual_guides/getting-started/creating-a-new-model.md b/source/bilingual_guides/getting-started/creating-a-new-model.md
index fccde52..ebb8530 100644
--- a/source/bilingual_guides/getting-started/creating-a-new-model.md
+++ b/source/bilingual_guides/getting-started/creating-a-new-model.md
@@ -73,7 +73,6 @@ In `index.html` include `js/controllers/todos_controller.js` as a dependency:
```html
-