LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

Ticket #2685 - Forgot the annotations and resource bundles 

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4739 8810af33-2d31-482b-a856-94f89814c4df
baka 2017-05-17 12:17:03 +00:00
parent 6a2e34fae8
commit 9b643491bc
5 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ccm-cms/src/main/java/org/librecms/Cms.java
View File

@ -19,14 +19,7 @@ import org.libreccm.modules.ShutdownEvent;
import org.libreccm.modules.UnInstallEvent;
import org.libreccm.web.ApplicationType;
import org.libreccm.web.CcmApplication;
import org.librecms.assets.AssetTypes;
import org.librecms.assets.Bookmark;
import org.librecms.assets.ExternalAudioAsset;
import org.librecms.assets.ExternalVideoAsset;
import org.librecms.assets.FileAsset;
import org.librecms.assets.Image;
import org.librecms.assets.LegalMetadata;
import org.librecms.assets.SideNote;
import org.librecms.assets.*;
import org.librecms.contentsection.ContentSection;
import org.librecms.contentsection.ContentSectionCreator;
import org.librecms.contentsection.ContentSectionSetup;
@ -70,7 +63,8 @@ import java.util.Properties;
Event.class,
MultiPartArticle.class,
News.class})
@AssetTypes({Bookmark.class,
@AssetTypes({AudioAsset.class,
Bookmark.class,
ExternalVideoAsset.class,
ExternalAudioAsset.class,
FileAsset.class,

8
ccm-cms/src/main/java/org/librecms/assets/AudioAsset.java
View File

@ -18,6 +18,8 @@
*/
package org.librecms.assets;
import com.arsdigita.cms.ui.assets.forms.AudioForm;
import com.arsdigita.cms.ui.assets.forms.ExternalVideoAssetForm;
import org.hibernate.envers.Audited;
import java.io.Serializable;
@ -29,6 +31,7 @@ import javax.persistence.OneToOne;
import javax.persistence.Table;
import static org.librecms.CmsConstants.*;
import static org.librecms.assets.AssetConstants.ASSETS_BUNDLE;
/**
* An asset for audio files, for example podcasts of music.
@ -38,6 +41,11 @@ import static org.librecms.CmsConstants.*;
@Entity
@Table(name = "AUDIO_ASSETS", schema = DB_SCHEMA)
@Audited
@AssetType(assetForm = AudioForm.class,
labelKey = "audio_asset.label",
labelBundle = ASSETS_BUNDLE,
descriptionKey = "audio_asset.description",
descriptionBundle = ASSETS_BUNDLE)
public class AudioAsset extends BinaryAsset implements Serializable {
private static final long serialVersionUID = -2290028707028530325L;

2
ccm-cms/src/main/resources/org/librecms/CmsResources.properties
View File

@ -275,6 +275,8 @@ cms.ui.assets.binaryasset.size=Size (bytes)
cms.ui.assets.image.width.label=Width
cms.ui.assets.image.height.label=Height
cms.ui.assets.image.legal_metadata.label=Legal metadata
cms.ui.assets.audio.legal_metadata.label=Legal metadata
cms.ui.categories=Categories
cms.ui.new_item=Create new content item
cms.ui.authoring.content_type=Content Type:

1
ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties
View File

@ -273,6 +273,7 @@ cms.ui.assets.binaryasset.size=Gr\u00f6\u00dfe (Bytes)
cms.ui.assets.image.width.label=Breite
cms.ui.assets.image.height.label=H\u00f6he
cms.ui.assets.image.legal_metadata.label=Rechtliche Informationen
cms.ui.assets.audio.legal_metadata.label=Rechtliche Informationen
cms.ui.categories=Kategorien
cms.ui.new_item=Neues Content Item angelegen
cms.ui.authoring.content_type=Content Typ:

1
ccm-cms/src/main/resources/org/librecms/CmsResources_fr.properties
View File

@ -232,6 +232,7 @@ cms.ui.assets.binaryasset.size=Size (bytes)
cms.ui.assets.image.width.label=Width
cms.ui.assets.image.height.label=Height
cms.ui.assets.image.legal_metadata.label=Legal metadata
cms.ui.assets.audio.legal_metadata.label=Legal metadata
cms.ui.categories=Categories
cms.ui.new_item=New item
cms.ui.authoring.content_type=Content Type: