Merge pull request #3584 from TomMalbran/tom/fix-issue-3583

jasonsanjose · jasonsanjose · commit 1459a7a9dc36 · 2013-04-29T16:46:54.000-07:00
Fix #3583: There is a grammar error with the string "1 lines"
diff --git a/src/editor/EditorStatusBar.js b/src/editor/EditorStatusBar.js
@@ -54,7 +54,8 @@ define(function (require, exports, module) {
     }
     
     function _updateFileInfo(editor) {
-        $fileInfo.text(StringUtils.format(Strings.STATUSBAR_LINE_COUNT, editor.lineCount()));
+        var lines = editor.lineCount();
+        $fileInfo.text(StringUtils.format(lines > 1 ? Strings.STATUSBAR_LINE_COUNT_PLURAL : Strings.STATUSBAR_LINE_COUNT_SINGULAR, lines));
     }
     
     function _updateIndentType() {
diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js
@@ -157,7 +157,8 @@ define({
     "STATUSBAR_INDENT_SIZE_TOOLTIP_TABS"    : "Click to change tab character width",
     "STATUSBAR_SPACES"                      : "Spaces",
     "STATUSBAR_TAB_SIZE"                    : "Tab Size",
-    "STATUSBAR_LINE_COUNT"                  : "{0} Lines",
+    "STATUSBAR_LINE_COUNT_SINGULAR"         : "{0} Line",
+    "STATUSBAR_LINE_COUNT_PLURAL"           : "{0} Lines",
 
     /**
      * Command Name Constants

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,8 @@ define(function (require, exports, module) {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`function _updateFileInfo(editor) {`
`57`		`- $fileInfo.text(StringUtils.format(Strings.STATUSBAR_LINE_COUNT, editor.lineCount()));`
	`57`	`+ var lines = editor.lineCount();`
	`58`	`+ $fileInfo.text(StringUtils.format(lines > 1 ? Strings.STATUSBAR_LINE_COUNT_PLURAL : Strings.STATUSBAR_LINE_COUNT_SINGULAR, lines));`
`58`	`59`	`}`
`59`	`60`
`60`	`61`	`function _updateIndentType() {`