Merge branch '5' of https://github.com/siebrand/jquery.ime into siebr…

…and-5
satwiki · Aug 14, 2013 · fbc457d · fbc457d
2 parents 8257b40 + 7a48378
commit fbc457d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/rules/no/no-normforms.js → rules/nb/nb-normforms.js b/rules/no/no-normforms.js → rules/nb/nb-normforms.js
@@ -2,8 +2,8 @@
 	'use strict';
 
 	var defs = {
-		id: 'no-normforms',
-		name: 'Norsk',
+		id: 'nb-normforms',
+		name: 'Norsk normal transliterasjon',
 		description: 'Norwegian input method with most common form transliterated',
 		date: '2012-12-04',
 		URL: 'http://www.evertype.com/alphabets/bokmaal-norwegian.pdf',

diff --git a/rules/no/no-tildeforms.js → rules/nb/nb-tildeforms.js b/rules/no/no-tildeforms.js → rules/nb/nb-tildeforms.js
@@ -2,8 +2,8 @@
 	'use strict';
 
 	var defs = {
-		id: 'no-tildeforms',
-		name: 'Norsk',
+		id: 'nb-tildeforms',
+		name: 'Norsk tildemerket transliterasjon',
 		description: 'Norwegian input method with initial tilde triggering transliteration',
 		date: '2012-12-04',
 		URL: 'http://www.evertype.com/alphabets/bokmaal-norwegian.pdf',

diff --git a/src/jquery.ime.inputmethods.js b/src/jquery.ime.inputmethods.js
@@ -364,13 +364,17 @@
 			name: 'Traditional',
 			source: 'rules/ne/ne-trad.js'
 		},
-		'no-normforms': {
+		'nb-normforms': {
 			name: 'Normal transliterasjon',
-			source: 'rules/no/no-normforms.js'
+			source: 'rules/nb/nb-normforms.js'
 		},
-		'no-tildeforms': {
+		'nb-tildeforms': {
 			name: 'Tildemerket transliterasjon',
-			source: 'rules/no/no-tildeforms.js'
+			source: 'rules/nb/nb-tildeforms.js'
+		},
+		'nn-tildeforms': {
+			name: 'Tildemerkt transliterasjon',
+			source: 'rules/nb/nb-tildeforms.js'
 		},
 		'or-transliteration': {
 			name: 'ଟ୍ରାନ୍ସଲିଟରେସନ',
@@ -723,17 +727,13 @@
 			autonym: 'नेपाल भाषा',
 			inputmethods: [ 'hi-transliteration', 'hi-inscript' ]
 		},
-		'no': {
-			autonym: 'Norsk',
-			inputmethods: [ 'no-normforms', 'no-tildeforms' ]
-		},
 		'nb': {
 			autonym: 'Norsk (bokmål)',
-			inputmethods: [ 'no-normforms', 'no-tildeforms' ]
+			inputmethods: [ 'nb-normforms', 'nb-tildeforms' ]
 		},
 		'nn': {
 			autonym: 'Norsk (nynorsk)',
-			inputmethods: [ 'no-normforms', 'no-tildeforms' ]
+			inputmethods: [ 'nb-normforms', 'nn-tildeforms' ]
 		},
 		'or': {
 			autonym: 'ଓଡ଼ିଆ',