Skip to content
This repository was archived by the owner on Oct 22, 2025. It is now read-only.

Commit f9869d4

Browse files
niemyjskiniemyjski
committed
Updated dependencies and fixed some build issues
@m-e-conroy I got rid of the src/dialogs because it was confusing and causing people to do pull requests on that single file. It should only be in the dist folder.
1 parent 5847734 commit f9869d4

File tree

12 files changed

+161
-691
lines changed

12 files changed

+161
-691
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
node_modules
22
bower_components
33
.idea
4+
temp

‎bower.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333
"README.md"
3434
],
3535
"dependencies": {
36-
"bootstrap": "~3.3.5",
37-
"angular": "^1.5",
38-
"angular-sanitize": "^1.5",
36+
"bootstrap": "~3.3.6",
37+
"angular": "^1.5.0",
38+
"angular-sanitize": "^1.5.0",
3939
"angular-bootstrap": "^1.1.2",
40-
"angular-translate": "^2.4"
40+
"angular-translate": "^2.9.2"
4141
},
4242
"main": [
4343
"dist/dialogs.css",

‎dist/dialogs-default-translations.js‎

Lines changed: 65 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,23 @@
3535
* $translateProvider.preferredLanguage('[lang]');
3636
*/
3737
.config(['$translateProvider',function($translateProvider){
38+
$translateProvider.translations('de-DE',{
39+
DIALOGS_ERROR: "Error",
40+
DIALOGS_ERROR_MSG: "Ein unbekannter Fehler ist aufgetreten.",
41+
DIALOGS_CLOSE: "Schließen",
42+
DIALOGS_PLEASE_WAIT: "Bitte warten",
43+
DIALOGS_PLEASE_WAIT_ELIPS: "Bitte warten...",
44+
DIALOGS_PLEASE_WAIT_MSG: "Warte auf Fertigstellung der Operation.",
45+
DIALOGS_PERCENT_COMPLETE: "% fertig",
46+
DIALOGS_NOTIFICATION: "Benachrichtigung",
47+
DIALOGS_NOTIFICATION_MSG: "Unbekannte Anwendungsbenachrichtigung.",
48+
DIALOGS_CONFIRMATION: "Bestätigung",
49+
DIALOGS_CONFIRMATION_MSG: "Bestätigung erforderlich.",
50+
DIALOGS_OK: "OK",
51+
DIALOGS_YES: "Ja",
52+
DIALOGS_NO: "Nein"
53+
});
54+
3855
$translateProvider.translations('en-US',{
3956
DIALOGS_ERROR: "Error",
4057
DIALOGS_ERROR_MSG: "An unknown error has occurred.",
@@ -51,58 +68,41 @@
5168
DIALOGS_YES: "Yes",
5269
DIALOGS_NO: "No"
5370
});
54-
55-
$translateProvider.translations('zh-CN',{
56-
DIALOGS_ERROR: "错误",
57-
DIALOGS_ERROR_MSG: "出现未知错误。",
58-
DIALOGS_CLOSE: "关闭",
59-
DIALOGS_PLEASE_WAIT: "请稍候",
60-
DIALOGS_PLEASE_WAIT_ELIPS: "请稍候...",
61-
DIALOGS_PLEASE_WAIT_MSG: "请等待操作完成。",
62-
DIALOGS_PERCENT_COMPLETE: "% 已完成",
63-
DIALOGS_NOTIFICATION: "通知",
64-
DIALOGS_NOTIFICATION_MSG: "未知应用程序的通知。",
65-
DIALOGS_CONFIRMATION: "确认",
66-
DIALOGS_CONFIRMATION_MSG: "确认要求。",
67-
DIALOGS_OK: "确定",
68-
DIALOGS_YES: "确认",
69-
DIALOGS_NO: "取消"
70-
});
71-
71+
7272
$translateProvider.translations('es-ES',{
73-
DIALOGS_ERROR: "Error",
74-
DIALOGS_ERROR_MSG: "Se ha producido un error.",
75-
DIALOGS_CLOSE: "Cerrar",
76-
DIALOGS_PLEASE_WAIT: "Espere por favor",
77-
DIALOGS_PLEASE_WAIT_ELIPS: "Espere por favor...",
78-
DIALOGS_PLEASE_WAIT_MSG: "Completando operación.",
79-
DIALOGS_PERCENT_COMPLETE: "% Completado",
80-
DIALOGS_NOTIFICATION: "Notificación",
81-
DIALOGS_NOTIFICATION_MSG: "Notificación de una aplicación desconocida.",
82-
DIALOGS_CONFIRMATION: "Confirmación",
83-
DIALOGS_CONFIRMATION_MSG: "Se requiere confirmacion.",
84-
DIALOGS_OK: "Aceptar",
85-
DIALOGS_YES: "Sí",
86-
DIALOGS_NO: "No"
73+
DIALOGS_ERROR: "Error",
74+
DIALOGS_ERROR_MSG: "Se ha producido un error.",
75+
DIALOGS_CLOSE: "Cerrar",
76+
DIALOGS_PLEASE_WAIT: "Espere por favor",
77+
DIALOGS_PLEASE_WAIT_ELIPS: "Espere por favor...",
78+
DIALOGS_PLEASE_WAIT_MSG: "Completando operación.",
79+
DIALOGS_PERCENT_COMPLETE: "% Completado",
80+
DIALOGS_NOTIFICATION: "Notificación",
81+
DIALOGS_NOTIFICATION_MSG: "Notificación de una aplicación desconocida.",
82+
DIALOGS_CONFIRMATION: "Confirmación",
83+
DIALOGS_CONFIRMATION_MSG: "Se requiere confirmacion.",
84+
DIALOGS_OK: "Aceptar",
85+
DIALOGS_YES: "Sí",
86+
DIALOGS_NO: "No"
8787
});
88-
88+
8989
$translateProvider.translations("fr-FR", {
90-
DIALOGS_ERROR: "Erreur",
91-
DIALOGS_ERROR_MSG: "Une erreur inconnue s'est produite.",
92-
DIALOGS_CLOSE: "Fermer",
93-
DIALOGS_PLEASE_WAIT: "Patientez svp",
94-
DIALOGS_PLEASE_WAIT_ELIPS: "Patienter svp...",
95-
DIALOGS_PLEASE_WAIT_MSG: "En attente de la fin de l'opération.",
96-
DIALOGS_PERCENT_COMPLETE: "% Terminer",
97-
DIALOGS_NOTIFICATION: "Notification",
98-
DIALOGS_NOTIFICATION_MSG: "Notification de l'application inconnue",
99-
DIALOGS_CONFIRMATION: "Confirmer",
100-
DIALOGS_CONFIRMATION_MSG: "Merci de confirmer",
101-
DIALOGS_OK: "OK",
102-
DIALOGS_YES: "Oui",
103-
DIALOGS_NO: "Non"
90+
DIALOGS_ERROR: "Erreur",
91+
DIALOGS_ERROR_MSG: "Une erreur inconnue s'est produite.",
92+
DIALOGS_CLOSE: "Fermer",
93+
DIALOGS_PLEASE_WAIT: "Patientez svp",
94+
DIALOGS_PLEASE_WAIT_ELIPS: "Patienter svp...",
95+
DIALOGS_PLEASE_WAIT_MSG: "En attente de la fin de l'opération.",
96+
DIALOGS_PERCENT_COMPLETE: "% Terminer",
97+
DIALOGS_NOTIFICATION: "Notification",
98+
DIALOGS_NOTIFICATION_MSG: "Notification de l'application inconnue",
99+
DIALOGS_CONFIRMATION: "Confirmer",
100+
DIALOGS_CONFIRMATION_MSG: "Merci de confirmer",
101+
DIALOGS_OK: "OK",
102+
DIALOGS_YES: "Oui",
103+
DIALOGS_NO: "Non"
104104
});
105-
105+
106106
$translateProvider.translations('pt-BR',{
107107
DIALOGS_ERROR: "Erro",
108108
DIALOGS_ERROR_MSG: "Ocorreu um erro inesperado.",
@@ -120,5 +120,22 @@
120120
DIALOGS_NO: "Não"
121121
});
122122

123+
$translateProvider.translations('zh-CN',{
124+
DIALOGS_ERROR: "错误",
125+
DIALOGS_ERROR_MSG: "出现未知错误。",
126+
DIALOGS_CLOSE: "关闭",
127+
DIALOGS_PLEASE_WAIT: "请稍候",
128+
DIALOGS_PLEASE_WAIT_ELIPS: "请稍候...",
129+
DIALOGS_PLEASE_WAIT_MSG: "请等待操作完成。",
130+
DIALOGS_PERCENT_COMPLETE: "% 已完成",
131+
DIALOGS_NOTIFICATION: "通知",
132+
DIALOGS_NOTIFICATION_MSG: "未知应用程序的通知。",
133+
DIALOGS_CONFIRMATION: "确认",
134+
DIALOGS_CONFIRMATION_MSG: "确认要求。",
135+
DIALOGS_OK: "确定",
136+
DIALOGS_YES: "确认",
137+
DIALOGS_NO: "取消"
138+
});
139+
123140
$translateProvider.preferredLanguage('en-US');
124141
}]); // end config

‎dist/dialogs-default-translations.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/dialogs.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ angular.module('dialogs.main',['dialogs.services','ngSanitize']) // requires ang
537537
// try to find css rule .fa, in case style sheet has been concatenated
538538
_rules = _sheets[i].cssRules;
539539
for(var x = (_rules.length - 1);x >= 0;x--){
540-
if(_rules[x].selectorText.toLowerCase() == '.fa'){
540+
if(typeof(_rules[x].selectorText) === 'string' && _rules[x].selectorText.toLowerCase() === '.fa'){
541541
dialogsProvider.useFontAwesome();
542542
break sheetLoop; // done, exit both for loops
543543
}

0 commit comments

Comments
 (0)