Skip to content

Commit

Permalink
Making TopLevelItemDescriptor.displayName be in the form of a noun ph…
Browse files Browse the repository at this point in the history
…rase.

Also moving keys out of Jenkins core where they were apparently forgotten when this plugin was split.
  • Loading branch information
jglick committed Nov 18, 2014
1 parent c95dce3 commit 4175bb5
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/main/java/hudson/model/ExternalJob.java
Expand Up @@ -23,18 +23,18 @@
*/
package hudson.model;

import hudson.model.RunMap.Constructor;
import hudson.Extension;
import hudson.model.RunMap.Constructor;
import hudson.util.AlternativeUiTextProvider;
import java.io.File;
import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
import jenkins.model.Jenkins;
import org.jenkinsci.plugins.externalmonitorjob.Messages;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;

import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;

/**
* Job that runs outside Hudson whose result is submitted to Hudson
* (either via web interface, or simply by placing files on the file system,
Expand Down Expand Up @@ -114,12 +114,12 @@ public TopLevelItemDescriptor getDescriptor() {

@Override
public String getPronoun() {
return AlternativeUiTextProvider.get(PRONOUN, this, Messages.ExternalJob_Pronoun());
return AlternativeUiTextProvider.get(PRONOUN, this, Messages.ExternalJob_displayName());
}

public static final class DescriptorImpl extends TopLevelItemDescriptor {
public String getDisplayName() {
return Messages.ExternalJob_DisplayName();
return Messages.ExternalJob_displayName();
}

public ExternalJob newInstance(ItemGroup parent, String name) {
Expand Down
@@ -0,0 +1,23 @@
# The MIT License
#
# Copyright 2014 Jesse Glick.
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

ExternalJob.displayName=External Job

0 comments on commit 4175bb5

Please sign in to comment.