? asterisk/appdial.c
? asterisk/syncinfo.xml
? asterisk/test.pt
? asterisk/apps/app_dialconfirm.c
? asterisk/apps/bak.c
? asterisk/sounds/en/wav
? asterisk/sounds/en/digits/1
Index: asterisk/Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.127
diff -u -r1.127 Makefile
--- asterisk/Makefile	29 Dec 2004 23:52:42 -0000	1.127
+++ asterisk/Makefile	8 Jan 2005 18:05:07 -0000
@@ -336,41 +336,44 @@
 	$(MAKE) -C stdtime clean
 
 datafiles: all
-	sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig
-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
-	for x in sounds/digits/*.gsm; do \
-		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \
-		else \
-			echo "No description for $$x"; \
-			exit 1; \
-		fi; \
-	done
-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters
-	for x in sounds/letters/*.gsm; do \
-		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \
-		else \
-			echo "No description for $$x"; \
-			exit 1; \
-		fi; \
-	done
-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic
-	for x in sounds/phonetic/*.gsm; do \
-		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \
-		else \
-			echo "No description for $$x"; \
-			exit 1; \
-		fi; \
-	done
-	for x in sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-*; do \
-		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
-		else \
-			echo "No description for $$x"; \
-			exit 1; \
-		fi; \
+#	sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig
+	for y in sounds/*; do \
+		mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/$$y ; \
+		mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/$$y/digits ; \
+		for x in $$y/digits/*.gsm; do \
+			if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
+				install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/$$y/digits ; \
+			else \
+				echo "No description for $$x"; \
+				exit 1; \
+			fi; \
+		done ; \
+		mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/$$y/letters ; \
+		for x in $$y/letters/*.gsm; do \
+			if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
+				install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/$$y/letters ; \
+			else \
+				echo "No description for $$x"; \
+				exit 1; \
+			fi; \
+		done ; \
+		mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/$$y/phonetic  ; \
+		for x in $$y/phonetic/*.gsm; do \
+			if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
+				install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/$$y/phonetic ; \
+			else \
+				echo "No description for $$x"; \
+				exit 1; \
+			fi; \
+		done ; \
+		for x in $$y/vm-* $$y/transfer* $$y/pbx-* $$y/ss-* $$y/beep* $$y/dir-* $$y/conf-* $$y/agent-* $$y/invalid* $$y/tt-* $$y/auth-* $$y/privacy-* $$y/queue-*; do \
+			if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
+				install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/$$y ; \
+			else \
+				echo "No description for $$x"; \
+				exit 1; \
+			fi; \
+		done ; \
 	done
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/images
Index: asterisk/file.c
===================================================================
RCS file: /usr/cvsroot/asterisk/file.c,v
retrieving revision 1.54
diff -u -r1.54 file.c
--- asterisk/file.c	24 Dec 2004 01:40:07 -0000	1.54
+++ asterisk/file.c	8 Jan 2005 18:05:08 -0000
@@ -469,6 +469,22 @@
 		if (endpart) {
 			*endpart = '\0';
 			endpart++;
+			snprintf(filename2, sizeof(filename2), "%s/%s/%s", preflang, filename3, endpart);
+		} else
+			snprintf(filename2, sizeof(filename2), "%s/%s", preflang, filename);
+		fmts = ast_fileexists(filename2, NULL, NULL);
+	}
+	if (fmts < 1) {
+		snprintf(filename2, sizeof(filename2), "en/%s", filename);
+		fmts = ast_fileexists(filename2, NULL, NULL);
+	}
+	/* previous way to check sounds location (to keep backward compability */
+	if (fmts < 1 && preflang && !ast_strlen_zero(preflang)) {
+		strncpy(filename3, filename, sizeof(filename3) - 1);
+		endpart = strrchr(filename3, '/');
+		if (endpart) {
+			*endpart = '\0';
+			endpart++;
 			snprintf(filename2, sizeof(filename2), "%s/%s/%s", filename3, preflang, endpart);
 		} else
 			snprintf(filename2, sizeof(filename2), "%s/%s", preflang, filename);
@@ -478,6 +494,7 @@
 		strncpy(filename2, filename, sizeof(filename2)-1);
 		fmts = ast_fileexists(filename2, NULL, NULL);
 	}
+
 	if (fmts < 1) {
 		ast_log(LOG_WARNING, "File %s does not exist in any format\n", filename);
 		return NULL;