Merge changes I1e913e08,I898bcf6e

* changes: Update jquery.i18n from upstream Load the fallback locales
2012-10-13 11:12:48 +00:00
parent 3ca9bbd8c3 f667c41d51
commit 702d45286e
2 changed files with 8 additions and 3 deletions
--- a/lib/jquery.i18n.js
+++ b/lib/jquery.i18n.js
@@ -1647,7 +1647,7 @@
 		 * @return {String}
 		 */
 		convertGrammar: function ( word, form ) {
-			return word + form;
+			return word;
 		},

 		/**