Refactor Azb → Cyr

README.md

@@ -24,12 +24,12 @@ npm install translit-rue
 ## Documentation
 Transliterate text from Cyrillic script to Latin alphabet:
 ```javascript
-translitAzbLat(string)
+translitCyrLat(string)
 ```
 
 Transliterate text from Latin alphabet to Cyrillic script:
 ```javascript
-translitLatAzb(string)
+translitLatCyr(string)
 ```
 
 
@@ -38,4 +38,4 @@ Licensed under MIT license. (See [LICENCE.TXT](//github.com/surfinzap/translit/b
 
 
 ## Special thanks
-* [@vit-svoboda](https://github.com/vit-svoboda) for help with gulp pipeline (2.0.0)
+* [@vit-svoboda](https://github.com/vit-svoboda) for a help with gulp pipeline (2.0.0)

src/browser_translit.js

@@ -1,5 +1,5 @@
-import { translitLatAzb,
- 				 translitAzbLat} from './translit';
+import { translitLatCyr,
+ 				 translitCyrLat} from './translit';
 
-window.translitAzbLat = translitAzbLat;
-window.translitLatAzb = translitLatAzb;
+window.translitCyrLat = translitCyrLat;
+window.translitLatCyr = translitLatCyr;

src/translit.js

@@ -251,41 +251,41 @@ function streamlineApostrophes(string) {
 	return string.replace(/\'|’|ʼ|‘/g , '’');
 }
 
-function mapAzbLat(string, mappingOption) {
+function mapCyrLat(string, mappingOption) {
 	for (var rule in mapping[mappingOption]){
 		var re = new RegExp(mapping[mappingOption][rule],"g");
 		string =  string.replace(re, rule);
 	}
 	return string;
 }
 
-export function translitAzbLat(string) {
-	string = mapAzbLat(string, "exceptions");
-	string = mapAzbLat(string, "priority-set-1");
-	string = mapAzbLat(string, "priority-set-2");
-	string = mapAzbLat(string, "priority-set-3");
-	string = mapAzbLat(string, "carons");
-	string = mapAzbLat(string, "basic");
-	string = mapAzbLat(string, "chars");
+export function translitCyrLat(string) {
+	string = mapCyrLat(string, "exceptions");
+	string = mapCyrLat(string, "priority-set-1");
+	string = mapCyrLat(string, "priority-set-2");
+	string = mapCyrLat(string, "priority-set-3");
+	string = mapCyrLat(string, "carons");
+	string = mapCyrLat(string, "basic");
+	string = mapCyrLat(string, "chars");
 	return string;
 }
 
-function mapLatAzb(string, mappingOption) {
+function mapLatCyr(string, mappingOption) {
 	for (var rule in mapping[mappingOption]){
 		var re = new RegExp(rule,"g");
 		string =  string.replace(re, mapping[mappingOption][rule]);
 	}
 	return string;
 }
 
-export function translitLatAzb(string) {
+export function translitLatCyr(string) {
 	string = streamlineApostrophes(string);
-	string = mapLatAzb(string, 'exceptions');
-	string = mapLatAzb(string, 'priority-set-1');
-	string = mapLatAzb(string, 'priority-set-2');
-	string = mapLatAzb(string, 'priority-set-3');
-	string = mapLatAzb(string, 'carons');
-	string = mapLatAzb(string, 'basic');
-	string = mapLatAzb(string, 'chars');
+	string = mapLatCyr(string, 'exceptions');
+	string = mapLatCyr(string, 'priority-set-1');
+	string = mapLatCyr(string, 'priority-set-2');
+	string = mapLatCyr(string, 'priority-set-3');
+	string = mapLatCyr(string, 'carons');
+	string = mapLatCyr(string, 'basic');
+	string = mapLatCyr(string, 'chars');
 	return string;
 }

test/test_translit.html

@@ -31,10 +31,10 @@
 
 	<script>
 		$("#action_lat_azb").click(function() {
-			$('#translit-textarea').val(translitLatAzb($('#translit-textarea').val()));
+			$('#translit-textarea').val(translitLatCyr($('#translit-textarea').val()));
 		});
 		$("#action_azb_lat").click(function() {
-			$('#translit-textarea').val(translitAzbLat($('#translit-textarea').val()));
+			$('#translit-textarea').val(translitCyrLat($('#translit-textarea').val()));
 		});
 	</script>
 

test/test_translit.js

@@ -84,18 +84,18 @@
 
 	// Test translations from latin to azbuka
 	for (var key in test_dict){
-		assert(translitLatAzb(key), (test_dict[key]),"Assertion error: " + key + "\ntransliterates to: " + translitLatAzb(key) + "\nshould trans’ to: " + test_dict[key]);
+		assert(translitLatCyr(key), (test_dict[key]),"Assertion error: " + key + "\ntransliterates to: " + translitLatCyr(key) + "\nshould trans’ to: " + test_dict[key]);
 	}
 
 	// Test translations from azbuka to latin
 	for (var key in test_dict){
-		assert(translitAzbLat(test_dict[key]), (key),"Assertion error: " + test_dict[key] + "\ntransliterates to: " + translitAzbLat(test_dict[key]) + "\nshould trans’ to: " + key);
+		assert(translitCyrLat(test_dict[key]), (key),"Assertion error: " + test_dict[key] + "\ntransliterates to: " + translitCyrLat(test_dict[key]) + "\nshould trans’ to: " + key);
 	}
 
 	// Test if script takes different apostrophes
 	assert(streamlineApostrophes("ja‘nk‘o"),"ja’nk’o","Assertion error: apostrophe is not streamlined");
 	for (var key in test_dict_apostrophe){
-		assert(translitLatAzb(key), (test_dict_apostrophe[key]),"Assertion error: " + key + "\ntransliterates to: " + translitLatAzb(key) + ",\nshould trans’ to: " + test_dict[key] + "+\n— this is an apostrophe error.");
+		assert(translitLatCyr(key), (test_dict_apostrophe[key]),"Assertion error: " + key + "\ntransliterates to: " + translitLatCyr(key) + ",\nshould trans’ to: " + test_dict[key] + "+\n— this is an apostrophe error.");
 	}
 
 })();