Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: mantisbt/mantisbt
base: 6c79f5d39801
...
head fork: mantisbt/mantisbt
compare: 6ccec55ee982
Checking mergeability… Don't worry, you can still create the pull request.
  • 19 commits
  • 647 files changed
  • 0 commit comments
  • 1 contributor
Commits on Oct 21, 2012
@grangeway grangeway Further work on Exceptions 82d615b
Commits on Oct 28, 2012
@grangeway grangeway Replace PHP UTF-8 library with PHP's mbstring extension
Git Commit ID: beb4c5b

For MantisBT 1.2.x, the PHP UTF-8 library at [1] was selected to provide
proper Unicode support to MantisBT. This library wraps around PHP's
mbstring extension and provides an alternative implemented-in-PHP
approach where the mbstring extension is not available on a server
running MantisBT. mbstring is a PHP extension that is not bundled with
PHP by default. Linux distributions already package the extension and it
is trivial to install. The extension is also bundled with the Windows
.zip distribution of PHP for Windows users and is also trivial to
install.

The need to support platform configurations where mbstring isn't
available and can't be installed stems from the days when shared hosting
was popular. With the popularisation of virtualisation (virtual private
servers) as a cheap replacement to shared hosting, administrators once
again have control over their own platform, allowing them to install PHP
extensions whenever they please. Popular Linux distributions have been
packaging and making the mbstring PHP extension available for a long
time. Installation on Windows platforms is also trivial (relative to the
complexity of Windows platforms due to a lack of software package
management functionality).

Removal of the PHP UTF-8 wrapper simplifies MantisBT's code base and
likely improves performance (no need to wrap function calls and compile
and load an entire UTF-8 library into memory). More importantly,
MantisBT no longer depends on a small library that hasn't seen updates
since 2007. Reliance on mbstring is a less risky option because it is
more widely used and ties in with PHP's official infrastructure and
support/documentation system.

MantisBT's documentation has been updated and expanded to reflect the
new installation requirement. Links to external documentation on php.net
have also been provided to guide new users in performing the simple
action of adding the mbstring extension.

[1] http://sourceforge.net/projects/phputf8/
6a165ba
@grangeway grangeway Add new Locale i18n/l10n API to replace lang_api
Commit: 4deea44

This is some initial work towards replacing lang_api with a new Locale
API that makes use of PHP's gettext support for translation.

gettext offers the following advantages:
a) Greater performance
b) Better supporting tools for translation work
c) Import/export support at MediaWiki.net that doesn't require
MantisBT-specific hacks
d) Pluralisation (1 thing vs 1 things)
e) en-US language is embedded in the source code and acts as a key --
this makes the source code easier to read and sections of code easier to
find upon searching for UI strings
f) Easy plugin support via loading of new text domains
g) Ability to perform more specific translations (en-US, en-GB,
en-AU...) rather than "one English fits all"
h) Support for context aware translations

There is lot of negativity in the wild regarding gettext and PHP.
Typical arguments include:

1. Lack of thread safety - this is no longer an issue with php-fpm (or
earlier Fast CGI methods) because each script will execute in a separate
process. Threaded execution of PHP under mod_php (Apache) or an IIS
equivalent is thoroughly deprecated and not recommended for numerous
reasons.

2. gettext is difficult to install with PHP - Linux distributions of PHP
will most likely have gettext enabled by default. If not, packages are
readily available in all the major distribution repositories. Windows
users are given php_gettext.dll in the .zip distribution of PHP and
simple instructions at [1] can be followed to get things up and running
quickly.

3. The gettext API is "inconsistent" or doesn't support xyz - it's
trivial to create a new wrapper function around these APIs that allows
us to implement enhanced functionality or make the API easier to use.

Don't be tricked by the outdated negativity from the early 2000's.
gettext is an "industry standard" and is not going away any time soon.

[1] http://php.net/manual/en/install.windows.extensions.php
159be15
Commits on Nov 11, 2012
@grangeway grangeway phpdoc changes 83168de
@grangeway grangeway Add additional exceptions 2184342
@grangeway grangeway Remove ERROR_ constants and ERROR_STRINGS[...] translations
The new Locale API (using gettext) and the new Exception approach to
error handling in MantisBT means that ERROR_ constants are now
unnecessary.

All exceptions have been updated to use gettext for translating error
strings. Because many of the error messages have been rewritten in the
process, translations have been dropped. It is expected that we'll need
to recommence translating MantisBT from scratch after the new Locale API
is fully implemented. Why?

1. We need to support pluralisation.
2. We need to factor in the context of strings that need translating.
3. Many old error messages/strings are confusing and desperately in need
of updating.
4. A move towards modern web standards compliant HTML will greatly
increase the number of strings needing translation: alt and title
attributes on images and hyperlinks being just one example.
5. Huge chunks of MantisBT are likely going to be rewritten or
redesigned, dramatically changing the strings/error messages that need
to be translated.

As part of this change error codes have also been removed from MantisBT
exceptions. These codes do not add any value because exception class
names already provide unique identification (that is superior than just
a random number).

Exception constructors are also heavily simplified -- now containing
just a single argument for the error message.

MantisBT\Error has also been cleaned up further in preparation for
removal/replacement with a modern exception handler/displayer. We no
longer have an error_handler: all errors are converted to exceptions of
type ErrorException and handled by exception_handler. This removes a lot
of duplication and complexity.
c30bfb8
Commits on Jan 19, 2013
@grangeway grangeway replace bulk of lang_get calls with _(gettext) call d5add72
Commits on Jan 20, 2013
@grangeway grangeway Set enum strings in one place for lang_get use ee96a86
@grangeway grangeway Update Copyright Statements 8f72b64
@grangeway grangeway remove unused function param 0695ceb
Commits on Jan 23, 2013
@grangeway grangeway Remove reference to old utf8 library b55d30c
@grangeway grangeway fix typo ed227dd
@grangeway grangeway Add locale settings to default config 8c3f6a0
@grangeway grangeway Use config_get_global instead of config_get for retrieving cookie
related configuration options. They are always global and failure to
treat them as such will cause infinite call loops. These loops occur
when config_get calls authentication_api functions which check for a
user cookie (calling config_get to retrieve settings related to
cookies).

commit 83619f3
cb49d0b
@grangeway grangeway Followed up to port of dhx's cookie change - add cookies to list of g…
…lobal settings
24745db
Commits on Jan 24, 2013
@grangeway grangeway Replace plugin_lang_get with new gettext approach
The replacement of lang_get() calls for strings in the 'core' text
domain has mostly been completed. Plugins were calling a separate
function plugin_lang_get() that told lang_api (now deprecated) to use
the plugin-specific "lang" directory for translations specific to
plugins.

This new approach loads a text domain specific to each plugin prior to
plugin initialisation. Just as MantisBT core has a "locale" directory,
each plugin also needs a "locale" directory.

plugin_lang_get(...) has been completely removed and d___(...) and
dn_(...) should be used instead. This new syntax may change to something
simler and easier to handle in the near future.

Commit: d956d32
5bf9b2e
Commits on Feb 04, 2013
@grangeway grangeway Replace plugin_lang_get with new gettext approach (part 2) 52c646c
@grangeway grangeway Further lang_get updates b97cdba
Commits on Feb 07, 2013
@grangeway grangeway add html_get_status_css_class function to replace lang_get calls 6ccec55
Showing with 5,733 additions and 1,958 deletions.
  1. +5 −5 account_delete.php
  2. +2 −2 account_manage_columns_page.php
  3. +19 −19 account_page.php
  4. +43 −43 account_prefs_inc.php
  5. +2 −2 account_prefs_page.php
  6. +1 −1  account_prefs_reset.php
  7. +1 −1  account_prefs_update.php
  8. +7 −7 account_prof_edit_page.php
  9. +14 −14 account_prof_menu_page.php
  10. +1 −1  account_prof_update.php
  11. +40 −34 account_sponsor_page.php
  12. +2 −2 account_sponsor_update.php
  13. +4 −4 account_update.php
  14. +1 −1  admin/check/check_L10n_inc.php
  15. +1 −1  admin/check/check_anonymous_inc.php
  16. +8 −7 admin/check/check_api.php
  17. +1 −1  admin/check/check_attachments_inc.php
  18. +1 −1  admin/check/check_config_inc.php
  19. +1 −1  admin/check/check_crypto_inc.php
  20. +1 −1  admin/check/check_database_inc.php
  21. +1 −1  admin/check/check_display_inc.php
  22. +1 −1  admin/check/check_email_inc.php
  23. +1 −1  admin/check/check_i18n_inc.php
  24. +3 −3 admin/check/check_integrity_inc.php
  25. +1 −1  admin/check/check_paths_inc.php
  26. +1 −1  admin/check/check_php_inc.php
  27. +1 −1  admin/check/index.php
  28. +2 −2 admin/db_stats.php
  29. +2 −2 admin/email_queue.php
  30. +9 −9 admin/index.php
  31. +7 −7 admin/install.php
  32. +1 −1  admin/move_db2disk.php
  33. +1 −1  admin/system_utils.php
  34. +5 −5 admin/test_langs.php
  35. +1 −1  admin/upgrade_warning.php
  36. +15 −15 billing_inc.php
  37. +2 −2 billing_page.php
  38. +1 −1  browser_search_plugin.php
  39. +22 −22 bug_actiongroup.php
  40. +8 −8 bug_actiongroup_add_note_inc.php
  41. +7 −7 bug_actiongroup_attach_tags_inc.php
  42. +4 −4 bug_actiongroup_ext.php
  43. +2 −2 bug_actiongroup_ext_page.php
  44. +33 −33 bug_actiongroup_page.php
  45. +6 −6 bug_actiongroup_update_product_build_inc.php
  46. +6 −6 bug_actiongroup_update_severity_inc.php
  47. +9 −9 bug_change_status_page.php
  48. +2 −2 bug_file_add.php
  49. +2 −2 bug_file_delete.php
  50. +6 −6 bug_file_upload_inc.php
  51. +1 −1  bug_monitor_add.php
  52. +1 −1  bug_monitor_delete.php
  53. +8 −8 bug_monitor_list_view_inc.php
  54. +4 −4 bug_relationship_add.php
  55. +3 −3 bug_relationship_delete.php
  56. +11 −11 bug_relationship_graph.php
  57. +1 −1  bug_relationship_graph_img.php
  58. +2 −2 bug_reminder.php
  59. +9 −9 bug_reminder_page.php
  60. +8 −8 bug_report.php
  61. +35 −35 bug_report_page.php
  62. +2 −2 bug_revision_drop.php
  63. +15 −15 bug_revision_view_page.php
  64. +3 −3 bug_set_sponsorship.php
  65. +14 −14 bug_sponsorship_list_view_inc.php
  66. +1 −1  bug_stick.php
  67. +7 −7 bug_update.php
  68. +41 −37 bug_update_page.php
  69. +1 −1  bug_view_advanced_page.php
  70. +43 −39 bug_view_inc.php
  71. +1 −1  bug_view_page.php
  72. +3 −3 bugnote_add.php
  73. +10 −10 bugnote_add_inc.php
  74. +3 −3 bugnote_delete.php
  75. +6 −6 bugnote_edit_page.php
  76. +2 −2 bugnote_set_view_state.php
  77. +7 −7 bugnote_stats_inc.php
  78. +2 −2 bugnote_update.php
  79. +15 −15 bugnote_view_inc.php
  80. +13 −13 changelog_page.php
  81. +28 −7 config_defaults_inc.php
  82. +23 −7 core.php
  83. +1 −1  core/access_api.php
  84. +18 −20 core/authentication_api.php
  85. +3 −2 core/bug_api.php
  86. +27 −22 core/bug_group_action_api.php
  87. +5 −5 core/bug_revision_api.php
  88. +5 −4 core/bugnote_api.php
  89. +8 −6 core/category_api.php
  90. +5 −5 core/cfdefs/cfdef_standard.php
  91. +3 −3 core/classes/Exception/Access/AccessDenied.class.php
  92. +48 −0 core/classes/Exception/Access/InsufficientAccessLevel.class.php
  93. +48 −0 core/classes/Exception/Authentication/LostPasswordBlankEmail.class.php
  94. +48 −0 core/classes/Exception/Authentication/LostPasswordDisabled.class.php
  95. +48 −0 core/classes/Exception/Column/ColumnDuplicate.class.php
  96. +48 −0 core/classes/Exception/Column/ColumnInvalid.class.php
  97. +48 −0 core/classes/Exception/Configuration/OptionCannotBeSetInDatabase.class.php
  98. +48 −0 core/classes/Exception/Configuration/OptionInvalidValue.class.php
  99. +48 −0 core/classes/Exception/Configuration/OptionNotFound.class.php
  100. +3 −3 core/classes/Exception/CustomField/FieldNotFound.class.php
  101. +3 −3 core/classes/Exception/CustomField/InvalidDefinition.class.php
  102. +3 −3 core/classes/Exception/CustomField/NameNotUnique.class.php
  103. +48 −0 core/classes/Exception/CustomField/NotLinkedToProject.class.php
  104. +3 −3 core/classes/Exception/Database/ConnectionFailed.class.php
  105. +3 −3 core/classes/Exception/Database/FieldNotFound.class.php
  106. +3 −3 core/classes/Exception/Database/QueryFailed.class.php
  107. +3 −3 core/classes/Exception/Email/AddressInvalid.class.php
  108. +3 −3 core/classes/Exception/Email/DisposableAddressNotAllowed.class.php
  109. +1 −1  core/classes/Exception/ExceptionAbstract.class.php
  110. +3 −3 core/classes/Exception/FTP/ConnectionFailed.class.php
  111. +3 −3 core/classes/Exception/Field/EmptyField.class.php
  112. +48 −0 core/classes/Exception/Field/InvalidValue.class.php
  113. +3 −3 core/classes/Exception/File/FileDuplicate.class.php
  114. +3 −3 core/classes/Exception/File/FileMoveFailed.class.php
  115. +48 −0 core/classes/Exception/File/FileNoUpload.class.php
  116. +48 −0 core/classes/Exception/File/FileTooBig.class.php
  117. +48 −0 core/classes/Exception/File/FileTypeNotAllowed.class.php
  118. +48 −0 core/classes/Exception/File/FileUploadFailed.class.php
  119. +48 −0 core/classes/Exception/File/InvalidUploadPath.class.php
  120. +48 −0 core/classes/Exception/Filter/FilterNotFound.class.php
  121. +3 −3 core/classes/Exception/Filter/FilterTooOldToUpgrade.class.php
  122. +3 −3 core/classes/Exception/Issue/Category/CategoryDuplicate.class.php
  123. +3 −3 core/classes/Exception/Issue/Category/CategoryNotFound.class.php
  124. +3 −3 core/classes/Exception/Issue/IssueDuplicateSelf.class.php
  125. +3 −3 core/classes/Exception/Issue/IssueNotFound.class.php
  126. +48 −0 core/classes/Exception/Issue/IssueReadOnly.class.php
  127. +48 −0 core/classes/Exception/Issue/Note/NoteNotFound.class.php
  128. +48 −0 core/classes/Exception/Issue/Relationship/RelationshipDuplicate.class.php
  129. +4 −4 core/classes/Exception/Issue/Relationship/RelationshipNotFound.class.php
  130. +3 −3 core/classes/Exception/Issue/Revision/RevisionNotFound.class.php
  131. +48 −0 core/classes/Exception/Issue/Tag/TagAlreadyAttached.class.php
  132. +48 −0 core/classes/Exception/Issue/Tag/TagNotAttached.class.php
  133. +48 −0 core/classes/Exception/Issue/Version/VersionDuplicate.class.php
  134. +48 −0 core/classes/Exception/Issue/Version/VersionNotFound.class.php
  135. +3 −3 core/classes/Exception/LDAP/QueryFailed.class.php
  136. +3 −3 core/classes/Exception/LDAP/ServerConnectFailed.class.php
  137. +48 −0 core/classes/Exception/Language/LanguageStringNotFound.class.php
  138. +47 −0 core/classes/Exception/Locale/LocaleNotProvidedByUserAgent.php
  139. +47 −0 core/classes/Exception/Locale/LocalesNotSupported.php
  140. +48 −0 core/classes/Exception/News/NewsItemNotFound.class.php
  141. +3 −3 core/classes/Exception/PHP/ExtensionNotLoaded.class.php
  142. +48 −0 core/classes/Exception/PHP/HeadersAlreadySent.class.php
  143. +3 −3 core/classes/Exception/PHP/TimezoneUpdateFailed.class.php
  144. +48 −0 core/classes/Exception/Plugin/EventNotDeclared.class.php
  145. +48 −0 core/classes/Exception/Plugin/PluginAlreadyInstalled.class.php
  146. +48 −0 core/classes/Exception/Plugin/PluginInstallationFailed.class.php
  147. +48 −0 core/classes/Exception/Plugin/PluginNotRegistered.class.php
  148. +48 −0 core/classes/Exception/Plugin/PluginPageNotFound.class.php
  149. +48 −0 core/classes/Exception/Plugin/PluginUpgradeFailed.class.php
  150. +48 −0 core/classes/Exception/Project/Category/CategoryNotFound.class.php
  151. +48 −0 core/classes/Exception/Project/ProjectNameNotUnique.class.php
  152. +48 −0 core/classes/Exception/Project/ProjectNameNotValid.class.php
  153. +48 −0 core/classes/Exception/Project/ProjectNotFound.class.php
  154. +48 −0 core/classes/Exception/Project/RecursiveHierarchyNotAllowed.class.php
  155. +48 −0 core/classes/Exception/Security/CSPRNGNotAvailable.class.php
  156. +3 −3 core/classes/Exception/Security/CSRFTokenInvalid.class.php
  157. +48 −0 core/classes/Exception/Security/MasterSaltInvalid.class.php
  158. +48 −0 core/classes/Exception/Session/SessionHandlerInvalid.class.php
  159. +48 −0 core/classes/Exception/Session/SessionInvalid.class.php
  160. +48 −0 core/classes/Exception/Session/SessionVariableNotFound.class.php
  161. +3 −3 core/classes/Exception/Sponsorship/SponsorshipAmountTooLow.class.php
  162. +3 −3 core/classes/Exception/Sponsorship/SponsorshipDisabled.class.php
  163. +48 −0 core/classes/Exception/Sponsorship/SponsorshipNotFound.class.php
  164. +3 −3 core/classes/Exception/Tag/TagDuplicate.class.php
  165. +48 −0 core/classes/Exception/Tag/TagNameNotValid.class.php
  166. +48 −0 core/classes/Exception/Tag/TagNotFound.class.php
  167. +48 −0 core/classes/Exception/Token/TokenNotFound.class.php
  168. +3 −3 core/classes/Exception/UnknownException.class.php
  169. +3 −3 core/classes/Exception/User/PasswordMismatch.class.php
  170. +3 −3 core/classes/Exception/User/ProtectedLastAdministrator.class.php
  171. +3 −3 core/classes/Exception/User/ProtectedUser.class.php
  172. +3 −3 core/classes/Exception/User/UserNameNotUnique.class.php
  173. +3 −3 core/classes/Exception/User/UserPreferencesNotFound.class.php
  174. +48 −0 core/classes/Exception/User/UserProfileNotFound.class.php
  175. +3 −3 core/classes/Exception/Validation/ArrayExpected.class.php
  176. +3 −3 core/classes/Exception/Validation/ArrayNotExpected.class.php
  177. +48 −0 core/classes/Exception/Validation/DateFormatInvalid.class.php
  178. +3 −3 core/classes/Exception/Validation/GPCNotFound.class.php
  179. +3 −3 core/classes/Exception/Validation/NumberExpected.class.php
  180. +115 −0 core/classes/Locale/LocaleManager.php
  181. +105 −0 core/classes/Locale/locale_support_functions.php
  182. +6 −5 core/classes/MantisBug.class.php
  183. +1 −1  core/classes/MantisBugRelationshipData.class.php
  184. +1 −1  core/classes/MantisColumn.class.php
  185. +1 −1  core/classes/MantisCorePlugin.class.php
  186. +2 −2 core/classes/MantisCoreWikiPlugin.class.php
  187. +14 −15 core/classes/MantisDatabase/MantisDatabase.class.php
  188. +1 −1  core/classes/MantisDatabase/PDO/Mysql/Mysql.class.php
  189. +1 −1  core/classes/MantisDatabase/PDO/PDO.class.php
  190. +2 −2 core/classes/MantisDatabaseDict/MantisDatabaseDict.class.php
  191. +1 −1  core/classes/MantisDatabaseException.class.php
  192. +2 −2 core/classes/MantisEnum.class.php
  193. +10 −7 core/classes/MantisError.class.php
  194. +1 −1  core/classes/MantisException.class.php
  195. +1 −1  core/classes/MantisFilter.class.php
  196. +2 −2 core/classes/MantisFormattingPlugin.class.php
  197. +3 −2 core/classes/MantisLanguage.class.php
  198. +2 −2 core/classes/MantisPlugin.class.php
  199. +2 −2 core/classes/MantisUser.class.php
  200. +2 −2 core/classes/MantisWikiPlugin.class.php
  201. +1 −1  core/collapse_api.php
  202. +57 −55 core/columns_api.php
  203. +1 −1  core/compress_api.php
  204. +3 −2 core/config_api.php
  205. +5 −3 core/crypto_api.php
  206. +2 −2 core/current_user_api.php
  207. +7 −5 core/custom_field_api.php
  208. +3 −3 core/custom_function_api.php
  209. +9 −9 core/database_api.php
  210. +3 −3 core/date_api.php
  211. +25 −23 core/email_api.php
  212. +3 −3 core/email_queue_api.php
  213. +5 −3 core/event_api.php
  214. +1 −1  core/events_inc.php
  215. +1 −1  core/export_api.php
  216. +17 −10 core/file_api.php
  217. +179 −171 core/filter_api.php
  218. +1 −1  core/filter_constants_inc.php
  219. +3 −3 core/form_api.php
  220. +12 −9 core/gpc_api.php
  221. +1 −1  core/graphviz_api.php
  222. +54 −12 core/helper_api.php
  223. +60 −60 core/history_api.php
  224. +53 −44 core/html_api.php
  225. +1 −1  core/http_api.php
  226. +1 −1  core/icon_api.php
  227. +3 −3 core/install_helper_functions_api.php
  228. +2 −2 core/lang_api.php
  229. +1 −1  core/last_visited_api.php
  230. +1 −1  core/ldap_api.php
  231. +8 −8 core/logging_api.php
  232. +7 −6 core/news_api.php
  233. +1 −1  core/obsolete.php
  234. +1 −1  core/php_api.php
  235. +16 −47 core/plugin_api.php
  236. +1 −1  core/prepare_api.php
  237. +37 −36 core/print_api.php
  238. +7 −7 core/profile_api.php
  239. +13 −8 core/project_api.php
  240. +3 −2 core/project_hierarchy_api.php
  241. +21 −18 core/relationship_api.php
  242. +1 −1  core/relationship_graph_api.php
  243. +1 −1  core/rss_api.php
  244. +9 −12 core/session_api.php
  245. +3 −2 core/sponsorship_api.php
  246. +42 −24 core/string_api.php
  247. +1 −1  core/summary_api.php
  248. +16 −11 core/tag_api.php
  249. +3 −2 core/tokens_api.php
  250. +3 −3 core/twitter_api.php
  251. +11 −9 core/user_api.php
  252. +3 −3 core/user_pref_api.php
  253. +2 −2 core/utility_api.php
  254. +13 −8 core/version_api.php
  255. +1 −1  core/wiki_api.php
  256. +1 −1  core/workflow_api.php
  257. +2 −2 core/xmlhttprequest_api.php
  258. +1 −3 docbook/Admin_Guide/en-US/Configuration.xml
  259. +1 −1  export.php
  260. +1 −1  file_download.php
  261. +7 −7 history_inc.php
  262. +2 −2 img_ext.php
  263. +1 −1  index.php
  264. +3 −3 issues_rss.php
  265. +1 −1  javascript_config.php
  266. +1 −1  javascript_translations.php
  267. +42 −0 js/jquery.iviewer.min.js
  268. +13 −0 js/jquery.mousewheel.min.js
  269. +467 −0 js/jquery.panzoom.js
  270. +228 −0 js/jquery.splitter.js
  271. +115 −0 js/jquery.tools.min.js
  272. +256 −0 js/jquery.treeview.js
  273. +31 −0 js/menu.js
  274. +2 −0  js/prettify/lang-apollo.js
  275. +18 −0 js/prettify/lang-clj.js
  276. +2 −0  js/prettify/lang-css.js
  277. +1 −0  js/prettify/lang-go.js
  278. +2 −0  js/prettify/lang-hs.js
  279. +3 −0  js/prettify/lang-lisp.js
  280. +2 −0  js/prettify/lang-lua.js
  281. +2 −0  js/prettify/lang-ml.js
  282. +4 −0 js/prettify/lang-n.js
  283. +1 −0  js/prettify/lang-proto.js
  284. +2 −0  js/prettify/lang-scala.js
  285. +2 −0  js/prettify/lang-sql.js
  286. +1 −0  js/prettify/lang-tex.js
  287. +2 −0  js/prettify/lang-vb.js
  288. +3 −0  js/prettify/lang-vhdl.js
  289. +2 −0  js/prettify/lang-wiki.js
  290. +3 −0  js/prettify/lang-xq.js
  291. +2 −0  js/prettify/lang-yaml.js
  292. +28 −0 js/prettify/prettify.min.js
  293. +45 −0 js/sidebar.js
  294. +185 −0 js/template.js
  295. +1 −48 lang/strings_afrikaans.txt
  296. +1 −7 lang/strings_amharic.txt
  297. +2 −109 lang/strings_arabic.txt
  298. +1 −108 lang/strings_arabicegyptianspoken.txt
  299. +1 −108 lang/strings_breton.txt
  300. +2 −85 lang/strings_bulgarian.txt
Sorry, we could not display the entire diff because too many files (647) changed.
View
10 account_delete.php
@@ -35,7 +35,7 @@
*
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
- * @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
+ * @copyright Copyright 2002 - 2013 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*
* @uses core.php
@@ -83,8 +83,8 @@
throw new MantisBT\Exception\User\ProtectedLastAdministrator();
}
-helper_ensure_confirmed( lang_get( 'confirm_delete_msg' ),
- lang_get( 'delete_account_button' ) );
+helper_ensure_confirmed( _( 'Are you sure you wish to delete your account?' ),
+ _( 'Delete Account' ) );
form_security_purge('account_delete');
@@ -102,8 +102,8 @@
<br />
<div>
<?php
-echo lang_get( 'account_removed_msg' ) . '<br />';
-print_bracket_link( config_get( 'logout_redirect_page' ), lang_get( 'proceed' ) );
+echo _( 'Your account has been removed...' ) . '<br />';
+print_bracket_link( config_get( 'logout_redirect_page' ), _( 'Proceed' ) );
?>
</div>
View
4 account_manage_columns_page.php
@@ -32,7 +32,7 @@
*
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
- * @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
+ * @copyright Copyright 2002 - 2013 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*
* @uses core.php
@@ -46,7 +46,7 @@
require_api( 'html_api.php' );
require_api( 'lang_api.php' );
-html_page_top( lang_get( 'manage_columns_config' ) );
+html_page_top( _( 'Manage Columns' ) );
current_user_ensure_unprotected();
View
38 account_page.php
@@ -39,7 +39,7 @@
*
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
- * @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
+ * @copyright Copyright 2002 - 2013 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*
* @uses core.php
@@ -97,14 +97,14 @@
# Only show the update button if there is something to update.
$t_show_update_button = false;
-html_page_top( lang_get( 'account_link' ) );
+html_page_top( _( 'My Account' ) );
if ( $t_force_pw_reset ) {
echo '<div id="reset-passwd-msg" class="important-msg">';
echo '<ul>';
- echo '<li>' . lang_get( 'verify_warning' ) . '</li>';
+ echo '<li>' . _( 'Your account information has been verified. The account confirmation message you have received is now invalid.' ) . '</li>';
if ( helper_call_custom_function( 'auth_can_change_password', array() ) ) {
- echo '<li>' . lang_get( 'verify_change_password' ) . '</li>';
+ echo '<li>' . _( 'You must set a password here to allow you to log in again.' ) . '</li>';
}
echo '</ul>';
echo '</div>';
@@ -114,20 +114,20 @@
<div id="account-update-div" class="form-container">
<form id="account-update-form" method="post" action="account_update.php">
<fieldset <?php if ( $t_force_pw_reset ) { ?> class="has-required"<?php } ?>>
- <legend><span><?php echo lang_get( 'edit_account_title' ); ?></span></legend>
+ <legend><span><?php echo _( 'Edit Account' ); ?></span></legend>
<?php echo form_security_field( 'account_update' );
print_account_menu( 'account_page.php' );
if ( !helper_call_custom_function( 'auth_can_change_password', array() ) ) {
# With LDAP --> ?>
<div class="field-container">
- <span class="display-label"><span><?php echo lang_get( 'username' ) ?></span></span>
+ <span class="display-label"><span><?php echo _( 'Username' ) ?></span></span>
<span class="input"><span class="field-value"><?php echo string_display_line( $u_username ) ?></span></span>
<span class="label-style"></span>
</div>
<div class="field-container">
- <span class="display-label"><span><?php echo lang_get( 'password' ) ?></span></span>
- <span class="input"><span class="field-value"><?php echo lang_get( 'no_password_change' ) ?></span></span>
+ <span class="display-label"><span><?php echo _( 'Password' ) ?></span></span>
+ <span class="input"><span class="field-value"><?php echo _( 'The password is controlled by another system, hence cannot be edited here.' ) ?></span></span>
<span class="label-style"></span>
</div><?php
} else {
@@ -135,23 +135,23 @@
$t_show_update_button = true;
?>
<div class="field-container">
- <span class="display-label"><span><?php echo lang_get( 'username' ) ?></span></span>
+ <span class="display-label"><span><?php echo _( 'Username' ) ?></span></span>
<span class="input"><span class="field-value"><?php echo string_display_line( $u_username ) ?></span></span>
<span class="label-style"></span>
</div>
<div class="field-container">
- <label for="password" <?php if ( $t_force_pw_reset ) { ?> class="required" <?php } ?>><span><?php echo lang_get( 'password' ) ?></span></label>
+ <label for="password" <?php if ( $t_force_pw_reset ) { ?> class="required" <?php } ?>><span><?php echo _( 'Password' ) ?></span></label>
<span class="input"><input id="password" type="password" name="password" size="32" maxlength="<?php echo PASSLEN; ?>" /></span>
<span class="label-style"></span>
</div>
<div class="field-container">
- <label for="password-confirm" <?php if ( $t_force_pw_reset ) { ?> class="required" <?php } ?>><span><?php echo lang_get( 'confirm_password' ) ?></span></label>
+ <label for="password-confirm" <?php if ( $t_force_pw_reset ) { ?> class="required" <?php } ?>><span><?php echo _( 'Confirm Password' ) ?></span></label>
<span class="input"><input id="password-confirm" type="password" name="password_confirm" size="32" maxlength="<?php echo PASSLEN; ?>" /></span>
<span class="label-style"></span>
</div><?php
} ?>
<div class="field-container">
- <span class="display-label"><span><?php echo lang_get( 'email' ) ?></span></span>
+ <span class="display-label"><span><?php echo _( 'E-mail' ) ?></span></span>
<span class="input"><?php
if ( $t_ldap && ON == config_get( 'use_ldap_email' ) ) {
// With LDAP
@@ -167,7 +167,7 @@
<div class="field-container"><?php
if ( $t_ldap && ON == config_get( 'use_ldap_realname' ) ) {
# With LDAP
- echo '<span class="display-label"><span>' . lang_get( 'realname' ) . '</span></span>';
+ echo '<span class="display-label"><span>' . _( 'Real Name' ) . '</span></span>';
echo '<span class="input">';
echo '<span class="field-value">';
echo string_display_line( ldap_realname( $u_user_id ) );
@@ -176,7 +176,7 @@
} else {
# Without LDAP
$t_show_update_button = true;
- echo '<label for="realname"><span>' . lang_get( 'realname' ) . '</span></label>';
+ echo '<label for="realname"><span>' . _( 'Real Name' ) . '</span></label>';
echo '<span class="input">';
echo '<input id="realname" type="text" size="32" maxlength="' . REALLEN . '" name="realname" value="' . string_attribute( $u_realname ) . '" />';
echo '</span>';
@@ -184,12 +184,12 @@
<span class="label-style"></span>
</div>
<div class="field-container">
- <span class="display-label"><span><?php echo lang_get( 'access_level' ) ?></span></span>
+ <span class="display-label"><span><?php echo _( 'Access Level' ) ?></span></span>
<span class="input"><span class="field-value"><?php echo get_enum_element( 'access_levels', $u_access_level ); ?></span></span>
<span class="label-style"></span>
</div>
<div class="field-container">
- <span class="display-label"><span><?php echo lang_get( 'access_level_project' ) ?></span></span>
+ <span class="display-label"><span><?php echo _( 'Project Access Level' ) ?></span></span>
<span class="input"><span class="field-value"><?php echo get_enum_element( 'access_levels', current_user_get_access_level() ); ?></span></span>
<span class="label-style"></span>
</div>
@@ -197,7 +197,7 @@
$t_projects = user_get_assigned_projects( auth_get_current_user_id() );
if( count( $t_projects ) > 0 ) {
echo '<div class="field-container">';
- echo '<span class="display-label"><span>' . lang_get( 'assigned_projects' ) . '</span></span>';
+ echo '<span class="display-label"><span>' . _( 'Assigned Projects' ) . '</span></span>';
echo '<div class="input">';
echo '<ul class="project-list">';
foreach( $t_projects AS $t_project_id=>$t_project ) {
@@ -216,7 +216,7 @@
}
?>
<?php if ( $t_show_update_button ) { ?>
- <span class="submit-button"><input type="submit" class="button" value="<?php echo lang_get( 'update_user_button' ) ?>" /></span>
+ <span class="submit-button"><input type="submit" class="button" value="<?php echo _( 'Update User' ) ?>" /></span>
<?php } ?>
</fieldset>
</form>
@@ -229,7 +229,7 @@
<form method="post" action="account_delete.php">
<fieldset>
<?php echo form_security_field( 'account_delete' ) ?>
- <span class="submit-button"><input type="submit" class="button" value="<?php echo lang_get( 'delete_account_button' ) ?>" /></span>
+ <span class="submit-button"><input type="submit" class="button" value="<?php echo _( 'Delete Account' ) ?>" /></span>
</fieldset>
</form>
</div>
View
86 account_prefs_inc.php
@@ -19,7 +19,7 @@
*
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
- * @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
+ * @copyright Copyright 2002 - 2013 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*
* @uses authentication_api.php
@@ -90,7 +90,7 @@ function edit_account_prefs($p_user_id = null, $p_error_if_protected = true, $p_
<div id="account-prefs-update-div" class="form-container">
<form id="account-prefs-update-form" method="post" action="account_prefs_update.php">
<fieldset>
- <legend><span><?php echo lang_get( 'default_account_preferences_title' ) ?></span></legend>
+ <legend><span><?php echo _( 'Account Preferences' ) ?></span></legend>
<?php echo form_security_field( 'account_prefs_update' ) ?>
<input type="hidden" name="user_id" value="<?php echo $p_user_id ?>" />
<input type="hidden" name="redirect_url" value="<?php echo $t_redirect_url ?>" />
@@ -100,7 +100,7 @@ function edit_account_prefs($p_user_id = null, $p_error_if_protected = true, $p_
}
?>
<div class="field-container">
- <label for="default-project-id"><span><?php echo lang_get( 'default_project' ) ?></span></label>
+ <label for="default-project-id"><span><?php echo _( 'Default Project' ) ?></span></label>
<span class="select">
<select id="default-project-id" name="default_project">
<?php print_project_option_list( $t_pref->default_project ) ?>
@@ -109,31 +109,31 @@ function edit_account_prefs($p_user_id = null, $p_error_if_protected = true, $p_
<span class="label-style"></span>
</div>
<div class="field-container">
- <label for="refresh-delay"><span><?php echo lang_get( 'refresh_delay' ) ?></span></label>
- <span class="input"><input id="refresh-delay" type="text" name="refresh_delay" size="4" maxlength="4" value="<?php echo $t_pref->refresh_delay ?>" /> <?php echo lang_get( 'minutes' ) ?></span>
+ <label for="refresh-delay"><span><?php echo _( 'Refresh Delay' ) ?></span></label>
+ <span class="input"><input id="refresh-delay" type="text" name="refresh_delay" size="4" maxlength="4" value="<?php echo $t_pref->refresh_delay ?>" /> <?php echo _( 'minutes' ) ?></span>
<span class="label-style"></span>
</div>
<div class="field-container">
- <label for="redirect-delay"><span><?php echo lang_get( 'redirect_delay' ) ?></span></label>
- <span class="input"><input id="redirect-delay" type="text" name="redirect_delay" size="4" maxlength="3" value="<?php echo $t_pref->redirect_delay ?>" /> <?php echo lang_get( 'seconds' ) ?></span>
+ <label for="redirect-delay"><span><?php echo _( 'Redirect Delay' ) ?></span></label>
+ <span class="input"><input id="redirect-delay" type="text" name="redirect_delay" size="4" maxlength="3" value="<?php echo $t_pref->redirect_delay ?>" /> <?php echo _( 'seconds' ) ?></span>
<span class="label-style"></span>
</div>
<fieldset class="field-container">
- <legend><span><?php echo lang_get( 'bugnote_order' ) ?></span></legend>
+ <legend><span><?php echo _( 'Notes Sort Order' ) ?></span></legend>
<span class="radio"><input id="bugnote-order-desc" type="radio" name="bugnote_order" value="DESC" <?php check_checked( $t_pref->bugnote_order, 'DESC' ); ?> /></span>
- <label for="bugnote-order-desc"><span><?php echo lang_get( 'bugnote_order_desc' ) ?></span></label>
+ <label for="bugnote-order-desc"><span><?php echo _( 'Descending' ) ?></span></label>
<span class="radio"><input id="bugnote-order-asc" type="radio" name="bugnote_order" value="ASC" <?php check_checked( $t_pref->bugnote_order, 'ASC' ); ?> /></span>
- <label for="bugnote-order-asc"><span><?php echo lang_get( 'bugnote_order_asc' ) ?></span></label>
+ <label for="bugnote-order-asc"><span><?php echo _( 'Ascending' ) ?></span></label>
<span class="label-style"></span>
</fieldset>
<?php if ( ON == config_get( 'enable_email_notification' ) ) { ?>
<fieldset class="field-container">
- <legend><label for="email-on-new"><?php echo lang_get( 'email_on_new' ) ?></label></legend>
+ <legend><label for="email-on-new"><?php echo _( 'E-mail on New' ) ?></label></legend>
<span class="checkbox"><input id="email-on-new" type="checkbox" name="email_on_new" <?php check_checked( $t_pref->email_on_new, ON ); ?> /></span>
- <label for="email-on-new-min-severity" class="email-on-severity-label"><span><?php echo lang_get( 'with_minimum_severity' ) ?></span></label>
+ <label for="email-on-new-min-severity" class="email-on-severity-label"><span><?php echo _( 'With Minimum Severity of' ) ?></span></label>
<span class="select email-on-severity">
<select id="email-on-new-min-severity" name="email_on_new_min_severity">
- <option value="<?php echo OFF ?>"><?php echo lang_get( 'any' ) ?></option>
+ <option value="<?php echo OFF ?>"><?php echo _( 'any' ) ?></option>
<option disabled="disabled">-----</option>
<?php print_enum_string_option_list( 'severity', $t_pref->email_on_new_min_severity ) ?>
</select>
@@ -141,12 +141,12 @@ function edit_account_prefs($p_user_id = null, $p_error_if_protected = true, $p_
<span class="label-style"></span>
</fieldset>
<fieldset class="field-container">
- <legend><label for="email-on-assigned"><?php echo lang_get( 'email_on_assigned' ) ?></label></legend>
+ <legend><label for="email-on-assigned"><?php echo _( 'E-mail on Change of Handler' ) ?></label></legend>
<span class="checkbox"><input id="email-on-assigned" type="checkbox" name="email_on_assigned" <?php check_checked( $t_pref->email_on_assigned, ON ); ?> /></span>
- <label for="email-on-assigned-min-severity" class="email-on-severity-label"><span><?php echo lang_get( 'with_minimum_severity' ) ?></span></label>
+ <label for="email-on-assigned-min-severity" class="email-on-severity-label"><span><?php echo _( 'With Minimum Severity of' ) ?></span></label>
<span class="select email-on-severity">
<select id="email-on-assigned-min-severity" name="email_on_assigned_min_severity">
- <option value="<?php echo OFF ?>"><?php echo lang_get( 'any' ) ?></option>
+ <option value="<?php echo OFF ?>"><?php echo _( 'any' ) ?></option>
<option disabled="disabled">-----</option>
<?php print_enum_string_option_list( 'severity', $t_pref->email_on_assigned_min_severity ) ?>
</select>
@@ -154,12 +154,12 @@ function edit_account_prefs($p_user_id = null, $p_error_if_protected = true, $p_
<span class="label-style"></span>
</fieldset>
<fieldset class="field-container">
- <legend><label for="email-on-feedback"><?php echo lang_get( 'email_on_feedback' ) ?></label></legend>
+ <legend><label for="email-on-feedback"><?php echo _( 'E-mail on Feedback' ) ?></label></legend>
<span class="checkbox"><input id="email-on-feedback" type="checkbox" name="email_on_feedback" <?php check_checked( $t_pref->email_on_feedback, ON ); ?> /></span>
- <label for="email-on-feedback-min-severity" class="email-on-severity-label"><span><?php echo lang_get( 'with_minimum_severity' ) ?></span></label>
+ <label for="email-on-feedback-min-severity" class="email-on-severity-label"><span><?php echo _( 'With Minimum Severity of' ) ?></span></label>
<span class="select email-on-severity">
<select id="email-on-feedback-min-severity" name="email_on_feedback_min_severity">
- <option value="<?php echo OFF ?>"><?php echo lang_get( 'any' ) ?></option>
+ <option value="<?php echo OFF ?>"><?php echo _( 'any' ) ?></option>
<option disabled="disabled">-----</option>
<?php print_enum_string_option_list( 'severity', $t_pref->email_on_feedback_min_severity ) ?>
</select>
@@ -167,12 +167,12 @@ function edit_account_prefs($p_user_id = null, $p_error_if_protected = true, $p_
<span class="label-style"></span>
</fieldset>
<fieldset class="field-container">
- <legend><label for="email-on-resolved"><?php echo lang_get( 'email_on_resolved' ) ?></label></legend>
+ <legend><label for="email-on-resolved"><?php echo _( 'E-mail on Resolved' ) ?></label></legend>
<span class="checkbox"><input id="email-on-resolved" type="checkbox" name="email_on_resolved" <?php check_checked( $t_pref->email_on_resolved, ON ); ?> /></span>
- <label for="email-on-resolved-min-severity" class="email-on-severity-label"><span><?php echo lang_get( 'with_minimum_severity' ) ?></span></label>
+ <label for="email-on-resolved-min-severity" class="email-on-severity-label"><span><?php echo _( 'With Minimum Severity of' ) ?></span></label>
<span class="select email-on-severity">
<select id="email-on-resolved-min-severity" name="email_on_resolved_min_severity">
- <option value="<?php echo OFF ?>"><?php echo lang_get( 'any' ) ?></option>
+ <option value="<?php echo OFF ?>"><?php echo _( 'any' ) ?></option>
<option disabled="disabled">-----</option>
<?php print_enum_string_option_list( 'severity', $t_pref->email_on_resolved_min_severity ) ?>
</select>
@@ -180,12 +180,12 @@ function edit_account_prefs($p_user_id = null, $p_error_if_protected = true, $p_
<span class="label-style"></span>
</fieldset>
<fieldset class="field-container">
- <legend><label for="email-on-closed"><?php echo lang_get( 'email_on_closed' ) ?></label></legend>
+ <legend><label for="email-on-closed"><?php echo _( 'E-mail on Closed' ) ?></label></legend>
<span class="checkbox"><input id="email-on-closed" type="checkbox" name="email_on_closed" <?php check_checked( $t_pref->email_on_closed, ON ); ?> /></span>
- <label for="email-on-closed-min-severity" class="email-on-severity-label"><span><?php echo lang_get( 'with_minimum_severity' ) ?></span></label>
+ <label for="email-on-closed-min-severity" class="email-on-severity-label"><span><?php echo _( 'With Minimum Severity of' ) ?></span></label>
<span class="select email-on-severity">
<select id="email-on-closed-min-severity" name="email_on_closed_min_severity">
- <option value="<?php echo OFF ?>"><?php echo lang_get( 'any' ) ?></option>
+ <option value="<?php echo OFF ?>"><?php echo _( 'any' ) ?></option>
<option disabled="disabled">-----</option>
<?php print_enum_string_option_list( 'severity', $t_pref->email_on_closed_min_severity ) ?>
</select>
@@ -193,12 +193,12 @@ function edit_account_prefs($p_user_id = null, $p_error_if_protected = true, $p_
<span class="label-style"></span>
</fieldset>
<fieldset class="field-container">
- <legend><label for="email-on-reopened"><?php echo lang_get( 'email_on_reopened' ) ?></label></legend>
+ <legend><label for="email-on-reopened"><?php echo _( 'E-mail on Reopened' ) ?></label></legend>
<span class="checkbox"><input id="email-on-reopened" type="checkbox" name="email_on_reopened" <?php check_checked( $t_pref->email_on_reopened, ON ); ?> /></span>
- <label for="email-on-reopened-min-severity" class="email-on-severity-label"><span><?php echo lang_get( 'with_minimum_severity' ) ?></span></label>
+ <label for="email-on-reopened-min-severity" class="email-on-severity-label"><span><?php echo _( 'With Minimum Severity of' ) ?></span></label>
<span class="select email-on-severity">
<select id="email-on-reopened-min-severity" name="email_on_reopened_min_severity">
- <option value="<?php echo OFF ?>"><?php echo lang_get( 'any' ) ?></option>
+ <option value="<?php echo OFF ?>"><?php echo _( 'any' ) ?></option>
<option disabled="disabled">-----</option>
<?php print_enum_string_option_list( 'severity', $t_pref->email_on_reopened_min_severity ) ?>
</select>
@@ -206,12 +206,12 @@ function edit_account_prefs($p_user_id = null, $p_error_if_protected = true, $p_
<span class="label-style"></span>
</fieldset>
<fieldset class="field-container">
- <legend><label for="email-on-bugnote-added"><?php echo lang_get( 'email_on_bugnote_added' ) ?></label></legend>
+ <legend><label for="email-on-bugnote-added"><?php echo _( 'E-mail on Note Added' ) ?></label></legend>
<span class="checkbox"><input id="email-on-bugnote-added" type="checkbox" name="email_on_bugnote" <?php check_checked( $t_pref->email_on_bugnote, ON ); ?> /></span>
- <label for="email-on-bugnote-min-severity" class="email-on-severity-label"><span><?php echo lang_get( 'with_minimum_severity' ) ?></span></label>
+ <label for="email-on-bugnote-min-severity" class="email-on-severity-label"><span><?php echo _( 'With Minimum Severity of' ) ?></span></label>
<span class="select email-on-severity">
<select id="email-on-bugnote-min-severity" name="email_on_bugnote_min_severity">
- <option value="<?php echo OFF ?>"><?php echo lang_get( 'any' ) ?></option>
+ <option value="<?php echo OFF ?>"><?php echo _( 'any' ) ?></option>
<option disabled="disabled">-----</option>
<?php print_enum_string_option_list( 'severity', $t_pref->email_on_bugnote_min_severity ) ?>
</select>
@@ -219,12 +219,12 @@ function edit_account_prefs($p_user_id = null, $p_error_if_protected = true, $p_
<span class="label-style"></span>
</fieldset>
<fieldset class="field-container">
- <legend><label for="email-on-status"><?php echo lang_get( 'email_on_status_change' ) ?></label></legend>
+ <legend><label for="email-on-status"><?php echo _( 'E-mail on Status Change' ) ?></label></legend>
<span class="checkbox"><input id="email-on-status" type="checkbox" name="email_on_status" <?php check_checked( $t_pref->email_on_status, ON ); ?> /></span>
- <label for="email-on-status-min-severity" class="email-on-severity-label"><span><?php echo lang_get( 'with_minimum_severity' ) ?></span></label>
+ <label for="email-on-status-min-severity" class="email-on-severity-label"><span><?php echo _( 'With Minimum Severity of' ) ?></span></label>
<span class="select email-on-severity">
<select id="email-on-status-min-severity" name="email_on_status_min_severity">
- <option value="<?php echo OFF ?>"><?php echo lang_get( 'any' ) ?></option>
+ <option value="<?php echo OFF ?>"><?php echo _( 'any' ) ?></option>
<option disabled="disabled">-----</option>
<?php print_enum_string_option_list( 'severity', $t_pref->email_on_status_min_severity ) ?>
</select>
@@ -232,12 +232,12 @@ function edit_account_prefs($p_user_id = null, $p_error_if_protected = true, $p_
<span class="label-style"></span>
</fieldset>
<fieldset class="field-container">
- <legend><label for="email-on-priority-change"><?php echo lang_get( 'email_on_priority_change' ) ?></label></legend>
+ <legend><label for="email-on-priority-change"><?php echo _( 'E-mail on Priority Change' ) ?></label></legend>
<span class="checkbox"><input id="email-on-priority-change" type="checkbox" name="email_on_priority" <?php check_checked( $t_pref->email_on_priority , ON); ?> /></span>
- <label for="email-on-priority-min-severity" class="email-on-severity-label"><span><?php echo lang_get( 'with_minimum_severity' ) ?></span></label>
+ <label for="email-on-priority-min-severity" class="email-on-severity-label"><span><?php echo _( 'With Minimum Severity of' ) ?></span></label>
<span class="select email-on-severity">
<select id="email-on-priority-min-severity" name="email_on_priority_min_severity">
- <option value="<?php echo OFF ?>"><?php echo lang_get( 'any' ) ?></option>
+ <option value="<?php echo OFF ?>"><?php echo _( 'any' ) ?></option>
<option disabled="disabled">-----</option>
<?php print_enum_string_option_list( 'severity', $t_pref->email_on_priority_min_severity ) ?>
</select>
@@ -245,7 +245,7 @@ function edit_account_prefs($p_user_id = null, $p_error_if_protected = true, $p_
<span class="label-style"></span>
</fieldset>
<div class="field-container">
- <label for="email-bugnote-limit"><span><?php echo lang_get( 'email_bugnote_limit' ) ?></span></label>
+ <label for="email-bugnote-limit"><span><?php echo _( 'E-mail Notes Limit' ) ?></span></label>
<span class="input"><input id="email-bugnote-limit" type="text" name="email_bugnote_limit" maxlength="2" size="2" value="<?php echo $t_pref->email_bugnote_limit ?>" /></span>
<span class="label-style"></span>
</div>
@@ -271,7 +271,7 @@ function edit_account_prefs($p_user_id = null, $p_error_if_protected = true, $p_
<input type="hidden" name="email_bugnote_limit" value="<?php echo $t_pref->email_bugnote_limit ?>" />
<?php } ?>
<div class="field-container">
- <label for="timezone"><span><?php echo lang_get( 'timezone' ) ?></span></label>
+ <label for="timezone"><span><?php echo _( 'Time Zone' ) ?></span></label>
<span class="select">
<select id="timezone" name="timezone">
<?php print_timezone_option_list( $t_pref->timezone ? $t_pref->timezone : config_get_global( 'default_timezone' ) ) ?>
@@ -280,7 +280,7 @@ function edit_account_prefs($p_user_id = null, $p_error_if_protected = true, $p_
<span class="label-style"></span>
</div>
<div class="field-container">
- <label for="language"><span><?php echo lang_get( 'language' ) ?></span></label>
+ <label for="language"><span><?php echo _( 'Language' ) ?></span></label>
<span class="select">
<select id="language" name="language">
<?php print_language_option_list( $t_pref->language ) ?>
@@ -289,7 +289,7 @@ function edit_account_prefs($p_user_id = null, $p_error_if_protected = true, $p_
<span class="label-style"></span>
</div>
<div class="field-container">
- <label for="theme"><span><?php echo lang_get( 'theme' ) ?></span></label>
+ <label for="theme"><span><?php echo _( 'Theme' ) ?></span></label>
<span class="select">
<select id="theme" name="theme">
<?php print_theme_option_list( $t_pref->theme ) ?>
@@ -298,7 +298,7 @@ function edit_account_prefs($p_user_id = null, $p_error_if_protected = true, $p_
<span class="label-style"></span>
</div>
<?php event_signal( 'EVENT_ACCOUNT_PREF_UPDATE_FORM', array( $p_user_id ) ); ?>
- <span class="submit-button"><input type="submit" class="button" value="<?php echo lang_get( 'update_prefs_button' ) ?>" /></span>
+ <span class="submit-button"><input type="submit" class="button" value="<?php echo _( 'Update Prefs' ) ?>" /></span>
</fieldset>
</form>
</div>
@@ -309,7 +309,7 @@ function edit_account_prefs($p_user_id = null, $p_error_if_protected = true, $p_
<?php echo form_security_field( 'account_prefs_reset' ) ?>
<input type="hidden" name="user_id" value="<?php echo $p_user_id ?>" />
<input type="hidden" name="redirect_url" value="<?php echo $t_redirect_url ?>" />
- <span class="submit-button"><input type="submit" class="button" value="<?php echo lang_get( 'reset_prefs_button' ) ?>" /></span>
+ <span class="submit-button"><input type="submit" class="button" value="<?php echo _( 'Reset Prefs' ) ?>" /></span>
</fieldset>
</form>
</div>
View
4 account_prefs_page.php
@@ -36,7 +36,7 @@
*
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
- * @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
+ * @copyright Copyright 2002 - 2013 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*
* @uses core.php
@@ -63,7 +63,7 @@
define( 'ACCOUNT_PREFS_INC_ALLOW', true );
include( dirname( __FILE__ ) . '/account_prefs_inc.php' );
-html_page_top( lang_get( 'change_preferences_link' ) );
+html_page_top( _( 'Preferences' ) );
edit_account_prefs();
View
2  account_prefs_reset.php
@@ -32,7 +32,7 @@
*
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
- * @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
+ * @copyright Copyright 2002 - 2013 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*
* @uses core.php
View
2  account_prefs_update.php
@@ -19,7 +19,7 @@
*
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
- * @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
+ * @copyright Copyright 2002 - 2013 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*
* @uses core.php
View
14 account_prof_edit_page.php
@@ -20,7 +20,7 @@
*
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
- * @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
+ * @copyright Copyright 2002 - 2013 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*
* @uses core.php
@@ -87,7 +87,7 @@
<tr>
<td class="form-title">
<input type="hidden" name="profile_id" value="<?php echo $v_id ?>" />
- <?php echo lang_get( 'edit_profile_title' ) ?>
+ <?php echo _( 'Edit Profile' ) ?>
</td>
<td class="right">
<?php
@@ -99,7 +99,7 @@
</tr>
<tr class="row-1">
<th class="category" width="25%">
- <span class="required">*</span><?php echo lang_get( 'platform' ) ?>
+ <span class="required">*</span><?php echo _( 'platform' ) ?>
</th>
<td width="75%">
<input type="text" name="platform" size="32" maxlength="32" value="<?php echo string_attribute( $v_platform ) ?>" />
@@ -107,7 +107,7 @@
</tr>
<tr class="row-2">
<th class="category">
- <span class="required">*</span><?php echo lang_get( 'operating_system' ) ?>
+ <span class="required">*</span><?php echo _( 'Operating System' ) ?>
</th>
<td>
<input type="text" name="os" size="32" maxlength="32" value="<?php echo string_attribute( $v_os ) ?>" />
@@ -115,7 +115,7 @@
</tr>
<tr class="row-1">
<th class="category">
- <span class="required">*</span><?php echo lang_get( 'os_version' ) ?>
+ <span class="required">*</span><?php echo _( 'OS Version' ) ?>
</th>
<td>
<input type="text" name="os_build" size="16" maxlength="16" value="<?php echo string_attribute( $v_os_build ) ?>" />
@@ -123,7 +123,7 @@
</tr>
<tr class="row-2">
<th class="category">
- <?php echo lang_get( 'additional_description' ) ?>
+ <?php echo _( 'Additional Description' ) ?>
</th>
<td>
<textarea name="description" cols="60" rows="8"><?php echo string_textarea( $v_description ) ?></textarea>
@@ -131,7 +131,7 @@
</tr>
<tr>
<td class="center" colspan="2">
- <input type="submit" class="button" value="<?php echo lang_get( 'update_profile_button' ) ?>" />
+ <input type="submit" class="button" value="<?php echo _( 'Update Profile' ) ?>" />
</td>
</tr>
</table>
View
28 account_prof_menu_page.php
@@ -22,7 +22,7 @@
*
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
- * @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
+ * @copyright Copyright 2002 - 2013 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*
* @uses core.php
@@ -70,7 +70,7 @@
access_ensure_global_level( config_get( 'add_profile_threshold' ) );
}
-html_page_top( lang_get( 'manage_profiles_link' ) );
+html_page_top( _( 'Profiles' ) );
if ( $g_global_profiles ) {
print_manage_menu( 'prof_menu_page.php' );
@@ -87,7 +87,7 @@
<div id="account-profile-div" class="form-container">
<form id="account-profile-form" method="post" action="account_prof_update.php">
<fieldset class="has-required">
- <legend><span><?php echo lang_get( 'add_profile_title' ) ?></span></legend>
+ <legend><span><?php echo _( 'Add Profile' ) ?></span></legend>
<?php echo form_security_field( 'profile_update' )?>
<input type="hidden" name="action" value="add" />
<input type="hidden" name="user_id" value="<?php echo $t_user_id ?>" />
@@ -97,26 +97,26 @@
}
?>
<div class="field-container">
- <label for="platform" class="required"><span><?php echo lang_get( 'platform' ) ?></span></label>
+ <label for="platform" class="required"><span><?php echo _( 'platform' ) ?></span></label>
<span class="input"><input id="platform" type="text" name="platform" size="32" maxlength="32" /></span>
<span class="label-style"></span>
</div>
<div class="field-container">
- <label for="os" class="required"><span><?php echo lang_get( 'operating_system' ) ?></span></label>
+ <label for="os" class="required"><span><?php echo _( 'Operating System' ) ?></span></label>
<span class="input"><input id="os" type="text" name="os" size="32" maxlength="32" /></span>
<span class="label-style"></span>
</div>
<div class="field-container">
- <label for="os-version" class="required"><span><?php echo lang_get( 'os_version' ) ?></span></label>
+ <label for="os-version" class="required"><span><?php echo _( 'OS Version' ) ?></span></label>
<span class="input"><input id="os-version" type="text" name="os_build" size="16" maxlength="16" /></span>
<span class="label-style"></span>
</div>
<div class="field-container">
- <label for="description"><span><?php echo lang_get( 'additional_description' ) ?></span></label>
+ <label for="description"><span><?php echo _( 'Additional Description' ) ?></span></label>
<span class="textarea"><textarea id="description" name="description" cols="80" rows="8"></textarea></span>
<span class="label-style"></span>
</div>
- <span class="submit-button"><input type="submit" class="button" value="<?php echo lang_get( 'add_profile_button' ) ?>" /></span>
+ <span class="submit-button"><input type="submit" class="button" value="<?php echo _( 'Add Profile' ) ?>" /></span>
</fieldset>
</form>
</div>
@@ -131,27 +131,27 @@
<div id="account-profile-update-div" class="form-container">
<form id="account-profile-update-form" method="post" action="account_prof_update.php">
<fieldset>
- <legend><span><?php echo lang_get( 'edit_or_delete_profiles_title' ) ?></span></legend>
+ <legend><span><?php echo _( 'Edit or Delete Profiles' ) ?></span></legend>
<?php echo form_security_field( 'profile_update' )?>
<div class="field-container">
- <label for="action-edit"><span><?php echo lang_get( 'edit_profile' ) ?></span></label>
+ <label for="action-edit"><span><?php echo _( 'Edit Profile' ) ?></span></label>
<span class="input"><input id="action-edit" type="radio" name="action" value="edit" /></span>
<span class="label-style"></span>
</div>
<div class="field-container">
<?php if ( !$g_global_profiles ) { ?>
- <label for="action-default"><span><?php echo lang_get( 'make_default' ) ?></span></label>
+ <label for="action-default"><span><?php echo _( 'Make Default' ) ?></span></label>
<span class="input"><input id="action-default" type="radio" name="action" value="make_default" /></span>
<?php } ?>
<span class="label-style"></span>
</div>
<div class="field-container">
- <label for="action-delete"><span><?php echo lang_get( 'delete_profile' ) ?></span></label>
+ <label for="action-delete"><span><?php echo _( 'Delete Profile' ) ?></span></label>
<span class="input"><input id="action-delete" type="radio" name="action" value="delete" /></span>
<span class="label-style"></span>
</div>
<div class="field-container">
- <label for="select-profile"><span><?php echo lang_get( 'select_profile' ) ?></span></label>
+ <label for="select-profile"><span><?php echo _( 'Select Profile' ) ?></span></label>
<span class="input">
<select id="select-profile" name="profile_id">
<?php print_profile_option_list( $t_user_id, '', $t_profiles ) ?>
@@ -159,7 +159,7 @@
</span>
<span class="label-style"></span>
</div>
- <span class="submit-button"><input type="submit" class="button" value="<?php echo lang_get( 'submit_button' ) ?>" /></span>
+ <span class="submit-button"><input type="submit" class="button" value="<?php echo _( 'Submit' ) ?>" /></span>
</fieldset>
</form>
</div>
View
2  account_prof_update.php
@@ -20,7 +20,7 @@
*
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
- * @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
+ * @copyright Copyright 2002 - 2013 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*
* @uses core.php
View
74 account_sponsor_page.php
@@ -34,7 +34,7 @@
*
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
- * @copyright Copyright (C) 2002 - 2012 MantisBT Team - mantisbt-dev@lists.sourceforge.net
+ * @copyright Copyright 2002 - 2013 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*
* @uses core.php
@@ -89,7 +89,7 @@
$t_show_all = gpc_get_bool( 'show_all', false );
# start the page
-html_page_top( lang_get( 'my_sponsorship' ) );
+html_page_top( _( 'My Sponsorships' ) );
$t_project = helper_get_current_project();
?>
@@ -97,7 +97,7 @@
<table class="width100" cellspacing="1">
<tr>
<td class="form-title">
- <?php echo lang_get( 'my_sponsorship' ) ?>
+ <?php echo _( 'My Sponsorships' ) ?>
</td>
<td class="right">
<?php print_account_menu( 'account_sponsor_page.php' ) ?>
@@ -128,7 +128,7 @@
$t_sponsor_count = count( $t_sponsors );
if ( $t_sponsor_count === 0 ) {
- echo '<p>' . lang_get( 'no_own_sponsored' ) . '</p>';
+ echo '<p>' . _( 'You have not sponsored any issues.' ) . '</p>';
} else {
?>
@@ -150,18 +150,18 @@
<!-- Headings -->
<tr>
<td class="form-title" colspan="9">
- <?php echo lang_get( 'own_sponsored' ) ?>
+ <?php echo _( 'Issues You have Sponsored:' ) ?>
</td>
</tr>
<tr>
- <td class="form-title"><?php echo lang_get( 'email_bug' ) ?></td>
- <td class="form-title"><?php echo lang_get( 'email_project' ) ?></td>
- <td class="form-title"><?php echo lang_get( 'fixed_in_version' ) ?></td>
- <td class="form-title"><?php echo lang_get( 'email_status' ) ?></td>
- <td class="form-title"><?php echo lang_get( 'email_handler' ) ?></td>
- <td class="form-title"><?php echo lang_get( 'email_summary' ) ?></td>
- <td class="form-title"><?php echo lang_get( 'amount' ) ?></td>
- <td class="form-title"><?php echo lang_get( 'status' ) ?></td>
+ <td class="form-title"><?php echo _( 'Issue ID' ) ?></td>
+ <td class="form-title"><?php echo _( 'Project' ) ?></td>
+ <td class="form-title"><?php echo _( 'Fixed in Version' ) ?></td>
+ <td class="form-title"><?php echo _( 'Status' ) ?></td>
+ <td class="form-title"><?php echo _( 'Assigned To' ) ?></td>
+ <td class="form-title"><?php echo _( 'Summary' ) ?></td>
+ <td class="form-title"><?php echo _( 'Amount' ) ?></td>
+ <td class="form-title"><?php echo _( 'Status' ) ?></td>
<td class="form-title">&#160;</td>
</tr>
<?php
@@ -177,12 +177,15 @@
$t_resolution = string_attribute( get_enum_element( 'resolution', $t_bug->resolution ) );
$t_version_id = version_get_id( $t_bug->fixed_in_version, $t_bug->project_id );
if ( ( false !== $t_version_id ) && ( VERSION_RELEASED == version_get_field( $t_version_id, 'released' ) ) ) {
- $t_released_label = '<a title="' . lang_get( 'released' ) . '">' . $t_bug->fixed_in_version . '</a>';
+ $t_released_label = '<a title="' . _( 'Released' ) . '">' . $t_bug->fixed_in_version . '</a>';
} else {
$t_released_label = $t_bug->fixed_in_version;
}
- echo '<tr class="' . MantisEnum::getLabel( config_get('status_enum_string' ), $t_bug->status ) . '-color">';
+ # choose color based on status
+ $status_label = html_get_status_css_class( $t_bug->status, auth_get_current_user_id(), $t_bug->project_id );
+
+ echo '<tr class="' . $status_label . '">';
echo '<td><a href="' . string_get_bug_view_url( $row['bug'] ) . '">' . bug_format_id( $row['bug'] ) . '</a></td>';
echo '<td>' . project_get_field( $t_bug->project_id, 'name' ) . '&#160;</td>';
echo '<td class="right">' . $t_released_label . '&#160;</td>';
@@ -194,7 +197,7 @@
# summary
echo '<td>' . string_display_line( $t_bug->summary );
if ( VS_PRIVATE == $t_bug->view_state ) {
- printf( ' <img src="%s" alt="(%s)" title="%s" />', helper_mantis_url( 'themes/' . config_get( 'theme' ) . '/images/protected.png' ), lang_get( 'private' ), lang_get( 'private' ) );
+ printf( ' <img src="%s" alt="(%s)" title="%s" />', helper_mantis_url( 'themes/' . config_get( 'theme' ) . '/images/protected.png' ), _( 'private' ), _( 'private' ) );
}
echo '</td>';
@@ -221,13 +224,13 @@
<!-- Totals -->
<tr>
<td colspan="5"></td>
- <td><?php echo lang_get( 'total_owing' ) ?></td>
+ <td><?php echo _( 'Total Owing' ) ?></td>
<td class="right"><?php echo sponsorship_format_amount( $t_total_owing ) ?></td>
<td colspan="2"></td>
</tr>
<tr>
<td colspan="5"></td>
- <td><?php echo lang_get( 'total_paid' ) ?></td>
+ <td><?php echo _( 'Total Paid' ) ?></td>
<td class="right"><?php echo sponsorship_format_amount( $t_total_paid ) ?></td>
<td colspan="2"></td>
</tr>
@@ -251,7 +254,7 @@
$t_sponsor_count = count( $t_sponsors );
if ( $t_sponsor_count === 0 ) {
- echo '<p>' . lang_get( 'no_sponsored' ) . '</p>';
+ echo '<p>' . _( 'No sponsored issues Assigned To yourself were found.' ) . '</p>';
} else {
?>
@@ -275,18 +278,18 @@
<!-- Headings -->
<tr>
<td class="form-title" colspan="8">
- <?php echo lang_get( 'issues_handled' ) ?>
+ <?php echo _( 'Sponsored Issues You Have Been Assigned To:' ) ?>
</td>
</tr>
<tr>
- <td class="form-title"><?php echo lang_get( 'email_bug' ) ?></td>
- <td class="form-title"><?php echo lang_get( 'email_project' ) ?></td>
- <td class="form-title"><?php echo lang_get( 'fixed_in_version' ) ?></td>
- <td class="form-title"><?php echo lang_get( 'email_status' ) ?></td>
- <td class="form-title"><?php echo lang_get( 'email_summary' ) ?></td>