Bug 1183503 - Rename model and dictionary files for recognition in preparation for localization. r=smaug

dom/media/webspeech/recognition/Makefile.in

@@ -1,15 +1,15 @@
 ifdef MOZ_WEBSPEECH_MODELS
 MODELSPS_KEEP_PATH := 1
 
-MODELSPS_FILES := models/dict/cmu07a.dic \
-		models/en-us-semi/mixture_weights \
-		models/en-us-semi/feat.params \
-		models/en-us-semi/mdef \
-		models/en-us-semi/means \
-		models/en-us-semi/noisedict \
-		models/en-us-semi/sendump \
-		models/en-us-semi/transition_matrices \
-		models/en-us-semi/variances
+MODELSPS_FILES := models/dict/en-US.dic \
+		models/en-US/mixture_weights \
+		models/en-US/feat.params \
+		models/en-US/mdef \
+		models/en-US/means \
+		models/en-US/noisedict \
+		models/en-US/sendump \
+		models/en-US/transition_matrices \
+		models/en-US/variances
 
 MODELSPS_DEST := $(DIST)/bin
 INSTALL_TARGETS += MODELSPS

dom/media/webspeech/recognition/PocketSphinxSpeechRecognitionService.cpp

@@ -139,7 +139,7 @@ PocketSphinxSpeechRecognitionService::PocketSphinxSpeechRecognitionService()
   tmpFile->AppendRelativePath(NS_LITERAL_STRING(".."));
 #endif
   tmpFile->AppendRelativePath(NS_LITERAL_STRING("models"));
-  tmpFile->AppendRelativePath(NS_LITERAL_STRING("en-us-semi"));
+  tmpFile->AppendRelativePath(NS_LITERAL_STRING("en-US"));
   tmpFile->GetPath(aStringAMPath);
 
   NS_GetSpecialDirectory(NS_GRE_DIR, getter_AddRefs(tmpFile));
@@ -149,7 +149,7 @@ PocketSphinxSpeechRecognitionService::PocketSphinxSpeechRecognitionService()
 #endif
   tmpFile->AppendRelativePath(NS_LITERAL_STRING("models"));     //
   tmpFile->AppendRelativePath(NS_LITERAL_STRING("dict"));       //
-  tmpFile->AppendRelativePath(NS_LITERAL_STRING("cmu07a.dic")); //
+  tmpFile->AppendRelativePath(NS_LITERAL_STRING("en-US.dic")); //
   tmpFile->GetPath(aStringDictPath);
 
   // FOR B2G PATHS HARDCODED (APPEND /DATA ON THE BEGINING, FOR DESKTOP, ONLY