Changeset 2397
- Timestamp:
- 01/11/08 13:06:41 (9 months ago)
- Files:
-
- Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder/CapturePlayback.java (modified) (6 diffs)
- Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder/LabelLocalizer.java (modified) (5 diffs)
- Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder/License.java (modified) (1 diff)
- Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder/Prompts.java (modified) (1 diff)
- Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder/englishPromptList.txt (modified) (4 diffs)
- Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder/germanPromptList.txt (added)
- Trunk/SpeechSubmission/VFSpeechSubmission/server/javaUploadServer.php (modified) (1 diff)
- Trunk/SpeechSubmission/VFSpeechSubmission/server/submit_audio.php (deleted)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder/CapturePlayback.java
r2387 r2397 277 277 String sampleGraphLengthLabel; 278 278 String sampleGraphPositionLabel; 279 String uploadingMessageLabel; 280 String uploadCompletedMessageLabel; 279 281 // ############ Localized Fields #################################### 280 282 URL endPageURL; … … 291 293 // ############ Localized Fields #################################### 292 294 this.language = language; 295 // for testing this.language = "DE"; 293 296 // debug System.err.println("CapturePlayback Language:" + this.language + ":"); 294 297 … … 336 339 sampleGraphLengthLabel = labels.getSampleGraphLengthLabel(); 337 340 sampleGraphPositionLabel = labels.getSampleGraphPositionLabel(); 341 342 uploadingMessageLabel = labels.getUploadingMessageLabel(); 343 uploadCompletedMessageLabel = labels.getUploadCompletedMessageLabel(); 338 344 // ############ Localized Fields #################################### 339 345 if (prompt1 == null || prompt1.length() == 0) { … … 1843 1849 progBar.setStringPainted(true); 1844 1850 progBar.setMaximum(100); 1845 progBar.setString("Uploading..."); 1851 // !!!!!! 1852 //progBar.setString("Uploading..."); 1853 progBar.setString(uploadingMessageLabel); 1854 // !!!!!! 1846 1855 progBar.setIndeterminate(false); 1847 1856 progBar.setMinimum(0); … … 1970 1979 1971 1980 if (userName != null){ 1972 if (language != "EN") { 1981 if (language.equals("EN")) { 1982 archiveFile = new File(tempdir + userName + "-" + date + "-" + randomID + ".zip"); 1983 } else { 1973 1984 archiveFile = new File(tempdir + language + "-" + userName + "-" + date + "-" + randomID + ".zip"); 1974 } else {1975 archiveFile = new File(tempdir + userName + "-" + date + "-" + randomID + ".zip");1976 1985 } 1977 1986 } else { … … 2260 2269 //DEL progCompletion.setText(pLabels.getLabel(2)); 2261 2270 if (endPageURL != null){ 2262 progBar.setString("Upload completed... Thank you for your submission!"); 2271 // !!!!!! 2272 //progBar.setString("Upload completed... Thank you for your submission!"); 2273 progBar.setString(uploadCompletedMessageLabel); 2274 // !!!!!!! 2263 2275 progBar.setIndeterminate(false); 2264 2276 System.err.println("Finished! Sending you on to "+endPageURL); Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder/LabelLocalizer.java
r2366 r2397 40 40 private String sampleGraphLengthLabel; 41 41 private String sampleGraphPositionLabel; 42 43 private String uploadingMessageLabel; 44 private String uploadCompletedMessageLabel; 42 45 43 46 public LabelLocalizer (String language) { … … 48 51 } else if (language.equals("NL")) { 49 52 Dutch(); 53 } else if (language.equals("DE")) { 54 German(); 50 55 } else { 51 56 English(); … … 123 128 sampleGraphLengthLabel = " Length: "; 124 129 sampleGraphPositionLabel =" Position: "; 130 131 uploadingMessageLabel = "Uploading..."; 132 uploadCompletedMessageLabel = "Upload completed... Thank you for your submission!"; 125 133 } 126 134 135 private void German() { 136 usernamePanelLabel = "Benutzername:"; 137 usernamePanelText = "(für anonymen Beitrag leer lassen)"; 138 139 copyrightName = "Free Software Foundation"; 140 gplAccepted = "Ja"; 141 142 pleaseSelect = "Bitte wählen"; 143 notApplicable = "unbekannt"; 144 145 genderPanelLabel = "Geschlecht:"; 146 genderSelection = new String [3]; 147 genderSelection[0] = pleaseSelect; 148 genderSelection[1] = "Männlich"; 149 genderSelection[2] = "Weiblich"; 150 151 ageRangePanelLabel = "Altersgruppe:"; 152 ageSelection = new String [4]; 153 ageSelection[0] = pleaseSelect; 154 ageSelection[1] = "Jugendlicher"; 155 ageSelection[2] = "Erwachsener"; 156 ageSelection[3] = "Senior"; 157 158 dialectPanelLabel = "Dialekt der Aussprache:"; 159 dialectSelection = new String [7]; 160 dialectSelection[0] = pleaseSelect; 161 dialectSelection[1] = "Hochdeutsch"; // official "high" German 162 dialectSelection[2] = "Süddeutsch"; // Southern Germany, e.g. rolled "r" 163 dialectSelection[3] = "Norddeutsch"; // Northern Germany 164 dialectSelection[4] = "Österreich"; // Austria 165 dialectSelection[5] = "Schweiz"; // Switzerland 166 dialectSelection[6] = "Anderer Dialekt"; 167 168 microphonePanelLabel = "Mikrofon-Typ:"; 169 microphoneSelection = new String [9]; 170 microphoneSelection[0] = pleaseSelect; 171 microphoneSelection[1] = "Headset-Mikro (am Kopfhörer)"; 172 microphoneSelection[2] = "Headset-Mikro (USB)"; 173 microphoneSelection[3] = "Tisch-Mikro"; 174 microphoneSelection[4] = "Tisch-Mikro (USB)"; 175 microphoneSelection[5] = "Eingebautes Laptop-Mikro"; 176 microphoneSelection[6] = "Webcam-Mikro"; 177 microphoneSelection[7] = "Studio-Mikro"; 178 microphoneSelection[8] = "Anderes Mikro"; 179 180 uploadText = "<html>Durch Ihren Klick auf\"Hochladen\" erklären Sie, dass Sie das Copyright Ihrer Sprachaufnahme<br> " 181 + "auf die Free Software Foundation übertragen und Ihren Beitrag unter der GNU Public Licence (\"GPL\") lizensieren:" ; 182 uploadButtonLabel = "Hochladen"; 183 184 moreInfoText = "Weitere Informationen zu Copyright und GPL:"; 185 moreInfoButtonLabel = "Weitere Informationen"; 186 187 disclaimerText = 188 "<html>VoxForge SpeechSubmission Applet - Copyright (C) 2007 VoxForge<br>" 189 +"Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, daß es Ihnen<br> " 190 +"von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite<br> " 191 +"Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK.<br> " 192 +"Details können Sie mit einem Klick auf \"Lizenz\" erhalten."; 193 aboutButtonLabel = "Lizenz"; 194 195 recordButton = "Aufnahme"; 196 stopButton = "Stop"; 197 playButton = "Wiedergabe"; 198 199 peakWarningLabel = "Achtung: Eingabe könnte zu laut sein"; 200 sampleGraphFileLabel = "Datei: "; 201 sampleGraphLengthLabel = " Länge: "; 202 sampleGraphPositionLabel =" Position: "; 203 204 uploadingMessageLabel = "Uploading..."; 205 uploadCompletedMessageLabel = "Upload completed... Thank you for your submission!"; 206 } 207 127 208 private void Dutch() { 128 209 usernamePanelLabel = "Gebruikersnaam:"; … … 200 281 sampleGraphLengthLabel = " Lengte: "; 201 282 sampleGraphPositionLabel =" Positie: "; 283 284 uploadingMessageLabel = "Uploading..."; 285 uploadCompletedMessageLabel = "Upload completed... Thank you for your submission!"; 202 286 } 203 287 … … 309 393 return sampleGraphPositionLabel; 310 394 } 395 396 public String getUploadingMessageLabel() { 397 return uploadingMessageLabel; 398 } 399 public String getUploadCompletedMessageLabel() { 400 return uploadCompletedMessageLabel; 401 } 402 403 311 404 } Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder/License.java
r2375 r2397 48 48 49 49 VFlicenseNotice = 50 "VoxForge Speech Submission Application v0.1. 2" + System.getProperty("line.separator")50 "VoxForge Speech Submission Application v0.1.3" + System.getProperty("line.separator") 51 51 + "============================" + System.getProperty("line.separator") 52 52 + "Allows a user to record their speech and upload it to the VoxForge server" + System.getProperty("line.separator") Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder/Prompts.java
r2381 r2397 72 72 } else if (Language.equals("NL")) { 73 73 promptList = getPromptTextFile("nl","dutchPromptList.txt", 200); 74 } else if (Language.equals("DE")) { 75 promptList = getPromptTextFile("germanPromptList.txt", 350); 74 76 } else { 75 77 System.err.println("getPromptTextFile error accessing prompt file for "+ Language + "using default English prompts"); Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder/englishPromptList.txt
r2380 r2397 32 32 ar-01 Once there was a young rat named Arthur who never could make up his mind. 33 33 ar-02 Whenever his friends asked him if he would like to go out with them, 34 ar-03 he would only answer, \"I don't know;\" he wouldn't say yes or no either.34 ar-03 he would only answer, "I don't know;" he wouldn't say yes or no either. 35 35 ar-04 He would always shirk making a choice. His Aunt Helen said to him, 36 ar-05 \"Now look here! No one is going to care for you if you carry on like this.\"36 ar-05 "Now look here! No one is going to care for you if you carry on like this." 37 37 ar-06 You have no more mind than a blade of grass. 38 38 ar-07 One rainy day the rats heard a great noise in the loft. … … 40 40 ar-09 At last the joists gave way and fell to the ground. 41 41 ar-10 The walls shook, and all the rats' hair stood on end with fear and horror. 42 ar-11 \"This won't do,\" said the captain; \"I'll send out scouts to search for a new home.\"42 ar-11 "This won't do," said the captain; "I'll send out scouts to search for a new home." 43 43 ar-12 Within five hours the ten scouts came back and said, 44 44 ar-13 We found a stone house where there is room for us all. … … 46 46 ar-15 The rats crawled out of their little houses and stood on the floor in a long line. 47 47 ar-16 Just then the old rat saw Arthur. Stop. he ordered coarsely. 48 ar-17 \"You are coming, of course.\" \"I'm not certain,\" said Arthur, undaunted,49 ar-18 \"The roof may not come down yet.\"50 ar-19 \"Well,\" said the old rat, \"we can't wait for you to join us. Right about face! March!\"48 ar-17 "You are coming, of course." "I'm not certain," said Arthur, undaunted, 49 ar-18 "The roof may not come down yet." 50 ar-19 "Well," said the old rat, "we can't wait for you to join us. Right about face! March!" 51 51 ar-20 Arthur stood and watched them hurry away. 52 ar-21 \"I think I'll go tomorrow,\" he said calmly to himself, \"but then again I don't know;\"53 ar-22 \"it's so nice and snug here,\". That night there was a big crash.52 ar-21 "I think I'll go tomorrow," he said calmly to himself, "but then again I don't know;" 53 ar-22 "it's so nice and snug here,". That night there was a big crash. 54 54 ar-23 In the foggy morning some men with some boys and girls rode up and looked at the barn. 55 55 ar-24 One of them moved a board and saw a rat quite dead, half in and half out of his hole. … … 61 61 rb-06 recognition for inputting text. This has a couple of drawbacks. 62 62 rb-07 The keyboard, whether it's an on-screen version or not, strongly reduces 63 rb-08 the amount of available \"screen real-estate\".63 rb-08 the amount of available "screen real-estate". 64 64 rb-09 On top of that thumbing or thumb typing puts a lot of strain on the thumb, 65 rb-10 which is not as dexterous as the fingers are. A good solution would be to use speech recognition, 66 rb-11 especially since most of these devices often already have a built-in microphone. 67 rb-12 Many phones already offer the possibility of so-called voice dialing. 68 rb-13 A major stumbling block is the still limited computing power of these phones. 69 rb-14 One way to deal with this is to use only a limited number of available commands. 70 rb-15 That way the software only needs to compare the voice input with a small number of possible options. 71 rb-16 Modern computers have far more computing power than hand-held devices. 72 rb-17 That means that when a programmer wants to write speech recognition software, 73 rb-18 it is necessary to keep in mind on which hardware the software will run. 74 rb-19 A full-blown computer offers a programmer the freedom to develop software 75 rb-20 that allows the end user to issue a wider array of commands. 76 rb-21 In practice this will allow end users to issue commands 77 rb-22 such as \"go to previous paragraph\ \"go up one paragraph\ or even \"I want to edit the previous paragraph\". 78 rb-23 Where all these commands might lead to the same result on that powerful PC, 79 rb-24 the software on a hand-held device might only respond to one specific command. 80 rb-25 The same would be the case for other tasks such as browsing the Web, 81 rb-26 searching for documents in the file browser, and starting or closing programs. 82 rb-27 Therefore, behind your PC, \"go online\ \"start my Web browser\ or \"visit my home page\ 83 rb-28 might all be valid commands, whereas on your mobile phone you would have to stick to \"run browser\". 84 rb-29 Obviously, when running a file browser the same logic would apply. 85 rb-30 When working on a powerful PC or laptop 86 rb-31 commands like \"go to the folder with my University documents and open my thesis\ might soon be quite common. 87 rb-32 It is however likely that on mobile devices we will have to use more rudimentary commands 88 rb-33 like \"go up one folder\ \"open the folder University\ or \"open document thesis\". 65 rb-10 which is not as dexterous as the fingers are. 66 rb-11 A good solution would be to use speech recognition, 67 rb-12 especially since most of these devices often already have a built-in microphone. 68 rb-13 Many phones already offer the possibility of so-called voice dialing. 69 rb-14 A major stumbling block is the still limited computing power of these phones. 70 rb-15 One way to deal with this is to use only a limited number of available commands. 71 rb-16 That way the software only needs to compare 72 rb-17 the voice input with a small number of possible options. 73 rb-18 Modern computers have far more computing power than hand-held devices. 74 rb-19 That means that when a programmer wants to write speech recognition software, 75 rb-20 it is necessary to keep in mind on which hardware the software will run. 76 rb-21 A full-blown computer offers a programmer the freedom to develop software 77 rb-22 that allows the end user to issue a wider array of commands. 78 rb-23 In practice this will allow end users to issue commands such as "go to previous paragraph" 79 rb-24 "go up one paragraph" or even "I want to edit the previous paragraph". 80 rb-25 Where all these commands might lead to the same result on that powerful PC, 81 rb-26 the software on a hand-held device might only respond to one specific command. 82 rb-27 The same would be the case for other tasks such as browsing the Web, 83 rb-28 searching for documents in the file browser, and starting or closing programs. 84 rb-29 Therefore, behind your PC, "go online" "start my Web browser" or "visit my home page" 85 rb-30 might all be valid commands, 86 rb-31 whereas on your mobile phone you would have to stick to "run browser". 87 rb-32 Obviously, when running a file browser the same logic would apply. 88 rb-33 When working on a powerful PC or laptop 89 rb-34 commands like "go to the folder with my University documents 90 rb-35 and open my thesis might soon be quite common. 91 rb-36 It is however likely that on mobile devices we will have to use more rudimentary commands 92 rb-37 like "go up one folder" "open the folder University" or "open document thesis". 89 93 a0001 Author of the danger trail, Philip Steels, etc. 90 94 a0002 Not at this particular case, Tom, apologized Whittemore. Trunk/SpeechSubmission/VFSpeechSubmission/server/javaUploadServer.php
r2382 r2397 51 51 } 52 52 // !!!!!! 53 // limits the length of the filename to 25char53 // limits the length of the filename to 40 char 54 54 // removes non-alphanumeric characters from file name 55 55 // listfiles needs to remove random number