From 137e3a9bdff7954fc14a5abe866ab38cd08b04fb Mon Sep 17 00:00:00 2001 From: Peter Kozak Date: Thu, 28 Feb 2013 03:15:53 -0500 Subject: translations --- config/locales/navigation.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/locales/navigation.en.yml b/config/locales/navigation.en.yml index 82e901b..015b783 100644 --- a/config/locales/navigation.en.yml +++ b/config/locales/navigation.en.yml @@ -1,3 +1,3 @@ en: navigation: - admin_docu: 'Admin-Docu' \ No newline at end of file + admin_docu: 'Admin-Doc' -- cgit v1.2.3 From e1c2ef6e5d2d48eab026f788d93e6c170d276194 Mon Sep 17 00:00:00 2001 From: Peter Kozak Date: Thu, 28 Feb 2013 09:38:07 -0500 Subject: phone book entry view --- config/locales/views/phone_book_entries/de.yml | 2 +- config/locales/views/phone_book_entries/en.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/locales/views/phone_book_entries/de.yml b/config/locales/views/phone_book_entries/de.yml index bdd0d67..839df3b 100644 --- a/config/locales/views/phone_book_entries/de.yml +++ b/config/locales/views/phone_book_entries/de.yml @@ -67,7 +67,7 @@ de: xing_account: 'Xing Konto' linkedin_account: 'LinkedIn Konto' mobileme_account: 'iCloud Konto' - manage_phone_number: 'Telefonnummern verwalten.' + manage_phone_numbers: 'Telefonnummern verwalten.' actions: confirm_destroy: 'Sind Sie sicher, dass Sie diesen Telefonbucheintrag löschen möchten?' destroy: 'Löschen' diff --git a/config/locales/views/phone_book_entries/en.yml b/config/locales/views/phone_book_entries/en.yml index abfbbb2..e733d85 100644 --- a/config/locales/views/phone_book_entries/en.yml +++ b/config/locales/views/phone_book_entries/en.yml @@ -67,7 +67,7 @@ en: xing_account: 'Xing account' linkedin_account: 'LinkedIn account' mobileme_account: 'iCloud account' - manage_phone_number: 'Manage phone number.' + manage_phone_numbers: 'Manage phone numbers.' actions: confirm_destroy: 'Are you sure you want to delete this phone book entry?' destroy: 'Delete phone book entry' -- cgit v1.2.3 From 75362f4b48f02fc28ac45762bfb6b28a06d38b72 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 5 Mar 2013 09:42:12 +0100 Subject: Fixed the backup. --- config/backup.rb | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) (limited to 'config') diff --git a/config/backup.rb b/config/backup.rb index 88edd94..0cb6a32 100644 --- a/config/backup.rb +++ b/config/backup.rb @@ -32,23 +32,7 @@ Backup::Model.new(:GS5, 'GS5 backup') do # if File.exists?('/var/opt/gemeinschaft/fax') archive :faxes do |archive| - # Incoming faxes - # - Dir.glob("/var/opt/gemeinschaft/fax/in/**/*.pdf").each do |fax_file| - archive.add(fax_file) - end - Dir.glob("/var/opt/gemeinschaft/fax/in/**/*.tiff").each do |fax_file| - archive.add(fax_file) - end - - # Outgoing faxes - # - Dir.glob("/var/opt/gemeinschaft/fax/out/**/*.pdf").each do |fax_file| - archive.add(fax_file) - end - Dir.glob("/var/opt/gemeinschaft/fax/out/**/*.tiff").each do |fax_file| - archive.add(fax_file) - end + archive.add '/var/opt/gemeinschaft/fax' end end @@ -81,4 +65,4 @@ Backup::Model.new(:GS5, 'GS5 backup') do # Gzip [Compressor] # compress_with Gzip -end \ No newline at end of file +end -- cgit v1.2.3 From a865b1f9506b900ed8643c01d94c86268e907720 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 5 Mar 2013 17:30:45 +0100 Subject: Added voicemails and recordings to the backup/restore. #195 --- config/backup.rb | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'config') diff --git a/config/backup.rb b/config/backup.rb index 0cb6a32..2c2984b 100644 --- a/config/backup.rb +++ b/config/backup.rb @@ -45,6 +45,15 @@ Backup::Model.new(:GS5, 'GS5 backup') do end end + ## + # Voicemails + # + if File.exists?('/var/opt/gemeinschaft/freeswitch/recordings') + archive :recordings do |archive| + archive.add '/var/opt/gemeinschaft/freeswitch/recordings' + end + end + ## # Avatars # -- cgit v1.2.3 From 287e9d8fe964b0b0449732597f1f5ef5057cf4b3 Mon Sep 17 00:00:00 2001 From: Peter Kozak Date: Wed, 6 Mar 2013 06:39:15 -0500 Subject: Abort on conversion errors --- config/locales/views/fax_documents/de.yml | 1 + config/locales/views/fax_documents/en.yml | 1 + 2 files changed, 2 insertions(+) (limited to 'config') diff --git a/config/locales/views/fax_documents/de.yml b/config/locales/views/fax_documents/de.yml index da59833..236c031 100644 --- a/config/locales/views/fax_documents/de.yml +++ b/config/locales/views/fax_documents/de.yml @@ -5,6 +5,7 @@ de: successfuly_created: 'Eine neues Fax-Dokument wurde erstellt.' successfuly_updated: 'Das Fax-Dokument wurde aktualisiert.' successfuly_destroyed: 'Das Fax-Dokument wurde gelöscht.' + tiff_not_created: 'Konnte nicht konvertiert werden.' states: queued_for_sending: 'In der Warteschleife zum Versand' sending: 'Wird aktuell versendet' diff --git a/config/locales/views/fax_documents/en.yml b/config/locales/views/fax_documents/en.yml index ff5f8f8..0606e81 100644 --- a/config/locales/views/fax_documents/en.yml +++ b/config/locales/views/fax_documents/en.yml @@ -5,6 +5,7 @@ en: successfuly_created: 'Successfully created fax.' successfuly_updated: 'Successfully updated fax.' successfuly_destroyed: 'Successfully destroyed fax.' + tiff_not_created: 'Could not be converted.' states: queued_for_sending: 'Queued for sending' sending: 'Currently sending' -- cgit v1.2.3