Merge branch 'master' into rename-repo-url

angular-gettext/angular-gettext-tests.ts

@@ -1,7 +1,7 @@
 /// <reference path="angular-gettext.d.ts" />
 
-module angular_gettext_tests {
-  
+namespace angular_gettext_tests {
+
 
   // Configuring angular-gettext
   // https://angular-gettext.rocketeer.be/dev-guide/configure/
@@ -15,12 +15,12 @@ module angular_gettext_tests {
     gettextCatalog.debug = true;
   });
 
-  
-  // Marking strings in JavaScript code as translatable. 
-  // https://angular-gettext.rocketeer.be/dev-guide/annotate-js/  
+
+  // Marking strings in JavaScript code as translatable.
+  // https://angular-gettext.rocketeer.be/dev-guide/annotate-js/
   angular.module("myApp").controller("helloController", function (gettext: angular.gettext.gettextFunction) {
     var myString = gettext("Hello");
-  });  
+  });
 
   //Translating directly in JavaScript.
   angular.module("myApp").controller("helloController", function (gettextCatalog: angular.gettext.gettextCatalog) {
@@ -58,4 +58,4 @@ module angular_gettext_tests {
       gettextCatalog.loadRemote("/languages/" + lang + ".json");
     };
   });
-}
+}

angular-gettext/angular-gettext.d.ts

@@ -5,7 +5,7 @@
 
 /// <reference path="../angularjs/angular.d.ts" />
 
-declare module angular.gettext {
+declare namespace angular.gettext {
   interface gettextCatalog {
 
     //////////////
@@ -24,7 +24,7 @@ declare module angular.gettext {
     translatedMarkerSuffix: string;
     /** An object of loaded translation strings.Shouldn't be used directly. */
     strings: {};
-    /** The default language, in which you're application is written. This defaults to English and it's generally a bad idea to use anything else: if your language has different pluralization rules you'll end up with incorrect translations. Deprecated 
+    /** The default language, in which you're application is written. This defaults to English and it's generally a bad idea to use anything else: if your language has different pluralization rules you'll end up with incorrect translations. Deprecated
      * @deprecreated
      */
     baseLanguage: string;
@@ -51,7 +51,7 @@ declare module angular.gettext {
     /** Get the correct pluralized (but untranslated) string for the value of n. */
     getStringForm(string: string, n: number): string;
 
-    /** Translate a string with the given context. Uses Angular.JS interpolation, so something like this will do what you expect: 
+    /** Translate a string with the given context. Uses Angular.JS interpolation, so something like this will do what you expect:
      * var hello = gettextCatalog.getString("Hello {{name}}!", { name: "Ruben" });
      * // var hello will be "Hallo Ruben!" in Dutch.
      * The context parameter is optional: pass null (or don't pass anything) if you're not using it: this skips interpolation and is a lot faster.