Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Update 'archived' to 'deleted' in activity table
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Eng committed Jun 10, 2015
1 parent 5d586db commit f9ef068
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
2 changes: 2 additions & 0 deletions docs/release-notes.md
Expand Up @@ -53,6 +53,8 @@ Example usage in html file: `<link rel="shortcut icon" href="#{assets['img/logo/
* [1224030](https://bugzilla.redhat.com/show_bug.cgi?id=1224030) - Search form does not trigger search if paste text
* [1198898](https://bugzilla.redhat.com/show_bug.cgi?id=1198898) - Exception on using the URL to view a language not yet added to Zanata
* [1116172](https://bugzilla.redhat.com/show_bug.cgi?id=1116172) - Captcha no longer used, dead code still exists
* [1230424](https://bugzilla.redhat.com/show_bug.cgi?id=1230424) - Update message "Archived" to "Deleted" in activity table

-----------------------

<h5>New Features</h5>
Expand Down
10 changes: 4 additions & 6 deletions zanata-war/src/main/resources/messages.properties
Expand Up @@ -8,6 +8,8 @@ jsf.Active=Active
jsf.ReadOnly=Read-only
! project/version status
jsf.Obsolete=Archived
! project/version deleted
jsf.Deleted=Deleted

! this is shown when trying to access a project, version or other item that does not exist in the system.
! e.g. navigate to a project, then change the project slug in the URL to make it invalid and press enter.
Expand Down Expand Up @@ -92,7 +94,6 @@ jsf.auth.KerberosNotice.label=It looks like you don't have a valid Kerberos tick
#--- Project search (all pages) ---
jsf.SearchProjects=Search Projects
jsf.SearchProjectsAndPeople=Search Projects and People
jsf.project.search.IncludeObsoleteTooltip=Include Archived Projects in Search

#--- Footer (all pages) ---
jsf.About=About
Expand Down Expand Up @@ -226,7 +227,6 @@ jsf.Language.useGlobal=Use default languages
jsf.CreateProject=Create project
jsf.FilterActiveProjects=Filter active projects
jsf.FilterReadOnlyProjects=Filter read-only projects
jsf.FilterObsoleteProjects=Filter archived projects
jsf.ProjectName=Project Name
jsf.NoProjectExists=No project exists.

Expand Down Expand Up @@ -306,7 +306,6 @@ jsf.webhook.response.state={0}% {1}

#------ [home] > Projects > [project-id] ------
jsf.ReadOnlyVersions=Read-only versions
jsf.ObsoleteVersions=Archived versions
jsf.DocumentCount=Documents:
jsf.TranslateLinks=Translate Links
! tooltip for an icon that launches the translation editor, with editing enabled.
Expand Down Expand Up @@ -390,7 +389,7 @@ jsf.group.RemoveVersion.sr.label=Remove
jsf.group.RemoveVersion.title=Remove Version
jsf.group.RemoveMaintainer.sr.label=Remove
jsf.group.RemoveMaintainer.title=Remove Maintainer
jsf.group.ArchivedVersionNotIncluded=This project-version is archived and will not be included.
jsf.group.ArchivedVersionNotIncluded=This project-version is deleted and will not be included.


#------ [home] > Projects > [project-id] > Copy Trans Options ------
Expand Down Expand Up @@ -449,7 +448,7 @@ jsf.iteration.CopyTrans.Completed="Copy Translations" for {0} [{1}] is completed
jsf.iteration.CopyTrans.Cancelled="Copy Translations" cancelled.
jsf.iteration.CopyTransOpts.tooltip=Help: Set this version's "Copy Translations" settings.
jsf.iteration.tooltip.readonly=This version is currently read only
jsf.iteration.tooltip.obsolete=This version is currently archived
jsf.iteration.tooltip.obsolete=This version is deleted

jsf.iteration.documentType.select=Document type

Expand Down Expand Up @@ -629,7 +628,6 @@ jsf.generatezip.ProgressLabel=Processing {0} of {1}
jsf.iteration.files.WhyCantITranslate=Why can't I translate?
jsf.iteration.files.translateDenied.NotLoggedIn=You are not logged In.
jsf.iteration.files.translateDenied.VersionIsReadOnly=This project version is Read-Only.
jsf.iteration.files.translateDenied.VersionIsObsolete=This project version is Archived.
! {0} is a language name
jsf.iteration.files.translateDenied.UserNotTranslatorInLanguageTeam=You are a not translator of the {0} language team.
! {0} is a list of user roles
Expand Down
10 changes: 5 additions & 5 deletions zanata-war/src/main/webapp/admin/stats.xhtml
Expand Up @@ -80,7 +80,7 @@
</span>

<span class="l--push-h-quarter txt--meta">
#{msgs['jsf.Obsolete']} <span class="badge--danger">#{adminStatsAction.totalObsoleteProjectCount}</span>
#{msgs['jsf.Deleted']} <span class="badge--danger">#{adminStatsAction.totalObsoleteProjectCount}</span>
</span>
</div>
</s:fragment>
Expand All @@ -106,7 +106,7 @@
</span>

<span class="l--push-h-quarter txt--meta">
#{msgs['jsf.Obsolete']} <span class="badge--danger">#{adminStatsAction.totalObsoleteProjectIterCount}</span>
#{msgs['jsf.Deleted']} <span class="badge--danger">#{adminStatsAction.totalObsoleteProjectIterCount}</span>
</span>
</div>
</s:fragment>
Expand All @@ -127,7 +127,7 @@
</span>

<span class="l--push-h-quarter txt--meta">
#{msgs['jsf.Obsolete']} <span class="badge--danger">#{adminStatsAction.totalObsoleteDocuments}</span>
#{msgs['jsf.Deleted']} <span class="badge--danger">#{adminStatsAction.totalObsoleteDocuments}</span>
</span>
</div>
</s:fragment>
Expand All @@ -149,7 +149,7 @@
</span>

<span class="l--push-h-quarter txt--meta">
#{msgs['jsf.Obsolete']} <span class="badge--danger">#{adminStatsAction.totalObsoleteTextFlows}</span>
#{msgs['jsf.Deleted']} <span class="badge--danger">#{adminStatsAction.totalObsoleteTextFlows}</span>
</span>
</div>
</s:fragment>
Expand All @@ -170,7 +170,7 @@
</span>

<span class="l--push-h-quarter txt--meta">
#{msgs['jsf.Obsolete']} <span class="badge--danger">#{adminStatsAction.totalObsoleteTextFlowTargets}</span>
#{msgs['jsf.Deleted']} <span class="badge--danger">#{adminStatsAction.totalObsoleteTextFlowTargets}</span>
</span>
</div>

Expand Down

0 comments on commit f9ef068

Please sign in to comment.